sunholo 0.83.5__py3-none-any.whl → 0.84.0__py3-none-any.whl

sunholo/agents/flask/__init__.py

@@ -1,2 +1,3 @@
 from .qna_routes import register_qna_routes
-from .base import create_app
+from .base import create_app
+from .vac_routes import VACRoutes

sunholo/invoke/async_class.py

@@ -0,0 +1,89 @@
+import asyncio
+import logging
+from typing import Callable, List, Any, Coroutine, Tuple
+
+# Setup basic logging configuration
+logging.basicConfig(level=logging.INFO)
+logger = logging.getLogger(__name__)
+
+class AsyncTaskRunner:
+    """
+    # Example async functions for testing
+    async def api_call_1(url, params):
+        await asyncio.sleep(1)
+        if "fail" in params:
+            raise ValueError(f"Error in api_call_1 with params: {params}")
+        return f"api_call_1 response from {url} with params {params}"
+
+    async def api_call_2(url, params):
+        await asyncio.sleep(2)
+        if "fail" in params:
+            raise ValueError(f"Error in api_call_2 with params: {params}")
+        return f"api_call_2 response from {url} with params {params}"
+
+    # Example usage in an existing async function
+    async def example_usage():
+        runner = AsyncTaskRunner()
+
+        runner.add_task(api_call_1, "http://example.com", {"key": "value"})
+        runner.add_task(api_call_2, "http://example.org", {"key": "fail"})
+
+        # Run all tasks within the existing event loop
+        results = await runner.run_async()
+        for result in results:
+            print(result)
+
+    # Example of calling run_sync() in a synchronous context
+    if __name__ == "__main__":
+        runner = AsyncTaskRunner()
+
+        runner.add_task(api_call_1, "http://example.com", {"key": "value"})
+        runner.add_task(api_call_2, "http://example.org", {"key": "fail"})
+
+        # Running in a synchronous context
+        results = runner.run_sync()
+        for result in results:
+            print(result)
+    """
+    def __init__(self):
+        self.tasks = []
+
+    def add_task(self, func: Callable[..., Coroutine], *args: Any):
+        """Adds a task (function and its arguments) to the list of tasks to be executed."""
+        logger.info(f"Adding task: {func.__name__} with args: {args}")
+        self.tasks.append(func(*args))
+
+    def add_group(self, functions: List[Callable[..., Coroutine]], *args: Any):
+        """Adds a group of functions that should run in parallel with the same arguments."""
+        group_tasks = [func(*args) for func in functions]
+        logger.info(f"Adding group of tasks with args: {args}")
+        self.tasks.append(asyncio.gather(*group_tasks, return_exceptions=True))
+
+    async def run_async(self) -> List[Any]:
+        """Runs all tasks using the current event loop and returns the results."""
+        logger.info("Running tasks asynchronously")
+        results = await asyncio.gather(*self.tasks, return_exceptions=True)
+        self._log_results(results)
+        return results
+
+    def run_sync(self) -> List[Any]:
+        """Runs all tasks synchronously (blocking) using a new event loop and returns the results."""
+        try:
+            logger.info("Running tasks synchronously")
+            loop = asyncio.get_running_loop()
+            return loop.run_until_complete(self.run_async())
+        except RuntimeError:
+            loop = asyncio.new_event_loop()
+            asyncio.set_event_loop(loop)
+            results = loop.run_until_complete(self.run_async())
+            loop.close()
+            return results
+
+    def _log_results(self, results: List[Any]):
+        """Logs the results of the task executions."""
+        for result in results:
+            if isinstance(result, Exception):
+                logger.error(f"Task resulted in an error: {result}")
+            else:
+                logger.info(f"Task completed successfully: {result}")
+

sunholo/llamaindex/llamaindex_class.py

@@ -198,7 +198,12 @@ class LlamaIndexVertexCorpusManager:
         """
         List all VertexAI Corpus for the project/location
         """
-        return rag.list_corpora()
+        try:
+            return rag.list_corpora()
+        except Exception as err:
+            log.error(f"Could not list corpora: {str(err)}")
+            return []
+
     
     def find_corpus_from_list(self, display_name: str):
         """
@@ -410,3 +415,6 @@ def setup_llamaindex_subparser(subparsers):
     query_parser.add_argument('vac', nargs='?', default="global", help='The VAC config to set it up for')
 
     llamaindex_parser.set_defaults(func=llamaindex_command)
+
+    # If no subcommand is provided, print the help message
+    llamaindex_parser.set_defaults(func=lambda args: llamaindex_parser.print_help() if args.action is None else llamaindex_command)

sunholo/llamaindex/user_history.py

@@ -49,13 +49,21 @@ def add_user_history_rag(
 
 def get_user_history_chunks(user_id:str, config:ConfigManager, query):
 
-    manager = LlamaIndexVertexCorpusManager(config)
+    try:
+        manager = LlamaIndexVertexCorpusManager(config)
 
-    manager.create_corpus(user_id)
+        manager.create_corpus(user_id)
 
-    response = manager.query_corpus(query, user_id)
-    user_history_memory = []
-    for chunk in response.contexts.contexts:
-        user_history_memory.append(chunk.text)
-    
-    return "\n".join(user_history_memory)
+        response = manager.query_corpus(query, user_id)
+        log.info(f"User history got: {response=}")
+        user_history_memory = []
+        for chunk in response.contexts.contexts:
+            user_history_memory.append(chunk.text)
+        
+        log.info(f"User history chunks: {user_history_memory}")
+
+        return "\n".join(user_history_memory)
+    except Exception as err:
+        log.error(f"Could not find user history due to error: {str(err)}")
+
+        return f"No user history available due to error: {str(err)}"

{sunholo-0.83.5.dist-info → sunholo-0.84.0.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.83.5
+Version: 0.84.0
 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.83.5.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.84.0.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0
@@ -21,7 +21,7 @@ License-File: LICENSE.txt
 Requires-Dist: google-auth
 Requires-Dist: ruamel.yaml
 Requires-Dist: langchain >=0.2.12
-Requires-Dist: langchain-experimental ==0.0.63
+Requires-Dist: langchain-experimental >=0.0.61
 Requires-Dist: langchain-community >=0.2.11
 Provides-Extra: all
 Requires-Dist: asyncpg ; extra == 'all'
@@ -49,7 +49,7 @@ Requires-Dist: httpx ; extra == 'all'
 Requires-Dist: jsonschema ; extra == 'all'
 Requires-Dist: lancedb ; extra == 'all'
 Requires-Dist: langchain >=0.2.12 ; extra == 'all'
-Requires-Dist: llangchain-experimental >=0.0.61 ; extra == 'all'
+Requires-Dist: langchain-experimental >=0.0.61 ; extra == 'all'
 Requires-Dist: langchain-community >=0.2.11 ; extra == 'all'
 Requires-Dist: langchain-openai >=0.1.20 ; extra == 'all'
 Requires-Dist: langchain-google-genai >=1.0.5 ; extra == 'all'

{sunholo-0.83.5.dist-info → sunholo-0.84.0.dist-info}/RECORD

@@ -11,7 +11,7 @@ sunholo/agents/swagger.py,sha256=2tzGmpveUMmTREykZvVnDj3j295wyOMu7mUFDnXdY3c,106
 sunholo/agents/fastapi/__init__.py,sha256=S_pj4_bTUmDGoq_exaREHlOKThi0zTuGT0VZY0YfODQ,88
 sunholo/agents/fastapi/base.py,sha256=W-cyF8ZDUH40rc-c-Apw3-_8IIi2e4Y9qRtnoVnsc1Q,2521
 sunholo/agents/fastapi/qna_routes.py,sha256=lKHkXPmwltu9EH3RMwmD153-J6pE7kWQ4BhBlV3to-s,3864
-sunholo/agents/flask/__init__.py,sha256=uqfHNw2Ru3EJ4dJEcbp86h_lkquBQPMxZbjhV_xe3rs,72
+sunholo/agents/flask/__init__.py,sha256=poJDKMr2qj8qMb99JqCvCPSiEt1tj2tLQ3hKW3f2aVw,107
 sunholo/agents/flask/base.py,sha256=FgSaCODyoTtlstJtsqlLPScdgRUtv9_plxftdzHdVFo,809
 sunholo/agents/flask/qna_routes.py,sha256=uwUD1yrzOPH27m2AXpiQrPk_2VfJOQOM6dAynOWQtoQ,22532
 sunholo/agents/flask/vac_routes.py,sha256=JHBrz9URmRzxoNAiqEeI-5qWyKfVSZ1Ix__1t19p6HI,19527
@@ -83,6 +83,7 @@ sunholo/gcs/download_folder.py,sha256=ijJTnS595JqZhBH8iHFErQilMbkuKgL-bnTCMLGuvl
 sunholo/gcs/download_url.py,sha256=q1NiJSvEhdNrmU5ZJ-sBCMC_J5CxzrajY8LRgdPOV_M,6130
 sunholo/gcs/metadata.py,sha256=oQLcXi4brsZ74aegWyC1JZmhlaEV270HS5_UWtAYYWE,898
 sunholo/invoke/__init__.py,sha256=bELcqIjzKvaupcIN5OQmDgGx_8jARtH9T6PCe8UgcvE,99
+sunholo/invoke/async_class.py,sha256=J-qMgarhdi6nPQyOIFM5k0wF7nqr8aJGaz99-Ye6XGQ,3507
 sunholo/invoke/direct_vac_func.py,sha256=L_Gz7hEbZQqAZn2j5ehB-eIXmCEYmSZ7F95mjbYP9Nw,4489
 sunholo/invoke/invoke_vac_utils.py,sha256=sJc1edHTHMzMGXjji1N67c3iUaP7BmAL5nj82Qof63M,2053
 sunholo/langfuse/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -91,8 +92,8 @@ sunholo/langfuse/prompts.py,sha256=27BsVfihM6-h1jscbkGSO4HsATl-d4ZN6tcNCVztWoY,1
 sunholo/llamaindex/__init__.py,sha256=DlY_cHWCsVEV1C5WBgDdHRgOMlJc8pDoCRukUJ8PT9w,88
 sunholo/llamaindex/get_files.py,sha256=6rhXCDqQ_lrIapISQ_OYQDjiSATXvS_9m3qq53-oIl0,781
 sunholo/llamaindex/import_files.py,sha256=Bnic5wz8c61af9Kwq8KSrNBbc4imYnzMtBCb2jzSImI,6224
-sunholo/llamaindex/llamaindex_class.py,sha256=MYCgmJ2ebN0yrJbkshGIoaoX0pKi5yONLKbEPULDXRY,17049
-sunholo/llamaindex/user_history.py,sha256=SwBNDOU2hsAzOMVwDjXQsR3d8RPUZofKTlZV_pAraO8,1934
+sunholo/llamaindex/llamaindex_class.py,sha256=wtMS97YMsfA2IWLTd5mzr73DV4_fi5I5GVD7AC4wVm0,17375
+sunholo/llamaindex/user_history.py,sha256=ZtkecWuF9ORduyGB8kF8gP66bm9DdvCI-ZiK6Kt-cSE,2265
 sunholo/lookup/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sunholo/lookup/model_lookup.yaml,sha256=O7o-jP53MLA06C8pI-ILwERShO-xf6z_258wtpZBv6A,739
 sunholo/patches/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -134,9 +135,9 @@ sunholo/vertex/init.py,sha256=1OQwcPBKZYBTDPdyU7IM4X4OmiXLdsNV30C-fee2scQ,2875
 sunholo/vertex/memory_tools.py,sha256=q_phxgGX2TG2j2MXNULF2xGzQnQPENwjPN9nZ_A9Gh0,7526
 sunholo/vertex/safety.py,sha256=S9PgQT1O_BQAkcqauWncRJaydiP8Q_Jzmu9gxYfy1VA,2482
 sunholo/vertex/type_dict_to_json.py,sha256=uTzL4o9tJRao4u-gJOFcACgWGkBOtqACmb6ihvCErL8,4694
-sunholo-0.83.5.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.83.5.dist-info/METADATA,sha256=05IvbTEGbeGoW5dwFBd2IUAEBd7nFySYZcQConfSrLs,7413
-sunholo-0.83.5.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-sunholo-0.83.5.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.83.5.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.83.5.dist-info/RECORD,,
+sunholo-0.84.0.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.84.0.dist-info/METADATA,sha256=YeMjnUjnqWzP1QNrPWTwDGjJ4WtmEm0OTgxAzuvP1ME,7412
+sunholo-0.84.0.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+sunholo-0.84.0.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.84.0.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.84.0.dist-info/RECORD,,