sunholo 0.90.4__py3-none-any.whl → 0.90.6__py3-none-any.whl

sunholo/agents/flask/vac_routes.py

@@ -529,12 +529,10 @@ if __name__ == "__main__":
 
         trace = None
         span = None
-        if 'trace_id' in data:
-            trace_id = data.pop('trace_id')
-            trace = self.create_langfuse_trace(request, vector_name, trace_id)
-            log.info(f"Using existing langfuse trace: {trace_id}")
-        else:
-            trace = self.create_langfuse_trace(request, vector_name)
+
+        trace_id = data.get('trace_id')
+        trace = self.create_langfuse_trace(request, vector_name, trace_id)
+        log.info(f"Using existing langfuse trace: {trace_id}")
         
         config, _ = load_config("config/llm_config.yaml")
         vac_configs = config.get("vac")
@@ -550,6 +548,7 @@ if __name__ == "__main__":
         chat_history = data.pop('chat_history', None)
         eval_percent = data.pop('eval_percent', 0.01)
         vector_name = data.pop('vector_name', vector_name)
+        data.pop('trace_id', None) # to ensure not in kwargs
 
         paired_messages = extract_chat_history(chat_history)
 

sunholo/components/llm.py

@@ -114,9 +114,18 @@ def llm_str_to_llm(llm_str, model=None, vector_name=None, config=None):
     elif llm_str == 'anthropic':
         from langchain_anthropic import ChatAnthropic
         if model is None:
-            model = 'claude-3-opus-20240229'
+            model = 'claude-3-5-sonnet-20240620'
             log.info(f"No 'model' value in config file - selecting default {model}")
         return ChatAnthropic(model_name = model, temperature=0)
+    elif llm_str == 'anthropic-vertex':
+        from langchain_google_vertexai.model_garden import ChatAnthropicVertex
+        if model is None:
+            model = "claude-3-5-sonnet@20240620"
+            log.info(f"No 'model' value in config file - selecting default {model}")
+        gcp_config = config.vacConfig("gcp_config")
+        return ChatAnthropicVertex(model_name=model, 
+                                   project=gcp_config.get('project_id'), 
+                                   location=gcp_config.get('location'))
 
     if llm_str is None:
         raise NotImplementedError(f'No llm implemented for {llm_str}') 

sunholo/langfuse/evals.py

@@ -3,6 +3,7 @@ import json
 
 from ..pubsub import decode_pubsub_message
 from langfuse import Langfuse
+import traceback
 from ..custom_logging import log
 
 # Example of how eval_funcs might be structured
@@ -71,7 +72,7 @@ def do_evals(trace_id, eval_funcs: list=[eval_length], **kwargs) -> dict:
         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_result = {"score": 0, "reason":f"ERROR: {str(e)} traceback: {traceback.format_exc()}"}
         eval_results.append(eval_result)
 
         eval_name = eval_func.__name__

{sunholo-0.90.4.dist-info → sunholo-0.90.6.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.90.4
+Version: 0.90.6
 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.90.4.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.90.6.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0
@@ -24,6 +24,7 @@ Requires-Dist: langchain >=0.2.12
 Requires-Dist: langchain-experimental >=0.0.61
 Requires-Dist: langchain-community >=0.2.11
 Provides-Extra: all
+Requires-Dist: anthropic[vertex] ; extra == 'all'
 Requires-Dist: asyncpg ; extra == 'all'
 Requires-Dist: azure-identity ; extra == 'all'
 Requires-Dist: azure-storage-blob ; extra == 'all'
@@ -96,6 +97,7 @@ Requires-Dist: xlwings ; extra == 'excel'
 Requires-Dist: requests ; extra == 'excel'
 Requires-Dist: rich ; extra == 'excel'
 Provides-Extra: gcp
+Requires-Dist: anthropic[vertex] ; extra == 'gcp'
 Requires-Dist: google-api-python-client ; extra == 'gcp'
 Requires-Dist: google-cloud-alloydb-connector[pg8000] ; extra == 'gcp'
 Requires-Dist: google-auth-httplib2 ; extra == 'gcp'

{sunholo-0.90.4.dist-info → sunholo-0.90.6.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=MLJ55ytBMI-CBScXGAMVLFtxa-FFfkoEiZoL5cAPz5o,23237
+sunholo/agents/flask/vac_routes.py,sha256=r8CRzqovtPzTFCto6UoPcA4z8jEPHgzETetwK0SNrUg,23173
 sunholo/archive/__init__.py,sha256=qNHWm5rGPVOlxZBZCpA1wTYPbalizRT7f8X4rs2t290,31
 sunholo/archive/archive.py,sha256=PxVfDtO2_2ZEEbnhXSCbXLdeoHoQVImo4y3Jr2XkCFY,1204
 sunholo/auth/__init__.py,sha256=TeP-OY0XGxYV_8AQcVGoh35bvyWhNUcMRfhuD5l44Sk,91
@@ -54,7 +54,7 @@ sunholo/cli/sun_rich.py,sha256=UpMqeJ0C8i0pkue1AHnnyyX0bFJ9zZeJ7HBR6yhuA8A,54
 sunholo/cli/swagger.py,sha256=absYKAU-7Yd2eiVNUY-g_WLl2zJfeRUNdWQ0oH8M_HM,1564
 sunholo/cli/vertex.py,sha256=8130YCarxHL1UC3aqblNmUwGZTXbkdL4Y_FOnZJsWiI,2056
 sunholo/components/__init__.py,sha256=IDoylb74zFKo6NIS3RQqUl0PDFBGVxM1dfUmO7OJ44U,176
-sunholo/components/llm.py,sha256=5wRVf7lIb7q1vRADNcdQp26L9l4vGHFIvjtUDurZN_s,11488
+sunholo/components/llm.py,sha256=5QkYgMoqFeFVl71w0zrLN-aKMieSlMiL2gM4aB-6uk8,12023
 sunholo/components/retriever.py,sha256=bKIVT7_18Ut3OJd0E0jyiISPnD9qkHWVjcQPT4i1_G8,7720
 sunholo/components/vectorstore.py,sha256=xKk7micTRwZckaI7U6PxvFz_ZSjCH48xPTDYiDcv2tc,5913
 sunholo/database/__init__.py,sha256=bpB5Nk21kwqYj-qdVnvNgXjLsbflnH4g-San7OHMqR4,283
@@ -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=YTaqOxSoeVxjuynASWjia07z9Q4NusOi_gQUUWaCTY4,3359
+sunholo/langfuse/evals.py,sha256=y1T6qUA-k41BD2_5warjd1CQN4N107zsDizg9j5jCW4,3412
 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
@@ -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.90.4.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.90.4.dist-info/METADATA,sha256=Zi5cT9oDUXzjMwZSIvfj93fzi22DlXOzpSm2_X-J-Ts,7706
-sunholo-0.90.4.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-sunholo-0.90.4.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.90.4.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.90.4.dist-info/RECORD,,
+sunholo-0.90.6.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.90.6.dist-info/METADATA,sha256=oeL4J2tqfAvbatVNoApFgnG2_1A2mN3lpeoVZmLFhdE,7806
+sunholo-0.90.6.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+sunholo-0.90.6.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.90.6.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.90.6.dist-info/RECORD,,