cat-llm 0.0.22__tar.gz → 0.0.24__tar.gz

{cat_llm-0.0.22 → cat_llm-0.0.24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cat-llm
-Version: 0.0.22
+Version: 0.0.24
 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.22 → cat_llm-0.0.24}/src/catllm/CERAD_functions.py

@@ -1,10 +1,13 @@
-# 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
+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 +24,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 +33,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 +42,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",
@@ -87,7 +90,7 @@ def cerad_score(
     link1 = []
     extracted_jsons = []
 
-    for i, img_path in enumerate(tqdm(image_files, desc="Categorising images"), start=0):
+    for i, img_path in enumerate(tqdm(image_files, desc="Scoring images"), start=0):
     # Check validity first
         if img_path is None or not os.path.exists(img_path):
             link1.append("Skipped NaN input or invalid path")
@@ -101,6 +104,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 = [
             {
@@ -109,7 +117,7 @@ def cerad_score(
                     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"
-                    f"Image is expected to show within it a drawing of a {shape}.\n\n"
+                    f"{reference_text}"
                     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. "

{cat_llm-0.0.22 → cat_llm-0.0.24}/src/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.24"
 __author__ = "Chris Soria"
 __email__ = "chrissoria@berkeley.edu"
 __title__ = "cat-llm"

{cat_llm-0.0.22 → cat_llm-0.0.24}/src/catllm/__init__.py

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

{cat_llm-0.0.22 → cat_llm-0.0.24}/src/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",