sunholo 0.71.13__tar.gz → 0.71.15__tar.gz

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

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.71.13
+Version: 0.71.15
 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.13.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.71.15.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0
@@ -40,7 +40,7 @@ Requires-Dist: google-cloud-logging; extra == "all"
 Requires-Dist: google-cloud-storage; extra == "all"
 Requires-Dist: google-cloud-pubsub; extra == "all"
 Requires-Dist: google-cloud-discoveryengine; extra == "all"
-Requires-Dist: google-generativeai; extra == "all"
+Requires-Dist: google-generativeai>=0.7.1; extra == "all"
 Requires-Dist: gunicorn; extra == "all"
 Requires-Dist: httpcore; extra == "all"
 Requires-Dist: httpx; extra == "all"
@@ -97,7 +97,7 @@ Requires-Dist: google-cloud-storage; extra == "gcp"
 Requires-Dist: google-cloud-logging; extra == "gcp"
 Requires-Dist: google-cloud-pubsub; extra == "gcp"
 Requires-Dist: google-cloud-discoveryengine; extra == "gcp"
-Requires-Dist: google-generativeai>=0.4.1; extra == "gcp"
+Requires-Dist: google-generativeai>=0.7.1; extra == "gcp"
 Requires-Dist: langchain-google-genai>=1.0.5; extra == "gcp"
 Requires-Dist: langchain_google_alloydb_pg>=0.2.2; extra == "gcp"
 Requires-Dist: google-api-python-client; extra == "gcp"

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

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 # Define your base version
-version = '0.71.13'
+version = '0.71.15'
 
 setup(
     name='sunholo',
@@ -55,7 +55,7 @@ setup(
             "google-cloud-storage",
             "google-cloud-pubsub",
             "google-cloud-discoveryengine",
-            "google-generativeai",
+            "google-generativeai>=0.7.1",
             "gunicorn",
             "httpcore",
             "httpx",
@@ -117,7 +117,7 @@ setup(
             "google-cloud-logging",
             "google-cloud-pubsub",
             "google-cloud-discoveryengine",
-            "google-generativeai>=0.4.1",
+            "google-generativeai>=0.7.1",
             "langchain-google-genai>=1.0.5",
             "langchain_google_alloydb_pg>=0.2.2",
             "google-api-python-client",

{sunholo-0.71.13 → sunholo-0.71.15}/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.13 → sunholo-0.71.15}/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 = [
@@ -118,8 +139,19 @@ class VertexAIExtensions:
     def execute_code_extension(self, query: str, filenames: list[str] = None, gcs_files: list[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
 
-        extension_code_interpreter = extensions.Extension.from_hub("code_interpreter")
+        if not code_interpreter_exists:
+            extension_code_interpreter = extensions.Extension.from_hub("code_interpreter")
+
+        operation_params = {"query": query}
 
         file_arr = None
         if filenames:
@@ -130,14 +162,14 @@ class VertexAIExtensions:
                 }
                 for filename in filenames
             ]
-
+            operation_params["files"] = file_arr
+        
+        if gcs_files:
+            operation_params["file_gcs_uris"] = gcs_files
+        
         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']])
@@ -195,7 +227,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 +266,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.13 → sunholo-0.71.15}/sunholo/vertex/init.py

@@ -3,6 +3,11 @@ from ..utils.gcp_project import get_gcp_project
 import os
 
 def init_genai():
+    """
+    There are some features that come to the google.generativeai first, 
+    which needs to be authenticated via a GOOGLE_API_KEY environment variable, 
+    created via the Google AI Console at https://aistudio.google.com/app/apikey 
+    """
     try:
         import google.generativeai as genai
     except ImportError:

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

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.71.13
+Version: 0.71.15
 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.13.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.71.15.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0
@@ -40,7 +40,7 @@ Requires-Dist: google-cloud-logging; extra == "all"
 Requires-Dist: google-cloud-storage; extra == "all"
 Requires-Dist: google-cloud-pubsub; extra == "all"
 Requires-Dist: google-cloud-discoveryengine; extra == "all"
-Requires-Dist: google-generativeai; extra == "all"
+Requires-Dist: google-generativeai>=0.7.1; extra == "all"
 Requires-Dist: gunicorn; extra == "all"
 Requires-Dist: httpcore; extra == "all"
 Requires-Dist: httpx; extra == "all"
@@ -97,7 +97,7 @@ Requires-Dist: google-cloud-storage; extra == "gcp"
 Requires-Dist: google-cloud-logging; extra == "gcp"
 Requires-Dist: google-cloud-pubsub; extra == "gcp"
 Requires-Dist: google-cloud-discoveryengine; extra == "gcp"
-Requires-Dist: google-generativeai>=0.4.1; extra == "gcp"
+Requires-Dist: google-generativeai>=0.7.1; extra == "gcp"
 Requires-Dist: langchain-google-genai>=1.0.5; extra == "gcp"
 Requires-Dist: langchain_google_alloydb_pg>=0.2.2; extra == "gcp"
 Requires-Dist: google-api-python-client; extra == "gcp"

{sunholo-0.71.13 → sunholo-0.71.15}/sunholo.egg-info/requires.txt

@@ -21,7 +21,7 @@ google-cloud-logging
 google-cloud-storage
 google-cloud-pubsub
 google-cloud-discoveryengine
-google-generativeai
+google-generativeai>=0.7.1
 gunicorn
 httpcore
 httpx
@@ -77,7 +77,7 @@ google-cloud-storage
 google-cloud-logging
 google-cloud-pubsub
 google-cloud-discoveryengine
-google-generativeai>=0.4.1
+google-generativeai>=0.7.1
 langchain-google-genai>=1.0.5
 langchain_google_alloydb_pg>=0.2.2
 google-api-python-client