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

sunholo/invoke/async_class.py

@@ -21,8 +21,9 @@ class AsyncTaskRunner:
         """
         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)
@@ -32,9 +33,11 @@ class AsyncTaskRunner:
             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:
-                # Wait for either a message in the queue or a task to complete
                 done, _ = await asyncio.wait(
                     list(tasks.keys()),
                     timeout=0.1,
@@ -42,6 +45,7 @@ class AsyncTaskRunner:
                 )
                 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})
@@ -49,19 +53,20 @@ class AsyncTaskRunner:
                         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
+        # 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):
-                # 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
@@ -87,18 +92,12 @@ class AsyncTaskRunner:
         finally:
             # Stop the heartbeat task
             heartbeat_task.cancel()
-            # Let the heartbeat_task finish in the background without awaiting it
+            # Wait for the heartbeat task to finish
             try:
-                await asyncio.shield(heartbeat_task)  # Ensure cancellation is handled cleanly
+                await heartbeat_task
             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.
@@ -117,9 +116,8 @@ class AsyncTaskRunner:
         # Keep track of elapsed time
         elapsed_time = 0
 
-        # Keep sending heartbeats until task completes
-        while True:
-            try:
+        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")
@@ -130,5 +128,11 @@ class AsyncTaskRunner:
                     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
+        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})

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/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.dist-info → sunholo-0.100.1.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.100.0
+Version: 0.100.1
 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.1.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0

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

@@ -89,7 +89,7 @@ sunholo/genai/init.py,sha256=yG8E67TduFCTQPELo83OJuWfjwTnGZsyACospahyEaY,687
 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=6AQ3d1-8F0lG9y3pXli1IsJW7eDqGLxoIFxYnmjbmn0,6067
+sunholo/invoke/async_class.py,sha256=TbYzdS2RDu1WhbYcq6wt7GTJzrtk-7Y3I-2AbJAD1Ik,6134
 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
@@ -114,10 +114,10 @@ sunholo/qna/__init__.py,sha256=F8q1uR_HreoSX0IfmKY1qoSwIgXhO2Q8kuDSxh9_-EE,28
 sunholo/qna/parsers.py,sha256=YpOaK5S_LxJ6FbliSYDc3AVOJ62RVduayoNnzi_p8CM,2494
 sunholo/qna/retry.py,sha256=yMw7RTkw-RXCzfENPJOt8c32mXlpvOR589EGkvK-6yI,2028
 sunholo/streaming/__init__.py,sha256=MpbydI2UYo_adttPQFkxNM33b-QRyNEbrKJx0C2AGPc,241
-sunholo/streaming/content_buffer.py,sha256=0oNltM8jBU_3-728--DGdXfS278C2s1xwdcbWthGFks,12810
+sunholo/streaming/content_buffer.py,sha256=dGzzajY_DEnIxMERiApCKUSzDI5mXKByW9L4dmYRqSw,12814
 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=FUdcotNbLQg2VV_mHnHloLJNL2gDQYAYsaNiHjzaT2I,16467
+sunholo/streaming/streaming.py,sha256=S4GzVNol3J_8tkzXodvkcR-THiTGnIKYj40NtrBhtL4,16459
 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
@@ -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.0.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.100.0.dist-info/METADATA,sha256=3E-fkTmyUzOkUNGCshJmLpnirzeSiKHaRk8oYec-xQQ,8312
-sunholo-0.100.0.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-sunholo-0.100.0.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.100.0.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.100.0.dist-info/RECORD,,
+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,,