sunholo 0.92.4__py3-none-any.whl → 0.92.6__py3-none-any.whl

sunholo/cli/chat_vac.py

@@ -533,6 +533,14 @@ def get_cloud_run_service_url(project, region, service_name):
     Returns:
         str: The URL of the Cloud Run service, or an error message if not found.
     """
+        # Try to load existing data from the file, or initialize an empty dict
+    file_path = "config/cloud_run_urls.json"
+    if os.path.exists(file_path):
+        with open(file_path, 'r') as file:
+            services_dict = json.load(file)
+    else:
+        services_dict = {}
+
     try:
         result = subprocess.run(
             ["gcloud", "run", "services", "describe", service_name, "--project", project, "--region", region, "--format=json"],
@@ -544,6 +552,14 @@ def get_cloud_run_service_url(project, region, service_name):
 
         service = json.loads(result.stdout.decode())
         service_url = service['status']['url']
+
+        # Update the services dictionary
+        services_dict[service_name] = service_url
+
+        # Write the updated dictionary back to the file
+        with open(file_path, 'w') as file:
+            json.dump(services_dict, file, indent=4)
+            
         return service_url
     except Exception as e:
         console.print(f"[bold red]ERROR: An unexpected error occurred: {e}[/bold red]")

sunholo/genai/process_funcs_cls.py

@@ -7,6 +7,7 @@ from .safety import genai_safety
 from typing import TYPE_CHECKING, Union
 
 import json
+from collections import deque
 
 try:
     import google.generativeai as genai
@@ -254,7 +255,9 @@ class GenAIFunctionProcessor:
                         if not isinstance(fn_exec, genai.protos.FunctionDeclaration):
                             # Execute the function with the provided parameters
                             result = fn_exec(**params_obj)
-                            log.info(f"Got result from {function_name}: {result}")
+                            log.info(f"Got result from {function_name}: {result} of type: {type(result)}")
+                            if not isinstance(result, str):
+                                log.warning(f"Tool functions should return strings: {function_name} returned type: {type(result)}")
                         else:
                             fn_result = type(fn).to_dict(fn)
                             result = fn_result.get("result")
@@ -370,12 +373,12 @@ class GenAIFunctionProcessor:
         }
         functions_called =[]
         function_results = []
+        # Initialize token queue to ensure sequential processing
+        token_queue = deque()
 
         while guardrail < guardrail_max:
 
-            callback.on_llm_new_token(
-                token=f"\n----Loop [{guardrail}] Start------\nFunctions: {list(self.funcs.keys())}\n"
-            )
+            token_queue.append(f"\n----Loop [{guardrail}] Start------\nFunctions: {list(self.funcs.keys())}\n")
 
             content_parse = ""
             for i, chunk in enumerate(content):
@@ -387,13 +390,13 @@ class GenAIFunctionProcessor:
             response = []
 
             try:
-                callback.on_llm_new_token(token="\n= Calling Agent\n")
+                token_queue.append("\n= Calling Agent =\n")
                 response = chat.send_message(content, stream=True)
                 
             except Exception as e:
                 msg = f"Error sending {content} to model: {str(e)} - {traceback.format_exc()}"
                 log.info(msg)
-                callback.on_llm_new_token(token=msg)
+                token_queue.append(msg)
                 break
 
             loop_metadata = response.usage_metadata
@@ -403,11 +406,10 @@ class GenAIFunctionProcessor:
                     "candidates_token_count": usage_metadata["candidates_token_count"] + (loop_metadata.candidates_token_count or 0),
                     "total_token_count": usage_metadata["total_token_count"] + (loop_metadata.total_token_count or 0),
                 }
-                callback.on_llm_new_token(token=(
-                    "\n-- Agent response\n" 
-                    f"prompt_token_count: [{loop_metadata.prompt_token_count}]/[{usage_metadata['prompt_token_count']}] "
-                    f"candidates_token_count: [{loop_metadata.candidates_token_count}]/[{usage_metadata['candidates_token_count']}] "
-                    f"total_token_count: [{loop_metadata.total_token_count}]/[{usage_metadata['total_token_count']}] \n"
+                token_queue.append((
+                    "\n-- Agent response -- " 
+                    f"Loop tokens: [{loop_metadata.prompt_token_count}]/[{usage_metadata['prompt_token_count']}] "
+                    f"Session tokens: [{loop_metadata.total_token_count}]/[{usage_metadata['total_token_count']}] \n"
                 ))
             loop_metadata = None
 
@@ -419,20 +421,20 @@ class GenAIFunctionProcessor:
                 try:
                     if hasattr(chunk, 'text') and isinstance(chunk.text, str):
                         token = chunk.text
-                        callback.on_llm_new_token(token=token)
+                        token_queue.append(token)
                         big_text += token
                         this_text += token
                     else:
                         log.info("skipping chunk with no text")
                     
                 except ValueError as err:
-                    callback.on_llm_new_token(token=f"{str(err)} for {chunk=}")
+                    token_queue.append(f"{str(err)} for {chunk=}")
             
             executed_responses = self.process_funcs(response) 
             log.info(f"[{guardrail}] {executed_responses=}")
 
             if executed_responses:  
-                callback.on_llm_new_token(token="\nAgent function execution:\n")
+                token_queue.append("\n-- Agent Actions:\n")
                 for executed_response in executed_responses:
                     token = ""
                     fn = executed_response.function_response.name
@@ -442,10 +444,13 @@ class GenAIFunctionProcessor:
                     log.info(fn_log)
                     functions_called.append(fn_log)
                     function_results.append(fn_result)
-                    callback.on_llm_new_token(token=f"\n--- function calling: {fn_log} ...\n")
+                    token_queue.append(f"\n-- {fn_log} ...executing...\n") if fn != "decide_to_go_on" else ""
+                    while token_queue:
+                        token = token_queue.popleft()
+                        callback.on_llm_new_token(token=token)
 
                     try:
-                            # Convert MapComposite to a standard Python dictionary
+                        # Convert MapComposite to a standard Python dictionary
                         if isinstance(fn_result, proto.marshal.collections.maps.MapComposite):
                             fn_result = dict(fn_result)
                         fn_result_json = json.loads(fn_result)
@@ -463,12 +468,12 @@ class GenAIFunctionProcessor:
                         log.info(f"{fn_result_json} {fn_result=} {type(fn_result)}")
                         go_on_args = fn_result_json
                         if go_on_args:
-                            token = f"\n\n{'STOPPING' if not go_on_args.get('go_on') else 'CONTINUE'}: {go_on_args.get('chat_summary')}"
+                            token = f"\n{'STOPPING' if not go_on_args.get('go_on') else 'CONTINUE'}: {go_on_args.get('chat_summary')}\n"
                         else:
                             log.warning(f"{fn_result_json} did not work for decide_to_go_on")
                             token = f"Error calling decide_to_go_on with {fn_result_json}\n"
                     else:
-                        token = f"--- {fn} call result: \n"
+                        token = f"--- {fn}() result --- \n"
                         if fn_result_json:
                             if fn_result_json.get('stdout'):
                                 text = fn_result_json.get('stdout').encode('utf-8').decode('unicode_escape')
@@ -479,14 +484,14 @@ class GenAIFunctionProcessor:
                             if not fn_result_json.get('stdout') and fn_result_json.get('stderr'):
                                 token += f"{fn_result}\n"
                         else:
-                            token += f"{fn_result}\n--- {fn} result end ---\n"
+                            token += f"{fn_result}\n--- end ---\n"
                     
                     big_text += token
                     this_text += token
-                    callback.on_llm_new_token(token=token)
+                    token_queue.append(token)
             else:
                 token = "\nNo function executions were found\n"
-                callback.on_llm_new_token(token=token)
+                token_queue.append(token)
                 big_text += token
                 this_text += token
 
@@ -497,20 +502,26 @@ class GenAIFunctionProcessor:
                 log.warning(f"[{guardrail}] No content created this loop")
                 content.append(f"Agent: No response was found for loop [{guardrail}]")
 
-            callback.on_llm_new_token(
-                token=f"\n----Loop [{guardrail}] End------\n{usage_metadata}\n----------------------"
-            )
+            token_queue.append(f"\n----Loop [{guardrail}] End------\n{usage_metadata}\n----------------------")
 
             go_on_check = self.check_function_result("decide_to_go_on", {"go_on": False})
             if go_on_check:
                 log.info("Breaking agent loop")
                 break
             
+            while token_queue:
+                token = token_queue.popleft()
+                callback.on_llm_new_token(token=token)
+            
             guardrail += 1
             if guardrail > guardrail_max:
-                log.warning("Guardrail kicked in, more than 10 loops")
+                log.warning(f"Guardrail kicked in, more than {guardrail_max} loops")
                 break
         
+        while token_queue:
+            token = token_queue.popleft()
+            callback.on_llm_new_token(token=token)
+        
         usage_metadata["functions_called"] = functions_called
         #usage_metadata["function_results"] = function_results
 

sunholo/utils/config_class.py

@@ -26,14 +26,12 @@ class ConfigManager:
         agent = config.vacConfig("agent")
         ```
         """
-        print(f"Current working directory: {os.getcwd()}")
         if os.getenv("VAC_CONFIG_FOLDER") is None:
             print("WARNING: No VAC_CONFIG_FOLDER environment variable was specified")
         local_config_folder = os.path.join(os.getcwd(), "config")
-        if os.path.isdir(local_config_folder):
-            print(f"Found local config folder {local_config_folder} - will overwrite any global configurations")
-        else:
+        if not os.path.isdir(local_config_folder):
             local_config_folder = None
+            
         if os.getenv("VAC_CONFIG_FOLDER") is None and local_config_folder is None:
             raise ValueError(f"Must have either a local config/ folder in this dir ({os.getcwd()}/config/) or a folder specified via the VAC_CONFIG_FOLDER environment variable, or both.")
 
@@ -151,7 +149,7 @@ class ConfigManager:
 
         self.config_cache[filename] = (config, datetime.now())
         if is_local:
-            log.warning(f"Local configuration override for {filename} via {self.local_config_folder}")
+            log.info(f"Local configuration override for {filename} via {self.local_config_folder}")
         return config
 
     def _check_and_reload_configs(self):

{sunholo-0.92.4.dist-info → sunholo-0.92.6.dist-info}/METADATA

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

{sunholo-0.92.4.dist-info → sunholo-0.92.6.dist-info}/RECORD

@@ -42,7 +42,7 @@ sunholo/chunker/publish.py,sha256=AX5u-fcyDytED67IfizMzvOMcYPXEo6XBJvyk_7maK8,29
 sunholo/chunker/pubsub.py,sha256=48bhuAcszN7LGe3-ksPSLHHhq0uKxiXOrizck5qpcP0,1012
 sunholo/chunker/splitter.py,sha256=QLAEsJOpEYFZr9-UGZUuAlNVyjfCWb8jvzCHg0rVShE,6751
 sunholo/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sunholo/cli/chat_vac.py,sha256=jTmCt62U4uqJjeGp_XfIbxnafAAOhQAJMi8TxSkeKlM,23164
+sunholo/cli/chat_vac.py,sha256=sYPzUDwwwebJvIobv3GRW_xbQQ4BTy9G-WHdarGCHB0,23705
 sunholo/cli/cli.py,sha256=q-ATmnWnc_PPo2q31xhqpp-m3GtOSBoqh0gvMeSo4XU,4374
 sunholo/cli/cli_init.py,sha256=9-w-7OW1yl5QRedkKg_W_-LuPia9t79QsSWq_4vUG6A,8298
 sunholo/cli/configs.py,sha256=QUM9DvKOdZmEQRM5uI3Nh887T0YDiSMr7O240zTLqws,4546
@@ -86,7 +86,7 @@ sunholo/gcs/download_url.py,sha256=q1NiJSvEhdNrmU5ZJ-sBCMC_J5CxzrajY8LRgdPOV_M,6
 sunholo/gcs/metadata.py,sha256=oQLcXi4brsZ74aegWyC1JZmhlaEV270HS5_UWtAYYWE,898
 sunholo/genai/__init__.py,sha256=dBl6IA3-Fx6-Vx81r0XqxHlUq6WeW1iDX188dpChu8s,115
 sunholo/genai/init.py,sha256=yG8E67TduFCTQPELo83OJuWfjwTnGZsyACospahyEaY,687
-sunholo/genai/process_funcs_cls.py,sha256=u4eOU31IaIybia7i40LfwezwcWJbADlAn3qIvio802Y,23789
+sunholo/genai/process_funcs_cls.py,sha256=1yDVh7Gi5qX0FMzV__8k3vn3BJ7AreX9CvPxM_QPFkU,24235
 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
@@ -128,7 +128,7 @@ sunholo/utils/__init__.py,sha256=Hv02T5L2zYWvCso5hzzwm8FQogwBq0OgtUbN_7Quzqc,89
 sunholo/utils/api_key.py,sha256=Ct4bIAQZxzPEw14hP586LpVxBAVi_W9Serpy0BK-7KI,244
 sunholo/utils/big_context.py,sha256=gJIP7_ZL-YSLhOMq8jmFTMqH1wq8eB1NK7oKPeZAq2s,5578
 sunholo/utils/config.py,sha256=aG29MXcL5qzQMtCMqcdy-2ysDCYf9Zn_ZLk5NNOQNSE,8982
-sunholo/utils/config_class.py,sha256=D8lrqubVcUkHQLjfMxYOgqdwAoAJB8gcv7knVqgCzAo,10015
+sunholo/utils/config_class.py,sha256=aNhxhEHIxRvqQNq_9wFJt1yM9U1ypahCVZ3NzPWuay4,9843
 sunholo/utils/config_schema.py,sha256=Wv-ncitzljOhgbDaq9qnFqH5LCuxNv59dTGDWgd1qdk,4189
 sunholo/utils/gcp.py,sha256=uueODEpA-P6O15-t0hmcGC9dONLO_hLfzSsSoQnkUss,4854
 sunholo/utils/gcp_project.py,sha256=Fa0IhCX12bZ1ctF_PKN8PNYd7hihEUfb90kilBfUDjg,1411
@@ -144,9 +144,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.92.4.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.92.4.dist-info/METADATA,sha256=YWRorSv9yV1LmiVzQx58WwE0a0fku5SXST4kHqRvnVo,7806
-sunholo-0.92.4.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-sunholo-0.92.4.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.92.4.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.92.4.dist-info/RECORD,,
+sunholo-0.92.6.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.92.6.dist-info/METADATA,sha256=qQpD3u4tg37RVQcIZH2Kb0cemizMQQWS-PfHgHE4nYo,7806
+sunholo-0.92.6.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+sunholo-0.92.6.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.92.6.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.92.6.dist-info/RECORD,,