sunholo 0.100.0__tar.gz → 0.100.2__tar.gz

{sunholo-0.100.0 → sunholo-0.100.2}/PKG-INFO

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

{sunholo-0.100.0 → sunholo-0.100.2}/setup.py

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

{sunholo-0.100.0 → sunholo-0.100.2}/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.0 → sunholo-0.100.2}/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.0 → sunholo-0.100.2}/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.0 → sunholo-0.100.2}/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.2/sunholo/invoke/async_class.py

@@ -0,0 +1,117 @@
+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, 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:
+            # Pass the callback down to _task_wrapper
+            coro = self._task_wrapper(name, func, args, callback)
+            task = asyncio.create_task(coro)
+            tasks[task] = name
+        
+        log.info(f"Start async run with {len(self.tasks)} runners")
+        while tasks:
+            done, _ = await asyncio.wait(tasks.keys(), return_when=asyncio.FIRST_COMPLETED)
+            for task in done:
+                name = tasks.pop(task)
+                try:
+                    # func_name = message['func_name']; result = message['result']
+                    result = await task
+                    yield {'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()}")
+                    yield {'type':'task_error', 'func_name': name, 'error': f'{e}\n{traceback.format_exc()}'}
+
+    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
+                return await func(*args)
+            else:
+                # If the function is sync, run it in a thread to prevent blocking
+                return await asyncio.to_thread(func, *args)
+
+        # 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()
+                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.100.0 → sunholo-0.100.2}/sunholo/streaming/content_buffer.py

@@ -173,13 +173,13 @@ class BufferStreamingStdOutCallbackHandler(StreamingStdOutCallbackHandler):
         The buffer content is written to the content buffer when appropriate tokens or
         patterns are detected.
         """
-        log.debug(f"on_llm_new_token: {token}")
+        #log.debug(f"on_llm_new_token: {token}")
 
         # Check if the token is a heartbeat message
         if self._is_heartbeat_token(token):
             # Strip the [[HEARTBEAT]] markers and write immediately
             heartbeat_content = self._strip_heartbeat_markers(token)
-            log.info(f"Heartbeat token detected, writing immediately: {heartbeat_content}")
+            #log.info(f"Heartbeat token detected, writing immediately: {heartbeat_content}")
             self.content_buffer.write(heartbeat_content)
         else:
             self.buffer += token
@@ -268,13 +268,13 @@ class BufferStreamingStdOutCallbackHandlerAsync(StreamingStdOutCallbackHandler):
         log.info("Starting to stream LLM")
 
     async def async_on_llm_new_token(self, token: str, **kwargs: Any) -> None:
-        log.debug(f"async_on_llm_new_token: {token}")
+        #log.debug(f"async_on_llm_new_token: {token}")
 
         # Check if the token is a heartbeat message
         if self._is_heartbeat_token(token):
             # Strip the [[HEARTBEAT]] markers and write immediately
             heartbeat_content = self._strip_heartbeat_markers(token)
-            log.info(f"Heartbeat token detected, writing immediately: {heartbeat_content}")
+            #log.info(f"Heartbeat token detected, writing immediately: {heartbeat_content}")
             await self.content_buffer.async_write(heartbeat_content)
         else:
             self.buffer += token

{sunholo-0.100.0 → sunholo-0.100.2}/sunholo/streaming/streaming.py

@@ -194,7 +194,7 @@ async def start_streaming_chat_async(question, vector_name, qna_func_async, chat
 
         content_to_send = await content_buffer.async_read()
         if content_to_send:
-            log.info(f"Content to send: {content_to_send}")
+            log.info(f"==Async\n{content_to_send}")
             yield content_to_send
             await content_buffer.async_clear()
         else:

{sunholo-0.100.0 → sunholo-0.100.2}/sunholo.egg-info/PKG-INFO

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

sunholo-0.100.0/sunholo/invoke/async_class.py

@@ -1,134 +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 = {}
-        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}")
-                yield message
-            else:
-                # Wait for either a message in the queue or a task to complete
-                done, _ = await asyncio.wait(
-                    list(tasks.keys()),
-                    timeout=0.1,
-                    return_when=asyncio.FIRST_COMPLETED
-                )
-                for task in done:
-                    name = tasks.pop(task)
-                    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})
-
-        # After all tasks have completed, process any remaining messages in the queue
-        while not queue.empty():
-            message = await queue.get()
-            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):
-                # If the function is async, await it
-                return await func(*args)
-            else:
-                # If the function is sync, run it in a thread to prevent blocking
-                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()
-            # Let the heartbeat_task finish in the background without awaiting it
-            try:
-                await asyncio.shield(heartbeat_task)  # Ensure cancellation is handled cleanly
-            except asyncio.CancelledError:
-                pass
-
-            # Send a message indicating task completion to update the spinner's state
-            completion_html = (
-                f'<div style="display: none;" data-complete-id="{name}-spinner"></div>'
-            )
-            await queue.put({'type': 'heartbeat', 'func_name': name, 'token': completion_html})
-
-    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
-
-        # Keep sending heartbeats until task completes
-        while True:
-            try:
-                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:
-                break  # Exit the loop if the heartbeat task is canceled