sunholo 0.99.9__py3-none-any.whl → 0.99.11__py3-none-any.whl

sunholo/genai/process_funcs_cls.py

@@ -12,6 +12,8 @@ from collections import deque
 try:
     import google.generativeai as genai
     import proto
+    from google.generativeai.types import RequestOptions
+    from google.api_core import retry
 except ImportError:
     genai = None
 
@@ -234,6 +236,10 @@ class GenAIFunctionProcessor:
 
         # Loop through each part in the response to handle multiple function calls
         #TODO: async
+        if not full_response.candidates or len(full_response.candidates) == 0:
+            log.error("No candidates found in the response. The response might have failed.")
+            return "No candidates available in the response. Please check your query or try again."
+
         for part in full_response.candidates[0].content.parts:
             if fn := part.function_call:
                 # Extract parameters for the function call
@@ -402,7 +408,14 @@ class GenAIFunctionProcessor:
 
             try:
                 token_queue.append("\n= Calling Agent =\n")
-                response = chat.send_message(content, stream=True)
+                response = chat.send_message(content, stream=True, request_options=RequestOptions(
+                                        retry=retry.Retry(
+                                            initial=10, 
+                                            multiplier=2, 
+                                            maximum=60, 
+                                            timeout=300
+                                        )
+                                       ))
                 
             except Exception as e:
                 msg = f"Error sending {content} to model: {str(e)} - {traceback.format_exc()}"
@@ -440,7 +453,13 @@ class GenAIFunctionProcessor:
                 except ValueError as err:
                     token_queue.append(f"{str(err)} for {chunk=}")
             
-            executed_responses = self.process_funcs(response) 
+            try:
+                executed_responses = self.process_funcs(response) 
+            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=}")
 
             if executed_responses:  

sunholo/invoke/async_class.py

@@ -1,7 +1,7 @@
 import asyncio
 from ..custom_logging import log
 import traceback
-from typing import Callable, List, Any, AsyncGenerator, Dict
+from typing import Callable, Any, AsyncGenerator, Dict
 from tenacity import AsyncRetrying, retry_if_exception_type, wait_random_exponential, stop_after_attempt
 
 class AsyncTaskRunner:
@@ -15,12 +15,18 @@ class AsyncTaskRunner:
         log.info(f"Adding task: {func.__name__} with args: {args}")
         self.tasks.append((func.__name__, func, args))
     
-    async def run_async_as_completed(self) -> AsyncGenerator[Dict[str, Any], None]:
-        """Runs all tasks concurrently and yields results as they complete."""
+    async def run_async_as_completed(self, callback=None) -> AsyncGenerator[Dict[str, Any], None]:
+        """
+        Runs all tasks concurrently and yields results as they complete, while periodically sending heartbeat messages.
+
+        Args:
+            callback: The callback object that will receive heartbeat messages.
+        """
         log.info("Running tasks asynchronously and yielding results as they complete")
         tasks = {}
         for name, func, args in self.tasks:
-            coro = self._task_wrapper(name, func, args)
+            # Pass the callback down to _task_wrapper
+            coro = self._task_wrapper(name, func, args, callback)
             task = asyncio.create_task(coro)
             tasks[task] = name
         
@@ -35,9 +41,9 @@ class AsyncTaskRunner:
                 except Exception as e:
                     log.error(f"Task {name} resulted in an error: {e}\n{traceback.format_exc()}")
                     yield {name: e}
-    
-    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 _task_wrapper(self, name: str, func: Callable[..., Any], args: Any, callback=None) -> Any:
+        """Wraps the task function to process its output and handle retries, while managing heartbeat updates."""
         async def run_func():
             if asyncio.iscoroutinefunction(func):
                 # If the function is async, await it
@@ -45,20 +51,66 @@ class AsyncTaskRunner:
             else:
                 # 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),
-                'stop': stop_after_attempt(5),
-                'retry': retry_if_exception_type(Exception),
-                **self.retry_kwargs
-            }
-            async for attempt in AsyncRetrying(**retry_kwargs):
-                with attempt:
+
+        # Start the heartbeat task if a callback is provided
+        heartbeat_task = None
+        if callback:
+            heartbeat_task = asyncio.create_task(self._send_heartbeat(callback, name))
+
+        try:
+            if self.retry_enabled:
+                retry_kwargs = {
+                    'wait': wait_random_exponential(multiplier=1, max=60),
+                    'stop': stop_after_attempt(5),
+                    'retry': retry_if_exception_type(Exception),
+                    **self.retry_kwargs
+                }
+                async for attempt in AsyncRetrying(**retry_kwargs):
+                    with attempt:
+                        return await run_func()
+            else:
+                try:
                     return await run_func()
-        else:
-            try:
-                return await run_func()
-            except Exception as e:
-                log.error(f"Error in task {name}: {e}\n{traceback.format_exc()}")
-                raise
+                except Exception as e:
+                    log.error(f"Error in task {name}: {e}\n{traceback.format_exc()}")
+                    raise
+        finally:
+            # Stop the heartbeat task
+            if heartbeat_task:
+                heartbeat_task.cancel()
+                try:
+                    await heartbeat_task  # Ensure the heartbeat task is properly canceled
+                except asyncio.CancelledError:
+                    pass
+
+            # Send a message indicating task completion and remove spinner
+            if callback:
+                completion_html = (
+                    f"<script>"
+                    f"document.getElementById('{name}-spinner').innerHTML = '✔️ Task {name} completed!';"
+                    f"</script>"
+                )
+                await callback.async_on_llm_new_token(token=completion_html)
+
+    async def _send_heartbeat(self, callback, func_name, interval=2):
+        """
+        Sends periodic heartbeat updates to indicate the task is still in progress.
+
+        Args:
+            callback: The callback to notify that the task is still working.
+            func_name: The name of the task function.
+            interval: How frequently to send heartbeat messages (in seconds).
+        """
+        # Send the initial spinner HTML
+        spinner_html = (
+            f'<div id="{func_name}-spinner" style="display:inline-block; margin: 5px;">'
+            f'<div class="spinner" style="width:16px; height:16px; border: 2px solid #f3f3f3; '
+            f'border-radius: 50%; border-top: 2px solid #3498db; animation: spin 1s linear infinite;"></div>'
+            f'<style>@keyframes spin {{0% {{ transform: rotate(0deg); }} 100% {{ transform: rotate(360deg); }}}}</style>'
+            f' <span>Task {func_name} is in progress...</span></div>'
+        )
+        await callback.async_on_llm_new_token(token=spinner_html)
+
+        # Keep sending heartbeats until task completes
+        while True:
+            await asyncio.sleep(interval)  # Sleep for the interval but do not send multiple messages

{sunholo-0.99.9.dist-info → sunholo-0.99.11.dist-info}/METADATA

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

{sunholo-0.99.9.dist-info → sunholo-0.99.11.dist-info}/RECORD

@@ -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=PSb5MiNKG6NU5OBJU-myq0uRRtj640j2IBkIaxBUC5Q,25695
+sunholo/genai/process_funcs_cls.py,sha256=MF3wm-N-zoYvme4I8ffXM9I7cog8OFyBnLu1e3A6eVc,26695
 sunholo/genai/safety.py,sha256=mkFDO_BeEgiKjQd9o2I4UxB6XI7a9U-oOFjZ8LGRUC4,1238
 sunholo/invoke/__init__.py,sha256=o1RhwBGOtVK0MIdD55fAIMCkJsxTksi8GD5uoqVKI-8,184
-sunholo/invoke/async_class.py,sha256=uvCP8ekUCfTRWk7xwofTzRqFykMAwrRZ4Ce_YUR6PVs,2820
+sunholo/invoke/async_class.py,sha256=O-Jv0MHkACGA5uBG0EuyYnPpY4I5xMKgoNZZ4Q0dECY,5297
 sunholo/invoke/direct_vac_func.py,sha256=GXSCMkC6vOWGUtQjxy-ZpTrMvJa3CgcW-y9mDpJwWC8,9533
 sunholo/invoke/invoke_vac_utils.py,sha256=sJc1edHTHMzMGXjji1N67c3iUaP7BmAL5nj82Qof63M,2053
 sunholo/langfuse/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -144,9 +144,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.99.9.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.99.9.dist-info/METADATA,sha256=1rH-_XTnX4V8aENU_dXeqoy3jgY4ophTljQ17gmX5Vw,8310
-sunholo-0.99.9.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-sunholo-0.99.9.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.99.9.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.99.9.dist-info/RECORD,,
+sunholo-0.99.11.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.99.11.dist-info/METADATA,sha256=EcWW2HDcFkxMivwaUo69Qg5sFI3ySqM8ZxmusIz2U90,8312
+sunholo-0.99.11.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+sunholo-0.99.11.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.99.11.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.99.11.dist-info/RECORD,,