sunholo 0.100.1__py3-none-any.whl → 0.100.3__py3-none-any.whl

sunholo/auth/refresh.py

@@ -14,7 +14,7 @@ def get_default_email():
 
     if gcs_credentials is None:
         log.error("Could not refresh the credentials properly.")
-        return None
+        return None, None
 
     service_account_email = getattr(gcs_credentials, 'service_account_email', None)
     # If you use a service account credential, you can use the embedded email
@@ -23,7 +23,7 @@ def get_default_email():
         if not service_account_email:
             log.error("Could not create the credentials for signed requests - no credentials.service_account_email or GCS_MAIL_USER with roles/iam.serviceAccountTokenCreator")
             
-            return None
+            return None, None
     
     log.info(f"Found default email: {service_account_email=} for {project_id=}")
     return service_account_email, gcs_credentials

sunholo/gcs/add_file.py

@@ -182,8 +182,6 @@ def add_file_to_gcs(filename: str,
 
     blob.metadata = the_metadata
     
-
-
     max_retries = 5
     base_delay = 1  # 1 second
     for attempt in range(max_retries):

sunholo/gcs/download_url.py

@@ -106,7 +106,14 @@ def sign_gcs_url(bucket_name:str, object_name:str, expiry_secs:int = 86400) -> O
     Returns:
         str: The signed URL or None if not avialable
     """
-    service_account_email, gcs_credentials = get_default_email()
+    result = get_default_email()
+    
+    # Check if the result is None
+    if result is None or any(item is None for item in result):
+        log.error("Failed to retrieve the service account email and credentials.")
+        return None
+
+    service_account_email, gcs_credentials = result
 
     expires = datetime.now() + timedelta(seconds=expiry_secs)
 

sunholo/genai/process_funcs_cls.py

@@ -262,8 +262,7 @@ class GenAIFunctionProcessor:
                             # Execute the function with the provided parameters
                             result = fn_exec(**params_obj)
                             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)}")
+                            #TODO: return images
                         else:
                             fn_result = type(fn).to_dict(fn)
                             result = fn_result.get("result")

sunholo/invoke/async_class.py

@@ -1,9 +1,12 @@
 import asyncio
-from ..custom_logging import log
-import traceback
 from typing import Callable, Any, AsyncGenerator, Dict
+import time
+import traceback
+from ..custom_logging import setup_logging
 from tenacity import AsyncRetrying, retry_if_exception_type, wait_random_exponential, stop_after_attempt
 
+log = setup_logging("sunholo_AsyncTaskRunner")
+
 class AsyncTaskRunner:
     def __init__(self, retry_enabled=False, retry_kwargs=None):
         self.tasks = []
@@ -11,67 +14,94 @@ class AsyncTaskRunner:
         self.retry_kwargs = retry_kwargs or {}
 
     def add_task(self, func: Callable[..., Any], *args: Any):
-        """Adds a task to the list of tasks to be executed."""
+        """
+        Adds a task to the list of tasks to be executed.
+        """
         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 and heartbeats as they are produced.
+        Runs all tasks concurrently and yields results as they complete,
+        while periodically sending heartbeat messages.
         """
-        log.info("Running tasks asynchronously and yielding results and heartbeats as they occur")
+        log.info("Running tasks asynchronously and yielding results as they complete")
+
+        # Create a queue for inter-coroutine communication
         queue = asyncio.Queue()
-        tasks = {}
-        completed_tasks = set()
 
+        # List to keep track of all running tasks and their heartbeats
+        task_infos = []
+
+        # Start all tasks and their corresponding heartbeats
         for name, func, args in self.tasks:
-            coro = self._task_wrapper(name, func, args, queue)
-            task = asyncio.create_task(coro)
-            tasks[task] = name
-
-        while tasks or not queue.empty():
-            if not queue.empty():
-                message = await queue.get()
-                log.info(f"Found queue message: {message}")
-                # Ignore heartbeats from completed tasks
-                if message['type'] == 'heartbeat' and message['func_name'] in completed_tasks:
-                    continue
-                yield message
-            else:
-                done, _ = await asyncio.wait(
-                    list(tasks.keys()),
-                    timeout=0.1,
-                    return_when=asyncio.FIRST_COMPLETED
-                )
-                for task in done:
-                    name = tasks.pop(task)
-                    completed_tasks.add(name)
-                    try:
-                        result = await task
-                        await queue.put({'type': 'task_complete', 'func_name': name, 'result': result})
-                    except Exception as e:
-                        log.error(f"Task {name} resulted in an error: {e}\n{traceback.format_exc()}")
-                        await queue.put({'type': 'task_error', 'func_name': name, 'error': e})
+            # Create an event to signal task completion to the heartbeat
+            completion_event = asyncio.Event()
+
+            # Start the main task with retries
+            task_coro = self._run_with_retries(name, func, *args, queue=queue, completion_event=completion_event)
+            task = asyncio.create_task(task_coro)
 
-        # Process any remaining messages in the queue
-        while not queue.empty():
+            # Start the heartbeat coroutine
+            heartbeat_coro = self._send_heartbeat(name, completion_event, queue)
+            heartbeat_task = asyncio.create_task(heartbeat_coro)
+
+            # Store task information for management
+            task_infos.append({
+                'name': name,
+                'task': task,
+                'heartbeat_task': heartbeat_task,
+                'completion_event': completion_event
+            })
+
+            log.info(f"Started task '{name}' and its heartbeat")
+
+        log.info(f"Started async run with {len(self.tasks)} tasks and heartbeats")
+
+        # Create a monitor task to detect when all tasks and heartbeats are done
+        monitor = asyncio.create_task(self._monitor_tasks(task_infos, queue))
+
+        # Continuously yield messages from the queue until sentinel is received
+        while True:
             message = await queue.get()
-            log.info(f"Found queue message: {message}")
-            if message['type'] == 'heartbeat' and message['func_name'] in completed_tasks:
-                continue
+            if message is None:
+                log.info("Received sentinel. Exiting message loop.")
+                break  # Sentinel received, all tasks and heartbeats are done
+            log.info(f"Received message from queue: {message}")
             yield message
 
-    async def _task_wrapper(self, name: str, func: Callable[..., Any], args: Any, queue: asyncio.Queue) -> Any:
-        """Wraps the task function to process its output and handle retries, while managing heartbeat updates."""
-        async def run_func():
-            if asyncio.iscoroutinefunction(func):
-                return await func(*args)
-            else:
-                return await asyncio.to_thread(func, *args)
+        # Wait for the monitor to finish
+        await monitor
+
+        log.info("All tasks and heartbeats have completed")
 
-        # Start the heartbeat task
-        heartbeat_task = asyncio.create_task(self._send_heartbeat(queue, name))
+    async def _monitor_tasks(self, task_infos, queue):
+        """
+        Monitors the tasks and heartbeats, and sends a sentinel to the queue when done.
+        """
+        # Wait for all main tasks to complete
+        main_tasks = [info['task'] for info in task_infos]
+        log.info("Monitor: Waiting for all main tasks to complete")
+        await asyncio.gather(*main_tasks, return_exceptions=True)
+        log.info("Monitor: All main tasks have completed")
 
+        # Cancel all heartbeat tasks
+        for info in task_infos:
+            info['heartbeat_task'].cancel()
+            try:
+                await info['heartbeat_task']
+            except asyncio.CancelledError:
+                pass
+            log.info(f"Monitor: Heartbeat for task '{info['name']}' has been canceled")
+
+        # Send a sentinel to indicate completion
+        await queue.put(None)
+        log.info("Monitor: Sent sentinel to queue")
+
+    async def _run_with_retries(self, name: str, func: Callable[..., Any], *args: Any, queue: asyncio.Queue, completion_event: asyncio.Event) -> None:
+        """
+        Executes a task with optional retries and sends completion or error messages to the queue.
+        """
         try:
             if self.retry_enabled:
                 retry_kwargs = {
@@ -82,57 +112,67 @@ class AsyncTaskRunner:
                 }
                 async for attempt in AsyncRetrying(**retry_kwargs):
                     with attempt:
-                        return await run_func()
+                        log.info(f"Starting task '{name}' with retry")
+                        result = await self._execute_task(func, *args)
+                        await queue.put({'type': 'task_complete', 'func_name': name, 'result': result})
+                        log.info(f"Sent 'task_complete' message for task '{name}'")
+                        return
             else:
-                try:
-                    return await run_func()
-                except Exception as e:
-                    log.error(f"Error in task {name}: {e}\n{traceback.format_exc()}")
-                    raise
+                log.info(f"Starting task '{name}' with no retry")
+                result = await self._execute_task(func, *args)
+                await queue.put({'type': 'task_complete', 'func_name': name, 'result': result})
+                log.info(f"Sent 'task_complete' message for task '{name}'")
+        except Exception as e:
+            log.error(f"Error in task '{name}': {e}\n{traceback.format_exc()}")
+            await queue.put({'type': 'task_error', 'func_name': name, 'error': f'{e}\n{traceback.format_exc()}'})
+            log.info(f"Sent 'task_error' message for task '{name}'")
         finally:
-            # Stop the heartbeat task
-            heartbeat_task.cancel()
-            # Wait for the heartbeat task to finish
-            try:
-                await heartbeat_task
-            except asyncio.CancelledError:
-                pass
+            log.info(f"Task '{name}' completed.")
+            # Set the completion event after sending the message
+            completion_event.set()
 
-    async def _send_heartbeat(self, queue: asyncio.Queue, func_name: str, interval=2):
-        """
-        Sends a periodic heartbeat to keep the task alive and update the spinner with elapsed time.
+    async def _execute_task(self, func: Callable[..., Any], *args: Any) -> Any:
         """
-        # Send the initial spinner HTML
-        spinner_html = (
-            f'<div id="{func_name}-spinner" class="spinner-container">'
-            f'  <div class="spinner"></div>'
-            f'  <span class="elapsed-time">Task {func_name} is still running... 0s elapsed</span>'
-            f'</div>'
-        )
-        log.info(f"Heartbeat started for task {func_name}")
+        Executes the given task function and returns its result.
 
-        await queue.put({'type': 'heartbeat', 'func_name': func_name, 'token': spinner_html})
+        Args:
+            func (Callable): The callable to execute.
+            *args: Arguments to pass to the callable.
 
-        # Keep track of elapsed time
-        elapsed_time = 0
+        Returns:
+            Any: The result of the task.
+        """
+        if asyncio.iscoroutinefunction(func):
+            return await func(*args)
+        else:
+            return await asyncio.to_thread(func, *args)
 
+    async def _send_heartbeat(self, func_name: str, completion_event: asyncio.Event, queue: asyncio.Queue, interval: int = 2):
+        """
+        Sends periodic heartbeat updates to indicate the task is still in progress.
+
+        Args:
+            func_name (str): The name of the task function.
+            completion_event (asyncio.Event): Event to signal when the task is completed.
+            queue (asyncio.Queue): The queue to send heartbeat messages to.
+            interval (int): How frequently to send heartbeat messages (in seconds).
+        """
+        start_time = time.time()
+        log.info(f"Starting heartbeat for task '{func_name}' with interval {interval} seconds")
         try:
-            while True:
-                await asyncio.sleep(interval)  # Sleep for the interval
-                elapsed_time += interval  # Increment elapsed time
-                log.info(f"Sending heartbeat for {func_name}: {elapsed_time}s elapsed")
-                # Update spinner with the elapsed time
-                update_html = (
-                    f'<div style="display: none;" data-update-id="{func_name}-spinner">'
-                    f'<span class="elapsed-time">Task {func_name} is still running... {elapsed_time}s elapsed</span>'
-                    f'</div>'
-                )
-                await queue.put({'type': 'heartbeat', 'func_name': func_name, 'token': update_html})
+            while not completion_event.is_set():
+                await asyncio.sleep(interval)
+                elapsed_time = int(time.time() - start_time)
+                heartbeat_message = {
+                    'type': 'heartbeat',
+                    'name': func_name,
+                    'interval': interval,
+                    'elapsed_time': elapsed_time
+                }
+                log.info(f"Sending heartbeat for task '{func_name}', running for {elapsed_time} seconds")
+                await queue.put(heartbeat_message)
         except asyncio.CancelledError:
-            log.info(f"Heartbeat task for {func_name} has been cancelled.")
+            log.info(f"Heartbeat for task '{func_name}' has been canceled")
         finally:
-            # Send a message indicating task completion to update the spinner's state
-            completion_html = (
-                f'<div style="display: none;" data-complete-id="{func_name}-spinner"></div>'
-            )
-            await queue.put({'type': 'heartbeat', 'func_name': func_name, 'token': completion_html})
+            log.info(f"Heartbeat for task '{func_name}' stopped")
+

{sunholo-0.100.1.dist-info → sunholo-0.100.3.dist-info}/METADATA

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

{sunholo-0.100.1.dist-info → sunholo-0.100.3.dist-info}/RECORD

@@ -19,7 +19,7 @@ sunholo/archive/__init__.py,sha256=qNHWm5rGPVOlxZBZCpA1wTYPbalizRT7f8X4rs2t290,3
 sunholo/archive/archive.py,sha256=PxVfDtO2_2ZEEbnhXSCbXLdeoHoQVImo4y3Jr2XkCFY,1204
 sunholo/auth/__init__.py,sha256=TeP-OY0XGxYV_8AQcVGoh35bvyWhNUcMRfhuD5l44Sk,91
 sunholo/auth/gcloud.py,sha256=PdbwkuTdRi4RKBmgG9uwsReegqC4VG15_tw5uzmA7Fs,298
-sunholo/auth/refresh.py,sha256=6AEWX87G3I9BCqrgGJjHGrrWABBXHuaGDKU9ZEcVeXM,2017
+sunholo/auth/refresh.py,sha256=WSlKa8TQ70GlZ2e0u83nYknhUsgTeiyyTVi-EFOa8Uc,2029
 sunholo/auth/run.py,sha256=pMSp2lzL6e6ZqlltVUH92bkeUt341yMue027qrE0jQU,2821
 sunholo/azure/__init__.py,sha256=S1WQ5jndzNgzhSBh9UpX_yw7hRVm3hCzkAWNxUdK4dA,48
 sunholo/azure/auth.py,sha256=Y3fDqFLYwbsIyi5hS5L-3hYnwrLWVL96yPng5Sj5c2c,2236
@@ -80,16 +80,16 @@ sunholo/embedder/embed_chunk.py,sha256=_FdO4-9frUJlDPqXv2Ai49ejUrrMTMGti3D7bfJGf
 sunholo/excel/__init__.py,sha256=AqTMN9K4qJYi4maEgoORc5oxDVGO_eqmwzDaVP37JgY,56
 sunholo/excel/plugin.py,sha256=rl3FoECZ6Ts8KKExPrbPwr3u3CegZfsevmcjgUXAlhE,4033
 sunholo/gcs/__init__.py,sha256=SZvbsMFDko40sIRHTHppA37IijvJTae54vrhooEF5-4,90
-sunholo/gcs/add_file.py,sha256=XuntzdFz9b0flMArgUe-4DSaPI7zdBw8hlsG1rsRQmc,8371
+sunholo/gcs/add_file.py,sha256=NxUaWTP-h9l5fbjnrEYpipo5rjS3uPkjMWeDhpK113g,8369
 sunholo/gcs/download_folder.py,sha256=ijJTnS595JqZhBH8iHFErQilMbkuKgL-bnTCMLGuvlA,1614
-sunholo/gcs/download_url.py,sha256=q1NiJSvEhdNrmU5ZJ-sBCMC_J5CxzrajY8LRgdPOV_M,6130
+sunholo/gcs/download_url.py,sha256=oPC8phesRcpXB4zB_p0nWPKPBMs7JBhhVJ7tnVYhzD8,6356
 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=MF3wm-N-zoYvme4I8ffXM9I7cog8OFyBnLu1e3A6eVc,26695
+sunholo/genai/process_funcs_cls.py,sha256=DPe70E71pofInLMFBFdudFZr0ZCFHN1LFCQjpxtG8xU,26552
 sunholo/genai/safety.py,sha256=mkFDO_BeEgiKjQd9o2I4UxB6XI7a9U-oOFjZ8LGRUC4,1238
 sunholo/invoke/__init__.py,sha256=o1RhwBGOtVK0MIdD55fAIMCkJsxTksi8GD5uoqVKI-8,184
-sunholo/invoke/async_class.py,sha256=TbYzdS2RDu1WhbYcq6wt7GTJzrtk-7Y3I-2AbJAD1Ik,6134
+sunholo/invoke/async_class.py,sha256=Wkrv3exjN3aDQdI1Q4tv8I8xSloKgdz_LzGomayfLhw,7734
 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.100.1.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.100.1.dist-info/METADATA,sha256=dFU8BBZlnOGZpfnkvOiQ-_yO3Hs12mNi0BFWnVQh9QQ,8312
-sunholo-0.100.1.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-sunholo-0.100.1.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.100.1.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.100.1.dist-info/RECORD,,
+sunholo-0.100.3.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.100.3.dist-info/METADATA,sha256=c5y87oJoR39hmBJfM3dGVuHKI1e2A5ZJhTyrFaTOSbQ,8312
+sunholo-0.100.3.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+sunholo-0.100.3.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.100.3.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.100.3.dist-info/RECORD,,