cat-llm 0.0.57__py3-none-any.whl → 0.0.59__py3-none-any.whl

{cat_llm-0.0.57.dist-info → cat_llm-0.0.59.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cat-llm
-Version: 0.0.57
+Version: 0.0.59
 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.57.dist-info → cat_llm-0.0.59.dist-info}/RECORD

@@ -1,15 +1,15 @@
 catllm/CERAD_functions.py,sha256=ZCKyCiv-2eUPzJ7Yhrz4Y0OJK4iEyWMnOUI7mFDsoEI,22471
-catllm/__about__.py,sha256=G7jnzmS4ZL5a-aOEWWKsjAXLRYmMxzB6Nf7V7yz-org,404
+catllm/__about__.py,sha256=sFpDAFDHuCRUsxZfcPhpF4HRhFnFXsmeLWtwEV6xI84,404
 catllm/__init__.py,sha256=sf02zp7N0NW0mAQi7eQ4gliWR1EwoqvXkHN2HwwjcTE,372
-catllm/build_web_research.py,sha256=CYGhxnonJLBw80ATEBkpRjOKJgCYntHTgx4s4Pb8g88,6833
+catllm/build_web_research.py,sha256=4nANCNeu_j2s3D7ouuZU_x-ZN0YS3TcsVglZZPuJYLU,8121
 catllm/image_functions.py,sha256=8dUpwHwVe4Vf06wjFNgLnh54q5upo4E-P87-TKaSECE,35519
-catllm/text_functions.py,sha256=iAfd6roKxxSrrKQ4VvEc5y_ZWyIgW9fVzQOaDITyFDU,18116
+catllm/text_functions.py,sha256=EL-jbVX6GJ9MX4yULz_RJOOhsYEjooaEK5lAagTeyWY,18083
 catllm/images/circle.png,sha256=JWujAWAh08-TajAoEr_TAeFNLlfbryOLw6cgIBREBuQ,86202
 catllm/images/cube.png,sha256=nFec3e5bmRe4zrBCJ8QK-HcJLrG7u7dYdKhmdMfacfE,77275
 catllm/images/diamond.png,sha256=rJDZKtsnBGRO8FPA0iHuA8FvHFGi9PkI_DWSFdw6iv0,99568
 catllm/images/overlapping_pentagons.png,sha256=VO5plI6eoVRnjfqinn1nNzsCP2WQhuQy71V0EASouW4,71208
 catllm/images/rectangles.png,sha256=2XM16HO9EYWj2yHgN4bPXaCwPfl7iYQy0tQUGaJX9xg,40692
-cat_llm-0.0.57.dist-info/METADATA,sha256=kNH__3Xq3xfOgaS9MW-_o7Fqq4YqYPpKWqzuzkQWRH0,22370
-cat_llm-0.0.57.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-cat_llm-0.0.57.dist-info/licenses/LICENSE,sha256=Vje2sS5WV4TnIwY5uQHrF4qnBAM3YOk1pGpdH0ot-2o,34969
-cat_llm-0.0.57.dist-info/RECORD,,
+cat_llm-0.0.59.dist-info/METADATA,sha256=VzCCPeGKFoyTcewKlmqDO0OsnZTLcE46TJzpQ-nv9Fo,22370
+cat_llm-0.0.59.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+cat_llm-0.0.59.dist-info/licenses/LICENSE,sha256=Vje2sS5WV4TnIwY5uQHrF4qnBAM3YOk1pGpdH0ot-2o,34969
+cat_llm-0.0.59.dist-info/RECORD,,

catllm/__about__.py

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

catllm/build_web_research.py

@@ -88,13 +88,42 @@ def build_web_research_dataset(
                         if getattr(block, "type", "") == "text"
                     ).strip()
                     link1.append(reply)
-                    print(reply)
                     
                 except Exception as e:
                     print(f"An error occurred: {e}")
                     link1.append(f"Error processing input: {e}")
+
+            elif model_source == "Google":
+                import requests
+                url = f"https://generativelanguage.googleapis.com/v1beta/models/{user_model}:generateContent"
+                try:
+                    headers = {
+                        "x-goog-api-key": api_key,
+                        "Content-Type": "application/json"
+                    }
+                    payload = {
+                        "contents": [{"parts": [{"text": prompt}]}],
+                        "tools": [{"google_search": {}}]  # Enable search grounding
+                    }
+        
+                    response = requests.post(url, headers=headers, json=payload)
+                    response.raise_for_status()
+                    result = response.json()
+        
+                    # extract reply from Google's response structure
+                    if "candidates" in result and result["candidates"]:
+                        reply = result["candidates"][0]["content"]["parts"][0]["text"]
+                    else:
+                        reply = "No response generated"
+            
+                    link1.append(reply)
+        
+                except Exception as e:
+                    print(f"An error occurred: {e}")
+                    link1.append(f"Error processing input: {e}")
+
             else:
-                raise ValueError("Unknown source! Currently this function only supports 'Anthropic' as model_source.")
+                raise ValueError("Unknown source! Currently this function only supports 'Anthropic' or 'Google' as model_source.")
             # in situation that no JSON is found
             if reply is not None:
                 extracted_json = regex.findall(r'\{(?:[^{}]|(?R))*\}', reply, regex.DOTALL)
@@ -126,7 +155,7 @@ def build_web_research_dataset(
             # Save progress so far
             temp_df = pd.DataFrame({
                 'survey_response': search_input[:idx+1],
-                'link1': link1,
+                'model_response': link1,
                 'json': extracted_jsons
             })
             # Normalize processed jsons so far

catllm/text_functions.py

@@ -334,7 +334,6 @@ Provide your work in JSON format where the number belonging to each category is
                         reply = "No response generated"
 
                     link1.append(reply)
-                    print(reply)
                 except Exception as e:
                     print(f"An error occurred: {e}")
                     link1.append(f"Error processing input: {e}")