sunholo 0.66.22__tar.gz → 0.67.2__tar.gz

{sunholo-0.66.22 → sunholo-0.67.2}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.66.22
+Version: 0.67.2
 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.66.22.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.67.2.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.5
-Requires-Dist: langchain_experimental
+Requires-Dist: langchain_experimental>0.0.60
 Requires-Dist: langchain-community
 Provides-Extra: all
 Requires-Dist: asyncpg; extra == "all"
@@ -52,7 +52,7 @@ Requires-Dist: langchain-community; extra == "all"
 Requires-Dist: langchain-openai; extra == "all"
 Requires-Dist: langchain-google-genai; extra == "all"
 Requires-Dist: langchain_google_alloydb_pg; extra == "all"
-Requires-Dist: langchain-anthropic; extra == "all"
+Requires-Dist: langchain-anthropic>=0.1.13; extra == "all"
 Requires-Dist: langfuse; extra == "all"
 Requires-Dist: pg8000; extra == "all"
 Requires-Dist: pgvector; extra == "all"
@@ -63,7 +63,7 @@ Requires-Dist: rich; extra == "all"
 Requires-Dist: supabase; extra == "all"
 Requires-Dist: tiktoken; extra == "all"
 Provides-Extra: cli
-Requires-Dist: jsonschema; extra == "cli"
+Requires-Dist: jsonschema>=4.21.1; extra == "cli"
 Requires-Dist: rich; extra == "cli"
 Provides-Extra: database
 Requires-Dist: asyncpg; extra == "database"
@@ -89,16 +89,16 @@ Requires-Dist: google-cloud-storage; extra == "gcp"
 Requires-Dist: google-cloud-logging; extra == "gcp"
 Requires-Dist: google-cloud-pubsub; extra == "gcp"
 Requires-Dist: google-cloud-discoveryengine; extra == "gcp"
-Requires-Dist: google-generativeai; extra == "gcp"
-Requires-Dist: langchain-google-genai; extra == "gcp"
-Requires-Dist: langchain_google_alloydb_pg; extra == "gcp"
+Requires-Dist: google-generativeai>=0.4.1; extra == "gcp"
+Requires-Dist: langchain-google-genai>=1.0.5; extra == "gcp"
+Requires-Dist: langchain_google_alloydb_pg>=0.2.2; extra == "gcp"
 Requires-Dist: google-api-python-client; extra == "gcp"
 Requires-Dist: google-cloud-alloydb-connector[pg8000]; extra == "gcp"
 Provides-Extra: openai
 Requires-Dist: langchain-openai; extra == "openai"
 Requires-Dist: tiktoken; extra == "openai"
 Provides-Extra: anthropic
-Requires-Dist: langchain-anthropic; extra == "anthropic"
+Requires-Dist: langchain-anthropic>=0.1.13; extra == "anthropic"
 Provides-Extra: http
 Requires-Dist: fastapi; extra == "http"
 Requires-Dist: flask; extra == "http"

{sunholo-0.66.22 → sunholo-0.67.2}/setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 # Define your base version
-version = '0.66.22'
+version = '0.67.2'
 
 setup(
     name='sunholo',
@@ -32,7 +32,7 @@ setup(
         #"tenacity==8.3.0", #TODO: remove soon
         "ruamel.yaml",
         "langchain>=0.2.5",
-        "langchain_experimental",
+        "langchain_experimental>0.0.60",
         "langchain-community",
         # Add the minimal dependencies that your package requires here
     ],
@@ -67,7 +67,7 @@ setup(
             "langchain-openai",
             "langchain-google-genai",
             "langchain_google_alloydb_pg",
-            "langchain-anthropic",
+            "langchain-anthropic>=0.1.13",
             "langfuse",
             "pg8000",
             "pgvector",
@@ -80,7 +80,7 @@ setup(
 
         ],
         'cli': [
-            "jsonschema",
+            "jsonschema>=4.21.1",
             "rich"
         ],
         'database': [
@@ -109,9 +109,9 @@ setup(
             "google-cloud-logging",
             "google-cloud-pubsub",
             "google-cloud-discoveryengine",
-            "google-generativeai",
-            "langchain-google-genai",
-            "langchain_google_alloydb_pg",
+            "google-generativeai>=0.4.1",
+            "langchain-google-genai>=1.0.5",
+            "langchain_google_alloydb_pg>=0.2.2",
             "google-api-python-client",
             "google-cloud-alloydb-connector[pg8000]",
         ],
@@ -120,7 +120,7 @@ setup(
             "tiktoken"
         ],
         'anthropic': [
-            "langchain-anthropic",        
+            "langchain-anthropic>=0.1.13",        
         ],
         'http': [
             "fastapi",

{sunholo-0.66.22 → sunholo-0.67.2}/sunholo/agents/swagger.py

@@ -198,24 +198,20 @@ See more at https://dev.sunholo.com/
             }
         }
     }
-    
     vac_services = vac_config['vac']
     
-    for vector_name, config in vac_services.items():
+    def configure_agent(vector_name, config, agent_config_paths):
         agent_type = config['agent']
-        agent_config_paths = agent_config['agents'].get(agent_type, {})
         log.info(f'Configuring swagger for agent_type: {agent_type} for vector_name: {vector_name}')
         try:
             stem = route_vac(vector_name).strip()
         except ValueError:
             log.warning(f"Failed to find URL stem for {vector_name}/{agent_type} - skipping")
-            continue
-        
+            return
+
         for method, endpoints in agent_config_paths.items():
-            # controls if get requests are protected or not
             do_auth = True
 
-            # default get: noauth, post: auth
             if method not in ['get', 'post', 'get-auth', 'post-noauth']:
                 continue
 
@@ -228,7 +224,7 @@ See more at https://dev.sunholo.com/
             elif method == 'get':
                 do_auth = False
             elif method == 'post':
-                do_auth = True # not needed but to be clear whats happening
+                do_auth = True
 
             for endpoint_key, endpoint_template in endpoints.items():
                 endpoint_template = endpoint_template.strip()
@@ -262,79 +258,26 @@ See more at https://dev.sunholo.com/
                         }
                     }))
                 }
-    # Handle default agent configuration for agent types without specific entries
+
+    for vector_name, config in vac_services.items():
+        agent_type = config['agent']
+        agent_config_paths = agent_config['agents'].get(agent_type, {})
+        configure_agent(vector_name, config, agent_config_paths)
+
     default_agent_config = agent_config['agents'].get('default', {})
-    
+
     for vector_name, config in vac_services.items():
         agent_type = config['agent']
         if agent_type in agent_config['agents']:
             continue
         log.info(f'Applying default configuration for agent_type: {agent_type} for vector_name: {vector_name}')
-        try:
-            stem = route_vac(vector_name).strip()
-        except ValueError:
-            log.warning(f"Failed to find URL stem for {vector_name}/{agent_type} - skipping")
-            continue
-
-        for method, endpoints in default_agent_config.items():
-            # controls if get requests are protected or not
-            do_auth = True
-
-            # default get: noauth, post: auth
-            if method not in ['get', 'post', 'get-auth', 'post-noauth']:
-                continue
-
-            if method == 'get-auth':
-                do_auth = True
-                method = 'get'
-            elif method == 'post-noauth':
-                do_auth = False
-                method = 'post'
-            elif method == 'get':
-                do_auth = False
-            elif method == 'post':
-                do_auth = True # not needed but to be clear whats happening
-
-            for endpoint_key, endpoint_template in endpoints.items():
-                endpoint_template = endpoint_template.strip()
-                endpoint_address = endpoint_template.replace("{stem}", stem).replace("{vector_name}", vector_name).strip()
-                endpoint_path = endpoint_template.replace("{stem}", f"/{agent_type}").replace("{vector_name}", vector_name).strip()
-                log.debug(f"default Endpoint_template: {endpoint_template}")
-                log.debug(f"default endpoint address: {endpoint_address}")
-                log.debug(f"default endpoint_path: {endpoint_path}")
-                if endpoint_path not in swagger_template['paths']:
-                    swagger_template['paths'][endpoint_path] = {}
-                
-                operation_id = f"{method}_{agent_type}_{endpoint_key}_{vector_name}"
-
-                security = [{'ApiKeyAuth': []}] if do_auth else [{'None': []}]
-
-                swagger_template['paths'][endpoint_path][method] = {
-                    'summary': f"{method.capitalize()} {agent_type}",
-                    'operationId': operation_id,
-                    'x-google-backend': {
-                        'address': endpoint_address,
-                        'protocol': 'h2',
-                        'deadline': 180000  # Timeout of 3 minutes (1,800,00 milliseconds)
-                    },
-                    'security': security,
-                    'responses': copy.deepcopy(default_agent_config.get('response', {}).get(endpoint_key, {
-                        '200': {
-                            'description': 'Default - A successful response',
-                            'schema': {
-                                'type': 'string'
-                            }
-                        }
-                    }))
-                }
+        configure_agent(vector_name, config, default_agent_config)
 
     yaml = YAML()
-    yaml.width = 4096 # to avoid breaking urls
+    yaml.width = 4096
 
-    # Capture YAML output in a string buffer
     string_stream = StringIO()
     yaml.dump(swagger_template, string_stream)
     yaml_string = string_stream.getvalue()
 
-    return yaml_string
-    
+    return yaml_string

{sunholo-0.66.22 → sunholo-0.67.2}/sunholo/chunker/publish.py

@@ -27,9 +27,14 @@ def publish_chunks(chunks: list[Document], vector_name: str):
     
     log.info("Publishing chunks to embed_chunk")
     
-    pubsub_manager = PubSubManager(vector_name, 
-                                   pubsub_topic="chunk-to-pubsub-embed", 
-                                   project_id=project)
+    try:
+        pubsub_manager = PubSubManager(vector_name, 
+                                    pubsub_topic="chunk-to-pubsub-embed", 
+                                    project_id=project)
+    except Exception as err:
+        log.error(f"PubSubManager init error: Could not publish chunks to {project} {vector_name} pubsub_topic chunk-to-pubsub-embed - {str(err)}")
+        
+        return None
         
     for chunk in chunks:
         # Convert chunk to string, as Pub/Sub messages must be strings or bytes

{sunholo-0.66.22 → sunholo-0.67.2}/sunholo/cli/chat_vac.py

@@ -12,7 +12,6 @@ import sys
 import subprocess
 import json
 import requests
-import os
 from pathlib import Path
 
 from rich import print
@@ -320,7 +319,7 @@ def vac_command(args):
 def invoke_vac(service_url, data, vector_name=None, metadata=None, is_file=False):
     try:
         if is_file:
-            console.print("Uploading file to chunker...")
+            console.print("Uploading file...")
             # Handle file upload
             if not isinstance(data, Path) or not data.is_file():
                 raise ValueError("For file uploads, 'data' must be a Path object pointing to a valid file.")
@@ -335,7 +334,7 @@ def invoke_vac(service_url, data, vector_name=None, metadata=None, is_file=False
 
             response = requests.post(service_url, files=files, data=form_data)
         else:
-            console.print("Uploading JSON to chunker...")
+            console.print("Uploading JSON...")
             try:
                 if isinstance(data, dict):
                     json_data = data

{sunholo-0.66.22 → sunholo-0.67.2}/sunholo/database/alloydb.py

@@ -8,6 +8,7 @@ try:
     from langchain_google_alloydb_pg import AlloyDBEngine, Column, AlloyDBLoader, AlloyDBDocumentSaver
     from google.cloud.alloydb.connector import IPTypes
 except ImportError:
+    AlloyDBEngine = None
     pass
 
 from .database import get_vector_size
@@ -16,6 +17,10 @@ from ..utils.config import load_config_key
 
 def create_alloydb_engine(vector_name):
 
+    if not AlloyDBEngine:
+        log.error("Can't create AlloyDBEngine - install via `pip install sunholo[gcp,database]`")
+        raise ValueError("Can't import AlloyDBEngine")
+
     alloydb_config = load_config_key(
         'alloydb_config', 
         vector_name=vector_name, 

{sunholo-0.66.22 → sunholo-0.67.2}/sunholo/embedder/embed_chunk.py

@@ -124,6 +124,23 @@ def embed_pubsub_chunk(data: dict):
                 if vector_name_other:
                     log.warning(f"Using different vector_name for vectorstore: {vector_name_other} overriding {vector_name}")
                     vector_name = vector_name_other
+                
+                # dynamic vectorstore names (for per user_id stores)
+                if value.get('from_metadata_id'):
+                    the_id = value.get('from_metadata_id')
+                    log.info(f"Lookup vectorstore vector_name from id: {the_id}")
+
+                    if the_id not in metadata:
+                        log.warning("Could not find vectorstore from_metadata_id {the_id} in metadata - skipping")
+                        continue
+                    else:
+                        match_id = metadata.get(the_id)
+                        if match_id:
+                            vector_name = match_id
+                        else:
+                            log.warning("Could not find any value for vectorstore from_metadata_id: {the_id} - skipping")
+                            continue
+
                 vectorstore_obj = pick_vectorstore(vectorstore, vector_name=vector_name, embeddings=embeddings)
                 vs_retriever = vectorstore_obj.as_retriever(search_kwargs=dict(k=3))
                 vectorstore_list.append(vs_retriever)

{sunholo-0.66.22 → sunholo-0.67.2}/sunholo.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.66.22
+Version: 0.67.2
 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.66.22.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.67.2.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.5
-Requires-Dist: langchain_experimental
+Requires-Dist: langchain_experimental>0.0.60
 Requires-Dist: langchain-community
 Provides-Extra: all
 Requires-Dist: asyncpg; extra == "all"
@@ -52,7 +52,7 @@ Requires-Dist: langchain-community; extra == "all"
 Requires-Dist: langchain-openai; extra == "all"
 Requires-Dist: langchain-google-genai; extra == "all"
 Requires-Dist: langchain_google_alloydb_pg; extra == "all"
-Requires-Dist: langchain-anthropic; extra == "all"
+Requires-Dist: langchain-anthropic>=0.1.13; extra == "all"
 Requires-Dist: langfuse; extra == "all"
 Requires-Dist: pg8000; extra == "all"
 Requires-Dist: pgvector; extra == "all"
@@ -63,7 +63,7 @@ Requires-Dist: rich; extra == "all"
 Requires-Dist: supabase; extra == "all"
 Requires-Dist: tiktoken; extra == "all"
 Provides-Extra: cli
-Requires-Dist: jsonschema; extra == "cli"
+Requires-Dist: jsonschema>=4.21.1; extra == "cli"
 Requires-Dist: rich; extra == "cli"
 Provides-Extra: database
 Requires-Dist: asyncpg; extra == "database"
@@ -89,16 +89,16 @@ Requires-Dist: google-cloud-storage; extra == "gcp"
 Requires-Dist: google-cloud-logging; extra == "gcp"
 Requires-Dist: google-cloud-pubsub; extra == "gcp"
 Requires-Dist: google-cloud-discoveryengine; extra == "gcp"
-Requires-Dist: google-generativeai; extra == "gcp"
-Requires-Dist: langchain-google-genai; extra == "gcp"
-Requires-Dist: langchain_google_alloydb_pg; extra == "gcp"
+Requires-Dist: google-generativeai>=0.4.1; extra == "gcp"
+Requires-Dist: langchain-google-genai>=1.0.5; extra == "gcp"
+Requires-Dist: langchain_google_alloydb_pg>=0.2.2; extra == "gcp"
 Requires-Dist: google-api-python-client; extra == "gcp"
 Requires-Dist: google-cloud-alloydb-connector[pg8000]; extra == "gcp"
 Provides-Extra: openai
 Requires-Dist: langchain-openai; extra == "openai"
 Requires-Dist: tiktoken; extra == "openai"
 Provides-Extra: anthropic
-Requires-Dist: langchain-anthropic; extra == "anthropic"
+Requires-Dist: langchain-anthropic>=0.1.13; extra == "anthropic"
 Provides-Extra: http
 Requires-Dist: fastapi; extra == "http"
 Requires-Dist: flask; extra == "http"

{sunholo-0.66.22 → sunholo-0.67.2}/sunholo.egg-info/requires.txt

@@ -1,7 +1,7 @@
 google-auth
 ruamel.yaml
 langchain>=0.2.5
-langchain_experimental
+langchain_experimental>0.0.60
 langchain-community
 
 [all]
@@ -33,7 +33,7 @@ langchain-community
 langchain-openai
 langchain-google-genai
 langchain_google_alloydb_pg
-langchain-anthropic
+langchain-anthropic>=0.1.13
 langfuse
 pg8000
 pgvector
@@ -45,10 +45,10 @@ supabase
 tiktoken
 
 [anthropic]
-langchain-anthropic
+langchain-anthropic>=0.1.13
 
 [cli]
-jsonschema
+jsonschema>=4.21.1
 rich
 
 [database]
@@ -71,9 +71,9 @@ google-cloud-storage
 google-cloud-logging
 google-cloud-pubsub
 google-cloud-discoveryengine
-google-generativeai
-langchain-google-genai
-langchain_google_alloydb_pg
+google-generativeai>=0.4.1
+langchain-google-genai>=1.0.5
+langchain_google_alloydb_pg>=0.2.2
 google-api-python-client
 google-cloud-alloydb-connector[pg8000]