sunholo 0.77.2__py3-none-any.whl → 0.77.3__py3-none-any.whl

sunholo/agents/flask/qna_routes.py

@@ -522,9 +522,11 @@ def prep_vac(request, vector_name):
     config, _ = load_config("config/llm_config.yaml")
     vac_configs = config.get("vac")
     if vac_configs:
-        vac_config = vac_configs[vector_name]
+        vac_config = vac_configs.get(vector_name)
+        if not vac_config:
+            log.warning("Not a local configured VAC, may be a remote config not synced yet")
 
-    if trace:
+    if trace and vac_config:
         trace.update(input=data, metadata=vac_config)
 
     user_input = data.pop('user_input').strip()

sunholo/auth/run.py

@@ -2,22 +2,23 @@
 import inspect
 
 from typing import Dict, Optional
-from ..utils.config import load_config_key, load_config
+from ..utils.config import load_config
+from ..utils import ConfigManager
 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
 from .gcloud import get_local_gcloud_token
 
-def get_run_url(vector_name=None):
+def get_run_url(config):
 
-    if not vector_name:
+    if not config:
         raise ValueError('Vector name was not specified')
     
-    cloud_urls = route_vac(vector_name)
+    cloud_urls = route_vac(config=config)
     
     cloud_urls, _ = load_config('config/cloud_run_urls.json')
-    agent = load_config_key("agent", vector_name=vector_name, kind="vacConfig")
+    agent = config.vacConfig("agent")
 
     try:
         log.info(f'Looking up URL for {agent}')
@@ -44,10 +45,13 @@ def get_cloud_run_token(vector_name):
         
         return {"x-api-key": get_multivac_api_key()}
 
-    if is_running_on_cloudrun():
-        run_url = get_run_url(vector_name)
-    else:
-        run_url = "http://127.0.0.1:8080"
+    #if is_running_on_cloudrun():
+    #    run_url = get_run_url(vector_name)
+    #else:
+    #    run_url = "http://127.0.0.1:8080"
+    
+    config = ConfigManager(vector_name)
+    run_url = get_run_url(config)
 
     # Append ID Token to make authenticated requests to Cloud Run services
     frame = inspect.currentframe()

sunholo/invoke/__init__.py

@@ -1 +1,2 @@
-from .invoke_vac_utils import invoke_vac, invoke_vac_qa
+from .invoke_vac_utils import invoke_vac
+from .direct_vac_func import direct_vac, direct_vac_stream

sunholo/invoke/direct_vac_func.py

@@ -0,0 +1,129 @@
+from ..logging import log
+from ..agents import send_to_qa
+from ..qna.parsers import parse_output
+from ..streaming import generate_proxy_stream
+from ..utils import ConfigManager
+from ..utils.api_key import has_multivac_api_key
+
+def direct_vac(vac_input: dict, vac_name: str, chat_history=[]):
+    """
+    This lets VACs call other VAC Q&A endpoints within their code
+    """
+
+    log.info(f"Invoking VAC Q&A endpoints for {vac_name}")
+
+    if 'user_input' not in vac_input:
+        raise ValueError('vac_input must contain at least "user_input" key - got {vac_input}')
+
+    user_id = vac_input.get('user_id')
+    session_id = vac_input.get('session_id')
+    image_uri = vac_input.get('image_url') or vac_input.get('image_uri')
+
+    global_config = ConfigManager('global')
+    config = ConfigManager(vac_name)
+
+    agent_name = config.vacConfig('agent')
+    agent_url = config.vacConfig("agent_url")
+
+    if agent_url:
+        log.info("Found agent_url within vacConfig: {agent_url}")
+    # via public cloud endpoints - assumes no gcloud auth
+    override_endpoint = None
+    if has_multivac_api_key():
+        print("Found MULTIVAC_API_KEY")
+        gcp_config = global_config.vacConfig("gcp_config")
+        endpoints_base_url = gcp_config.get("endpoints_base_url")
+        if not endpoints_base_url:
+            raise ValueError("MULTIVAC_API_KEY env var is set but no config.gcp_config.endpoints_base_url can be found")
+
+        override_endpoint = f"{endpoints_base_url}/v1/{agent_name}"
+
+    override_endpoint = agent_url or override_endpoint
+
+    print(f"Using {override_endpoint=}")
+    log.warning(f'Batch invoke_vac_qa with {vac_input=}')
+    vac_response = send_to_qa(
+        vac_input["user_input"],
+        vector_name=vac_name,
+        chat_history=chat_history,
+        message_author=user_id,
+        #TODO: populate these
+        image_url=image_uri,
+        source_filters=None,
+        search_kwargs=None,
+        private_docs=None,
+        whole_document=False,
+        source_filters_and_or=False,
+        # system kwargs
+        configurable={
+            "vector_name": vac_name,
+        },
+        user_id=user_id,
+        session_id=session_id, 
+        message_source="sunholo.invoke_vac_qa.invoke",
+        override_endpoint=override_endpoint,
+        stream=False)
+        
+    # ensures {'answer': answer}
+    answer = parse_output(vac_response)
+    chat_history.append({"name": "Human", "content": vac_input})
+    chat_history.append({"name": "AI", "content": answer})
+    answer["chat_history"] = chat_history
+    
+    return answer
+
+def direct_vac_stream(vac_input: dict, vac_name: str, chat_history=[]):
+
+    if 'user_input' not in vac_input:
+        raise ValueError('vac_input must contain at least "user_input" key - got {vac_input}')
+
+    user_id = vac_input.get('user_id')
+    session_id = vac_input.get('session_id')
+    image_uri = vac_input.get('image_url') or vac_input.get('image_uri')
+    
+    log.info(f"Streaming invoke_vac_qa with {vac_input=}")
+    def stream_response():
+        generate = generate_proxy_stream(
+                send_to_qa,
+                vac_input["user_input"],
+                vector_name=vac_name,
+                chat_history=chat_history,
+                generate_f_output=lambda x: x,  # Replace with actual processing function
+                stream_wait_time=0.5,
+                stream_timeout=120,
+                message_author=user_id,
+                #TODO: populate these
+                image_url=image_uri,
+                source_filters=None,
+                search_kwargs=None,
+                private_docs=None,
+                whole_document=False,
+                source_filters_and_or=False,
+                # system kwargs
+                configurable={
+                    "vector_name": vac_name,
+                },
+                user_id=user_id,
+                session_id=session_id, 
+                message_source="sunholo.invoke_vac_qa.stream"
+        )
+        for part in generate():
+            yield part
+
+    answer = ""
+
+    for token in stream_response():
+        if isinstance(token, bytes):
+            token = token.decode('utf-8')
+            yield token
+        if isinstance(token, dict):
+            # ?
+            pass
+        elif isinstance(token, str):
+            answer += token
+
+    if answer:
+        chat_history.append({"name": "Human", "content": vac_input})
+        chat_history.append({"name": "AI", "content": answer})
+
+    return chat_history

sunholo/invoke/invoke_vac_utils.py

@@ -4,99 +4,6 @@ import requests
 from pathlib import Path
 
 from ..logging import log
-from ..agents import send_to_qa
-from ..qna.parsers import parse_output
-from ..streaming import generate_proxy_stream
-
-def invoke_vac_qa(vac_input: dict, vac_name: str, chat_history=[], stream=False):
-    """
-    This lets VACs call other VAC Q&A endpoints within their code
-    """
-
-    if 'user_input' not in vac_input:
-        raise ValueError('vac_input must contain at least "user_input" key - got {vac_input}')
-
-    user_id = vac_input.get('user_id')
-    session_id = vac_input.get('session_id')
-    image_uri = vac_input.get('image_url') or vac_input.get('image_uri')
-
-    if not stream:
-        log.warning(f'Batch invoke_vac_qa with {vac_input=}')
-        vac_response = send_to_qa(
-            vac_input["user_input"],
-            vector_name=vac_name,
-            chat_history=chat_history,
-            message_author=user_id,
-            #TODO: populate these
-            image_url=image_uri,
-            source_filters=None,
-            search_kwargs=None,
-            private_docs=None,
-            whole_document=False,
-            source_filters_and_or=False,
-            # system kwargs
-            configurable={
-                "vector_name": vac_name,
-            },
-            user_id=user_id,
-            session_id=session_id, 
-            message_source="sunholo.invoke_vac_qa.invoke",
-            stream=False)
-        
-        # ensures {'answer': answer}
-        answer = parse_output(vac_response)
-        chat_history.append({"name": "Human", "content": vac_input})
-        chat_history.append({"name": "AI", "content": answer})
-        answer["chat_history"] = chat_history
-        
-        return answer
-    
-    log.info(f"Streaming invoke_vac_qa with {vac_input=}")
-    def stream_response():
-        generate = generate_proxy_stream(
-                send_to_qa,
-                vac_input["user_input"],
-                vector_name=vac_name,
-                chat_history=chat_history,
-                generate_f_output=lambda x: x,  # Replace with actual processing function
-                stream_wait_time=0.5,
-                stream_timeout=120,
-                message_author=user_id,
-                #TODO: populate these
-                image_url=image_uri,
-                source_filters=None,
-                search_kwargs=None,
-                private_docs=None,
-                whole_document=False,
-                source_filters_and_or=False,
-                # system kwargs
-                configurable={
-                    "vector_name": vac_name,
-                },
-                user_id=user_id,
-                session_id=session_id, 
-                message_source="sunholo.invoke_vac_qa.stream"
-        )
-        for part in generate():
-            yield part
-
-    answer = ""
-
-    for token in stream_response():
-        if isinstance(token, bytes):
-            token = token.decode('utf-8')
-            yield token
-        if isinstance(token, dict):
-            # ?
-            pass
-        elif isinstance(token, str):
-            answer += token
-
-    if answer:
-        chat_history.append({"name": "Human", "content": vac_input})
-        chat_history.append({"name": "AI", "content": answer})
-
-    return chat_history
 
 def invoke_vac(service_url, data, vector_name=None, metadata=None, is_file=False):
     """

{sunholo-0.77.2.dist-info → sunholo-0.77.3.dist-info}/METADATA

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

{sunholo-0.77.2.dist-info → sunholo-0.77.3.dist-info}/RECORD

@@ -13,14 +13,14 @@ sunholo/agents/fastapi/base.py,sha256=clk76cHbUAvU0OYJrRfCWX_5f0ACbhDsIzYBhI3wyo
 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=nY0NFgezxw1pEGUq49AIJ5nqIx4lLcUJAMD_FEAOdEA,21855
+sunholo/agents/flask/qna_routes.py,sha256=9F3yC6v2KeH7U0VFTwkntYoWc7fRXcWCKoKCKbkh9pA,21994
 sunholo/agents/flask/vac_routes.py,sha256=l2-w7x437F0Uu3QvwNueEYPtnKuIee6bHJ7LUMt_tkY,19520
 sunholo/archive/__init__.py,sha256=qNHWm5rGPVOlxZBZCpA1wTYPbalizRT7f8X4rs2t290,31
 sunholo/archive/archive.py,sha256=C-UhG5x-XtZ8VheQp92IYJqgD0V3NFQjniqlit94t18,1197
 sunholo/auth/__init__.py,sha256=TeP-OY0XGxYV_8AQcVGoh35bvyWhNUcMRfhuD5l44Sk,91
 sunholo/auth/gcloud.py,sha256=PdbwkuTdRi4RKBmgG9uwsReegqC4VG15_tw5uzmA7Fs,298
 sunholo/auth/refresh.py,sha256=uOdT7oQRVl0YsUP__NXj6PdUdLyXFSv2ylwF283esuw,1831
-sunholo/auth/run.py,sha256=3f2VKjIPePWz7o5EPetXF7JBCr-FNk9lOPJ-2qNTk0I,2724
+sunholo/auth/run.py,sha256=SBghZdWEwXhxuyeZ1s68RBE7foI_kUn6NcRvzFk_iVw,2769
 sunholo/azure/__init__.py,sha256=S1WQ5jndzNgzhSBh9UpX_yw7hRVm3hCzkAWNxUdK4dA,48
 sunholo/azure/event_grid.py,sha256=uXunwdjVLxNRf38aTRPoC9HXxFEFlL8JH9dijaOlF8M,2567
 sunholo/bots/__init__.py,sha256=EMFd7e2z68l6pzYOnkzHbLd2xJRvxTKFRNCTuhZ8hIw,130
@@ -78,8 +78,9 @@ sunholo/gcs/add_file.py,sha256=vWRjxuHBQkrPNrr9tRSFGT0N_nVIw120mqDEHiaHwuQ,7115
 sunholo/gcs/download_folder.py,sha256=mfntDA3Gl-7quMK9_eSTWvUOY1330jF--1cb62C0K1E,1607
 sunholo/gcs/download_url.py,sha256=iCIPESi2viQ-TcCINpbJXxUt7XJFFpF0KiVgSA6zFis,5228
 sunholo/gcs/metadata.py,sha256=C9sMPsHsq1ETetdQCqB3EBs3Kws8b8QHS9L7ei_v5aw,891
-sunholo/invoke/__init__.py,sha256=Dxivd9cU92X4v2JAZet4f7L2RJ5l_30rt9t2NiD-iLA,55
-sunholo/invoke/invoke_vac_utils.py,sha256=MLqmHVIqde7c5Qf1DvZYO5JITbjV7oWWIblaD8a_RSM,5269
+sunholo/invoke/__init__.py,sha256=bELcqIjzKvaupcIN5OQmDgGx_8jARtH9T6PCe8UgcvE,99
+sunholo/invoke/direct_vac_func.py,sha256=mr-xjIQyvn918Txpe1IRkV36Sp-lpS-e202c2hfTFMk,4471
+sunholo/invoke/invoke_vac_utils.py,sha256=lvH-5-mZX6DaxKAcEaxshktiVfX2SsoKMY1OIEIdD7Q,2090
 sunholo/langfuse/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sunholo/langfuse/callback.py,sha256=CTaos8sYcrga949BG6lIZ4I62DiiQSHxwz5re9XjDWQ,1677
 sunholo/langfuse/prompts.py,sha256=EkbzSw9Jr05ULMsRDoGOp-frbtCZpnvdYSJEYNpzfX8,1293
@@ -128,9 +129,9 @@ sunholo/vertex/init.py,sha256=uyg76EqS39jWJ2gxMqXOLWP6MQ2hc81wFdwgG86ZoCM,2868
 sunholo/vertex/memory_tools.py,sha256=pomHrDKqvY8MZxfUqoEwhdlpCvSGP6KmFJMVKOimXjs,6842
 sunholo/vertex/safety.py,sha256=S9PgQT1O_BQAkcqauWncRJaydiP8Q_Jzmu9gxYfy1VA,2482
 sunholo/vertex/type_dict_to_json.py,sha256=uTzL4o9tJRao4u-gJOFcACgWGkBOtqACmb6ihvCErL8,4694
-sunholo-0.77.2.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.77.2.dist-info/METADATA,sha256=xS_n1x1FYlsji1Wg46phwsE938jCS0c2OdFn3w9QN48,7252
-sunholo-0.77.2.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
-sunholo-0.77.2.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.77.2.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.77.2.dist-info/RECORD,,
+sunholo-0.77.3.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.77.3.dist-info/METADATA,sha256=9vY8vE2SX_kpKHSoNMLI7xbMuOGvLlsmTsoi5hA1d1A,7252
+sunholo-0.77.3.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
+sunholo-0.77.3.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.77.3.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.77.3.dist-info/RECORD,,