sunholo 0.81.5__tar.gz → 0.82.1__tar.gz

{sunholo-0.81.5 → sunholo-0.82.1}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.81.5
+Version: 0.82.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.81.5.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.82.1.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0
@@ -20,9 +20,9 @@ Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: google-auth
 Requires-Dist: ruamel.yaml
-Requires-Dist: langchain>=0.2.5
+Requires-Dist: langchain>=0.2.12
 Requires-Dist: langchain_experimental>0.0.60
-Requires-Dist: langchain-community
+Requires-Dist: langchain-community>=0.2.11
 Provides-Extra: all
 Requires-Dist: asyncpg; extra == "all"
 Requires-Dist: azure-identity; extra == "all"

{sunholo-0.81.5 → sunholo-0.82.1}/setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 # Define your base version
-version = '0.81.5'
+version = '0.82.1'
 
 setup(
     name='sunholo',
@@ -31,9 +31,9 @@ setup(
         "google-auth", # to check if on gcp
         #"tenacity==8.3.0", #TODO: remove soon
         "ruamel.yaml",
-        "langchain>=0.2.5",
+        "langchain>=0.2.12",
         "langchain_experimental>0.0.60",
-        "langchain-community",
+        "langchain-community>=0.2.11",
     ],
     extras_require={
         # Define optional dependencies with feature names

{sunholo-0.81.5 → sunholo-0.82.1}/sunholo/agents/swagger.py

@@ -173,7 +173,7 @@ def generate_swagger(vac_config, agent_config):
             'description': 'Multivac (Multi-VAC) Cloud. Generate API keys (MULTIVAC_API_KEY) to enable access to private services. See more at https://dev.sunholo.com/',
             'version': '0.1.0'
         },
-        'host': '"${_ENDPOINTS_HOST}"',
+        'host': '${_ENDPOINTS_HOST}',
         'basePath': '/v1',
         'schemes': ['https'],
         'produces': ['application/json'],

{sunholo-0.81.5 → sunholo-0.82.1}/sunholo/gcs/add_file.py

@@ -15,6 +15,7 @@ import datetime
 import os
 import base64
 import uuid
+import time
 
 try:
     from google.cloud import storage
@@ -89,6 +90,33 @@ def resolve_bucket(vector_name):
     
     return bucket_name
 
+def add_folder_to_gcs(
+        source_folder:str, 
+        vector_name:str=None, 
+        bucket_name:str=None, 
+        metadata:dict=None, 
+        bucket_folderpath:str=None):
+    """Uploads a folder and all its contents to a specified GCS bucket."""
+
+    uris = []
+    for root, dirs, files in os.walk(source_folder):
+        for file in files:
+            local_path = os.path.join(root, file)
+            # Create the relative path in the destination folder
+            relative_path = os.path.relpath(local_path, source_folder)
+            bucket_filepath = os.path.join(bucket_folderpath, relative_path)
+
+            uri = add_file_to_gcs(local_path, 
+                            vector_name=vector_name, 
+                            bucket_name=bucket_name, 
+                            metadata=metadata, 
+                            bucket_filepath=bucket_filepath)
+            uris.append(uri)
+            
+    log.info(f"uploaded [{len(files)}] to GCS bucket")
+
+    return uris
+
 def add_file_to_gcs(filename: str, 
                     vector_name:str=None, 
                     bucket_name: str=None, 
@@ -148,7 +176,7 @@ def add_file_to_gcs(filename: str,
 
     blob.metadata = the_metadata
     
-    import time
+
 
     max_retries = 5
     base_delay = 1  # 1 second

{sunholo-0.81.5 → sunholo-0.82.1}/sunholo/invoke/direct_vac_func.py

@@ -41,7 +41,7 @@ def direct_vac(vac_input: dict, vac_name: str, chat_history=[]):
     override_endpoint = agent_url or override_endpoint
 
     print(f"Using {override_endpoint=}")
-    log.warning(f'Batch invoke_vac_qa with {vac_input=}')
+    log.warning(f'Batch invoke_vac_qa {vac_name} with {vac_input=}')
     vac_response = send_to_qa(
         vac_input["user_input"],
         vector_name=vac_name,

sunholo-0.82.1/sunholo/pubsub/__init__.py

@@ -0,0 +1,3 @@
+from .pubsub_manager import PubSubManager
+from .process_pubsub import process_pubsub_message, decode_pubsub_message
+

{sunholo-0.81.5 → sunholo-0.82.1}/sunholo/pubsub/process_pubsub.py

@@ -16,8 +16,7 @@ from ..custom_logging import log
 from ..gcs.metadata import get_object_metadata
 
 
-
-def process_pubsub_message(data: dict) -> tuple:
+def decode_pubsub_message(data: dict) -> tuple:
     """Extracts message data and metadata from a Pub/Sub message.
 
     Args:
@@ -26,7 +25,6 @@ def process_pubsub_message(data: dict) -> tuple:
     Returns:
         tuple: A tuple containing the message data and attributes as metadata.
     """
-    # Decode the message data
     message_data = base64.b64decode(data['message']['data']).decode('utf-8')
     attributes = data['message'].get('attributes', {})
     messageId = data['message'].get('messageId')
@@ -38,6 +36,20 @@ def process_pubsub_message(data: dict) -> tuple:
     log.info(f"Process Pub/Sub was triggered by messageId {messageId} published at {publishTime}")
     log.debug(f"Process Pub/Sub data: {message_data}")
 
+    return message_data, attributes, vector_name
+
+def process_pubsub_message(data: dict) -> tuple:
+    """Extracts message data and metadata from a Pub/Sub message for a Cloud Storage event.
+
+    Args:
+        data (dict): The Pub/Sub message data.
+
+    Returns:
+        tuple: A tuple containing the message data and attributes as metadata.
+    """
+    # Decode the message data
+    message_data, attributes, vector_name = decode_pubsub_message(data)
+
     # Check for a valid GCS event type and payload format
     if attributes.get("eventType") == "OBJECT_FINALIZE" and attributes.get("payloadFormat") == "JSON_API_V1":
         objectId = attributes.get("objectId")

{sunholo-0.81.5 → sunholo-0.82.1}/sunholo.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.81.5
+Version: 0.82.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.81.5.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.82.1.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0
@@ -20,9 +20,9 @@ Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: google-auth
 Requires-Dist: ruamel.yaml
-Requires-Dist: langchain>=0.2.5
+Requires-Dist: langchain>=0.2.12
 Requires-Dist: langchain_experimental>0.0.60
-Requires-Dist: langchain-community
+Requires-Dist: langchain-community>=0.2.11
 Provides-Extra: all
 Requires-Dist: asyncpg; extra == "all"
 Requires-Dist: azure-identity; extra == "all"

{sunholo-0.81.5 → sunholo-0.82.1}/sunholo.egg-info/requires.txt

@@ -1,8 +1,8 @@
 google-auth
 ruamel.yaml
-langchain>=0.2.5
+langchain>=0.2.12
 langchain_experimental>0.0.60
-langchain-community
+langchain-community>=0.2.11
 
 [all]
 asyncpg

sunholo-0.81.5/sunholo/pubsub/__init__.py

@@ -1,3 +0,0 @@
-from .pubsub_manager import PubSubManager
-from .process_pubsub import process_pubsub_message
-