sunholo 0.71.14__tar.gz → 0.71.16__tar.gz

{sunholo-0.71.14 → sunholo-0.71.16}/PKG-INFO

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

{sunholo-0.71.14 → sunholo-0.71.16}/setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 # Define your base version
-version = '0.71.14'
+version = '0.71.16'
 
 setup(
     name='sunholo',

{sunholo-0.71.14 → sunholo-0.71.16}/sunholo/agents/flask/qna_routes.py

@@ -15,7 +15,6 @@
 
 import json
 import traceback
-import datetime
 import uuid
 
 from ...agents import extract_chat_history, handle_special_commands
@@ -142,7 +141,7 @@ def register_qna_routes(app, stream_interpreter, vac_interpreter):
                 name="start_streaming_chat",
                 metadata=vac_config,
                 input = all_input,
-                completion_start_time=datetime.datetime.now(),
+                completion_start_time=datetime.now(),
                 model=vac_config.get("model") or vac_config.get("llm")
             )
 

{sunholo-0.71.14 → sunholo-0.71.16}/sunholo/gcs/add_file.py

@@ -25,25 +25,63 @@ from ..logging import log
 from ..utils.config import load_config_key
 
 
-def handle_base64_image(base64_data, vector_name):
+def handle_base64_image(base64_data: str, vector_name: str, extension: str):
+    """
+    Handle base64 image data, decode it, save it as a file, upload it to GCS, and return the image URI and MIME type.
+
+    Args:
+        base64_data (str): The base64 encoded image data.
+        vector_name (str): The vector name for the GCS path.
+        extension (str): The file extension of the image (e.g., ".jpg", ".png").
+
+    Returns:
+        Tuple[str, str]: The URI of the uploaded image and the MIME type.
+    """
     model = load_config_key("llm", vector_name, "vacConfig")
-    if model.startswith("openai"): # pass it to gpt directly
-        return base64_data, base64_data.split(",",1)
-    
+    if model.startswith("openai"):  # pass it to gpt directly
+        return base64_data, base64_data.split(",", 1)
+
     try:
         header, encoded = base64_data.split(",", 1)
         data = base64.b64decode(encoded)
 
-        filename = f"{uuid.uuid4()}.jpg"
+        filename = f"{uuid.uuid4()}{extension}"
         with open(filename, "wb") as f:
             f.write(data)
 
         image_uri = add_file_to_gcs(filename, vector_name)
         os.remove(filename)  # Clean up the saved file
-        return image_uri, "image/jpeg"
+
+        # Determine MIME type based on extension
+        mime_type = {
+            ".jpg": "image/jpeg",
+            ".jpeg": "image/jpeg",
+            ".png": "image/png",
+            ".gif": "image/gif",
+            ".bmp": "image/bmp",
+            ".tiff": "image/tiff"
+        }.get(extension.lower(), "application/octet-stream")  # Default MIME type if unknown
+
+        return image_uri, mime_type
     except Exception as e:
         raise Exception(f'Base64 image upload failed: {str(e)}')
 
+
+def resolve_bucket(vector_name):
+    bucket_config = load_config_key("upload", vector_name, "vacConfig")
+    if bucket_config:
+        if bucket_config.get("buckets"):
+            bucket_name = bucket_config.get("buckets").get("all")
+
+    bucket_name = bucket_name if bucket_name else os.getenv('GCS_BUCKET', None)
+    if bucket_name is None:
+        raise ValueError("No bucket found to upload to: GCS_BUCKET returned None")
+    
+    if bucket_name.startswith("gs://"):
+        bucket_name = bucket_name.removeprefix("gs://")
+    
+    return bucket_name
+
 def add_file_to_gcs(filename: str, vector_name:str, bucket_name: str=None, metadata:dict=None, bucket_filepath:str=None):
 
     if not storage:
@@ -56,17 +94,7 @@ def add_file_to_gcs(filename: str, vector_name:str, bucket_name: str=None, metad
         return None
     
     if bucket_name is None:
-        bucket_config = load_config_key("upload", vector_name, "vacConfig")
-        if bucket_config:
-            if bucket_config.get("buckets"):
-                bucket_name = bucket_config.get("buckets").get("all")
-
-    bucket_name = bucket_name if bucket_name else os.getenv('GCS_BUCKET', None)
-    if bucket_name is None:
-        raise ValueError("No bucket found to upload to: GCS_BUCKET returned None")
-    
-    if bucket_name.startswith("gs://"):
-        bucket_name = bucket_name.removeprefix("gs://")
+        bucket_name = resolve_bucket(vector_name)
     
     bucket = storage_client.get_bucket(bucket_name)
     now = datetime.datetime.now()

{sunholo-0.71.14 → sunholo-0.71.16}/sunholo/vertex/__init__.py

@@ -1,3 +1,4 @@
 from .init import init_vertex, init_genai
 from .memory_tools import get_vertex_memories, print_grounding_response, get_google_search_grounding
 from .safety import vertex_safety, genai_safety
+from .extensions_class import VertexAIExtensions

{sunholo-0.71.14 → sunholo-0.71.16}/sunholo/vertex/extensions_class.py

@@ -1,4 +1,8 @@
-from vertexai.preview import extensions
+try:
+    from vertexai.preview import extensions
+except ImportError:
+    extensions = None
+
 from .init import init_vertex
 from ..logging import log
 from ..utils.gcp_project import get_gcp_project
@@ -9,6 +13,9 @@ from io import StringIO
 
 class VertexAIExtensions:
     def __init__(self):
+        if extensions is None:
+            raise ImportError("VertexAIExtensions needs vertexai.previewextensions to be installed. Install via `pip install sunholo[gcp]`")
+        
         self.CODE_INTERPRETER_WRITTEN_FILES = []
         self.css_styles = """
         <style>
@@ -21,6 +28,20 @@ class VertexAIExtensions:
         self.IMAGE_FILE_EXTENSIONS = set(["jpg", "jpeg", "png"])
         self.location = "us-central1"
 
+    def list_extensions(self):
+        the_list = extensions.Extension.list()
+        
+        extensions_list = []
+        for ext in the_list:
+            extensions_list.append({
+                "resource_name": getattr(ext, 'resource_name', ''),
+                "display_name": getattr(ext, 'display_name', 'N/A'),
+                "description": getattr(ext, 'description', 'N/A')
+            })
+        
+        return extensions_list
+        
+
     def get_extension_import_config(self, display_name: str, description: str,
                                     api_spec_gcs: dict, service_account_name: dict, tool_use_examples: list):
         tool_use_examples = [
@@ -115,11 +136,35 @@ class VertexAIExtensions:
 
         return response
 
-    def execute_code_extension(self, query: str, filenames: list[str] = None, gcs_files: list[str] = None):
+    def execute_code_extension(self, 
+                               query: str, 
+                               filenames: list[str] = None, 
+                               gcs_files: list[str] = None,
+                               bucket_name: str = None):
         if filenames and gcs_files:
             raise ValueError("Can't specify both filenames and gcs_files")
+        
+        listed_extensions = self.list_extensions()
+        code_interpreter_exists = False
+        for ext in listed_extensions:
+            if ext.get('display_name') == 'Code Interpreter':
+                code_interpreter_exists = True
+                extension_code_interpreter = extensions.Extension(ext['resource_name'])
+                break
+
+        if not code_interpreter_exists:
+            if bucket_name:
+                runtime_config = {
+                    "codeInterpreterRuntimeConfig": {
+                        "fileInputGcsBucket": f"{bucket_name}/extensions/input/",
+                        "fileOutputGcsBucket": f"{bucket_name}/extensions/output/",
+                    }
+                }
+            extension_code_interpreter = extensions.Extension.from_hub("code_interpreter", runtime_config=runtime_config)
 
-        extension_code_interpreter = extensions.Extension.from_hub("code_interpreter")
+        # This field is only applicable when `file_output_gcs_bucket` is specified in `Extension.CodeInterpreterRuntimeConfig`.
+
+        operation_params = {"query": query}
 
         file_arr = None
         if filenames:
@@ -130,20 +175,37 @@ class VertexAIExtensions:
                 }
                 for filename in filenames
             ]
-
+            operation_params["files"] = file_arr
+        
+        if gcs_files:
+            operation_params["file_gcs_uris"] = gcs_files
+        log.info("Executing code interpreter")
         response = extension_code_interpreter.execute(
             operation_id="generate_and_execute",
-            operation_params={
-                "query": query,
-                "files": file_arr,
-                "file_gcs_uris": gcs_files
-            })
+            operation_params=operation_params)
 
         self.CODE_INTERPRETER_WRITTEN_FILES.extend(
             [item['name'] for item in response['output_files']])
 
         if response.get('execution_error'):
+            #TODO: setup iteration many times with a timeout
             log.error(f"Code Execution Response failed with: {response.get('execution_error')} - maybe retry?")
+            new_query = f"""
+<original_query>{query}</original_query>
+<original_output>{response.get('generated_code')}</original_output>
+The code above failed with this error:
+<code_error>{response.get('execution_error')}</code_error>
+Please try again again to satisfy the original query.
+"""
+            operation_params = {"query": new_query}
+            response = extension_code_interpreter.execute(
+                operation_id="generate_and_execute",
+                operation_params=operation_params)
+            
+            self.CODE_INTERPRETER_WRITTEN_FILES.extend([item['name'] for item in response['output_files']])
+            if response.get('execution_error'):
+                log.error(f"Code Execution Response failed twice: {response.get('execution_error')}")
+
 
         return response
 
@@ -195,7 +257,7 @@ class VertexAIExtensions:
         buffer_html = [details_tml.format(**_file) for _file in file_list]
         return "".join(buffer_html)
     
-    def process_response(self, response: dict, save_files_locally=None) -> str:
+    def process_response(self, response: dict, save_file_name=None) -> str:
         result_template = """
         <details open>
             <summary class='main_summary'>{summary}:</summary>
@@ -234,8 +296,8 @@ class VertexAIExtensions:
     {result}
 </div>
 """
-        if save_files_locally:
-            with open('code_execution_results.html', 'w') as file:
+        if save_file_name:
+            with open(save_file_name or 'code_execution_results.html', 'w') as file:
                 file.write(html_content)
 
         return html_content

{sunholo-0.71.14 → sunholo-0.71.16}/sunholo.egg-info/PKG-INFO

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