sunholo 0.66.18__py3-none-any.whl → 0.66.21__py3-none-any.whl

sunholo/agents/flask/qna_routes.py

@@ -46,6 +46,7 @@ cache_duration = timedelta(minutes=5)  # Cache duration
 
 def make_openai_response(user_message, vector_name, answer):
     response_id = str(uuid.uuid4())
+    log.info("openai response: Q: {user_message} to VECTOR_NAME: {vector_name} - A: {answer}")
     openai_response = {
         "id": response_id,
         "object": "chat.completion",
@@ -418,9 +419,10 @@ def register_qna_routes(app, stream_interpreter, vac_interpreter):
             bot_output = parse_output(bot_output)
 
             log.info(f"Bot output: {bot_output}")
-
-            return make_openai_response(user_message, vector_name, bot_output.get('answer', ''))
-
+            if bot_output:
+                return make_openai_response(user_message, vector_name, bot_output.get('answer', ''))
+            else:
+                return make_openai_response(user_message, vector_name, 'ERROR: could not find an answer')
 
         except Exception as err:
             log.error(f"OpenAI response error: {err}")

sunholo/agents/swagger.py

@@ -208,8 +208,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 agent_config_paths.items():
             # controls if get requests are protected or not
@@ -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/cli/chat_vac.py

@@ -11,6 +11,7 @@ import sys
 import subprocess
 import json
 import requests
+import os
 from pathlib import Path
 
 from rich import print
@@ -226,15 +227,30 @@ 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 os.getenv("MULTIVAC_API_KEY"):
+        console.rule("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}"
 
-    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}")
     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:

{sunholo-0.66.18.dist-info → sunholo-0.66.21.dist-info}/METADATA

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

{sunholo-0.66.18.dist-info → sunholo-0.66.21.dist-info}/RECORD

@@ -7,13 +7,13 @@ sunholo/agents/langserve.py,sha256=FdhQjorAY2bMn2rpuabNT6bU3uqSKWrl8DjpH3L_V7k,4
 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=93owb98_P2IDH9eEssxpz0Cr6rgMxSZ1p6jRfm56tXU,13683
+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
 sunholo/agents/flask/__init__.py,sha256=uqfHNw2Ru3EJ4dJEcbp86h_lkquBQPMxZbjhV_xe3rs,72
 sunholo/agents/flask/base.py,sha256=FgSaCODyoTtlstJtsqlLPScdgRUtv9_plxftdzHdVFo,809
-sunholo/agents/flask/qna_routes.py,sha256=jBcfD1n-aXJhEBkLUKFuKqWx3-s56hodbB-wahqeusw,21411
+sunholo/agents/flask/qna_routes.py,sha256=tEsJRnnGoz_cOEaPtPpCCD920jZpLypLK58UzIxe1Ac,21659
 sunholo/archive/__init__.py,sha256=qNHWm5rGPVOlxZBZCpA1wTYPbalizRT7f8X4rs2t290,31
 sunholo/archive/archive.py,sha256=C-UhG5x-XtZ8VheQp92IYJqgD0V3NFQjniqlit94t18,1197
 sunholo/auth/__init__.py,sha256=4owDjSaWYkbTlPK47UHTOC0gCWbZsqn4ZIEw5NWZTlg,28
@@ -32,7 +32,7 @@ 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=AK1lytiXctNIYOw2L_OmxUKG9q2wg5eddZ9Ei-TKbF4,18622
 sunholo/cli/cli.py,sha256=8e00HBN6eYIUJ8cnvKteBJNn7aZPRMk4b82jwcGg9D4,3741
 sunholo/cli/cli_init.py,sha256=JMZ9AX2cPDZ-_mv3adiv2ToFVNyRPtjk9Biszl1kiR0,2358
 sunholo/cli/configs.py,sha256=QUM9DvKOdZmEQRM5uI3Nh887T0YDiSMr7O240zTLqws,4546
@@ -104,9 +104,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.18.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.66.18.dist-info/METADATA,sha256=gBAjMviSvrGT2nk1kCGL86_otPXj8SbSAoFS0_pSJjY,6098
-sunholo-0.66.18.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
-sunholo-0.66.18.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.66.18.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.66.18.dist-info/RECORD,,
+sunholo-0.66.21.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.66.21.dist-info/METADATA,sha256=g0fzhIzo4-Re8S14chGFaANtaOSJK-X4-NRr2F7acQQ,6098
+sunholo-0.66.21.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
+sunholo-0.66.21.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.66.21.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.66.21.dist-info/RECORD,,