sunholo 0.88.3__tar.gz → 0.89.1__tar.gz

{sunholo-0.88.3 → sunholo-0.89.1}/PKG-INFO

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

{sunholo-0.88.3 → sunholo-0.89.1}/setup.py

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

{sunholo-0.88.3 → sunholo-0.89.1}/sunholo/cli/cli_init.py

@@ -1,6 +1,8 @@
 import os
+import yaml
 import shutil
 from ..utils.config import get_module_filepath
+from ..utils.parsers import sanitize_cloudrun_name
 
 def init_project(args):
     """
@@ -28,7 +30,7 @@ This will create a new directory named `my_genai_project` with the template file
     """
     from .sun_rich import console
 
-    project_name = args.project_name
+    project_name = sanitize_cloudrun_name(args.project_name)
     current_dir = os.getcwd()  # This captures the current directory where the command is run
     project_dir = os.path.join(current_dir, project_name)
 
@@ -51,6 +53,8 @@ This will create a new directory named `my_genai_project` with the template file
             shutil.copy(src_path, dest_path)
         elif os.path.isdir(src_path):
             shutil.copytree(src_path, dest_path)
+    
+
 
     # Determine the location of the generated.tfvars file
     terraform_dir = args.terraform_dir or os.getenv('MULTIVAC_TERRAFORM_DIR')
@@ -62,19 +66,15 @@ This will create a new directory named `my_genai_project` with the template file
     # Get the service account, either from the CLI argument or default
     service_account = args.service_account or "sa-llmops"  # Default service account
 
-    # Determine the relative path for the cloud build included directories
-    def get_relative_application_path(full_path: str, base_dir: str) -> str:
-        application_base_index = full_path.find("application/")
-        if application_base_index != -1:
-            return full_path[application_base_index:]
-        return os.path.relpath(full_path, base_dir)
-
     # Paths to be included in the cloud build (based on the current working directory)
     # We want paths to start from 'application/system_services/{project_name}'
     relative_base = os.path.relpath(current_dir, os.path.join(current_dir, "..", ".."))
     included_path = os.path.join(relative_base, project_name, "**")
     cloud_build_path = os.path.join(relative_base, project_name, "cloudbuild.yaml")
 
+    update_cloudbuild_template(project_dir, project_name, os.path.join(relative_base, project_name))
+    write_vac_config(project_dir, project_name)
+
     # Define the cloud_run configuration for 'discord-server' with the correct project_dir path
     cloud_run_config = {
         project_name: {
@@ -118,6 +118,91 @@ This will create a new directory named `my_genai_project` with the template file
             )
     console.rule()
 
+def update_cloudbuild_template(project_dir: str, service_name: str, build_folder: str):
+    """
+    Updates the cloudbuild.yaml template file by replacing the `CHANGE_ME` placeholders with actual values.
+
+    Args:
+    -----
+    project_dir : str
+        The directory where the project and cloudbuild.yaml are located.
+    service_name : str
+        The name of the service to be used in Cloud Run.
+    build_folder : str
+        The build folder where the Docker build will take place.
+
+    Example:
+    -------
+    update_cloudbuild_template('/path/to/project', 'my_service', 'src')
+    """
+    cloudbuild_path = os.path.join(project_dir, "cloudbuild.yaml")
+
+    # Define the substitutions to replace CHANGE_ME
+    substitutions = {
+        "_SERVICE_NAME": service_name,
+        "_BUILD_FOLDER": build_folder,
+    }
+
+    # Read the cloudbuild.yaml template
+    with open(cloudbuild_path, 'r') as file:
+        content = file.read()
+
+    # Replace each placeholder with its corresponding value
+    for placeholder, value in substitutions.items():
+        content = content.replace(f"{placeholder}: CHANGE_ME", f"{placeholder}: {value}")
+
+
+    # Write the updated content back to cloudbuild.yaml
+    with open(cloudbuild_path, 'w') as file:
+        file.write(content)
+
+    print(f"cloudbuild.yaml updated successfully with service name '{service_name}' and build folder '{build_folder}'.")
+
+def write_vac_config(project_dir: str, service_name: str):
+    """
+    Writes the vac_config.yaml file with the provided service name as the key.
+    """
+    vac_config_content = {
+        'kind': 'vacConfig',
+        'apiVersion': 'v1',
+        'vac': {
+            service_name: {  # Use the service name here
+                'llm': 'vertex',
+                'model': 'gemini-1.5-pro-preview-0514',
+                'agent': 'vertex-genai',
+                'display_name': 'Template VAC',
+                'memory': [
+                    {
+                        'llamaindex-native': {
+                            'vectorstore': 'llamaindex'
+                        }
+                    }
+                ],
+                'gcp_config': {
+                    'project_id': 'llamaindex_project',
+                    'location': 'europe-west1',
+                    'rag_id': '1234544343434'  # Replace with actual RAG ID
+                },
+                'chunker': {
+                    'chunk_size': 1000,
+                    'overlap': 200
+                }
+            }
+        }
+    }
+
+    config_dir = os.path.join(project_dir, 'config')
+    if not os.path.exists(config_dir):
+        os.makedirs(config_dir)
+
+    vac_config_path = os.path.join(config_dir, 'vac_config.yaml')
+
+    # Write the YAML configuration to the file
+    with open(vac_config_path, 'w') as file:
+        yaml.dump(vac_config_content, file, default_flow_style=False)
+
+    print(f"{vac_config_path} written successfully with service name '{service_name}'.")
+
 
 def setup_init_subparser(subparsers):
     """

{sunholo-0.88.3 → sunholo-0.89.1}/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.1/sunholo/langfuse/evals.py

@@ -0,0 +1,72 @@
+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')
+    
+    # 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"]
+    )
+
+    trace_id = message_data.pop('trace_id', None)
+ 
+    # 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"],
+            **message_data
+        )
+    
+    return {"trace_id": trace.id, "eval_results": eval_results}
+
+

{sunholo-0.88.3 → sunholo-0.89.1}/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.3 → sunholo-0.89.1}/sunholo/utils/parsers.py

@@ -15,6 +15,40 @@ import re
 import hashlib
 import urllib.parse
 
+def sanitize_cloudrun_name(name: str) -> str:
+    """
+    Sanitizes the project name to be a valid Cloud Run service name.
+    
+    - Converts to lowercase.
+    - Replaces invalid characters with hyphens.
+    - Ensures the name starts with a letter.
+    - Trims the name to be less than 64 characters.
+    - Removes trailing hyphens.
+    
+    Args:
+        name (str): The original project name.
+    
+    Returns:
+        str: The sanitized project name.
+    """
+    # Convert to lowercase
+    name = name.lower()
+    
+    # Replace invalid characters with hyphens
+    name = re.sub(r'[^a-z0-9-]', '-', name)
+    
+    # Ensure the name starts with a letter
+    if not name[0].isalpha():
+        name = 'a' + name
+    
+    # Trim to 63 characters to leave room for suffixes if needed
+    name = name[:63]
+    
+    # Remove trailing hyphens
+    name = name.rstrip('-')
+    
+    return name
+
 def validate_extension_id(ext_id):
     """
     Ensures the passed string fits the criteria for an extension ID.

{sunholo-0.88.3 → sunholo-0.89.1}/sunholo.egg-info/PKG-INFO

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

{sunholo-0.88.3 → sunholo-0.89.1}/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