cat-llm 0.0.36__py3-none-any.whl → 0.0.37__py3-none-any.whl

{cat_llm-0.0.36.dist-info → cat_llm-0.0.37.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cat-llm
-Version: 0.0.36
+Version: 0.0.37
 Summary: A tool for categorizing text data and images using LLMs and vision models
 Project-URL: Documentation, https://github.com/chrissoria/cat-llm#readme
 Project-URL: Issues, https://github.com/chrissoria/cat-llm/issues
@@ -20,6 +20,7 @@ Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Requires-Python: >=3.8
 Requires-Dist: pandas
+Requires-Dist: pkg-resources
 Requires-Dist: tqdm
 Description-Content-Type: text/markdown
 

{cat_llm-0.0.36.dist-info → cat_llm-0.0.37.dist-info}/RECORD

@@ -1,5 +1,5 @@
-catllm/CERAD_functions.py,sha256=3eGLrJAYkUt47eappuf0EECSNK1OmjofHQ1jMsNEWeg,19641
-catllm/__about__.py,sha256=xSQKWBq3GkAJZfrOyxQHQpuNDgMmxUTiAryYKvsN1KM,404
+catllm/CERAD_functions.py,sha256=NEf8HX1MNMjlMGuS42MaEcVE7XbQR9nGRYyPLQf91IU,19961
+catllm/__about__.py,sha256=WFqW7Tej2l4jCqQSDnklndjw7xQvVxk0mnWP4OXCnzw,404
 catllm/__init__.py,sha256=BpAG8nPhM3ZQRd0WqkubI_36-VCOs4eCYtGVgzz48Bs,337
 catllm/image_functions.py,sha256=7nw0HDvacYUVo_VLcy-6Pi8QcmDbPtKVKPJITAK19RQ,31311
 catllm/text_functions.py,sha256=K6oetWYk25PwsllWSZP4cFrz7kyxJg0plPRvpmQkCsU,16846
@@ -8,7 +8,7 @@ catllm/images/cube.png,sha256=nFec3e5bmRe4zrBCJ8QK-HcJLrG7u7dYdKhmdMfacfE,77275
 catllm/images/diamond.png,sha256=rJDZKtsnBGRO8FPA0iHuA8FvHFGi9PkI_DWSFdw6iv0,99568
 catllm/images/overlapping_pentagons.png,sha256=VO5plI6eoVRnjfqinn1nNzsCP2WQhuQy71V0EASouW4,71208
 catllm/images/rectangles.png,sha256=2XM16HO9EYWj2yHgN4bPXaCwPfl7iYQy0tQUGaJX9xg,40692
-cat_llm-0.0.36.dist-info/METADATA,sha256=ri1Cqd4xGLB6G2hAOXsPyaZgt2MaNqGynSxK2sR4m2E,17232
-cat_llm-0.0.36.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-cat_llm-0.0.36.dist-info/licenses/LICENSE,sha256=YYp5RSBpti1KKIJO0aV0GTRgQNLIsB7TEYivC3QkCOo,788
-cat_llm-0.0.36.dist-info/RECORD,,
+cat_llm-0.0.37.dist-info/METADATA,sha256=DTJBwpMhd7VU54SoTRplhN1ZsCR_efye6RdA2yL2VKw,17261
+cat_llm-0.0.37.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+cat_llm-0.0.37.dist-info/licenses/LICENSE,sha256=YYp5RSBpti1KKIJO0aV0GTRgQNLIsB7TEYivC3QkCOo,788
+cat_llm-0.0.37.dist-info/RECORD,,

catllm/CERAD_functions.py

@@ -165,14 +165,13 @@ def cerad_drawn_score(
             if provide_reference:
                 prompt.append({
                     "type": "image_url", 
-                    "image_url": {"url": reference_image, "detail": "high"}
+                    "image_url": {"url": encoded_ref_image, "detail": "high"}
                 })
                                 
             prompt.append({
                 "type": "image_url",
                 "image_url": {"url": encoded_image, "detail": "high"}
             })
-            print(prompt)   
         
         elif model_source == "Anthropic":
             prompt = [
@@ -190,16 +189,29 @@ def cerad_drawn_score(
                         f"Example:\n"
                         f"{example_JSON}"
                     ),
-                },
-                {
+                }
+            ]
+
+            if provide_reference:
+                prompt.append({
+                    "type": "image",
+                    "source": {
+                        "type": "base64",
+                        "media_type": "image/png",
+                        "data": encoded_ref
+                    }
+                }
+                )
+
+            prompt.append({
                     "type": "image",
                     "source": {
                         "type": "base64",
                         "media_type": "image/jpeg",
                         "data": encoded
                     }
-                    }
-            ]
+            }
+            )
 
         elif model_source == "Mistral":
             prompt = [

catllm/__about__.py

@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: 2025-present Christopher Soria <chrissoria@berkeley.edu>
 #
 # SPDX-License-Identifier: MIT
-__version__ = "0.0.36"
+__version__ = "0.0.37"
 __author__ = "Chris Soria"
 __email__ = "chrissoria@berkeley.edu"
 __title__ = "cat-llm"