sunholo 0.66.21__tar.gz → 0.66.22__tar.gz

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

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.66.21
+Version: 0.66.22
 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.66.22.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0

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

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

{sunholo-0.66.21 → sunholo-0.66.22}/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.66.22}/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.66.22}/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
@@ -234,21 +235,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 +261,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):
 

{sunholo-0.66.21 → sunholo-0.66.22}/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.22/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.66.22}/sunholo.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.66.21
+Version: 0.66.22
 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.66.22.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0

{sunholo-0.66.21 → sunholo-0.66.22}/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