sunholo 0.71.15__tar.gz → 0.71.17__tar.gz

{sunholo-0.71.15 → sunholo-0.71.17}/PKG-INFO

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

{sunholo-0.71.15 → sunholo-0.71.17}/setup.py

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

{sunholo-0.71.15 → sunholo-0.71.17}/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.15 → sunholo-0.71.17}/sunholo/cli/chat_vac.py

@@ -5,9 +5,11 @@ from ..utils.config import load_config_key
 from ..utils.api_key import has_multivac_api_key
 from ..logging import log
 from ..qna.parsers import parse_output
+from ..gcs.add_file import add_file_to_gcs
 from .run_proxy import clean_proxy_list, start_proxy, stop_proxy
 
 import uuid
+import os
 import sys
 import subprocess
 import json
@@ -44,6 +46,17 @@ def get_service_url(vac_name, project, region, no_config=False):
 
     return url
 
+def handle_file_upload(file, vector_name):
+    if not Path(file).is_file():
+        return None
+    
+    file_url = add_file_to_gcs(file, 
+                               vector_name=vector_name, 
+                               metadata={"type": "cli"},
+                               bucket_filepath=f"{vector_name}/uploads/{os.path.basename(file)}")
+    
+    return file_url
+
 def stream_chat_session(service_url, service_name, stream=True):
 
     user_id = generate_user_id()
@@ -62,7 +75,25 @@ def stream_chat_session(service_url, service_name, stream=True):
 
         if special_reply:
              console.print(f"[bold yellow]{service_name}:[/bold yellow] {special_reply}", end='\n')
-             continue     
+             continue    
+
+        if user_input.lower().startswith("upload"):
+            file_path = user_input.split(" ", 1)[1] if " " in user_input else None
+            if not file_path:
+                console.print("[bold red]Please provide a valid file path.[/bold red]")
+                continue
+
+            try:
+                file_reply = handle_file_upload(file_path, vector_name=service_name)
+                if not file_reply:
+                    console.print("[bold red]Invalid file upload[/bold red]")
+                    continue
+                
+                console.print(f"[bold yellow]{service_name}:[/bold yellow] Uploaded {file_path} to {file_reply}", end='\n')
+            
+            except FileNotFoundError:
+                console.print("[bold red]File not found. Please check the path and try again.[/bold red]")
+                continue 
         
         if not stream:
             vac_response = send_to_qa(user_input,
@@ -70,7 +101,7 @@ def stream_chat_session(service_url, service_name, stream=True):
                 chat_history=chat_history,
                 message_author=user_id,
                 #TODO: populate these
-                image_url=None,
+                image_url=file_reply,
                 source_filters=None,
                 search_kwargs=None,
                 private_docs=None,

{sunholo-0.71.15 → sunholo-0.71.17}/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")
+    else:
+        bucket_name = os.getenv('GCS_BUCKET')
+        if not bucket_name:
+            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:
@@ -55,18 +93,8 @@ def add_file_to_gcs(filename: str, vector_name:str, bucket_name: str=None, metad
         log.error(f"Error creating storage client: {str(err)}")
         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://")
+    if not bucket_name:
+        bucket_name = resolve_bucket(vector_name)
     
     bucket = storage_client.get_bucket(bucket_name)
     now = datetime.datetime.now()

{sunholo-0.71.15 → sunholo-0.71.17}/sunholo/vertex/extensions_class.py

@@ -136,7 +136,11 @@ 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")
         
@@ -149,7 +153,19 @@ class VertexAIExtensions:
                 break
 
         if not code_interpreter_exists:
-            extension_code_interpreter = extensions.Extension.from_hub("code_interpreter")
+            if bucket_name:
+                runtime_config = {
+                    "codeInterpreterRuntimeConfig": {
+                        "fileInputGcsBucket": f"{bucket_name}/extensions/input/",
+                        "fileOutputGcsBucket": f"{bucket_name}/extensions/output/",
+                    }
+                }
+            else:
+                runtime_config = {}
+                
+            extension_code_interpreter = extensions.Extension.from_hub("code_interpreter", runtime_config=runtime_config)
+
+        # This field is only applicable when `file_output_gcs_bucket` is specified in `Extension.CodeInterpreterRuntimeConfig`.
 
         operation_params = {"query": query}
 
@@ -166,7 +182,7 @@ class VertexAIExtensions:
         
         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=operation_params)
@@ -175,7 +191,24 @@ class VertexAIExtensions:
             [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
 

{sunholo-0.71.15 → sunholo-0.71.17}/sunholo.egg-info/PKG-INFO

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