From 55fe80c74ca6a389dc9234eb31494a438779d8e1 Mon Sep 17 00:00:00 2001 From: pharmapsychotic Date: Thu, 5 Jan 2023 15:51:52 -0600 Subject: [PATCH] Simplify install further Big ups to @justindujardin for proper syntax to get git dependency into requirements in way that pip will accept it! :D --- README.md | 7 +++---- clip_interrogator/__init__.py | 2 +- requirements.txt | 3 ++- setup.py | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index d9df433..a0f79dc 100644 --- a/README.md +++ b/README.md @@ -35,15 +35,14 @@ Install with PIP # install torch with GPU support for example: pip3 install torch torchvision --extra-index-url https://download.pytorch.org/whl/cu117 -# install clip-interrogator and blip -pip install clip-interrogator==0.3.3 -pip install git+https://github.com/pharmapsychotic/BLIP.git +# install clip-interrogator +pip install clip-interrogator==0.3.4 ``` You can then use it in your script ```python from PIL import Image -from clip_interrogator import Interrogator, Config +from clip_interrogator import Config, Interrogator image = Image.open(image_path).convert('RGB') ci = Interrogator(Config(clip_model_name="ViT-L-14/openai")) print(ci.interrogate(image)) diff --git a/clip_interrogator/__init__.py b/clip_interrogator/__init__.py index 925f76a..a8f6aab 100644 --- a/clip_interrogator/__init__.py +++ b/clip_interrogator/__init__.py @@ -1,4 +1,4 @@ from .clip_interrogator import Interrogator, Config -__version__ = '0.3.3' +__version__ = '0.3.4' __author__ = 'pharmapsychotic' \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 735e90b..3a66935 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,4 +3,5 @@ torchvision Pillow requests tqdm -open_clip_torch \ No newline at end of file +open_clip_torch +blip @ git+https://github.com/pharmapsychotic/BLIP.git \ No newline at end of file diff --git a/setup.py b/setup.py index 8201892..6554a13 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ from setuptools import setup, find_packages setup( name="clip-interrogator", - version="0.3.3", + version="0.3.4", license='MIT', author='pharmapsychotic', author_email='me@pharmapsychotic.com',