sunholo 0.88.4__tar.gz → 0.89.2__tar.gz

{sunholo-0.88.4 → sunholo-0.89.2}/PKG-INFO

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

{sunholo-0.88.4 → sunholo-0.89.2}/setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = '0.88.4'
+version = '0.89.2'
 
 setup(
     name='sunholo',

{sunholo-0.88.4 → sunholo-0.89.2}/sunholo/agents/dispatch_to_qa.py

@@ -20,6 +20,12 @@ from .langserve import prepare_request_data
 
 from .route import route_endpoint
 
+try:
+    from langfuse import Langfuse
+    langfuse = Langfuse()
+except ImportError:
+    langfuse = None
+
 def prep_request_payload(user_input, chat_history, vector_name, stream, **kwargs):
     """
     Prepares the request payload for sending a query to the QA system.
@@ -79,9 +85,21 @@ def prep_request_payload(user_input, chat_history, vector_name, stream, **kwargs
 
         if 'vector_name' not in qna_data:
             qna_data['vector_name'] = vector_name
+    
+    qna_data['trace_id'] = add_langfuse_trace(qna_endpoint)
 
     return qna_endpoint, qna_data
 
+def add_langfuse_trace(qna_endpoint):
+    if not langfuse:
+        return None
+    
+    trace = langfuse.trace(name = f'auto/{qna_endpoint}')
+
+    log.info('Adding langfuse trace {trace.id}')
+
+    return trace.id
+
 def send_to_qa(user_input, vector_name, chat_history, stream=False, **kwargs):
     """
     Sends a query to the QA system synchronously.

{sunholo-0.88.4 → sunholo-0.89.2}/sunholo/agents/flask/vac_routes.py

@@ -161,7 +161,7 @@ if __name__ == "__main__":
 
 
     def handle_stream_vac(self, vector_name):
-        observed_stream_interpreter = observe()(self.stream_interpreter)
+        observed_stream_interpreter = self.stream_interpreter
         prep = self.prep_vac(request, vector_name)
         log.info(f"Processing prep: {prep}")
         trace = prep["trace"]
@@ -225,7 +225,7 @@ if __name__ == "__main__":
         return response
 
     def handle_process_vac(self, vector_name):
-        observed_vac_interpreter = observe()(self.vac_interpreter)
+        observed_vac_interpreter = self.vac_interpreter
         prep = self.prep_vac(request, vector_name)
         log.debug(f"Processing prep: {prep}")
         trace = prep["trace"]
@@ -365,7 +365,7 @@ if __name__ == "__main__":
             "kwargs": data
         }
 
-        observed_stream_interpreter = observe()(self.stream_interpreter)
+        observed_stream_interpreter = self.stream_interpreter
 
         response_id = str(uuid.uuid4())
         
@@ -416,7 +416,7 @@ if __name__ == "__main__":
             return Response(generate_response_content(), content_type='text/plain; charset=utf-8')
 
         try:
-            observed_vac_interpreter = observe()(self.vac_interpreter)
+            observed_vac_interpreter = self.vac_interpreter
             bot_output = observed_vac_interpreter(
                 question=user_message,
                 vector_name=vector_name,
@@ -437,7 +437,7 @@ if __name__ == "__main__":
             return self.make_openai_response(user_message, vector_name, f'ERROR: {str(err)}')
 
 
-    def create_langfuse_trace(self, request, vector_name):
+    def create_langfuse_trace(self, request, vector_name, trace_id):
         try:
             from langfuse import Langfuse
             langfuse = Langfuse()
@@ -451,11 +451,12 @@ if __name__ == "__main__":
         message_source = request.headers.get("X-Message-Source")
 
         package_version = sunholo_version()
-        tags = [package_version]
+        tags = [package_version, "autogenerated"]
         if message_source:
             tags.append(message_source)
 
         return langfuse.trace(
+            id=trace_id, 
             name = f"/vac/{vector_name}",
             user_id = user_id,
             session_id = session_id,
@@ -464,8 +465,6 @@ if __name__ == "__main__":
         )
 
     def prep_vac(self, request, vector_name):
-        trace = self.create_langfuse_trace(request, vector_name)
-        span = None
 
         if request.content_type.startswith('application/json'):
             data = request.get_json()
@@ -490,6 +489,10 @@ if __name__ == "__main__":
 
         log.info(f"vac/{vector_name} got data: {data}")
 
+        trace_id = data.get('trace_id')
+        trace = self.create_langfuse_trace(request, vector_name, trace_id)
+        span = None
+
         config, _ = load_config("config/llm_config.yaml")
         vac_configs = config.get("vac")
         if vac_configs:

{sunholo-0.88.4 → sunholo-0.89.2}/sunholo/cli/cli_init.py

@@ -201,7 +201,7 @@ def write_vac_config(project_dir: str, service_name: str):
     with open(vac_config_path, 'w') as file:
         yaml.dump(vac_config_content, file, default_flow_style=False)
 
-    print(f"vac_config.yaml written successfully with service name '{service_name}'.")
+    print(f"{vac_config_path} written successfully with service name '{service_name}'.")
 
 
 def setup_init_subparser(subparsers):

{sunholo-0.88.4 → sunholo-0.89.2}/sunholo/genai/process_funcs_cls.py

@@ -109,14 +109,24 @@ class GenAIFunctionProcessor:
         work_on = api_requests_and_responses or self.last_api_requests_and_responses
         parts = []
         for part in work_on:
-            parts.append(
-                Part(
-                    function_response=genai.protos.FunctionResponse(
-                        name=part[0],
-                        response={"result": part[2], "args": json.dumps(part[1])}
+            try:
+                parts.append(
+                    Part(
+                        function_response=genai.protos.FunctionResponse(
+                            name=part[0],
+                            response={"result": part[2], "args": json.dumps(part[1])}
+                        )
                     )
                 )
-            )
+            except Exception as err:
+                parts.append(
+                    Part(
+                        function_response=genai.protos.FunctionResponse(
+                            name=part[0],
+                            response={"result": f"ERROR: {str(err)}"}
+                        )
+                    )
+                )                
 
         return parts
 
@@ -212,14 +222,15 @@ class GenAIFunctionProcessor:
             if fn := part.function_call:
                 # Extract parameters for the function call
                 function_name = fn.name
-                params = {key: val for key, val in fn.args.items()}
+                params_obj = {key: val for key, val in fn.args.items()}
+                params = ', '.join(f'{key}={val}' for key, val in params_obj.items())
                 log.info(f"Executing {function_name} with params {params}")
 
                 # Check if the function is in our dictionary of available functions
                 if function_name in self.funcs:
                     try:
                         # Execute the function with the provided parameters
-                        result = self.funcs[function_name](**params)
+                        result = self.funcs[function_name](**params_obj)
                         log.info(f"Got result from {function_name}: {result}")
                     except Exception as err:
                         error_message = f"Error in {function_name}: {str(err)}"

sunholo-0.89.2/sunholo/langfuse/evals.py

@@ -0,0 +1,83 @@
+import os
+from ..pubsub import decode_pubsub_message
+from langfuse import Langfuse
+from ..custom_logging import log
+
+# Example of how eval_funcs might be structured
+def eval_length(trace):
+    """
+    An example of how eval_funcs might be structured.
+    Must output a dictionary with 'score' and 'reason' keys.
+    """
+    # Example evaluation logic
+    return {
+        "score": len(trace.output),  # Example: length of the output text
+        "reason": "Length of the output text"
+    }
+
+def pubsub_to_evals(data: dict, eval_funcs: list=[eval_length]) -> dict:
+    """
+    Process a Pub/Sub message and run evaluations using the provided evaluation functions.
+
+    Args:
+        data (dict): The Pub/Sub message data.
+        eval_funcs (list): A list of evaluation functions to run. Each function should return a dict with 'score' and 'reason'.
+    """
+    
+    # Decode the message
+    message_data, metadata, vector_name = decode_pubsub_message(data)
+
+    if 'trace_id' not in message_data:
+        raise ValueError('No trace_id found in message data')
+
+    trace_id = message_data.pop('trace_id', None)
+
+    return do_evals(trace_id, eval_funcs, **message_data)
+
+
+def direct_langfuse_evals(data, eval_funcs: list=[eval_length]):
+    if 'trace_id' not in data:
+        raise ValueError('No trace_id found in data')
+    
+    return do_evals(data['trace_id'], eval_funcs, **data)
+
+
+def do_evals(trace_id, eval_funcs: list=[eval_length], **kwargs) -> dict:
+    # Initialize Langfuse with environment variables
+    langfuse = Langfuse(
+        secret_key=os.environ["LANGFUSE_SECRET_KEY"],
+        public_key=os.environ["LANGFUSE_PUBLIC_KEY"],
+        host=os.environ["LANGFUSE_HOST"]
+    )
+ 
+    # Fetch the latest trace (or modify as needed to fetch a specific trace)
+    trace = langfuse.fetch_trace(id=trace_id)
+
+    if trace.output is None:
+        raise ValueError("Trace {trace.name} had no generated output, it was skipped")
+
+    # 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'
+        eval_results.append(eval_result)
+
+        eval_name = eval_func.__name__
+
+        if 'score' or '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.info(f"TraceId {trace.id} with name {trace.name} had {eval_name=} with score {eval_result=}")
+        
+        # Submit the evaluation to Langfuse
+        langfuse.score(
+            trace_id=trace.id,
+            name=eval_name,  # Use the function name as the evaluation name
+            value=eval_result["score"],
+            comment=eval_result["reason"],
+            **kwargs
+        )
+    
+    return {"trace_id": trace.id, "eval_results": eval_results}
+
+

{sunholo-0.88.4 → sunholo-0.89.2}/sunholo/terraform/tfvars_editor.py

@@ -5,6 +5,8 @@ except ImportError:
 
 import json
 import subprocess
+from datetime import datetime
+import shutil
 import os
 import io
 from typing import Dict, Any
@@ -75,6 +77,13 @@ class TerraformVarsEditor:
         
         self.tfvars_file = tfvars_file
         self.terraform_dir = terraform_dir
+
+        # Ensure the tfvars file exists, if not, create it
+        if not os.path.exists(self.tfvars_file):
+            log.info(f"{self.tfvars_file} does not exist. Creating a new file.")
+            with open(self.tfvars_file, 'w') as file:
+                file.write("")  # Create an empty tfvars file
+                
         self.tfvars_data = self._load_tfvars()
 
     def _load_tfvars(self) -> Dict[str, Any]:
@@ -118,8 +127,9 @@ class TerraformVarsEditor:
         -------
         backup_file = self._backup_tfvars()
         """
-        backup_file = f"{self.tfvars_file}.bak"
-        os.rename(self.tfvars_file, backup_file)
+        timestamp = datetime.now().strftime('%Y%m%d%H%M%S')
+        backup_file = f"{self.tfvars_file}.{timestamp}.bak"
+        shutil.copy2(self.tfvars_file, backup_file)
         return backup_file
 
     def _restore_tfvars(self, backup_file: str) -> None:
@@ -231,8 +241,10 @@ class TerraformVarsEditor:
         # Attempt to validate the changes with Terraform
         if not self.validate_terraform():
             # If validation fails, restore the original file from the backup
+            failed_file = f"{self.tfvars_file}.failed"
+            shutil.copy2(self.tfvars_file, failed_file)
             self._restore_tfvars(backup_file)
-            log.error(f"Changes aborted, original {self.tfvars_file} restored.")
+            print(f"Changes aborted, original {self.tfvars_file} restored. Failed file: {failed_file}")
         else:
             log.info(f"Terraform validation passed, changes saved to {self.tfvars_file}.")
             os.remove(backup_file)  # Remove the backup if validation passes
@@ -273,8 +285,11 @@ class TerraformVarsEditor:
         # Attempt to validate the changes with Terraform
         if not self.validate_terraform():
             # If validation fails, restore the original file from the backup
+            failed_file = f"{self.tfvars_file}.failed"
+            shutil.copy2(self.tfvars_file, failed_file)
             self._restore_tfvars(backup_file)
-            console.print(f"Changes aborted, original {self.tfvars_file} restored.")
+
+            print(f"Changes aborted, original {self.tfvars_file} restored. Failed file: {failed_file}")
         else:
             console.print(f"Terraform validation passed, changes saved to {self.tfvars_file}.")
             os.remove(backup_file)  # Remove the backup if validation passes

{sunholo-0.88.4 → sunholo-0.89.2}/sunholo.egg-info/PKG-INFO

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

{sunholo-0.88.4 → sunholo-0.89.2}/sunholo.egg-info/SOURCES.txt

@@ -105,6 +105,7 @@ sunholo/invoke/direct_vac_func.py
 sunholo/invoke/invoke_vac_utils.py
 sunholo/langfuse/__init__.py
 sunholo/langfuse/callback.py
+sunholo/langfuse/evals.py
 sunholo/langfuse/prompts.py
 sunholo/llamaindex/__init__.py
 sunholo/llamaindex/get_files.py