sunholo 0.85.3__py3-none-any.whl → 0.86.1__py3-none-any.whl

sunholo/genai/__init__.py

@@ -1,2 +1,3 @@
 from .process_funcs_cls import GenAIFunctionProcessor
 from .safety import genai_safety
+from .init import init_genai

sunholo/genai/init.py

@@ -0,0 +1,18 @@
+import os
+
+def init_genai():
+    """
+    There are some features that come to the google.generativeai first, 
+    which needs to be authenticated via a GOOGLE_API_KEY environment variable, 
+    created via the Google AI Console at https://aistudio.google.com/app/apikey 
+    """
+    try:
+        import google.generativeai as genai
+    except ImportError:
+        raise ImportError("google.generativeai not installed, please install via 'pip install sunholo'[gcp]'")
+    
+    GOOGLE_API_KEY=os.getenv('GOOGLE_API_KEY')
+    if not GOOGLE_API_KEY:
+        raise ValueError("google.generativeai needs GOOGLE_API_KEY set in environment variable")
+
+    genai.configure(api_key=GOOGLE_API_KEY)

sunholo/genai/process_funcs_cls.py

@@ -6,6 +6,8 @@ from .safety import genai_safety
 
 from typing import TYPE_CHECKING, Union
 
+import json
+
 try:
     import google.generativeai as genai
 except ImportError:
@@ -58,7 +60,7 @@ class GenAIFunctionProcessor:
         
         self.config = config
         self.funcs = self.construct_tools()
-        self.model_name = config.vacConfig("model") or "gemini-1.5-flash"
+        self.model_name = config.vacConfig("model") if config.vacConfig("llm") == "vertex" else "gemini-1.5-flash"
         self.last_api_requests_and_responses = []
         self._validate_functions()
 
@@ -111,7 +113,7 @@ class GenAIFunctionProcessor:
                 Part(
                     function_response=genai.protos.FunctionResponse(
                         name=part[0],
-                        response={"result": part[2]}
+                        response={"result": part[2], "args": json.dumps(part[1])}
                     )
                 )
             )
@@ -146,6 +148,13 @@ class GenAIFunctionProcessor:
                 if isinstance(result, list) and target_value in result:
                     log.info(f"Target value '{target_value}' found in the result of function '{function_name}'.")
                     return True
+                elif isinstance(result, dict) and isinstance(target_value, dict):
+                    for key, expected_value in target_value.items():
+                        if key in result:
+                            if result[key] == expected_value:
+                                log.info(f"The key '{key}' has the same value in both dictionaries.")
+                                return True
+                    return False
                 elif result == target_value:
                     log.info(f"Target value '{target_value}' found in the result of function '{function_name}'.")
                     return True

{sunholo-0.85.3.dist-info → sunholo-0.86.1.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.85.3
+Version: 0.86.1
 Summary: Large Language Model DevOps - a package to help deploy LLMs to the Cloud.
 Home-page: https://github.com/sunholo-data/sunholo-py
-Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.85.3.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.86.1.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0

{sunholo-0.85.3.dist-info → sunholo-0.86.1.dist-info}/RECORD

@@ -84,8 +84,9 @@ sunholo/gcs/add_file.py,sha256=TRbdEd3j-lFnyC7kqs5IWEPMPlDMFLR68fdTWga06Wo,8096
 sunholo/gcs/download_folder.py,sha256=ijJTnS595JqZhBH8iHFErQilMbkuKgL-bnTCMLGuvlA,1614
 sunholo/gcs/download_url.py,sha256=q1NiJSvEhdNrmU5ZJ-sBCMC_J5CxzrajY8LRgdPOV_M,6130
 sunholo/gcs/metadata.py,sha256=oQLcXi4brsZ74aegWyC1JZmhlaEV270HS5_UWtAYYWE,898
-sunholo/genai/__init__.py,sha256=o2c17UbgzIDxNKKF8deCLoctNpatAYgm9Cf9XDfpqvg,87
-sunholo/genai/process_funcs_cls.py,sha256=xnSxGGEHO7fYct8VkjaOKSBmHG-cEkvFTZqFLsN_oCc,11798
+sunholo/genai/__init__.py,sha256=dBl6IA3-Fx6-Vx81r0XqxHlUq6WeW1iDX188dpChu8s,115
+sunholo/genai/init.py,sha256=yG8E67TduFCTQPELo83OJuWfjwTnGZsyACospahyEaY,687
+sunholo/genai/process_funcs_cls.py,sha256=8aEsa4PYSMFM-nfBJEB6bmunfOdGRcrPyGofzCXrcPc,12315
 sunholo/genai/safety.py,sha256=mkFDO_BeEgiKjQd9o2I4UxB6XI7a9U-oOFjZ8LGRUC4,1238
 sunholo/invoke/__init__.py,sha256=bELcqIjzKvaupcIN5OQmDgGx_8jARtH9T6PCe8UgcvE,99
 sunholo/invoke/async_class.py,sha256=vmLT6DqE1YaPd4W88_QzPQvSzsjwLUAwt23vGZm-BEs,5767
@@ -140,9 +141,9 @@ sunholo/vertex/init.py,sha256=1OQwcPBKZYBTDPdyU7IM4X4OmiXLdsNV30C-fee2scQ,2875
 sunholo/vertex/memory_tools.py,sha256=q_phxgGX2TG2j2MXNULF2xGzQnQPENwjPN9nZ_A9Gh0,7526
 sunholo/vertex/safety.py,sha256=S9PgQT1O_BQAkcqauWncRJaydiP8Q_Jzmu9gxYfy1VA,2482
 sunholo/vertex/type_dict_to_json.py,sha256=uTzL4o9tJRao4u-gJOFcACgWGkBOtqACmb6ihvCErL8,4694
-sunholo-0.85.3.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.85.3.dist-info/METADATA,sha256=Zl6FrkaxNICv045YTjTHxJI7gztNukIOutw4YVRxqlw,7598
-sunholo-0.85.3.dist-info/WHEEL,sha256=HiCZjzuy6Dw0hdX5R3LCFPDmFS4BWl8H-8W39XfmgX4,91
-sunholo-0.85.3.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.85.3.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.85.3.dist-info/RECORD,,
+sunholo-0.86.1.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.86.1.dist-info/METADATA,sha256=33nerpBWHKZTB-opKzrasdhI3cosYq0D-imCPCNeCuc,7598
+sunholo-0.86.1.dist-info/WHEEL,sha256=HiCZjzuy6Dw0hdX5R3LCFPDmFS4BWl8H-8W39XfmgX4,91
+sunholo-0.86.1.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.86.1.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.86.1.dist-info/RECORD,,