sunholo 0.104.5__py3-none-any.whl → 0.105.0__py3-none-any.whl

sunholo/agents/flask/vac_routes.py

@@ -618,7 +618,7 @@ if __name__ == "__main__":
             user_id = user_id,
             session_id = session_id,
             tags = tags,
-            release = f"sunholo-v{package_version}"
+            release = package_version
         )
 
     def prep_vac(self, request, vector_name):
@@ -660,7 +660,12 @@ if __name__ == "__main__":
             raise ValueError(f"Unable to find vac_config for {vector_name} - {str(e)}")
 
         if trace:
-            trace.update(input=data, metadata=vac_config.configs_by_kind)
+            this_vac_config = vac_config.configs_by_kind.get("vacConfig")
+            metadata_config=None
+            if this_vac_config:
+                metadata_config = this_vac_config.get(vector_name)
+
+            trace.update(input=data, metadata=metadata_config)
 
         user_input = data.pop('user_input').strip()
         stream_wait_time = data.pop('stream_wait_time', 7)

sunholo/genai/process_funcs_cls.py

@@ -12,7 +12,7 @@ from collections import deque
 try:
     import google.generativeai as genai
     import proto
-    from google.generativeai.types import RequestOptions
+    from google.generativeai.types import RequestOptions, GenerateContentResponse
     from google.api_core import retry
     from google.generativeai import ChatSession
     from google.api_core.exceptions import RetryError
@@ -441,11 +441,11 @@ class GenAIFunctionProcessor:
 
             log.info(f"== Start input content for loop [{guardrail}]\n ## Content: {content_parse}")
             this_text = ""  # reset for this loop
-            response = []
+            response = None
 
             try:
                 token_queue.append("\n= Calling Agent =\n")
-                response = chat.send_message(content, stream=True, request_options=RequestOptions(
+                response:GenerateContentResponse = chat.send_message(content, stream=True, request_options=RequestOptions(
                                         retry=retry.Retry(
                                             initial=10, 
                                             multiplier=2, 
@@ -465,19 +465,20 @@ class GenAIFunctionProcessor:
                 token_queue.append(msg)
                 break
 
-            loop_metadata = response.usage_metadata
-            if loop_metadata:
-                usage_metadata = {
-                    "prompt_token_count": usage_metadata["prompt_token_count"] + (loop_metadata.prompt_token_count or 0),
-                    "candidates_token_count": usage_metadata["candidates_token_count"] + (loop_metadata.candidates_token_count or 0),
-                    "total_token_count": usage_metadata["total_token_count"] + (loop_metadata.total_token_count or 0),
-                }
-                token_queue.append((
-                    "\n-- Agent response -- " 
-                    f"Loop tokens: [{loop_metadata.prompt_token_count}]/[{usage_metadata['prompt_token_count']}] "
-                    f"Session tokens: [{loop_metadata.total_token_count}]/[{usage_metadata['total_token_count']}] \n"
-                ))
-            loop_metadata = None
+            if response:
+                loop_metadata = response.usage_metadata
+                if loop_metadata:
+                    usage_metadata = {
+                        "prompt_token_count": usage_metadata["prompt_token_count"] + (loop_metadata.prompt_token_count or 0),
+                        "candidates_token_count": usage_metadata["candidates_token_count"] + (loop_metadata.candidates_token_count or 0),
+                        "total_token_count": usage_metadata["total_token_count"] + (loop_metadata.total_token_count or 0),
+                    }
+                    token_queue.append((
+                        "\n-- Agent response -- " 
+                        f"Loop tokens: [{loop_metadata.prompt_token_count}]/[{usage_metadata['prompt_token_count']}] "
+                        f"Session tokens: [{loop_metadata.total_token_count}]/[{usage_metadata['total_token_count']}] \n"
+                    ))
+                loop_metadata = None
 
             for chunk in response:
                 if not chunk:

sunholo/streaming/streaming.py

@@ -87,25 +87,31 @@ def start_streaming_chat(question,
             break
     else:
         log.info(f"Stream has ended after {round(time.time() - first_start, 2)} seconds")
-        log.info("Sending final full message plus sources...")
+        
         
     
     # if  you need it to stop it elsewhere use 
     # stop_event.set()
     content_to_send = content_buffer.read()
     if content_to_send:
-        log.info(f"==\n{content_to_send}")
+        log.info(f"==Flush==\n{content_to_send}")
         yield content_to_send
         content_buffer.clear()
 
     # Stop the stream thread
     chat_thread.join()
 
-    # the json object with full response in 'answer' and the 'sources' array
-    final_result = result_queue.get()
+    if kwargs.get("stream_only"):
+        log.info("stream_only so finishing now")
+        final_yield = ""
+    else:
+        log.info("Sending final full message plus sources...")
+        # the json object with full response in 'answer' and the 'sources' array
+        final_result = result_queue.get()
+        final_yield = parse_output(final_result)
 
     # parses out source_documents if not present etc.
-    yield parse_output(final_result)
+    yield final_yield
 
 async def start_streaming_chat_async(question, vector_name, qna_func_async, chat_history=[], wait_time=2, timeout=120, **kwargs): 
     """

{sunholo-0.104.5.dist-info → sunholo-0.105.0.dist-info}/METADATA

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

{sunholo-0.104.5.dist-info → sunholo-0.105.0.dist-info}/RECORD

@@ -14,7 +14,7 @@ sunholo/agents/fastapi/qna_routes.py,sha256=lKHkXPmwltu9EH3RMwmD153-J6pE7kWQ4BhB
 sunholo/agents/flask/__init__.py,sha256=poJDKMr2qj8qMb99JqCvCPSiEt1tj2tLQ3hKW3f2aVw,107
 sunholo/agents/flask/base.py,sha256=HLz3Z5efWaewTwSFEM6JH48NA9otoJBoVFJlARGk9L8,788
 sunholo/agents/flask/qna_routes.py,sha256=uwUD1yrzOPH27m2AXpiQrPk_2VfJOQOM6dAynOWQtoQ,22532
-sunholo/agents/flask/vac_routes.py,sha256=z-9gqrYiyqt4rRKa6c5rGgwdfK9Z3fNfSjMwMS63xOw,28541
+sunholo/agents/flask/vac_routes.py,sha256=mS_e2Kel-wCis4GAmxmn-trO76Q2jVzIx98p0H0P4sg,28723
 sunholo/archive/__init__.py,sha256=qNHWm5rGPVOlxZBZCpA1wTYPbalizRT7f8X4rs2t290,31
 sunholo/archive/archive.py,sha256=PxVfDtO2_2ZEEbnhXSCbXLdeoHoQVImo4y3Jr2XkCFY,1204
 sunholo/auth/__init__.py,sha256=TeP-OY0XGxYV_8AQcVGoh35bvyWhNUcMRfhuD5l44Sk,91
@@ -88,7 +88,7 @@ sunholo/gcs/metadata.py,sha256=oQLcXi4brsZ74aegWyC1JZmhlaEV270HS5_UWtAYYWE,898
 sunholo/genai/__init__.py,sha256=dBl6IA3-Fx6-Vx81r0XqxHlUq6WeW1iDX188dpChu8s,115
 sunholo/genai/images.py,sha256=EyjsDqt6XQw99pZUQamomCpMOoIah9bp3XY94WPU7Ms,1678
 sunholo/genai/init.py,sha256=yG8E67TduFCTQPELo83OJuWfjwTnGZsyACospahyEaY,687
-sunholo/genai/process_funcs_cls.py,sha256=6NZiYd9VWEzRN_-25PvOpBnQcfuJfWMuqi2hgAYm9ls,29530
+sunholo/genai/process_funcs_cls.py,sha256=aO23nFLYCJEQ1ZR1rWefSNaqpUg4KXJGIua_ouDVR8E,29658
 sunholo/genai/safety.py,sha256=mkFDO_BeEgiKjQd9o2I4UxB6XI7a9U-oOFjZ8LGRUC4,1238
 sunholo/invoke/__init__.py,sha256=o1RhwBGOtVK0MIdD55fAIMCkJsxTksi8GD5uoqVKI-8,184
 sunholo/invoke/async_class.py,sha256=G8vD2H94fpBc37mSJSQODEKJ67P2mPQEHabtDaLOvxE,8033
@@ -119,7 +119,7 @@ sunholo/streaming/__init__.py,sha256=MpbydI2UYo_adttPQFkxNM33b-QRyNEbrKJx0C2AGPc
 sunholo/streaming/content_buffer.py,sha256=0LHMwH4ctq5kjhIgMFNH0bA1RL0jMISlLVzzLcFrvv4,12766
 sunholo/streaming/langserve.py,sha256=hi7q8WY8DPKrALl9m_dOMxWOdE-iEuk7YW05SVDFIX8,6514
 sunholo/streaming/stream_lookup.py,sha256=hYg1DbdSE_QNJ8ZB-ynXJlWgvFjrGvwoUsGJu_E0pRQ,360
-sunholo/streaming/streaming.py,sha256=S4GzVNol3J_8tkzXodvkcR-THiTGnIKYj40NtrBhtL4,16459
+sunholo/streaming/streaming.py,sha256=gSxLuwK-5-t5D1AjcHf838BY-L4jvdkdn_xePl-DK3o,16635
 sunholo/summarise/__init__.py,sha256=MZk3dblUMODcPb1crq4v-Z508NrFIpkSWNf9FIO8BcU,38
 sunholo/summarise/summarise.py,sha256=95A-6PXFGanjona8DvZPnnIHLbzZ2ip5hO0wOAJQhfw,3791
 sunholo/terraform/__init__.py,sha256=yixxEltc3n9UpZaVi05GlgS-YRq_DVGjUc37I9ajeP4,76
@@ -147,9 +147,9 @@ sunholo/vertex/init.py,sha256=1OQwcPBKZYBTDPdyU7IM4X4OmiXLdsNV30C-fee2scQ,2875
 sunholo/vertex/memory_tools.py,sha256=tBZxqVZ4InTmdBvLlOYwoSEWu4-kGquc-gxDwZCC4FA,7667
 sunholo/vertex/safety.py,sha256=S9PgQT1O_BQAkcqauWncRJaydiP8Q_Jzmu9gxYfy1VA,2482
 sunholo/vertex/type_dict_to_json.py,sha256=uTzL4o9tJRao4u-gJOFcACgWGkBOtqACmb6ihvCErL8,4694
-sunholo-0.104.5.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.104.5.dist-info/METADATA,sha256=V3lxW5D4BUNeU7gySWFPnxVHG1HHdXtqAR-1MLbEN_M,8312
-sunholo-0.104.5.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-sunholo-0.104.5.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.104.5.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.104.5.dist-info/RECORD,,
+sunholo-0.105.0.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.105.0.dist-info/METADATA,sha256=VJ8EeXPxQ19YS2iUjsBY5W5V-4vBdxtHwowutoeMMiE,8312
+sunholo-0.105.0.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+sunholo-0.105.0.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.105.0.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.105.0.dist-info/RECORD,,

{sunholo-0.104.5.dist-info → sunholo-0.105.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.1.0)
+Generator: setuptools (75.2.0)
 Root-Is-Purelib: true
 Tag: py3-none-any