sunholo 0.83.4__tar.gz → 0.84.0__tar.gz

{sunholo-0.83.4 → sunholo-0.84.0}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.83.4
+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.4.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
@@ -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.4 → sunholo-0.84.0}/setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 # Define your base version
-version = '0.83.4'
+version = '0.84.0'
 
 setup(
     name='sunholo',
@@ -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.84.0/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.4 → sunholo-0.84.0}/sunholo/database/alloydb_client.py

@@ -9,6 +9,7 @@ except ImportError:
     pass
 
 from .database import get_vector_size
+from .uuid import generate_uuid_from_object_id
 from ..custom_logging import log
 from ..utils import ConfigManager
 
@@ -122,10 +123,10 @@ class AlloyDBClient:
             region=self.config["region"],
             cluster=self.config["cluster"],
             instance=self.config["instance"],
-            password=self.password,
             database=self.database,
             ip_type=self.config.get("ip_type") or IPTypes.PRIVATE
         )
+        self._loop = engine._loop
 
         log.info(f"Created AlloyDB engine for {engine}")
 
@@ -190,6 +191,34 @@ class AlloyDBClient:
                 await conn.close()
 
         return result
+    
+    def get_document_from_docstore(self, source:str, vector_name):
+        query = self._get_document_from_docstore(source, vector_name)
+
+        return self.execute_sql(query)
+
+    async def get_document_from_docstore_async(self, source:str, vector_name:str):
+        query = self._get_document_from_docstore(source, vector_name)
+
+        document = await self.execute_sql_async(query)
+
+        return document
+    
+    def _get_document_from_docstore(self, source:str, vector_name:str):
+        if not isinstance(source, str):
+            raise ValueError("The 'source' parameter must be a single string, not a list of strings or other iterable.")
+
+        table_name = f"{vector_name}_docstore"
+        doc_id = generate_uuid_from_object_id(source)
+
+        query = f"""
+            SELECT * 
+            FROM {table_name}
+            WHERE doc_id = {doc_id}
+            LIMIT 1;
+        """
+
+        return query
 
     async def get_sources_from_docstore_async(self, sources, vector_name, search_type="OR", just_source_name=False):
         """Fetches sources from the docstore asynchronously."""
@@ -233,7 +262,7 @@ class AlloyDBClient:
             FROM {table_name}
             WHERE {conditions}
             ORDER BY langchain_metadata->>'objectId' ASC
-            LIMIT 500;
+            LIMIT 50;
         """
 
         return query

sunholo-0.84.0/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.4 → sunholo-0.84.0}/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.4 → sunholo-0.84.0}/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.4 → sunholo-0.84.0}/sunholo/utils/config_class.py

@@ -89,7 +89,7 @@ class ConfigManager:
                 continue
             if filename.endswith(('.yaml', '.yml', '.json')):
                 config_file = os.path.join(folder, filename)
-                log.debug(f"Checking config file: {config_file}")
+               
                 if filename in self.config_cache:
                     cached_config, cache_time = self.config_cache[filename]
                     time_to_recache = (current_time - cache_time)

{sunholo-0.83.4 → sunholo-0.84.0}/sunholo.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.83.4
+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.4.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
@@ -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.4 → sunholo-0.84.0}/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.4 → sunholo-0.84.0}/sunholo.egg-info/requires.txt

@@ -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.4/sunholo/agents/flask/__init__.py

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