sunholo 0.89.8__py3-none-any.whl → 0.90.0__py3-none-any.whl

sunholo/agents/flask/vac_routes.py

@@ -187,19 +187,20 @@ if __name__ == "__main__":
         def generate_response_content():
 
             for chunk in start_streaming_chat(question=all_input["user_input"],
-                                                vector_name=vector_name,
-                                                qna_func=observed_stream_interpreter,
-                                                chat_history=all_input["chat_history"],
-                                                wait_time=all_input["stream_wait_time"],
-                                                timeout=all_input["stream_timeout"],
-                                                #kwargs
-                                                **all_input["kwargs"]
-                                                ):
+                                              vector_name=vector_name,
+                                              qna_func=observed_stream_interpreter,
+                                              chat_history=all_input["chat_history"],
+                                              wait_time=all_input["stream_wait_time"],
+                                              timeout=all_input["stream_timeout"],
+                                              trace_id=trace.id,
+                                              #kwargs
+                                              **all_input["kwargs"]
+                                            ):
                 if isinstance(chunk, dict) and 'answer' in chunk:
                     # When we encounter the dictionary, we yield it as a JSON string
                     # and stop the generator.
                     if trace:
-                        chunk["trace"] = trace.id
+                        chunk["trace_id"] = trace.id
                         chunk["trace_url"] = trace.get_trace_url()
                     archive_qa(chunk, vector_name)
                     if trace:
@@ -281,6 +282,7 @@ if __name__ == "__main__":
                 question=all_input["user_input"],
                 vector_name=vector_name,
                 chat_history=all_input["chat_history"],
+                trace_id=trace.id,
                 **all_input["kwargs"]
             )
             if span:
@@ -288,7 +290,7 @@ if __name__ == "__main__":
             # {"answer": "The answer", "source_documents": [{"page_content": "The page content", "metadata": "The metadata"}]}
             bot_output = parse_output(bot_output)
             if trace:
-                bot_output["trace"] = trace.id
+                bot_output["trace_id"] = trace.id
                 bot_output["trace_url"] = trace.get_trace_url()
             archive_qa(bot_output, vector_name)
             log.info(f'==LLM Q:{all_input["user_input"]} - A:{bot_output}')
@@ -409,6 +411,7 @@ if __name__ == "__main__":
                                             chat_history=all_input["chat_history"],
                                             wait_time=all_input.get("stream_wait_time", 1),
                                             timeout=all_input.get("stream_timeout", 60),
+                                            trace_id=all_input.get("trace_id"),
                                             **all_input["kwargs"]
                                             ):
                 if isinstance(chunk, dict) and 'answer' in chunk:
@@ -454,6 +457,7 @@ if __name__ == "__main__":
                 question=user_message,
                 vector_name=vector_name,
                 chat_history=all_input["chat_history"],
+                trace_id=all_input.get("trace_id"),
                 **all_input["kwargs"]
             )
             bot_output = parse_output(bot_output)

sunholo/langfuse/evals.py

@@ -40,7 +40,7 @@ def pubsub_to_evals(data: dict, eval_funcs: list=[eval_length]) -> dict:
 
     trace_id = the_json.pop('trace_id', None)
 
-    return do_evals(trace_id, eval_funcs, **message_data)
+    return do_evals(trace_id, eval_funcs, **the_json)
 
 
 def direct_langfuse_evals(data, eval_funcs: list=[eval_length]):
@@ -68,13 +68,17 @@ def do_evals(trace_id, eval_funcs: list=[eval_length], **kwargs) -> dict:
     # Run the evaluation functions
     eval_results = []
     for eval_func in eval_funcs:
-        eval_result = eval_func(trace)  # Assuming eval_func returns a dict with 'score' and 'reason'
+        try:
+            eval_result = eval_func(trace)  # Assuming eval_func returns a dict with 'score' and 'reason'
+        except Exception as e:
+            eval_result = {"score": 0, "reason":f"ERROR: {str(e)}"}
         eval_results.append(eval_result)
 
         eval_name = eval_func.__name__
 
         if 'score' and 'reason' not in eval_result:
-            raise ValueError(f"Trace {trace.name} using {eval_name=} did not return a dict with 'score' and 'reason': {eval_result=}")
+            log.error(f"Trace {trace.name} using {eval_name=} did not return a dict with 'score' and 'reason': {eval_result=}")
+            eval_result = {"score": 0, "reason": f"malformed eval_result: {eval_result}"}
         
         log.info(f"TraceId {trace.id} with name {trace.name} had {eval_name=} with score {eval_result=}")
         

sunholo/streaming/streaming.py

@@ -22,7 +22,7 @@ from .content_buffer import ContentBuffer, BufferStreamingStdOutCallbackHandler
 from ..qna.parsers import parse_output
 
 from ..custom_logging import log
-from ..utils import load_config_key, ConfigManager
+from ..utils import ConfigManager
 from ..utils.parsers import check_kwargs_support
 
 from .langserve import parse_langserve_token, parse_langserve_token_async

sunholo/utils/parsers.py

@@ -217,10 +217,10 @@ def escape_braces(text):
     """
     # First, handle cases where there might be a mix of braces
     # Replace all `{` that are not followed by another `{` with `{{`
-    text = re.sub(r'(?<!{){(?!{)', '{{', text)
+    text = re.sub(r'(?<!{){(?!{)', '<<', text)
     
     # Replace all `}` that are not preceded by another `}` with `}}`
-    text = re.sub(r'(?<!})}(?!})', '}}', text)
+    text = re.sub(r'(?<!})}(?!})', '>>', text)
 
     # After escaping single braces, return the modified text
     return text

{sunholo-0.89.8.dist-info → sunholo-0.90.0.dist-info}/METADATA

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

{sunholo-0.89.8.dist-info → sunholo-0.90.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=FgSaCODyoTtlstJtsqlLPScdgRUtv9_plxftdzHdVFo,809
 sunholo/agents/flask/qna_routes.py,sha256=uwUD1yrzOPH27m2AXpiQrPk_2VfJOQOM6dAynOWQtoQ,22532
-sunholo/agents/flask/vac_routes.py,sha256=z3omGsb6Ze3Hpxx_em1vve9aPnRQQjYKdz0dkStmJ-I,22811
+sunholo/agents/flask/vac_routes.py,sha256=V1MeYcMbrARdvLjxeN_pcmIuG4QXBkMqsh3m5mb7d8g,23031
 sunholo/archive/__init__.py,sha256=qNHWm5rGPVOlxZBZCpA1wTYPbalizRT7f8X4rs2t290,31
 sunholo/archive/archive.py,sha256=PxVfDtO2_2ZEEbnhXSCbXLdeoHoQVImo4y3Jr2XkCFY,1204
 sunholo/auth/__init__.py,sha256=TeP-OY0XGxYV_8AQcVGoh35bvyWhNUcMRfhuD5l44Sk,91
@@ -94,7 +94,7 @@ sunholo/invoke/direct_vac_func.py,sha256=fuTJlH5PsqWhN_yVMaWisHCTZU1JEUz8I8yVbWs
 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
-sunholo/langfuse/evals.py,sha256=TkZnJErN2n3IEEMIOaFtes--5bHvMpPcJz6hGliNtFc,3164
+sunholo/langfuse/evals.py,sha256=YTaqOxSoeVxjuynASWjia07z9Q4NusOi_gQUUWaCTY4,3359
 sunholo/langfuse/prompts.py,sha256=27BsVfihM6-h1jscbkGSO4HsATl-d4ZN6tcNCVztWoY,1300
 sunholo/llamaindex/__init__.py,sha256=DlY_cHWCsVEV1C5WBgDdHRgOMlJc8pDoCRukUJ8PT9w,88
 sunholo/llamaindex/get_files.py,sha256=6rhXCDqQ_lrIapISQ_OYQDjiSATXvS_9m3qq53-oIl0,781
@@ -117,7 +117,7 @@ sunholo/streaming/__init__.py,sha256=MpbydI2UYo_adttPQFkxNM33b-QRyNEbrKJx0C2AGPc
 sunholo/streaming/content_buffer.py,sha256=A9rVhlmLZxaFPvGYjVqCs5GfIsA1EMl_tyk-0VCDvo4,6462
 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=5dRXo1wHYE0E91gll-939RShYTYxQMeVwAVCqFR13h0,16343
+sunholo/streaming/streaming.py,sha256=TNnjlMH4tC4vDqLICyeLCj2tj9EcTLLvyH6zDSpsxh4,16326
 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
@@ -132,7 +132,7 @@ sunholo/utils/config_class.py,sha256=4uY7i7y18bDLvGNY1PiQ8c4LM-whopsjEWZerHEckwQ
 sunholo/utils/config_schema.py,sha256=Wv-ncitzljOhgbDaq9qnFqH5LCuxNv59dTGDWgd1qdk,4189
 sunholo/utils/gcp.py,sha256=uueODEpA-P6O15-t0hmcGC9dONLO_hLfzSsSoQnkUss,4854
 sunholo/utils/gcp_project.py,sha256=Fa0IhCX12bZ1ctF_PKN8PNYd7hihEUfb90kilBfUDjg,1411
-sunholo/utils/parsers.py,sha256=LxzkCTBQ4uYhf0FfqiO4yWeP_yqVaMz_fw7sMu7mq5E,6421
+sunholo/utils/parsers.py,sha256=wES0fRn3GONoymRXOXt-z62HCoOiUvvFXa-MfKfjCls,6421
 sunholo/utils/timedelta.py,sha256=BbLabEx7_rbErj_YbNM0MBcaFN76DC4PTe4zD2ucezg,493
 sunholo/utils/user_ids.py,sha256=SQd5_H7FE7vcTZp9AQuQDWBXd4FEEd7TeVMQe1H4Ny8,292
 sunholo/utils/version.py,sha256=P1QAJQdZfT2cMqdTSmXmcxrD2PssMPEGM-WI6083Fck,237
@@ -144,9 +144,9 @@ sunholo/vertex/init.py,sha256=1OQwcPBKZYBTDPdyU7IM4X4OmiXLdsNV30C-fee2scQ,2875
 sunholo/vertex/memory_tools.py,sha256=q_phxgGX2TG2j2MXNULF2xGzQnQPENwjPN9nZ_A9Gh0,7526
 sunholo/vertex/safety.py,sha256=S9PgQT1O_BQAkcqauWncRJaydiP8Q_Jzmu9gxYfy1VA,2482
 sunholo/vertex/type_dict_to_json.py,sha256=uTzL4o9tJRao4u-gJOFcACgWGkBOtqACmb6ihvCErL8,4694
-sunholo-0.89.8.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.89.8.dist-info/METADATA,sha256=kDmLpDCiMlsC_h6EK4A4l2EGqwQEgOXZJhUHzklEkk4,7706
-sunholo-0.89.8.dist-info/WHEEL,sha256=ixB2d4u7mugx_bCBycvM9OzZ5yD7NmPXFRtKlORZS2Y,91
-sunholo-0.89.8.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.89.8.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.89.8.dist-info/RECORD,,
+sunholo-0.90.0.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.90.0.dist-info/METADATA,sha256=PHAIaEQ-hoCAqwc1KGrVNO5zCU9i_o1m12_P6kjWriw,7706
+sunholo-0.90.0.dist-info/WHEEL,sha256=uCRv0ZEik_232NlR4YDw4Pv3Ajt5bKvMH13NUU7hFuI,91
+sunholo-0.90.0.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.90.0.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.90.0.dist-info/RECORD,,

{sunholo-0.89.8.dist-info → sunholo-0.90.0.dist-info}/WHEEL

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