sunholo 0.66.21__tar.gz → 0.67.0__tar.gz

{sunholo-0.66.21 → sunholo-0.67.0}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.66.21
+Version: 0.67.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.66.21.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.67.0.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0

{sunholo-0.66.21 → sunholo-0.67.0}/setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 # Define your base version
-version = '0.66.21'
+version = '0.67.0'
 
 setup(
     name='sunholo',

{sunholo-0.66.21 → sunholo-0.67.0}/sunholo/agents/dispatch_to_qa.py

@@ -121,7 +121,7 @@ def send_to_qa(user_input, vector_name, chat_history, stream=False, **kwargs):
 
     except requests.exceptions.HTTPError as err:
         log.error(f"HTTP error occurred: {err}")
-        error_message = f"There was an error processing your request. Please try again later. {str(err)}"
+        error_message = f"There was an error processing your request. {str(err)}"
         if stream:
             return iter([error_message])
         else:
@@ -129,7 +129,7 @@ def send_to_qa(user_input, vector_name, chat_history, stream=False, **kwargs):
 
     except Exception as err:
         log.error(f"Other error occurred: {str(err)}")
-        error_message = f"Something went wrong. Please try again later. {str(err)}"
+        error_message = f"Something went wrong. {str(err)}"
         if stream:
             return iter([error_message])
         else:

{sunholo-0.66.21 → sunholo-0.67.0}/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.21 → sunholo-0.67.0}/sunholo/auth/run.py

@@ -4,6 +4,7 @@ import inspect
 from typing import Dict, Optional
 from ..utils.config import load_config_key, load_config
 from ..utils.gcp import is_running_on_cloudrun
+from ..utils.api_key import has_multivac_api_key, get_multivac_api_key
 from ..logging import log
 from ..agents.route import route_vac
 
@@ -48,6 +49,10 @@ def get_id_token(url: str) -> str:
         )
 
 def get_header(vector_name) -> Optional[dict]:
+    if has_multivac_api_key():
+        
+        return {"x-api-key": get_multivac_api_key()}
+
     if is_running_on_cloudrun():
         run_url = get_run_url(vector_name)
     else:

{sunholo-0.66.21 → sunholo-0.67.0}/sunholo/cli/chat_vac.py

@@ -2,6 +2,7 @@ from ..agents import send_to_qa, handle_special_commands
 from ..streaming import generate_proxy_stream, can_agent_stream
 from ..utils.user_ids import generate_user_id
 from ..utils.config import load_config_key
+from ..utils.api_key import has_multivac_api_key
 from ..logging import log
 from ..qna.parsers import parse_output
 from .run_proxy import clean_proxy_list, start_proxy, stop_proxy
@@ -11,7 +12,6 @@ import sys
 import subprocess
 import json
 import requests
-import os
 from pathlib import Path
 
 from rich import print
@@ -234,21 +234,24 @@ def resolve_service_url(args, no_config=False):
         console.print("Found agent_url within vacConfig: {agent_url}")
     
     # via public cloud endpoints - assumes no gcloud auth
-    if os.getenv("MULTIVAC_API_KEY"):
-        console.rule("Found MULTIVAC_API_KEY")
+    if has_multivac_api_key():
+        log.debug("Found MULTIVAC_API_KEY")
         gcp_config = load_config_key("gcp_config", "global", "vacConfig")
         endpoints_base_url = gcp_config.get("endpoints_base_url")
         if not endpoints_base_url:
             console.print("[bold red]MULTIVAC_API_KEY env var is set but no config.gcp_config.endpoints_base_url can be found[/bold red]")
             sys.exit(1)
 
-        service_url = f"{endpoints_base_url}/v1/{agent_name}"
+        return f"{endpoints_base_url}/v1/{agent_name}"
 
     # via direct access to agent url - requires gcloud auth access
     elif args.no_proxy:
         
         service_url = agent_url or get_cloud_run_service_url(args.project, args.region, agent_name)
         console.print(f"No proxy, connecting directly to {service_url}")
+
+        return service_url
+    
     else:
         # via gcloud proxy - requires gcloud auth access
         try:
@@ -257,7 +260,7 @@ def resolve_service_url(args, no_config=False):
             console.print(f"[bold red]ERROR: Could not start {args.vac_name} proxy URL: {str(e)}[/bold red]")
             sys.exit(1)
     
-    return service_url
+        return service_url
 
 def vac_command(args):
 
@@ -316,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.")
@@ -331,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.21 → sunholo-0.67.0}/sunholo/cli/run_proxy.py

@@ -151,7 +151,6 @@ def stop_proxy(service_name, stop_local=True):
     # kill PID
 
     if service_name not in proxies:
-        print(f"No proxy found for service: {service_name}")
         return
 
     if not stop_local:

{sunholo-0.66.21 → sunholo-0.67.0}/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.67.0/sunholo/utils/api_key.py

@@ -0,0 +1,13 @@
+import os
+
+def has_multivac_api_key():
+    if os.getenv('MULTIVAC_API_KEY'):
+        return True
+    
+    return False
+
+def get_multivac_api_key():
+    if has_multivac_api_key():
+        return os.getenv('MULTIVAC_API_KEY')
+    
+    return None

{sunholo-0.66.21 → sunholo-0.67.0}/sunholo.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.66.21
+Version: 0.67.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.66.21.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.67.0.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0

{sunholo-0.66.21 → sunholo-0.67.0}/sunholo.egg-info/SOURCES.txt

@@ -102,6 +102,7 @@ sunholo/streaming/streaming.py
 sunholo/summarise/__init__.py
 sunholo/summarise/summarise.py
 sunholo/utils/__init__.py
+sunholo/utils/api_key.py
 sunholo/utils/big_context.py
 sunholo/utils/config.py
 sunholo/utils/config_schema.py