Update to nicer BLIP packaging

README.md

@@ -35,8 +35,7 @@ Install with PIP
 # install torch with GPU support for example:
 pip3 install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu117
 
-# install blip and clip-interrogator
+# install clip-interrogator
-pip install -e git+https://github.com/pharmapsychotic/BLIP.git@lib#egg=blip
 pip install clip-interrogator==0.3.2
 ```
 

clip_interrogator.ipynb

@@ -55,7 +55,7 @@
         "    install_cmds = [\n",
         "        ['pip', 'install', 'gradio'],\n",
         "        ['pip', 'install', 'open_clip_torch'],\n",
-        "        ['pip', 'install', '-e', 'git+https://github.com/pharmapsychotic/BLIP.git@lib#egg=blip'],\n",
+        "        ['pip', 'install', 'git+https://github.com/pharmapsychotic/BLIP.git'],\n",
         "        ['git', 'clone', 'https://github.com/pharmapsychotic/clip-interrogator.git']\n",
         "    ]\n",
         "    for cmd in install_cmds:\n",

clip_interrogator/__init__.py

@@ -1,4 +1,4 @@
 from .clip_interrogator import Interrogator, Config
 
-__version__ = '0.3.2'
+__version__ = '0.3.3'
 __author__ = 'pharmapsychotic'

clip_interrogator/clip_interrogator.py

@@ -9,7 +9,7 @@ import time
 import torch
 
 from dataclasses import dataclass
-from models.blip import blip_decoder, BLIP_Decoder
+from blip.models.blip import blip_decoder, BLIP_Decoder
 from PIL import Image
 from torchvision import transforms
 from torchvision.transforms.functional import InterpolationMode

cog.yaml

@@ -15,7 +15,6 @@ build:
     - "open_clip_torch==2.7.0"    
     - "timm==0.4.12"
     - "pycocoevalcap==1.2"
-  run:
+    - "git+https://github.com/pharmapsychotic/BLIP.git"
-  - git clone https://github.com/salesforce/BLIP /root/blip
 
 predict: "predict.py:Predictor"

predict.py

@@ -2,8 +2,6 @@ import sys
 from PIL import Image
 from cog import BasePredictor, Input, Path
 
-sys.path.append('/root/blip')
-
 from clip_interrogator import Interrogator, Config
 
 

requirements.txt

@@ -4,3 +4,4 @@ Pillow
 requests
 tqdm
 open_clip_torch
+git+https://github.com/pharmapsychotic/BLIP.git

setup.py

@@ -5,7 +5,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="clip-interrogator",
-    version="0.3.2",
+    version="0.3.3",
     license='MIT',
     author='pharmapsychotic',
     author_email='me@pharmapsychotic.com',