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

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

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

@@ -0,0 +1,9 @@
+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,,

catllm/CERAD_functions.py

@@ -179,6 +179,29 @@ def cerad_drawn_score(
                     }
                     },
             ]
+
+        elif model_source == "Mistral":
+            prompt = [
+                {
+                    "role": "system",
+                    "content": (
+                        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"{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. "
+                        f"No additional keys, comments, or text.\n\n"
+                        f"Example:\n"
+                        f"{example_JSON}"
+                    ),
+                },
+                {
+                    "type": "image_url",
+                    "image_url": f"data:image/jpeg;base64,{base64_image}"
+                }
+            ]
             
         if model_source == "OpenAI":
             from openai import OpenAI
@@ -195,20 +218,6 @@ def cerad_drawn_score(
                 print(f"An error occurred: {e}")
                 link1.append(f"Error processing input: {e}")
 
-        elif model_source == "Perplexity":
-            from openai import OpenAI
-            client = OpenAI(api_key=api_key, base_url="https://api.perplexity.ai")
-            try:
-                response_obj = client.chat.completions.create(
-                    model=user_model,
-                    messages=[{'role': 'user', 'content': prompt}],
-                    temperature=creativity
-                )
-                reply = response_obj.choices[0].message.content
-                link1.append(reply)
-            except Exception as e:
-                print(f"An error occurred: {e}")
-                link1.append(f"Error processing input: {e}")
         elif model_source == "Anthropic":
             import anthropic
             client = anthropic.Anthropic(api_key=api_key)
@@ -224,6 +233,7 @@ def cerad_drawn_score(
             except Exception as e:
                 print(f"An error occurred: {e}")
                 link1.append(f"Error processing input: {e}")
+
         elif model_source == "Mistral":
             from mistralai import Mistral
             client = Mistral(api_key=api_key)
@@ -241,7 +251,7 @@ def cerad_drawn_score(
                 print(f"An error occurred: {e}")
                 link1.append(f"Error processing input: {e}")
         else:
-            raise ValueError("Unknown source! Choose from OpenAI, Anthropic, Perplexity, or Mistral")
+            raise ValueError("Unknown source! Choose from OpenAI, Perplexity, or Mistral")
             # in situation that no JSON is found
         if reply is not None:
             extracted_json = regex.findall(r'\{(?:[^{}]|(?R))*\}', reply, regex.DOTALL)

catllm/__about__.py

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

cat_llm-0.0.29.dist-info/RECORD

@@ -1,9 +0,0 @@
-catllm/CERAD_functions.py,sha256=KaKrtw71VGNzWBRv7B_dMwGT6iYg3D7G5l5nUFKImMw,18332
-catllm/__about__.py,sha256=QnNiB46oNOtCa5XpK0snsSnXws0EtbKwFamcLpxgaIk,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.29.dist-info/METADATA,sha256=CPxmYv0wGD7HMY-rMyNa3wYR6sZ7d1Okg2SWJaqAHa0,1679
-cat_llm-0.0.29.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-cat_llm-0.0.29.dist-info/licenses/LICENSE,sha256=wJLsvOr6lrFUDcoPXExa01HOKFWrS3JC9f0RudRw8uw,1075
-cat_llm-0.0.29.dist-info/RECORD,,