cat-llm 0.0.30__py3-none-any.whl → 0.0.32__py3-none-any.whl

{cat_llm-0.0.30.dist-info → cat_llm-0.0.32.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cat-llm
-Version: 0.0.30
+Version: 0.0.32
 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.32.dist-info/RECORD

@@ -0,0 +1,9 @@
+catllm/CERAD_functions.py,sha256=fiSiBnCcFgNp5XmGhZULnToEoMyP5z6JMcH-aWC8q5o,18787
+catllm/__about__.py,sha256=TRcq8nZQQ7HQVhDvGX9Y2Zu3S7fzZzv_JDdqeeeYkr8,404
+catllm/__init__.py,sha256=BpAG8nPhM3ZQRd0WqkubI_36-VCOs4eCYtGVgzz48Bs,337
+catllm/image_functions.py,sha256=9e4V1IEMZUFrH00yEjyowwTUKeXWGsln0U1iQ-DELTY,31359
+catllm/text_functions.py,sha256=TNsjYKpr8ZH9jeAYN-4DcFcrnR8x2eRl99oXzpdhE0Q,16910
+cat_llm-0.0.32.dist-info/METADATA,sha256=TUOCnGXRsDP2H62Xfns3djY4271CUiLCnZIiP31_s2E,1679
+cat_llm-0.0.32.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+cat_llm-0.0.32.dist-info/licenses/LICENSE,sha256=wJLsvOr6lrFUDcoPXExa01HOKFWrS3JC9f0RudRw8uw,1075
+cat_llm-0.0.32.dist-info/RECORD,,

catllm/CERAD_functions.py

@@ -151,7 +151,7 @@ def cerad_drawn_score(
                         {
                             "type": "image_url",
                             "image_url": {"url": encoded_image, "detail": "high"},
-                            },
+                            }
             ]
         elif model_source == "Anthropic":
             prompt = [
@@ -177,14 +177,14 @@ def cerad_drawn_score(
                         "media_type": "image/jpeg",
                         "data": encoded
                     }
-                    },
+                    }
             ]
 
         elif model_source == "Mistral":
             prompt = [
                 {
-                    "role": "system",
-                    "content": (
+                    "type": "text",
+                    "text": (
                         f"You are an image-tagging assistant trained in the CERAD Constructional Praxis test.\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"
@@ -199,7 +199,7 @@ def cerad_drawn_score(
                 },
                 {
                     "type": "image_url",
-                    "image_url": f"data:image/jpeg;base64,{base64_image}"
+                    "image_url": f"data:image/jpeg;base64,{encoded}"
                 }
             ]
             
@@ -236,6 +236,7 @@ def cerad_drawn_score(
 
         elif model_source == "Mistral":
             from mistralai import Mistral
+            reply = None
             client = Mistral(api_key=api_key)
             try:
                 response = client.chat.complete(

catllm/__about__.py

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

catllm/__init__.py

@@ -11,6 +11,6 @@ from .__about__ import (
     __license__,
 )
 
-from .cat_llm import *
+from .text_functions import *
 from .CERAD_functions import * 
 from .image_functions import * 

catllm/image_functions.py

@@ -72,7 +72,7 @@ def image_multi_class(
     
     # Handle extension safely
         ext = Path(img_path).suffix.lstrip(".").lower()
-        if model_source == "OpenAI":
+        if model_source == "OpenAI" or model_source == "Mistral":
             encoded_image = f"data:image/{ext};base64,{encoded}"
             prompt = [
                 {
@@ -309,7 +309,7 @@ def image_score(
         ext = Path(img_path).suffix.lstrip(".").lower()
         encoded_image = f"data:image/{ext};base64,{encoded}"
 
-        if model_source == "OpenAI":
+        if model_source == "OpenAI" or model_source == "Mistral":
             prompt = [
                 {
                     "type": "text",
@@ -575,7 +575,7 @@ def image_features(
         ext = Path(img_path).suffix.lstrip(".").lower()
         encoded_image = f"data:image/{ext};base64,{encoded}"
 
-        if model_source == "OpenAI":
+        if model_source == "OpenAI" or model_source == "Mistral":
             prompt = [
                 {
                     "type": "text",

cat_llm-0.0.30.dist-info/RECORD

@@ -1,9 +0,0 @@
-catllm/CERAD_functions.py,sha256=OQOkCjC0J0ZiandP2J7YCx39KgdndJN3fAzq5XHYozs,18774
-catllm/__about__.py,sha256=YibkqP-aDZxbnylzJCTNLSTsAvGv9UhLUggZCWgK6kQ,404
-catllm/__init__.py,sha256=kLk180aJna1s-wU6CLr4_hKkbjoeET-11jGmC1pdhQw,330
-catllm/cat_llm.py,sha256=TNsjYKpr8ZH9jeAYN-4DcFcrnR8x2eRl99oXzpdhE0Q,16910
-catllm/image_functions.py,sha256=JLlv5qQhAQzgsRIY18rUPtM1P7x1Fw2UlWlI1dpv3dA,31272
-cat_llm-0.0.30.dist-info/METADATA,sha256=U0z9dm0ZCtDS5opnhns2irSQjQP00qlRqQEljPy_tG8,1679
-cat_llm-0.0.30.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-cat_llm-0.0.30.dist-info/licenses/LICENSE,sha256=wJLsvOr6lrFUDcoPXExa01HOKFWrS3JC9f0RudRw8uw,1075
-cat_llm-0.0.30.dist-info/RECORD,,