sunholo 0.66.20__py3-none-any.whl → 0.66.22__py3-none-any.whl

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/agents/swagger.py

@@ -273,9 +273,8 @@ See more at https://dev.sunholo.com/
         try:
             stem = route_vac(vector_name).strip()
         except ValueError:
-            stem = f"${{{agent_type.upper()}_BACKEND_URL}}"
-            log.warning(f"Failed to find URL stem for {vector_name}/{agent_type} - using {stem} instead")
-        
+            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

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/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,6 +12,7 @@ import sys
 import subprocess
 import json
 import requests
+import os
 from pathlib import Path
 
 from rich import print
@@ -226,22 +228,40 @@ def resolve_service_url(args, no_config=False):
     if args.url_override:
 
         return args.url_override
+    
+    agent_name = load_config_key("agent", args.vac_name, kind="vacConfig")
+    agent_url = load_config_key("agent_url", args.vac_name, "vacConfig")
+    if agent_url:
+        console.print("Found agent_url within vacConfig: {agent_url}")
+    
+    # via public cloud endpoints - assumes no gcloud auth
+    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)
+
+        return f"{endpoints_base_url}/v1/{agent_name}"
 
-    if args.no_proxy:
-        agent_url = load_config_key("agent_url", args.vac_name, "vacConfig")
-        if agent_url:
-            console.print("Found agent_url within vacConfig: {agent_url}")
+    # 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, args.vac_name)
+        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:
             service_url = get_service_url(args.vac_name, args.project, args.region, no_config=no_config)
         except ValueError as e:
             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/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/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.20.dist-info → sunholo-0.66.22.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.66.20
+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.20.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.20.dist-info → sunholo-0.66.22.dist-info}/RECORD

@@ -2,12 +2,12 @@ sunholo/__init__.py,sha256=0CdpufyRKWyZe7J7UKigL6j_qOorM-p0OjHIAuf9M38,864
 sunholo/logging.py,sha256=00VGGArfWHbJuHHSJ4kXhHTggWnRfbVYMcZNOYIsqnA,11787
 sunholo/agents/__init__.py,sha256=Hb4NXy2rN-83Z0-UDRwX-LXv2R29lcbSFPf8G6q4fZg,380
 sunholo/agents/chat_history.py,sha256=bkII7PNEbGCaobu2Rnr2rM9dim3BCK0kM-tiWhoI1tw,5219
-sunholo/agents/dispatch_to_qa.py,sha256=7Dl82DL3Wt-MxpLyCi_Udf8OPvxU6-UXbgP-pojoPuY,8339
+sunholo/agents/dispatch_to_qa.py,sha256=nFNdxhkr7rVYuUwVoBCBNYBI2Dke6-_z_ZApBEWb_cU,8291
 sunholo/agents/langserve.py,sha256=FdhQjorAY2bMn2rpuabNT6bU3uqSKWrl8DjpH3L_V7k,4375
 sunholo/agents/pubsub.py,sha256=5hbbhbBGyVWRpt2sAGC5FEheYH1mCCwVUhZEB1S7vGg,1337
 sunholo/agents/route.py,sha256=V1HKXTvaNuYgjmT5_QgIQum4O7O0Mw497m6YiMpEzX0,2383
 sunholo/agents/special_commands.py,sha256=ecD5jrBVXo170sdgPILi0m_m_4nRFEv6qKn5zYEvEK8,6494
-sunholo/agents/swagger.py,sha256=u8yVbXE-Ii_10VxXDai-yczfjCYLfaTWMi8rju-J_ZE,13632
+sunholo/agents/swagger.py,sha256=npZT7jRJA65xMXNjTcYsC3-RMd8qYP71vy_fSCCcKGg,13572
 sunholo/agents/fastapi/__init__.py,sha256=S_pj4_bTUmDGoq_exaREHlOKThi0zTuGT0VZY0YfODQ,88
 sunholo/agents/fastapi/base.py,sha256=clk76cHbUAvU0OYJrRfCWX_5f0ACbhDsIzYBhI3wyoE,2514
 sunholo/agents/fastapi/qna_routes.py,sha256=DgK4Btu5XriOC1JaRQ4G_nWEjJfnQ0J5pyLanF6eF1g,3857
@@ -17,7 +17,7 @@ sunholo/agents/flask/qna_routes.py,sha256=tEsJRnnGoz_cOEaPtPpCCD920jZpLypLK58UzI
 sunholo/archive/__init__.py,sha256=qNHWm5rGPVOlxZBZCpA1wTYPbalizRT7f8X4rs2t290,31
 sunholo/archive/archive.py,sha256=C-UhG5x-XtZ8VheQp92IYJqgD0V3NFQjniqlit94t18,1197
 sunholo/auth/__init__.py,sha256=4owDjSaWYkbTlPK47UHTOC0gCWbZsqn4ZIEw5NWZTlg,28
-sunholo/auth/run.py,sha256=1ATGHM1ji-08oDINltfTOabYqG3_nQqL4cNpw-3l4L8,2690
+sunholo/auth/run.py,sha256=n0fVWTn2MOIhTjYanKYhKnGZCOOshTfCgyxH_bW52OM,2855
 sunholo/bots/__init__.py,sha256=EMFd7e2z68l6pzYOnkzHbLd2xJRvxTKFRNCTuhZ8hIw,130
 sunholo/bots/discord.py,sha256=cCFae5K1BCa6JVkWGLh_iZ9qFO1JpXb6K4eJrlDfEro,2442
 sunholo/bots/github_webhook.py,sha256=5pQPRLM_wxxcILVaIzUDV8Kt7Arcm2dL1r1kMMHA524,9629
@@ -32,14 +32,14 @@ sunholo/chunker/pdfs.py,sha256=daCZ1xjn1YvxlifIyxskWNpLJLe-Q9D_Jq12MWx3tZo,2473
 sunholo/chunker/publish.py,sha256=GNXV6IPdKM2GZUcjGXIERu49D0ITYtizsLIktKVtMjM,2768
 sunholo/chunker/splitter.py,sha256=FLkDhkePkg_zGQpFBK13Cznw575D-Rf9pcaCpc1HUxY,6726
 sunholo/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sunholo/cli/chat_vac.py,sha256=uksCsOrkEvGXIpG_TTy8rUE3qLdxfUQaxR9MpyZQWFs,17872
+sunholo/cli/chat_vac.py,sha256=_M0M1t03QJUdkJEe4Ro74FWRa1LohiztLivbjvK0ECA,18691
 sunholo/cli/cli.py,sha256=8e00HBN6eYIUJ8cnvKteBJNn7aZPRMk4b82jwcGg9D4,3741
 sunholo/cli/cli_init.py,sha256=JMZ9AX2cPDZ-_mv3adiv2ToFVNyRPtjk9Biszl1kiR0,2358
 sunholo/cli/configs.py,sha256=QUM9DvKOdZmEQRM5uI3Nh887T0YDiSMr7O240zTLqws,4546
 sunholo/cli/deploy.py,sha256=zxdwUsRTRMC8U5vyRv0JiKBLFn84Ug_Tc88-_h9hJSs,1609
 sunholo/cli/embedder.py,sha256=w7LT1CANSoQbOz8xAP3Zt4C_hP4lzGJOf8XD2jY5jBQ,7291
 sunholo/cli/merge_texts.py,sha256=U9vdMwKmcPoc6iPOWX5MKSxn49dNGbNzVLw8ui5PhEU,1823
-sunholo/cli/run_proxy.py,sha256=8mrZj0GPYO1q5e6cxej-PHdns5pGguWoDrX7RFg0FWo,11581
+sunholo/cli/run_proxy.py,sha256=OeR12ZfnasbJ-smBZQznmGufoDa4iNjUN9FCFo5JxSc,11520
 sunholo/cli/sun_rich.py,sha256=UpMqeJ0C8i0pkue1AHnnyyX0bFJ9zZeJ7HBR6yhuA8A,54
 sunholo/cli/swagger.py,sha256=absYKAU-7Yd2eiVNUY-g_WLl2zJfeRUNdWQ0oH8M_HM,1564
 sunholo/components/__init__.py,sha256=IDoylb74zFKo6NIS3RQqUl0PDFBGVxM1dfUmO7OJ44U,176
@@ -91,6 +91,7 @@ sunholo/streaming/streaming.py,sha256=9z6pXINEopuL_Z1RnmgXAoZJum9dzyuOxqYtEYnjf8
 sunholo/summarise/__init__.py,sha256=MZk3dblUMODcPb1crq4v-Z508NrFIpkSWNf9FIO8BcU,38
 sunholo/summarise/summarise.py,sha256=C3HhjepTjUhUC8FLk4jMQIBvq1BcORniwuTFHjPVhVo,3784
 sunholo/utils/__init__.py,sha256=G11nN_6ATjxpuMfG_BvcUr9UU8onPIgkpTK6CjOcbr8,48
+sunholo/utils/api_key.py,sha256=Ct4bIAQZxzPEw14hP586LpVxBAVi_W9Serpy0BK-7KI,244
 sunholo/utils/big_context.py,sha256=gJIP7_ZL-YSLhOMq8jmFTMqH1wq8eB1NK7oKPeZAq2s,5578
 sunholo/utils/config.py,sha256=5lzO9CkLpDslp66ZwSBC_95aA1FQs-zpiOLi5YaYWbM,8907
 sunholo/utils/config_schema.py,sha256=Wv-ncitzljOhgbDaq9qnFqH5LCuxNv59dTGDWgd1qdk,4189
@@ -104,9 +105,9 @@ sunholo/vertex/__init__.py,sha256=JvHcGFuv6R_nAhY2AdoqqhMpJ5ugeWPZ_svGhWrObBk,13
 sunholo/vertex/init.py,sha256=JDMUaBRdednzbKF-5p33qqLit2LMsvgvWW-NRz0AqO0,1801
 sunholo/vertex/memory_tools.py,sha256=8F1iTWnqEK9mX4W5RzCVKIjydIcNp6OFxjn_dtQ3GXo,5379
 sunholo/vertex/safety.py,sha256=3meAX0HyGZYrH7rXPUAHxtI_3w_zoy_RX7Shtkoa660,1275
-sunholo-0.66.20.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.66.20.dist-info/METADATA,sha256=r79Ou6tg9lOYgzm0HJEppVuaLiqaNaKky1jm3NLNkMw,6098
-sunholo-0.66.20.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
-sunholo-0.66.20.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.66.20.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.66.20.dist-info/RECORD,,
+sunholo-0.66.22.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.66.22.dist-info/METADATA,sha256=IlI07pylXN-AMnC-00izt6cVpgCDJhbHpVzIom3CMwE,6098
+sunholo-0.66.22.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
+sunholo-0.66.22.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.66.22.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.66.22.dist-info/RECORD,,