sunholo 0.70.1__tar.gz → 0.70.3__tar.gz

{sunholo-0.70.1 → sunholo-0.70.3}/PKG-INFO

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

{sunholo-0.70.1 → sunholo-0.70.3}/setup.py

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

{sunholo-0.70.1 → sunholo-0.70.3}/sunholo/components/vectorstore.py

@@ -138,4 +138,4 @@ def pick_vectorstore(vs_str: str, vector_name: str, embeddings, read_only=None):
         return vectorstore
 
     else:
-        raise NotImplementedError(f'No llm implemented for {vs_str}')   
+        log.warning(f'No llm implemented for {vs_str}')   

{sunholo-0.70.1 → sunholo-0.70.3}/sunholo/embedder/embed_chunk.py

@@ -142,8 +142,11 @@ def embed_pubsub_chunk(data: dict):
                             continue
 
                 vectorstore_obj = pick_vectorstore(vectorstore, vector_name=vector_name, embeddings=embeddings)
-                vs_retriever = vectorstore_obj.as_retriever(search_kwargs=dict(k=3))
-                vectorstore_list.append(vs_retriever)
+                if vectorstore_obj:
+                    vs_retriever = vectorstore_obj.as_retriever(search_kwargs=dict(k=3))
+                    vectorstore_list.append(vs_retriever)
+                else:
+                    log.warning(f"No vectorstore added for {vectorstore}")
 
     # can have multiple vectorstores per embed
     metadata_list = []

{sunholo-0.70.1 → sunholo-0.70.3}/sunholo/utils/parsers.py

@@ -14,6 +14,38 @@
 import re
 import hashlib
 
+def validate_extension_id(ext_id):
+    """
+    Ensures the passed string fits the criteria for an extension ID.
+    If not, changes it so it will be.
+
+    Criteria:
+    - Length should be 4-63 characters.
+    - Valid characters are lowercase letters, numbers, and hyphens ("-").
+    - Should start with a number or a lowercase letter.
+
+    Args:
+        ext_id (str): The extension ID to validate and correct.
+
+    Returns:
+        str: The validated and corrected extension ID.
+    """
+    # Replace invalid characters
+    ext_id = re.sub(r'[^a-z0-9-]', '-', ext_id.lower())
+    
+    # Ensure it starts with a number or a lowercase letter
+    if not re.match(r'^[a-z0-9]', ext_id):
+        ext_id = 'a' + ext_id
+    
+    # Trim to 63 characters
+    ext_id = ext_id[:63]
+    
+    # Pad to at least 4 characters
+    while len(ext_id) < 4:
+        ext_id += 'a'
+    
+    return ext_id
+
 def contains_url(message_data):
     """
     Check if the provided text contains a URL.

sunholo-0.70.3/sunholo/vertex/extensions.py

@@ -0,0 +1,138 @@
+# https://cloud.google.com/vertex-ai/generative-ai/docs/extensions/create-extension
+# https://cloud.google.com/vertex-ai/generative-ai/docs/model-reference/extension#python
+from vertexai.preview import extensions
+from .init import init_vertex
+from ..logging import log
+from ..utils.gcp_project import get_gcp_project
+from ..utils.parsers import validate_extension_id
+
+def get_extension_import_config(
+        display_name: str, 
+        description: str,
+        api_spec_gcs: dict,
+        service_account_name: dict,
+        tool_use_examples: list):
+
+    tool_use_examples = [
+        {
+            "extensionOperation": {
+                "operationId": "say_hello",
+            },
+            "displayName": "Say hello in the requested language",
+            "query": "Say hello in French",
+            "requestParams": {
+                "fields": [
+                {
+                    "key": "apiServicePrompt",
+                    "value": {
+                    "string_value": "French",
+                    }
+                }
+                ]
+            },
+            "responseParams": {
+                "fields": [
+                {
+                    "key": "apiServiceOutput",
+                    "value": {
+                    "string_value": "bonjour",
+                    },
+                }
+                ],
+            },
+            "responseSummary": "Bonjour"
+            }
+    ]
+
+    
+    return {
+        "displayName":  display_name,
+        "description": description,
+        "manifest": {
+            "name": "EXTENSION_NAME_LLM",
+            "description": "DESCRIPTION_LLM",
+            "apiSpec": {
+                "openApiGcsUri": api_spec_gcs,
+            },
+            "authConfig": {
+                "authType": "OAUTH",
+                "oauthConfig": {"service_account": service_account_name}
+            }
+        },
+        "toolUseExamples": tool_use_examples, 
+        }
+
+# once an extension is available, call it in code here
+def create_extension_instance(
+        display_name: str,
+        description: str,
+        open_api_gcs_uri: str,
+        llm_name: str=None,
+        llm_description: str=None,
+        runtime_config: dict=None,
+        service_account: str=None,
+):
+    """
+    Args:
+    - display_name: for the human. parsed to be used as extension_name
+    - description: for the human
+    - open_api_gcs_uri: location on GCS where open_ai yaml spec is
+    - llm_name: for the model.  If None, uses display_name
+    - llm_description: for the model.  If None, uses description
+    - service_account: If not specified, the Vertex AI Extension Service Agent is used to execute the extension.
+    
+    """
+    project_id = get_gcp_project()
+    extension_name = f"projects/{project_id}/locations/us-central1/extensions/{validate_extension_id(display_name)}"
+
+    extension = extensions.Extension.create(
+        extension_name=extension_name,
+        display_name=display_name,
+        description=description,
+        runtime_config=runtime_config or None,
+        manifest={
+            "name": llm_name or display_name,
+            "description": llm_description or description,
+            "api_spec": {
+                "open_api_gcs_uri": open_api_gcs_uri
+            },
+            "auth_config": {
+                "auth_type": "GOOGLE_SERVICE_ACCOUNT_AUTH",
+                "google_service_account_config": service_account or {},
+            },
+        },
+    )
+    log.info(f"Creating Vertex Extension: {extension=}")
+
+    return extension
+
+
+
+def create_extension_code_interpreter(
+        code_artifacts_bucket=None
+):
+
+    # only us-central for now
+    location = "us-central1"
+    init_vertex(location=location)
+
+    runtime_config=None
+    if code_artifacts_bucket:
+        runtime_config = {"codeInterpreterRuntimeConfig": 
+                            {
+                                "fileInputGcsBucket": code_artifacts_bucket,
+                                "fileOutputGcsBucket": code_artifacts_bucket
+                            }
+                        }
+
+    code_extension = create_extension_instance(
+        display_name="Code Interpreter",
+        description="This extension generates and executes code in the specified language",
+        open_api_gcs_uri="gs://vertex-extension-public/code_interpreter.yaml",
+        llm_name="code_interpreter_tool",
+        llm_description="Google Code Interpreter Extension",
+        runtime_config=runtime_config
+        )
+    log.info(f"Created code extension: {code_extension=}")
+
+    return code_extension

{sunholo-0.70.1 → sunholo-0.70.3}/sunholo.egg-info/PKG-INFO

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

{sunholo-0.70.1 → sunholo-0.70.3}/sunholo.egg-info/SOURCES.txt

@@ -119,6 +119,7 @@ sunholo/utils/timedelta.py
 sunholo/utils/user_ids.py
 sunholo/utils/version.py
 sunholo/vertex/__init__.py
+sunholo/vertex/extensions.py
 sunholo/vertex/init.py
 sunholo/vertex/memory_tools.py
 sunholo/vertex/safety.py