CLIPInterrogator -> Interrogator

clip_interrogator.ipynb

@@ -74,7 +74,7 @@
         "\n",
         "from PIL import Image\n",
         "\n",
-        "from clip_interrogator import CLIPInterrogator, Config\n"
+        "from clip_interrogator import Interrogator, Config\n"
       ]
     },
     {
@@ -91,7 +91,7 @@
         "\n",
         "device = torch.device('cuda' if torch.cuda.is_available() else 'cpu')\n",
         "config = Config(device=device, clip_model_name=clip_model_name)\n",
-        "interrogator = CLIPInterrogator(config)\n"
+        "interrogator = Interrogator(config)\n"
       ]
     },
     {

clip_interrogator/__init__.py

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

clip_interrogator/clip_interrogator.py

@@ -46,7 +46,7 @@ def _load_list(data_path, filename) -> List[str]:
     return items
 
 
-class CLIPInterrogator():
+class Interrogator():
     def __init__(self, config: Config):
         self.config = config
         self.device = config.device

run_cli.py

@@ -7,7 +7,7 @@ import torch
 
 from PIL import Image
 
-from clip_interrogator import CLIPInterrogator, Config
+from clip_interrogator import Interrogator, Config
 
 
 def main():
@@ -39,9 +39,8 @@ def main():
     # generate a nice prompt
     device = torch.device('cuda' if torch.cuda.is_available() else 'cpu')
     config = Config(device=device, clip_model_name=args.clip)
-    interrogator = CLIPInterrogator(config)
-    prompt = interrogator.interrogate(image)
-    print(prompt)
+    ci = Interrogator(config)
+    print(ci.interrogate(image))
 
 if __name__ == "__main__":
     main()