sunholo 0.95.2__py3-none-any.whl → 0.95.4__py3-none-any.whl

sunholo/agents/route.py

@@ -65,14 +65,14 @@ def route_endpoint(vector_name=None, method = 'post', override_endpoint=None, co
     
     agents_config = config.agentConfig(agent_type)
     
-    log.info(f"agents_config: {agents_config}")
+    log.debug(f"agents_config: {agents_config}")
     if method not in agents_config:
         raise ValueError(f"Invalid method '{method}' for agent configuration.")
 
     # 'post' or 'get'
     endpoints_config = agents_config[method]
 
-    log.info(f"endpoints_config: {endpoints_config}")
+    log.debug(f"endpoints_config: {endpoints_config}")
     # Replace placeholders in the config
     endpoints = {}
     for key, value in endpoints_config.items():

sunholo/genai/process_funcs_cls.py

@@ -351,7 +351,7 @@ class GenAIFunctionProcessor:
             log.error(f"Error initializing model: {str(err)}")
             return None
 
-    def run_agent_loop(self, chat, content, callback, guardrail_max=10):
+    def run_agent_loop(self, chat, content, callback, guardrail_max=10, loop_return=3):
         """
         Runs the agent loop, sending messages to the orchestrator, processing responses, and executing functions.
 
@@ -360,12 +360,13 @@ class GenAIFunctionProcessor:
             content: The initial content to send to the agent.
             callback: The callback object for handling intermediate responses.
             guardrail_max (int): The maximum number of iterations for the loop.
+            loop_return (int): The number of last loop iterations to return. Default 3 will return last 3 iterations. If loop_return > guardrail_max then all iterations are returned.
 
         Returns:
             tuple: (big_text, usage_metadata) from the loop execution.
         """
         guardrail = 0
-        big_text = ""
+        big_result = []
         usage_metadata = {
             "prompt_token_count": 0,
             "candidates_token_count": 0,
@@ -422,7 +423,6 @@ class GenAIFunctionProcessor:
                     if hasattr(chunk, 'text') and isinstance(chunk.text, str):
                         token = chunk.text
                         token_queue.append(token)
-                        big_text += token
                         this_text += token
                     else:
                         log.info("skipping chunk with no text")
@@ -486,18 +486,17 @@ class GenAIFunctionProcessor:
                         else:
                             token += f"{fn_result}\n--- end ---\n"
                     
-                    big_text += token
                     this_text += token
                     token_queue.append(token)
             else:
                 token = "\nNo function executions were found\n"
                 token_queue.append(token)
-                big_text += token
                 this_text += token
 
             if this_text:
                 content.append(f"Agent: {this_text}")    
                 log.info(f"[{guardrail}] Updated content:\n{this_text}")
+                big_result.append(this_text)
             else:
                 log.warning(f"[{guardrail}] No content created this loop")
                 content.append(f"Agent: No response was found for loop [{guardrail}]")
@@ -523,7 +522,8 @@ class GenAIFunctionProcessor:
             callback.on_llm_new_token(token=token)
         
         usage_metadata["functions_called"] = functions_called
-        #usage_metadata["function_results"] = function_results
+
+        big_text = "\n".join(big_result[loop_return:])
 
         return big_text, usage_metadata
 

sunholo/invoke/async_class.py

@@ -39,17 +39,13 @@ class AsyncTaskRunner:
     async def _task_wrapper(self, name: str, func: Callable[..., Any], args: Any) -> Any:
         """Wraps the task function to process its output and handle retries."""
         async def run_func():
-            gen = func(*args)
-            if hasattr(gen, '__aiter__'):
-                # If it's an async generator, consume it completely
-                output = ''
-                async for chunk in gen:
-                    output += chunk
-                return output
+            if asyncio.iscoroutinefunction(func):
+                # If the function is async, await it
+                return await func(*args)
             else:
-                # If it's a coroutine, await the result
-                return await gen
-
+                # If the function is sync, run it in a thread to prevent blocking
+                return await asyncio.to_thread(func, *args)
+    
         if self.retry_enabled:
             retry_kwargs = {
                 'wait': wait_random_exponential(multiplier=1, max=60),
@@ -65,12 +61,4 @@ class AsyncTaskRunner:
                 return await run_func()
             except Exception as e:
                 log.error(f"Error in task {name}: {e}\n{traceback.format_exc()}")
-                raise
-
-    def _log_results(self, results: List[Any]):
-        """Logs the results of the task executions."""
-        for result in results:
-            if isinstance(result, Exception):
-                log.error(f"Task resulted in an error: {result}")
-            else:
-                log.info(f"Task completed successfully: {result}")
+                raise

sunholo/streaming/streaming.py

@@ -175,6 +175,16 @@ async def start_streaming_chat_async(question, vector_name, qna_func_async, chat
     # Run start_chat asynchronously
     chat_task = asyncio.create_task(start_chat())
 
+     # Allow the event loop to process the scheduled tasks
+    await asyncio.sleep(0)
+
+    # Read and yield any initial content from the content buffer
+    content_to_send = content_buffer.read()
+    if content_to_send:
+        log.info(f"Initial content: {content_to_send}")
+        yield content_to_send
+        content_buffer.clear()
+
     start = time.time()
 
     while not chat_callback_handler.stream_finished.is_set() and not stop_event.is_set():

sunholo/vertex/memory_tools.py

@@ -174,15 +174,11 @@ def print_grounding_response(response):
         markdown_text += (
             f"\n**Web Search Queries:** {grounding_metadata.web_search_queries}\n"
         )
-        if grounding_metadata.search_entry_point:
-            markdown_text += f"\n**Search Entry Point:**\n {grounding_metadata.search_entry_point.rendered_content}\n"
     elif grounding_metadata.retrieval_queries:
         markdown_text += (
             f"\n**Retrieval Queries:** {grounding_metadata.retrieval_queries}\n"
         )
 
-    markdown_text += "### Grounding Chunks\n"
-
     for index, grounding_chunk in enumerate(
         grounding_metadata.grounding_chunks, start=1
     ):
@@ -190,7 +186,9 @@ def print_grounding_response(response):
         if not context:
             print(f"Skipping Grounding Chunk {grounding_chunk}")
             continue
+        markdown_text += "### Grounding Chunks\n"
 
         markdown_text += f"{index}. [{context.title}]({context.uri})\n"
 
-    return markdown_text
+    return {"markdown_text": markdown_text, 
+            "search_entry_point": grounding_metadata.search_entry_point.rendered_content if grounding_metadata.search_entry_point else ""}

{sunholo-0.95.2.dist-info → sunholo-0.95.4.dist-info}/METADATA

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

{sunholo-0.95.2.dist-info → sunholo-0.95.4.dist-info}/RECORD

@@ -5,7 +5,7 @@ sunholo/agents/chat_history.py,sha256=Gph_CdlP2otYnNdR1q1Umyyyvcad2F6K3LxU5yBQ9l
 sunholo/agents/dispatch_to_qa.py,sha256=Z2q0ygYxfgBr-EGydq_H5y4Y-bKlY4ZCBCwkGpYwjFY,8766
 sunholo/agents/langserve.py,sha256=C46ph2mnygr6bdHijYWYyfQDI9ylAF0_9Kx2PfcCJpU,4414
 sunholo/agents/pubsub.py,sha256=TscZN_6am6DfaQkC-Yl18ZIBOoLE-0nDSiil6GpQEh4,1344
-sunholo/agents/route.py,sha256=Mo-YOHDsHOiQXfb6VmCH0BPThAD-0jZGIkIKAHxSDdc,2986
+sunholo/agents/route.py,sha256=mV8tGABbSqcg3PQL02MgQOs41gKEHLMyIJJJcTuFdbE,2988
 sunholo/agents/special_commands.py,sha256=YhN8_E4cGZVvagN5_fouaxZiVbxr7PEhSzoFcvTKH54,6501
 sunholo/agents/swagger.py,sha256=2tzGmpveUMmTREykZvVnDj3j295wyOMu7mUFDnXdY3c,10671
 sunholo/agents/fastapi/__init__.py,sha256=S_pj4_bTUmDGoq_exaREHlOKThi0zTuGT0VZY0YfODQ,88
@@ -86,10 +86,10 @@ 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=1yDVh7Gi5qX0FMzV__8k3vn3BJ7AreX9CvPxM_QPFkU,24235
+sunholo/genai/process_funcs_cls.py,sha256=OCLa_yPjVlE7wY1v54SY0M6b5lpU2l3guRHb-qYOk2A,24359
 sunholo/genai/safety.py,sha256=mkFDO_BeEgiKjQd9o2I4UxB6XI7a9U-oOFjZ8LGRUC4,1238
 sunholo/invoke/__init__.py,sha256=VOpsfhNf98az3at7bMaY1Fiw4UIZAS6zMmSqWd6_ksI,141
-sunholo/invoke/async_class.py,sha256=NYuQU-LIhnJEmierbSwmwxXfNzmEhqDZCSx5BZDEYA8,3225
+sunholo/invoke/async_class.py,sha256=uvCP8ekUCfTRWk7xwofTzRqFykMAwrRZ4Ce_YUR6PVs,2820
 sunholo/invoke/direct_vac_func.py,sha256=fuTJlH5PsqWhN_yVMaWisHCTZU1JEUz8I8yVbWsNUFE,4268
 sunholo/invoke/invoke_vac_utils.py,sha256=sJc1edHTHMzMGXjji1N67c3iUaP7BmAL5nj82Qof63M,2053
 sunholo/langfuse/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -117,7 +117,7 @@ sunholo/streaming/__init__.py,sha256=MpbydI2UYo_adttPQFkxNM33b-QRyNEbrKJx0C2AGPc
 sunholo/streaming/content_buffer.py,sha256=HLj-EJcCxxFwPcEZ4Xu3Ns0tDT6awkTe5QY9S7bMnjg,9162
 sunholo/streaming/langserve.py,sha256=hi7q8WY8DPKrALl9m_dOMxWOdE-iEuk7YW05SVDFIX8,6514
 sunholo/streaming/stream_lookup.py,sha256=hYg1DbdSE_QNJ8ZB-ynXJlWgvFjrGvwoUsGJu_E0pRQ,360
-sunholo/streaming/streaming.py,sha256=tMCAdB_piQXiiQLPkkYJwDiDxfg6UOBeto0d9C8m_Jk,16211
+sunholo/streaming/streaming.py,sha256=Z_M6rn6XZUMfQggiQ79dw5HD7xaodvq0UGS34C5dHbQ,16549
 sunholo/summarise/__init__.py,sha256=MZk3dblUMODcPb1crq4v-Z508NrFIpkSWNf9FIO8BcU,38
 sunholo/summarise/summarise.py,sha256=95A-6PXFGanjona8DvZPnnIHLbzZ2ip5hO0wOAJQhfw,3791
 sunholo/terraform/__init__.py,sha256=yixxEltc3n9UpZaVi05GlgS-YRq_DVGjUc37I9ajeP4,76
@@ -141,12 +141,12 @@ sunholo/vertex/extensions_call.py,sha256=QeQbL3aAHlc4_-SynOzooZ_3xkQWAlcgNmFBSwL
 sunholo/vertex/extensions_class.py,sha256=2QGW28lNjoMEnaoVb3QcqEDwphclIsZthnpLUi5_Ivo,21033
 sunholo/vertex/genai_functions.py,sha256=2z6grM9H0Z79Yzx88l8mE1wXck3bRa0TWvnqZZ9ifDc,2051
 sunholo/vertex/init.py,sha256=1OQwcPBKZYBTDPdyU7IM4X4OmiXLdsNV30C-fee2scQ,2875
-sunholo/vertex/memory_tools.py,sha256=x3_ESOhgMpf-gNpiOzmP7YQI0l0FAoLtbAVP2K2N0OA,7724
+sunholo/vertex/memory_tools.py,sha256=ZirFbS7EKxQaoRmOrb4BnG6jPJ83wt43N8M4zTVbutU,7717
 sunholo/vertex/safety.py,sha256=S9PgQT1O_BQAkcqauWncRJaydiP8Q_Jzmu9gxYfy1VA,2482
 sunholo/vertex/type_dict_to_json.py,sha256=uTzL4o9tJRao4u-gJOFcACgWGkBOtqACmb6ihvCErL8,4694
-sunholo-0.95.2.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.95.2.dist-info/METADATA,sha256=pbcXEqsG1NTMtixx4OjGvNaHwwMTW4aA-y6ICKa4VBo,7889
-sunholo-0.95.2.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-sunholo-0.95.2.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.95.2.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.95.2.dist-info/RECORD,,
+sunholo-0.95.4.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.95.4.dist-info/METADATA,sha256=0uNENTJHgisWBlLoAF-E2HpFxgxWiuAhxpJ9Tw9-LbE,7889
+sunholo-0.95.4.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+sunholo-0.95.4.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.95.4.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.95.4.dist-info/RECORD,,