sunholo 0.83.5__tar.gz → 0.84.1__tar.gz

{sunholo-0.83.5 → sunholo-0.84.1}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.83.5
+Version: 0.84.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.83.5.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.84.1.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 → sunholo-0.84.1}/setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 # Define your base version
-version = '0.83.5'
+version = '0.84.1'
 
 setup(
     name='sunholo',
@@ -32,7 +32,7 @@ setup(
         #"tenacity==8.3.0", #TODO: remove soon
         "ruamel.yaml",
         "langchain>=0.2.12",
-        "langchain_experimental==0.0.63",
+        "langchain_experimental>=0.0.61",
         "langchain-community>=0.2.11",
     ],
     extras_require={
@@ -63,7 +63,7 @@ setup(
             "jsonschema",
             "lancedb",
             "langchain>=0.2.12",
-            "llangchain-experimental>=0.0.61",
+            "langchain-experimental>=0.0.61",
             "langchain-community>=0.2.11",
             "langchain-openai>=0.1.20",
             "langchain-google-genai>=1.0.5",

{sunholo-0.83.5 → sunholo-0.84.1}/sunholo/agents/__init__.py

@@ -2,6 +2,6 @@ from .chat_history import extract_chat_history
 from .dispatch_to_qa import send_to_qa, send_to_qa_async
 from .pubsub import process_pubsub
 from .special_commands import handle_special_commands, app_to_store, handle_files
-from .flask import register_qna_routes, create_app
+from .flask import register_qna_routes, create_app, VACRoutes
 from .fastapi import register_qna_fastapi_routes, create_fastapi_app
 from .swagger import config_to_swagger

sunholo-0.84.1/sunholo/agents/flask/__init__.py

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

{sunholo-0.83.5 → sunholo-0.84.1}/sunholo/agents/flask/vac_routes.py

@@ -13,7 +13,7 @@ from ...utils.version import sunholo_version
 import os
 from ...gcs.add_file import add_file_to_gcs, handle_base64_image
 from ..swagger import validate_api_key
-from datetime import datetime, timedelta
+from datetime import timedelta
 
 try:
     from flask import request, jsonify, Response
@@ -95,7 +95,7 @@ if __name__ == "__main__":
         openai_response = {
             "id": response_id,
             "object": "chat.completion",
-            "created": str(int(datetime.now().timestamp())),
+            "created": str(int(datetime.datetime.now().timestamp())),
             "model": vector_name,
             "system_fingerprint": sunholo_version(),
             "choices": [{
@@ -137,7 +137,7 @@ if __name__ == "__main__":
                 name="start_streaming_chat",
                 metadata=vac_config,
                 input = all_input,
-                completion_start_time=datetime.datetime.now(),
+                completion_start_time=str(int(datetime.datetime.now().timestamp())),
                 model=vac_config.get("model") or vac_config.get("llm")
             )
 
@@ -247,7 +247,7 @@ if __name__ == "__main__":
                     return jsonify({'error': '_ENDPOINTS_HOST environment variable not found'}), 401
                 
                 # Check cache first
-                current_time = datetime.now()
+                current_time = datetime.datetime.now()
                 if api_key in api_key_cache:
                     cached_result, cache_time = api_key_cache[api_key]
                     if current_time - cache_time < cache_duration:
@@ -340,7 +340,7 @@ if __name__ == "__main__":
                     openai_chunk = {
                         "id": response_id,
                         "object": "chat.completion.chunk",
-                        "created": str(int(datetime.now().timestamp())),
+                        "created": str(int(datetime.datetime.now().timestamp())),
                         "model": vector_name,
                         "system_fingerprint": sunholo_version(),
                         "choices": [{
@@ -357,7 +357,7 @@ if __name__ == "__main__":
             final_chunk = {
                 "id": response_id,
                 "object": "chat.completion.chunk",
-                "created": str(int(datetime.now().timestamp())),
+                "created": str(int(datetime.datetime.now().timestamp())),
                 "model": vector_name,
                 "system_fingerprint": sunholo_version(),
                 "choices": [{

sunholo-0.84.1/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-0.83.5 → sunholo-0.84.1}/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-0.83.5 → sunholo-0.84.1}/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 → sunholo-0.84.1}/sunholo.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.83.5
+Version: 0.84.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.83.5.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.84.1.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 → sunholo-0.84.1}/sunholo.egg-info/SOURCES.txt

@@ -94,6 +94,7 @@ sunholo/gcs/download_folder.py
 sunholo/gcs/download_url.py
 sunholo/gcs/metadata.py
 sunholo/invoke/__init__.py
+sunholo/invoke/async_class.py
 sunholo/invoke/direct_vac_func.py
 sunholo/invoke/invoke_vac_utils.py
 sunholo/langfuse/__init__.py

{sunholo-0.83.5 → sunholo-0.84.1}/sunholo.egg-info/requires.txt

@@ -1,7 +1,7 @@
 google-auth
 ruamel.yaml
 langchain>=0.2.12
-langchain_experimental==0.0.63
+langchain_experimental>=0.0.61
 langchain-community>=0.2.11
 
 [all]
@@ -30,7 +30,7 @@ httpx
 jsonschema
 lancedb
 langchain>=0.2.12
-llangchain-experimental>=0.0.61
+langchain-experimental>=0.0.61
 langchain-community>=0.2.11
 langchain-openai>=0.1.20
 langchain-google-genai>=1.0.5

sunholo-0.83.5/sunholo/agents/flask/__init__.py

@@ -1,2 +0,0 @@
-from .qna_routes import register_qna_routes
-from .base import create_app