sunholo 0.105.2__py3-none-any.whl → 0.105.4__py3-none-any.whl

sunholo/database/alloydb_client.py

@@ -129,7 +129,7 @@ class AlloyDBClient:
                 log.error("Can't create AlloyDBEngine - install via `pip install sunholo[gcp,database]`")
                 raise ValueError("Can't import AlloyDBEngine")
 
-        log.info(f"Inititaing AlloyDB Langchain engine for database: {self.database}")
+        log.info(f"Inititaing AlloyDB Langchain engine for database: {self.database} with config: {self.config}")
 
         from google.cloud.alloydb.connector import IPTypes
         engine = AlloyDBEngine.from_instance(

sunholo/genai/process_funcs_cls.py

@@ -81,7 +81,9 @@ class GenAIFunctionProcessor:
         self.model_name = "gemini-1.5-flash"
         if config:
             self.model_name = config.vacConfig("model") if config.vacConfig("llm") == "vertex" else "gemini-1.5-flash"
-        elif model_name:
+        
+        if model_name:
+            log.info(f"Overriding agent model name {self.model_name} with model {model_name}")
             self.model_name = model_name
         
         self.trace = trace
@@ -225,7 +227,7 @@ class GenAIFunctionProcessor:
 
         return strings
 
-    def process_funcs(self, full_response, output_parts=True) -> Union[list['Part'], str]:
+    def process_funcs(self, full_response, output_parts=True, loop_span=None) -> Union[list['Part'], str]:
         """
         Processes the functions based on the full_response from the generative model.
 
@@ -247,6 +249,7 @@ class GenAIFunctionProcessor:
         """
         api_requests_and_responses = []
 
+
         if not full_response:
             log.info("No response was found to process")
             return api_requests_and_responses
@@ -273,6 +276,8 @@ class GenAIFunctionProcessor:
                 if len(params)>8000:
                     log.warning(f"Total parameters are over 8000 characters - it may not work properly: {params[:10000]}....[{len(params)}]")
 
+                fn_span = loop_span.span(name=function_name, input=params_obj) if loop_span else None
+
                 # Check if the function is in our dictionary of available functions
                 if function_name in self.funcs:
                     fn_exec = self.funcs[function_name]
@@ -297,8 +302,11 @@ class GenAIFunctionProcessor:
                     api_requests_and_responses.append(
                         [function_name, params, clean_result]
                     )
+                    fn_span.end(output=clean_result) if fn_span else None
                 else:
-                    log.error(f"Function {function_name} is not recognized")
+                    msg = f"Function {function_name} is not recognized"
+                    log.error(msg)
+                    fn_span.end(output=msg) if fn_span else None
 
         log.info(f"{api_requests_and_responses=}")
         self.last_api_requests_and_responses = api_requests_and_responses
@@ -466,7 +474,7 @@ class GenAIFunctionProcessor:
                     input = {'content': content},
                 ) if loop_span else None
 
-                response: GenerateContentResponse = chat.send_message(content, stream=True, request_options=RequestOptions(
+                response: GenerateContentResponse = chat.send_message(content, request_options=RequestOptions(
                                         retry=retry.Retry(
                                             initial=10, 
                                             multiplier=2, 
@@ -519,16 +527,14 @@ class GenAIFunctionProcessor:
                     
                 except ValueError as err:
                     token_queue.append(f"{str(err)} for {chunk=}")
-            fn_span = loop_span.span(name="function_execution", input=response) if loop_span else None
             try:
-                executed_responses = self.process_funcs(response) 
+                executed_responses = self.process_funcs(response, loop_span=loop_span) 
             except Exception as err:
                 log.error(f"Error in executions: {str(err)}")
                 executed_responses = []
                 token_queue.append(f"{str(err)} for {response=}")
 
             log.info(f"[{guardrail}] {executed_responses=}")
-            fn_span.end(output=executed_responses) if fn_span else None
 
             if executed_responses:  
                 token_queue.append("\n-- Agent Actions:\n")
@@ -548,7 +554,7 @@ class GenAIFunctionProcessor:
                         callback.on_llm_new_token(token=token)
 
                     log.info(f"{fn_log} created a result={type(fn_result)=}")
-                    fn_exec_one = fn_exec.span(name=fn_log, input=fn_result) if fn_exec else None
+                    fn_exec_one = fn_exec.span(name=fn, input=fn_args) if fn_exec else None
                     
                     fn_result_json = None
                     # Convert MapComposite to a standard Python dictionary

{sunholo-0.105.2.dist-info → sunholo-0.105.4.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.105.2
+Version: 0.105.4
 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.105.2.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.105.4.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0

{sunholo-0.105.2.dist-info → sunholo-0.105.4.dist-info}/RECORD

@@ -59,7 +59,7 @@ sunholo/components/retriever.py,sha256=bKIVT7_18Ut3OJd0E0jyiISPnD9qkHWVjcQPT4i1_
 sunholo/components/vectorstore.py,sha256=xKk7micTRwZckaI7U6PxvFz_ZSjCH48xPTDYiDcv2tc,5913
 sunholo/database/__init__.py,sha256=bpB5Nk21kwqYj-qdVnvNgXjLsbflnH4g-San7OHMqR4,283
 sunholo/database/alloydb.py,sha256=YH8wNPS8gN-TDZEXQcVHxwd1NScHRfAxma3gK4R6KCk,11740
-sunholo/database/alloydb_client.py,sha256=0Zljdy_AHCJE88_HD1nKc74x6edByuZUzYlaNbSJnn8,18916
+sunholo/database/alloydb_client.py,sha256=kg6J8pCqBkjfEkXdhU8mwxdaI7w-cSE9AxKHWuYmzaM,18943
 sunholo/database/database.py,sha256=VqhZdkXUNdvWn8sUcUV3YNby1JDVf7IykPVXWBtxo9U,7361
 sunholo/database/lancedb.py,sha256=DyfZntiFKBlVPaFooNN1Z6Pl-LAs4nxWKKuq8GBqN58,715
 sunholo/database/static_dbs.py,sha256=8cvcMwUK6c32AS2e_WguKXWMkFf5iN3g9WHzsh0C07Q,442
@@ -88,7 +88,7 @@ sunholo/gcs/metadata.py,sha256=oQLcXi4brsZ74aegWyC1JZmhlaEV270HS5_UWtAYYWE,898
 sunholo/genai/__init__.py,sha256=dBl6IA3-Fx6-Vx81r0XqxHlUq6WeW1iDX188dpChu8s,115
 sunholo/genai/images.py,sha256=EyjsDqt6XQw99pZUQamomCpMOoIah9bp3XY94WPU7Ms,1678
 sunholo/genai/init.py,sha256=yG8E67TduFCTQPELo83OJuWfjwTnGZsyACospahyEaY,687
-sunholo/genai/process_funcs_cls.py,sha256=jlwx1iSg2L5dnM0TYD_roAD9RnPHPNB6a2qhjhk2Qcw,31314
+sunholo/genai/process_funcs_cls.py,sha256=8T0664wMeLcUIOHfa3EYHjohbMOHnzTzNz_UNhxutNM,31532
 sunholo/genai/safety.py,sha256=mkFDO_BeEgiKjQd9o2I4UxB6XI7a9U-oOFjZ8LGRUC4,1238
 sunholo/invoke/__init__.py,sha256=o1RhwBGOtVK0MIdD55fAIMCkJsxTksi8GD5uoqVKI-8,184
 sunholo/invoke/async_class.py,sha256=G8vD2H94fpBc37mSJSQODEKJ67P2mPQEHabtDaLOvxE,8033
@@ -147,9 +147,9 @@ sunholo/vertex/init.py,sha256=1OQwcPBKZYBTDPdyU7IM4X4OmiXLdsNV30C-fee2scQ,2875
 sunholo/vertex/memory_tools.py,sha256=tBZxqVZ4InTmdBvLlOYwoSEWu4-kGquc-gxDwZCC4FA,7667
 sunholo/vertex/safety.py,sha256=S9PgQT1O_BQAkcqauWncRJaydiP8Q_Jzmu9gxYfy1VA,2482
 sunholo/vertex/type_dict_to_json.py,sha256=uTzL4o9tJRao4u-gJOFcACgWGkBOtqACmb6ihvCErL8,4694
-sunholo-0.105.2.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.105.2.dist-info/METADATA,sha256=PVeJnFc1FZNiwl7ByNcEKrhuVWssIQAU9jFnw5o2Z4E,8312
-sunholo-0.105.2.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-sunholo-0.105.2.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.105.2.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.105.2.dist-info/RECORD,,
+sunholo-0.105.4.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.105.4.dist-info/METADATA,sha256=mFYUzjQ7asBiG4SEi4oAVar-FbD0kgedLQ8h7C5cs6A,8312
+sunholo-0.105.4.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+sunholo-0.105.4.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.105.4.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.105.4.dist-info/RECORD,,