sunholo 0.70.0__py3-none-any.whl → 0.70.2__py3-none-any.whl

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/discovery_engine/chunker_handler.py

@@ -34,6 +34,8 @@ def do_discovery_engine(message_data, metadata, vector_name):
             vectorstore = value.get('vectorstore')
             if vectorstore == "discovery_engine" or vectorstore == "vertex_ai_search":
                 log.info(f"Found vectorstore {vectorstore}")
+                if value.get('read_only'):
+                    continue
                 #location = gcp_config.get('location') 
                 corpus = DiscoveryEngineClient(
                     data_store_id=vector_name, 

sunholo/llamaindex/import_files.py

@@ -64,6 +64,8 @@ def do_llamaindex(message_data, metadata, vector_name):
             vectorstore = value.get('vectorstore')
             if vectorstore == "llamaindex":
                 log.info(f"Found vectorstore {vectorstore}")
+                if value.get('read_only'):
+                    continue
                 rag_id = value.get('rag_id')
                 project_id = gcp_config.get('project_id')
                 location = gcp_config.get('location')

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/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/vertex/memory_tools.py

@@ -65,34 +65,43 @@ def get_vertex_memories(vector_name):
                 project_id = gcp_config.get('project_id')
                 location = gcp_config.get('location')
 
-                corpus = fetch_corpus(
-                    project_id=project_id or get_gcp_project(),
-                    location=location or global_location,
-                    rag_id=rag_id
-                )
-                corpus_tool = Tool.from_retrieval(
-                    retrieval=rag.Retrieval(
-                        source=rag.VertexRagStore(
-                            rag_corpora=[corpus.name],  # Currently only 1 corpus is allowed.
-                            similarity_top_k=10,  # Optional
-                        ),
+                try:
+                    corpus = fetch_corpus(
+                        project_id=project_id or get_gcp_project(),
+                        location=location or global_location,
+                        rag_id=rag_id
                     )
-                )
-                tools.append(corpus_tool)
+                    corpus_tool = Tool.from_retrieval(
+                        retrieval=rag.Retrieval(
+                            source=rag.VertexRagStore(
+                                rag_corpora=[corpus.name],  # Currently only 1 corpus is allowed.
+                                similarity_top_k=10,  # Optional
+                            ),
+                        )
+                    )
+                    tools.append(corpus_tool)
+                except Exception as err:
+                    log.error(f"Failed to fetch vertex.rag: {str(err)} - skipping")
+                    continue
+
             elif vectorstore == "discovery_engine" or vectorstore == "vertex_ai_search":
 
-                de = DiscoveryEngineClient(vector_name, project_id=get_gcp_project())
-                log.info(f"Found vectorstore {vectorstore}")
+                try:
+                    de = DiscoveryEngineClient(vector_name, project_id=get_gcp_project())
+                    log.info(f"Found vectorstore {vectorstore}")
 
-                data_store_path = de.data_store_path()
-                corpus_tool = Tool.from_retrieval(
-                    grounding.Retrieval(grounding.VertexAISearch(datastore=data_store_path))
-                )
-                tools.append(corpus_tool)
+                    data_store_path = de.data_store_path()
+                    corpus_tool = Tool.from_retrieval(
+                        grounding.Retrieval(grounding.VertexAISearch(datastore=data_store_path))
+                    )
+                    tools.append(corpus_tool)
+                except Exception as err:
+                    log.error(f"Failed to fetch DiscoveryEngine groudning - {str(err)} - skipping")
+                    continue
                 
 
     if not tools:
-        log.warning("No llamaindex Vertex corpus configurations could be found")
+        log.warning("No Vertex corpus configurations could be found")
     
     return tools
 

{sunholo-0.70.0.dist-info → sunholo-0.70.2.dist-info}/METADATA

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

{sunholo-0.70.0.dist-info → sunholo-0.70.2.dist-info}/RECORD

@@ -46,7 +46,7 @@ sunholo/cli/swagger.py,sha256=absYKAU-7Yd2eiVNUY-g_WLl2zJfeRUNdWQ0oH8M_HM,1564
 sunholo/components/__init__.py,sha256=IDoylb74zFKo6NIS3RQqUl0PDFBGVxM1dfUmO7OJ44U,176
 sunholo/components/llm.py,sha256=T4we3tGmqUj4tPwxQr9M6AXv_BALqZV_dRSvINan-oU,10374
 sunholo/components/retriever.py,sha256=jltG91N5r2P9RWKPW8A8tU3ilghciBczxapauW83Ir8,6377
-sunholo/components/vectorstore.py,sha256=BxtMF_wX8Zrexr67P07OTSJPjucTewmcPM5OQwIXHPM,5630
+sunholo/components/vectorstore.py,sha256=egFPeejf8kwM3Wx486X-FBzwoSSEziC2NV4LdxB2sXY,5616
 sunholo/database/__init__.py,sha256=Zz0Shcq-CtStf9rJGIYB_Ybzb8rY_Q9mfSj-nviM490,241
 sunholo/database/alloydb.py,sha256=d9W0pbZB0jTVIGF5OVaQ6kXHo-X3-6e9NpWNmV5e9UY,10464
 sunholo/database/alloydb_client.py,sha256=AYA0SSaBy-1XEfeZI97sMGehfrwnfbwZ8sE0exzI2E0,7254
@@ -61,7 +61,7 @@ sunholo/database/sql/sb/delete_source_row.sql,sha256=r6fEuUKdbiLHCDGKSbKINDCpJjs
 sunholo/database/sql/sb/return_sources.sql,sha256=89KAnxfK8n_qGK9jy1OQT8f9n4uYUtYL5cCxbC2mj_c,255
 sunholo/database/sql/sb/setup.sql,sha256=CvoFvZQev2uWjmFa3aj3m3iuPFzAAJZ0S7Qi3L3-zZI,89
 sunholo/discovery_engine/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sunholo/discovery_engine/chunker_handler.py,sha256=puNnV6vKnjNqk28FLnsIPMNsC-1Y6s20PK7ioi8qwzc,4491
+sunholo/discovery_engine/chunker_handler.py,sha256=H1HHDqWMCkchJER1_oU9TOLxqf2PygiMO6CL3uKZP64,4563
 sunholo/discovery_engine/create_new.py,sha256=7oZG78T6lW0EspRzlo7-qRyXFSuFxDn2dfSAVEaqlqY,978
 sunholo/discovery_engine/discovery_engine_client.py,sha256=n4euIZjc3pWUYfoFhpvReIzHXnIYO8J9nKC8euKSTgY,14581
 sunholo/embedder/__init__.py,sha256=sI4N_CqgEVcrMDxXgxKp1FsfsB4FpjoXgPGkl4N_u4I,44
@@ -76,7 +76,7 @@ sunholo/langfuse/prompts.py,sha256=HO4Zy9usn5tKooBPCKksuw4Lff3c03Ny5wqn4ce_xZM,1
 sunholo/llamaindex/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sunholo/llamaindex/generate.py,sha256=l1Picr-hVwkmAUD7XmTCa63qY9ERliFHQXwyX3BqB2Q,686
 sunholo/llamaindex/get_files.py,sha256=6rhXCDqQ_lrIapISQ_OYQDjiSATXvS_9m3qq53-oIl0,781
-sunholo/llamaindex/import_files.py,sha256=LIFBXxgXgRYMdVpq3FkycIoMMhLSXkKdKzK7qDuqOmQ,5566
+sunholo/llamaindex/import_files.py,sha256=h5kQCNtWoMNh9Hgn_kIJvV-Vu_AwwGIvbmuNq3yQ4Rk,5638
 sunholo/lookup/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sunholo/lookup/model_lookup.yaml,sha256=O7o-jP53MLA06C8pI-ILwERShO-xf6z_258wtpZBv6A,739
 sunholo/patches/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -103,17 +103,18 @@ sunholo/utils/config.py,sha256=5lzO9CkLpDslp66ZwSBC_95aA1FQs-zpiOLi5YaYWbM,8907
 sunholo/utils/config_schema.py,sha256=Wv-ncitzljOhgbDaq9qnFqH5LCuxNv59dTGDWgd1qdk,4189
 sunholo/utils/gcp.py,sha256=uueODEpA-P6O15-t0hmcGC9dONLO_hLfzSsSoQnkUss,4854
 sunholo/utils/gcp_project.py,sha256=0ozs6tzI4qEvEeXb8MxLnCdEVoWKxlM6OH05htj7_tc,1325
-sunholo/utils/parsers.py,sha256=NEfH6ZIYfMa-nuVaYmq9KhS0MNAYoKDbxvibT5MvGqM,4403
+sunholo/utils/parsers.py,sha256=z98cQ1v2_ScnqHxCtApNeAN2the8MdvS6RpKL6vWyOU,5287
 sunholo/utils/timedelta.py,sha256=BbLabEx7_rbErj_YbNM0MBcaFN76DC4PTe4zD2ucezg,493
 sunholo/utils/user_ids.py,sha256=SQd5_H7FE7vcTZp9AQuQDWBXd4FEEd7TeVMQe1H4Ny8,292
 sunholo/utils/version.py,sha256=jjU_4anXBikJxPg0Wur0X-B7-ec1tC7jToykAnAG9Dg,108
 sunholo/vertex/__init__.py,sha256=JvHcGFuv6R_nAhY2AdoqqhMpJ5ugeWPZ_svGhWrObBk,136
+sunholo/vertex/extensions.py,sha256=LDeuCp8RcHHACdlYhGyGjMoG5v70132HWA_2u-tzcAo,4533
 sunholo/vertex/init.py,sha256=RLjQppTUwubWgwf2PoAke-EtcwlVkFPaPMYvUsMw1KQ,2029
-sunholo/vertex/memory_tools.py,sha256=Qo6-uV0_SlwBsCEYsPnrr1l_2UH_zLT_xPxiC9XxGQg,5278
+sunholo/vertex/memory_tools.py,sha256=l2jNRFLjYpiNJULDZQq5b8fEEaqBQFPM4ehM9NhDHss,5718
 sunholo/vertex/safety.py,sha256=3meAX0HyGZYrH7rXPUAHxtI_3w_zoy_RX7Shtkoa660,1275
-sunholo-0.70.0.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.70.0.dist-info/METADATA,sha256=Jc55TzM3gNp1oMX2mF6sW-55-BjYesOKO_mVa9U15y4,6240
-sunholo-0.70.0.dist-info/WHEEL,sha256=mguMlWGMX-VHnMpKOjjQidIo1ssRlCFu4a4mBpz1s2M,91
-sunholo-0.70.0.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.70.0.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.70.0.dist-info/RECORD,,
+sunholo-0.70.2.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.70.2.dist-info/METADATA,sha256=657GueOuXqqE3LzXDsN6xgnIbPV16zJX7B03nF5upX4,6240
+sunholo-0.70.2.dist-info/WHEEL,sha256=mguMlWGMX-VHnMpKOjjQidIo1ssRlCFu4a4mBpz1s2M,91
+sunholo-0.70.2.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.70.2.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.70.2.dist-info/RECORD,,