sunholo 0.96.2__py3-none-any.whl → 0.96.5__py3-none-any.whl

sunholo/database/alloydb_client.py

@@ -280,7 +280,7 @@ class AlloyDBClient:
         query = f"""
             SELECT page_content, source, langchain_metadata, images_gsurls, doc_id::text as doc_id
             FROM "{table_name}"
-            WHERE source = '{source}'
+            WHERE source ILIKE '%{source}%'
             LIMIT 500;
         """
 

sunholo/invoke/direct_vac_func.py

@@ -1,9 +1,11 @@
 from ..custom_logging import log
-from ..agents import send_to_qa
+from ..agents import send_to_qa, send_to_qa_async
 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
+import asyncio
+from threading import Thread
 
 def direct_vac(vac_input: dict, vac_name: str, chat_history=[]):
     """
@@ -66,6 +68,76 @@ def direct_vac(vac_input: dict, vac_name: str, chat_history=[]):
     
     return answer
 
+async def async_direct_vac(vac_input: dict, vac_name: str, chat_history=[]):
+    """
+    Asynchronous version of direct_vac using send_to_qa_async.
+    Allows VACs to call other VAC Q&A endpoints without blocking the event loop.
+    """
+    log.info(f"Invoking VAC Q&A endpoints for {vac_name}")
+
+    if 'user_input' not in vac_input:
+        raise ValueError(f'vac_input must contain at least "user_input" key - got {vac_input}')
+
+    global_config = ConfigManager('global')
+    config = ConfigManager(vac_name)
+
+    agent_name = config.vacConfig('agent')
+    agent_url = config.vacConfig("agent_url")
+
+    if agent_url:
+        log.info(f"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={override_endpoint}")
+
+    # Prepare the kwargs for send_to_qa_async by copying vac_input and adding more values
+    qa_kwargs = vac_input.copy()
+
+    # Add additional arguments
+    qa_kwargs.update({
+        'vector_name': vac_name,
+        'chat_history': chat_history,
+        'image_url': vac_input.get('image_url') or vac_input.get('image_uri'),
+        'override_endpoint': override_endpoint,
+        'message_source': "sunholo.invoke_vac_qa.invoke",
+        'stream': False,
+        'configurable': {
+            "vector_name": vac_name,
+        },
+    })
+
+    log.info(f'Batch invoke_vac_qa {vac_name} with qa_kwargs={qa_kwargs}')
+
+    # Call send_to_qa_async directly
+    vac_response_generator = send_to_qa_async(**qa_kwargs)
+
+    # Since send_to_qa_async returns an async generator, we can get the response
+    vac_response = None
+    async for response in vac_response_generator:
+        vac_response = response  # Since stream=False, we expect only one response
+        break
+
+    # Call parse_output synchronously (since it's non-blocking)
+    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:
@@ -120,4 +192,88 @@ def direct_vac_stream(vac_input: dict, vac_name: str, chat_history=[]):
         chat_history.append({"name": "Human", "content": vac_input})
         chat_history.append({"name": "AI", "content": answer})
 
-    return chat_history
+    return chat_history
+
+
+
+async def async_direct_vac_stream(vac_input: dict, vac_name: str, chat_history=[]):
+    """
+    Asynchronous version of direct_vac_stream.
+    Streams responses from VAC Q&A endpoints without blocking the event loop.
+    """
+    if 'user_input' not in vac_input:
+        raise ValueError(f'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={vac_input}")
+
+    def sync_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
+
+    async def async_stream_response():
+        loop = asyncio.get_event_loop()
+        queue = asyncio.Queue()
+
+        def run_sync_gen():
+            try:
+                for item in sync_stream_response():
+                    loop.call_soon_threadsafe(queue.put_nowait, item)
+            finally:
+                loop.call_soon_threadsafe(queue.put_nowait, None)  # Sentinel
+
+        thread = Thread(target=run_sync_gen)
+        thread.start()
+
+        while True:
+            item = await queue.get()
+            if item is None:
+                break
+            yield item
+
+        thread.join()
+
+    answer = ""
+
+    async for token in async_stream_response():
+        if isinstance(token, bytes):
+            token = token.decode('utf-8')
+            yield token
+        if isinstance(token, dict):
+            # Process dict token if necessary
+            pass
+        elif isinstance(token, str):
+            answer += token
+
+    if answer:
+        chat_history.append({"name": "Human", "content": vac_input})
+        chat_history.append({"name": "AI", "content": answer})
+
+    yield chat_history

{sunholo-0.96.2.dist-info → sunholo-0.96.5.dist-info}/METADATA

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

{sunholo-0.96.2.dist-info → sunholo-0.96.5.dist-info}/RECORD

@@ -59,7 +59,7 @@ sunholo/components/retriever.py,sha256=bKIVT7_18Ut3OJd0E0jyiISPnD9qkHWVjcQPT4i1_
 sunholo/components/vectorstore.py,sha256=xKk7micTRwZckaI7U6PxvFz_ZSjCH48xPTDYiDcv2tc,5913
 sunholo/database/__init__.py,sha256=bpB5Nk21kwqYj-qdVnvNgXjLsbflnH4g-San7OHMqR4,283
 sunholo/database/alloydb.py,sha256=YH8wNPS8gN-TDZEXQcVHxwd1NScHRfAxma3gK4R6KCk,11740
-sunholo/database/alloydb_client.py,sha256=pD3aVT_UWEtcT8Ma1glyj6QEWHRqbNKJNKe3oau_0HA,18304
+sunholo/database/alloydb_client.py,sha256=bvQzvnLEYGrmOgTBx7QjgIn_-4N4aN8JNRUNOLNSRc8,18310
 sunholo/database/database.py,sha256=VqhZdkXUNdvWn8sUcUV3YNby1JDVf7IykPVXWBtxo9U,7361
 sunholo/database/lancedb.py,sha256=DyfZntiFKBlVPaFooNN1Z6Pl-LAs4nxWKKuq8GBqN58,715
 sunholo/database/static_dbs.py,sha256=8cvcMwUK6c32AS2e_WguKXWMkFf5iN3g9WHzsh0C07Q,442
@@ -90,7 +90,7 @@ sunholo/genai/process_funcs_cls.py,sha256=M6vE_-Mi8v1Od8iny3h9-pRA5KbO5n4hiJKr1y
 sunholo/genai/safety.py,sha256=mkFDO_BeEgiKjQd9o2I4UxB6XI7a9U-oOFjZ8LGRUC4,1238
 sunholo/invoke/__init__.py,sha256=VOpsfhNf98az3at7bMaY1Fiw4UIZAS6zMmSqWd6_ksI,141
 sunholo/invoke/async_class.py,sha256=uvCP8ekUCfTRWk7xwofTzRqFykMAwrRZ4Ce_YUR6PVs,2820
-sunholo/invoke/direct_vac_func.py,sha256=fuTJlH5PsqWhN_yVMaWisHCTZU1JEUz8I8yVbWsNUFE,4268
+sunholo/invoke/direct_vac_func.py,sha256=GXSCMkC6vOWGUtQjxy-ZpTrMvJa3CgcW-y9mDpJwWC8,9533
 sunholo/invoke/invoke_vac_utils.py,sha256=sJc1edHTHMzMGXjji1N67c3iUaP7BmAL5nj82Qof63M,2053
 sunholo/langfuse/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sunholo/langfuse/callback.py,sha256=jl0SZsFS53uMW9DGeM9SOL_EsRZsba0wwFGLqKzu9_U,1684
@@ -144,9 +144,9 @@ sunholo/vertex/init.py,sha256=1OQwcPBKZYBTDPdyU7IM4X4OmiXLdsNV30C-fee2scQ,2875
 sunholo/vertex/memory_tools.py,sha256=ZirFbS7EKxQaoRmOrb4BnG6jPJ83wt43N8M4zTVbutU,7717
 sunholo/vertex/safety.py,sha256=S9PgQT1O_BQAkcqauWncRJaydiP8Q_Jzmu9gxYfy1VA,2482
 sunholo/vertex/type_dict_to_json.py,sha256=uTzL4o9tJRao4u-gJOFcACgWGkBOtqACmb6ihvCErL8,4694
-sunholo-0.96.2.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.96.2.dist-info/METADATA,sha256=SjGyoQwCjP0t2BgYpsZQAm2d4Ckj3Q9TrJd5WUdTn0I,7889
-sunholo-0.96.2.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-sunholo-0.96.2.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.96.2.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.96.2.dist-info/RECORD,,
+sunholo-0.96.5.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.96.5.dist-info/METADATA,sha256=xSaGe0hLQU4vUWrnPs5v67kzLo3WMFwptSMOBXRSHvA,7889
+sunholo-0.96.5.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+sunholo-0.96.5.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.96.5.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.96.5.dist-info/RECORD,,