sunholo 0.92.4__tar.gz → 0.92.6__tar.gz

{sunholo-0.92.4 → sunholo-0.92.6}/PKG-INFO

@@ -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 → sunholo-0.92.6}/setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = '0.92.4'
+version = '0.92.6'
 
 setup(
     name='sunholo',

{sunholo-0.92.4 → sunholo-0.92.6}/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-0.92.4 → sunholo-0.92.6}/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-0.92.4 → sunholo-0.92.6}/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 → sunholo-0.92.6}/sunholo.egg-info/PKG-INFO

@@ -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