cat-llm 0.0.22__py3-none-any.whl → 0.0.23__py3-none-any.whl

{cat_llm-0.0.22.dist-info → cat_llm-0.0.23.dist-info}/METADATA

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

@@ -0,0 +1,8 @@
+catllm/CERAD_functions.py,sha256=Pxk8EE6fYDXQds_X_rpOkSYdC3qL1uk1J22dNqlIGsU,15245
+catllm/__about__.py,sha256=zwS1-qZYSyAy-RZXHHvm1VlcPU3oJNBheC_aGVi7IN0,404
+catllm/__init__.py,sha256=mNp5MQx2aNTtpNBHJ-U9INd1hX3u6jRkOoAewEI25MI,298
+catllm/cat_llm.py,sha256=TJmdM_O9oL7wvTuwohQLY5vgaAttIElCcfXEJHzdhfM,58311
+cat_llm-0.0.23.dist-info/METADATA,sha256=ULEDGfqEUjLUK8g89BAuaIIkmVnsenVM8jvEPpMKErg,1679
+cat_llm-0.0.23.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+cat_llm-0.0.23.dist-info/licenses/LICENSE,sha256=wJLsvOr6lrFUDcoPXExa01HOKFWrS3JC9f0RudRw8uw,1075
+cat_llm-0.0.23.dist-info/RECORD,,

catllm/CERAD_functions.py

@@ -1,10 +1,14 @@
-# image multi-class (binary) function
-def cerad_score(
+# a function specifically for CERAD Constructional Praxis test
+# specifically for pictures of drawings of shapes like circles, diamonds, rectangles, and cubes
+# SPDX-FileCopyrightText: 2025-present Christopher Soria <
+def cerad_drawn_score(
     shape, 
     image_input,
     api_key,
     user_model="gpt-4o-2024-11-20",
     creativity=0,
+    reference_in_image=False,
+    provide_reference=False,
     safety=False,
     filename="categorized_data.csv",
     model_source="OpenAI"
@@ -21,7 +25,7 @@ def cerad_score(
     shape = shape.lower()
 
     if shape == "circle":
-        categories = ["It has a drawing of a circle",
+        categories = ["The image contains a drawing that clearly represents a circle",
                     "The drawing does not resemble a circle",
                     "The drawing resembles a circle",
                     "The circle is closed",
@@ -30,7 +34,7 @@ def cerad_score(
                     "The circle is almost circular",
                     "None of the above descriptions apply"]
     elif shape == "diamond":
-        categories = ["It has a drawing of a diamond",
+        categories = ["The image contains a drawing that clearly represents a diamond shape",
                     "It has a drawing of a square",
                     "A drawn shape DOES NOT resemble a diamond",
                     "A drawn shape resembles a diamond",
@@ -39,7 +43,7 @@ def cerad_score(
                     "If a diamond is drawn it's more elaborate than a simple diamond (such as overlapping diamonds or a diamond with an extras lines inside)",
                     "None of the above descriptions apply"]
     elif shape == "rectangles" or shape == "overlapping rectangles":
-        categories = ["It has a drawing of overlapping rectangles",
+        categories = ["The image contains a drawing that clearly represents overlapping rectangles",
                     "A drawn shape DOES NOT resemble a overlapping rectangles",
                     "A drawn shape resembles a overlapping rectangles",
                     "Rectangle 1 has 4 sides",
@@ -101,6 +105,11 @@ def cerad_score(
     # Handle extension safely
         ext = Path(img_path).suffix.lstrip(".").lower()
         encoded_image = f"data:image/{ext};base64,{encoded}"
+
+        if reference_in_image:
+            reference_text = f"This image contains a perfect reference image of a {shape}. Next to is a drawing that is meant to be similar to the reference {shape}.\n\n"
+        else:
+            reference_text = f"Image is expected to show within it a drawing of a {shape}.\n\n"
     
         prompt = [
             {
@@ -123,6 +132,7 @@ def cerad_score(
                 "image_url": {"url": encoded_image, "detail": "high"},
             },
         ]
+        print(prompt)
         if model_source == "OpenAI":
             from openai import OpenAI
             client = OpenAI(api_key=api_key)

catllm/__about__.py

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

catllm/__init__.py

@@ -12,4 +12,4 @@ from .__about__ import (
 )
 
 from .cat_llm import *
-#from .CERAD_functions import * 
+from .CERAD_functions import * 

catllm/cat_llm.py

@@ -1094,7 +1094,7 @@ def cerad_score(
     shape = shape.lower()
 
     if shape == "circle":
-        categories = ["It has a drawing of a circle",
+        categories = ["The image contains a drawing that clearly represents a circle",
                     "The drawing does not resemble a circle",
                     "The drawing resembles a circle",
                     "The circle is closed",
@@ -1103,7 +1103,7 @@ def cerad_score(
                     "The circle is almost circular",
                     "None of the above descriptions apply"]
     elif shape == "diamond":
-        categories = ["It has a drawing of a diamond",
+        categories = ["The image contains a drawing that clearly represents a diamond shape",
                     "It has a drawing of a square",
                     "A drawn shape DOES NOT resemble a diamond",
                     "A drawn shape resembles a diamond",
@@ -1112,7 +1112,7 @@ def cerad_score(
                     "If a diamond is drawn it's more elaborate than a simple diamond (such as overlapping diamonds or a diamond with an extras lines inside)",
                     "None of the above descriptions apply"]
     elif shape == "rectangles" or shape == "overlapping rectangles":
-        categories = ["It has a drawing of overlapping rectangles",
+        categories = ["The image contains a drawing that clearly represents overlapping rectangles",
                     "A drawn shape DOES NOT resemble a overlapping rectangles",
                     "A drawn shape resembles a overlapping rectangles",
                     "Rectangle 1 has 4 sides",

cat_llm-0.0.22.dist-info/RECORD

@@ -1,8 +0,0 @@
-catllm/CERAD_functions.py,sha256=Qb6-X4147pLkiGYnhCiTZbUllnI_Phc78NeEGm9IYic,14560
-catllm/__about__.py,sha256=99aNi54Pad2znZPHwQtb9H2nkF1CTegDDOFO6fNlmcE,404
-catllm/__init__.py,sha256=bgH_2K70m3WP9B8GZNciAr7ld7bSNwgpzhYgkoAC8Bo,299
-catllm/cat_llm.py,sha256=QNa8ZD3z5cWZtdu0gQfkLYq2I96aGwGCUUN61E50RKA,58206
-cat_llm-0.0.22.dist-info/METADATA,sha256=W2tUxYh5WcE8LFHDRJJR6xZO5vRdzPDBIsv7i4JOJ04,1679
-cat_llm-0.0.22.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-cat_llm-0.0.22.dist-info/licenses/LICENSE,sha256=wJLsvOr6lrFUDcoPXExa01HOKFWrS3JC9f0RudRw8uw,1075
-cat_llm-0.0.22.dist-info/RECORD,,