sunholo 0.100.1__tar.gz → 0.100.3__tar.gz

{sunholo-0.100.1 → sunholo-0.100.3}/PKG-INFO

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

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

{sunholo-0.100.1 → sunholo-0.100.3}/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-0.100.1 → sunholo-0.100.3}/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-0.100.1 → sunholo-0.100.3}/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-0.100.1 → sunholo-0.100.3}/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-0.100.3/sunholo/invoke/async_class.py

@@ -0,0 +1,178 @@
+import asyncio
+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 = []
+        self.retry_enabled = retry_enabled
+        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.
+        """
+        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,
+        while periodically sending heartbeat messages.
+        """
+        log.info("Running tasks asynchronously and yielding results as they complete")
+
+        # Create a queue for inter-coroutine communication
+        queue = asyncio.Queue()
+
+        # 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:
+            # 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)
+
+            # 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()
+            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
+
+        # Wait for the monitor to finish
+        await monitor
+
+        log.info("All tasks and heartbeats have completed")
+
+    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 = {
+                    '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:
+                        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:
+                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:
+            log.info(f"Task '{name}' completed.")
+            # Set the completion event after sending the message
+            completion_event.set()
+
+    async def _execute_task(self, func: Callable[..., Any], *args: Any) -> Any:
+        """
+        Executes the given task function and returns its result.
+
+        Args:
+            func (Callable): The callable to execute.
+            *args: Arguments to pass to the callable.
+
+        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 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 for task '{func_name}' has been canceled")
+        finally:
+            log.info(f"Heartbeat for task '{func_name}' stopped")
+

{sunholo-0.100.1 → sunholo-0.100.3}/sunholo.egg-info/PKG-INFO

@@ -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/sunholo/invoke/async_class.py

@@ -1,138 +0,0 @@
-import asyncio
-from ..custom_logging import log
-import traceback
-from typing import Callable, Any, AsyncGenerator, Dict
-from tenacity import AsyncRetrying, retry_if_exception_type, wait_random_exponential, stop_after_attempt
-
-class AsyncTaskRunner:
-    def __init__(self, retry_enabled=False, retry_kwargs=None):
-        self.tasks = []
-        self.retry_enabled = retry_enabled
-        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."""
-        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.
-        """
-        log.info("Running tasks asynchronously and yielding results and heartbeats as they occur")
-        queue = asyncio.Queue()
-        tasks = {}
-        completed_tasks = set()
-
-        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})
-
-        # Process any remaining messages in the queue
-        while not queue.empty():
-            message = await queue.get()
-            log.info(f"Found queue message: {message}")
-            if message['type'] == 'heartbeat' and message['func_name'] in completed_tasks:
-                continue
-            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)
-
-        # Start the heartbeat task
-        heartbeat_task = asyncio.create_task(self._send_heartbeat(queue, 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()
-                except Exception as e:
-                    log.error(f"Error in task {name}: {e}\n{traceback.format_exc()}")
-                    raise
-        finally:
-            # Stop the heartbeat task
-            heartbeat_task.cancel()
-            # Wait for the heartbeat task to finish
-            try:
-                await heartbeat_task
-            except asyncio.CancelledError:
-                pass
-
-    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.
-        """
-        # 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}")
-
-        await queue.put({'type': 'heartbeat', 'func_name': func_name, 'token': spinner_html})
-
-        # Keep track of elapsed time
-        elapsed_time = 0
-
-        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})
-        except asyncio.CancelledError:
-            log.info(f"Heartbeat task for {func_name} has been cancelled.")
-        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})