cat-llm 0.0.26__tar.gz → 0.0.27__tar.gz

{cat_llm-0.0.26 → cat_llm-0.0.27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cat-llm
-Version: 0.0.26
+Version: 0.0.27
 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

{cat_llm-0.0.26 → cat_llm-0.0.27}/src/catllm/__about__.py

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

{cat_llm-0.0.26 → cat_llm-0.0.27}/src/catllm/image_functions.py

@@ -72,29 +72,56 @@ def extract_image_multi_class(
     
     # Handle extension safely
         ext = Path(img_path).suffix.lstrip(".").lower()
-        encoded_image = f"data:image/{ext};base64,{encoded}"
-    
-        prompt = [
-            {
-                "type": "text",
-                "text": (
-                    f"You are an image-tagging assistant.\n"
-                    f"Task ► Examine the attached image and decide, **for each category below**, "
-                    f"whether it is PRESENT (1) or NOT PRESENT (0).\n\n"
-                    f"Image is expected to show: {image_description}\n\n"
-                    f"Categories:\n{categories_str}\n\n"
-                    f"Output format ► Respond with **only** a JSON object whose keys are the "
-                    f"quoted category numbers ('1', '2', …) and whose values are 1 or 0. "
-                    f"No additional keys, comments, or text.\n\n"
-                    f"Example (three categories):\n"
-                    f"{example_JSON}"
-                ),
-            },
-            {
-                "type": "image_url",
-                "image_url": {"url": encoded_image, "detail": "high"},
-            },
-        ]
+        if model_source == "OpenAI":
+            encoded_image = f"data:image/{ext};base64,{encoded}"
+            prompt = [
+                {
+                    "type": "text",
+                    "text": (
+                        f"You are an image-tagging assistant.\n"
+                        f"Task ► Examine the attached image and decide, **for each category below**, "
+                        f"whether it is PRESENT (1) or NOT PRESENT (0).\n\n"
+                        f"Image is expected to show: {image_description}\n\n"
+                        f"Categories:\n{categories_str}\n\n"
+                        f"Output format ► Respond with **only** a JSON object whose keys are the "
+                        f"quoted category numbers ('1', '2', …) and whose values are 1 or 0. "
+                        f"No additional keys, comments, or text.\n\n"
+                        f"Example (three categories):\n"
+                        f"{example_JSON}"
+                    ),
+                },
+                {
+                    "type": "image_url",
+                    "image_url": {"url": encoded_image, "detail": "high"},
+                },
+            ]
+            
+        if model_source == "Anthropic":
+            encoded_image = f"data:image/{ext};base64,{encoded}"
+            prompt = [
+                {"type": "text",
+                    "text": (
+                        f"You are an image-tagging assistant.\n"
+                        f"Task ► Examine the attached image and decide, **for each category below**, "
+                        f"whether it is PRESENT (1) or NOT PRESENT (0).\n\n"
+                        f"Image is expected to show: {image_description}\n\n"
+                        f"Categories:\n{categories_str}\n\n"
+                        f"Output format ► Respond with **only** a JSON object whose keys are the "
+                        f"quoted category numbers ('1', '2', …) and whose values are 1 or 0. "
+                        f"No additional keys, comments, or text.\n\n"
+                        f"Example (three categories):\n"
+                        f"{example_JSON}"
+                    ),
+                },
+                {
+                    "type": "image",
+                    "source": {
+                        "type": "base64",
+                        "media_type": "image/jpeg",
+                        "data": encoded
+                    }
+                }
+            ]
         if model_source == "OpenAI":
             from openai import OpenAI
             client = OpenAI(api_key=api_key)
@@ -111,32 +138,8 @@ def extract_image_multi_class(
                 link1.append(f"Error processing input: {e}")
 
         elif model_source == "Anthropic":
-            prompt = [
-                {"type": "text",
-                "text": (
-                    f"You are an image-tagging assistant.\n"
-                    f"Task ► Examine the attached image and decide, **for each category below**, "
-                    f"whether it is PRESENT (1) or NOT PRESENT (0).\n\n"
-                    f"Image is expected to show: {image_description}\n\n"
-                    f"Categories:\n{categories_str}\n\n"
-                    f"Output format ► Respond with **only** a JSON object whose keys are the "
-                    f"quoted category numbers ('1', '2', …) and whose values are 1 or 0. "
-                    f"No additional keys, comments, or text.\n\n"
-                    f"Example (three categories):\n"
-                    f"{example_JSON}"
-                ),
-            },
-            {
-                "type": "image",
-                "source": {
-                    "type": "base64",
-                    "media_type": "image/jpeg",
-                    "data": encoded_image
-                }
-            }
-            ]
-
             import anthropic
+            reply = None
             client = anthropic.Anthropic(api_key=api_key)
             try:
                 message = client.messages.create(