sunholo 0.76.5__py3-none-any.whl → 0.76.7__py3-none-any.whl

sunholo/auth/run.py

@@ -66,12 +66,12 @@ def get_cloud_run_token(vector_name):
             }
     log.info(f"Authenticating for run_url {run_url} from {caller_frame.f_code.co_name}")
     id_token = get_id_token(run_url)
-
+    #log.info(f"id_token {id_token}")
     return id_token
 
 def get_header(vector_name) -> Optional[dict]:
     id_token = get_cloud_run_token(vector_name)
-    
+
     headers = {"Authorization": f"Bearer {id_token}"}
-    #log.info(f"id_token {id_token}")
+    
     return headers

sunholo/azure/event_grid.py

@@ -12,9 +12,10 @@ def process_azure_blob_event(events: list) -> tuple:
         tuple: A tuple containing the blob URL, attributes as metadata, and the vector name.
         
     Example of Event Grid schema:
+    ```
     {
-        "topic": "/subscriptions/{subscription-id}/resourceGroups/{resource-group}/providers/Microsoft.Storage/storageAccounts/{storage-account}",
-        "subject": "/blobServices/default/containers/{container}/blobs/{blob}",
+        "topic": "/subscriptions/subscription-id/resourceGroups/resource-group/providers/Microsoft.Storage/storageAccounts/storage-account",
+        "subject": "/blobServices/default/containers/container/blobs/blob",
         "eventType": "Microsoft.Storage.BlobCreated",
         "eventTime": "2021-01-01T12:34:56.789Z",
         "id": "event-id",
@@ -26,8 +27,8 @@ def process_azure_blob_event(events: list) -> tuple:
             "contentType": "application/octet-stream",
             "contentLength": 524288,
             "blobType": "BlockBlob",
-            "url": "https://{storage-account}.blob.core.windows.net/{container}/{blob}",
-            "sequencer": "0000000000000000000000000000000000000000000000000000000000000000",
+            "url": "https://storage-account.blob.core.windows.net/container/blob",
+            "sequencer": "0000000000000000000000000",
             "storageDiagnostics": {
                 "batchId": "batch-id"
             }
@@ -35,6 +36,7 @@ def process_azure_blob_event(events: list) -> tuple:
         "dataVersion": "",
         "metadataVersion": "1"
     }
+    ```
     """
     storage_blob_created_event = "Microsoft.Storage.BlobCreated"
     

sunholo/cli/vertex.py

@@ -12,15 +12,14 @@ def deploy_extension(args):
         tool_example_file=args.tool_example_file,
         open_api_file=args.open_api_file,
         service_account=args.service_account,
-        project_id=args.project,
         bucket_name=args.bucket_name
     )
-    extensions = vex.list_extensions(args.project)
+    extensions = vex.list_extensions()
     console.print(extensions)
 
 def list_extensions(args):
-    vex = VertexAIExtensions()
-    extensions = vex.list_extensions(args.project)
+    vex = VertexAIExtensions(args.project)
+    extensions = vex.list_extensions()
     console.print(extensions)
 
 def setup_vertex_subparser(subparsers):

sunholo/vertex/extensions_class.py

@@ -7,6 +7,7 @@ from .init import init_vertex
 from ..logging import log
 from ..utils.gcp_project import get_gcp_project
 from ..utils.parsers import validate_extension_id
+from ..utils.gcp import is_running_on_cloudrun
 from ..auth import get_local_gcloud_token, get_cloud_run_token
 import base64
 import json
@@ -19,7 +20,7 @@ class VertexAIExtensions:
 
     ```python
     from sunholo.vertex import VertexAIExtensions
-    vex = VertexAIExtensions()
+    vex = VertexAIExtensions(project_id='your-project')
     vex.list_extensions()
     # [{'resource_name': 'projects/374404277595/locations/us-central1/extensions/770924776838397952', 
     #   'display_name': 'Code Interpreter', 
@@ -53,7 +54,7 @@ class VertexAIExtensions:
     """
     def __init__(self, project_id=None):
         if extensions is None:
-            raise ImportError("VertexAIExtensions needs vertexai.previewextensions to be installed. Install via `pip install sunholo[gcp]`")
+            raise ImportError("VertexAIExtensions needs vertexai.preview extensions to be installed. Install via `pip install sunholo'[gcp]'`")
         
         self.CODE_INTERPRETER_WRITTEN_FILES = []
         self.css_styles = """
@@ -71,12 +72,13 @@ class VertexAIExtensions:
         self.manifest = {}
         self.created_extensions = []
         self.bucket_name = os.getenv('EXTENSIONS_BUCKET')
-        init_vertex(location=self.location, project_id=project_id)
+        self.project_id = project_id or get_gcp_project()
+        self.access_token = None
+        init_vertex(location=self.location, project_id=self.project_id)
 
-    def list_extensions(self, project_id:str=None):
-        project_id = project_id or get_gcp_project()
-        log.info(f"Creating extension within {project_id=}")
-        the_list = extensions.Extension.list(project=project_id)
+    def list_extensions(self):
+        log.info(f"Creating extension within {self.project_id=}")
+        the_list = extensions.Extension.list(project=self.project_id)
         
         extensions_list = []
         for ext in the_list:
@@ -109,12 +111,25 @@ class VertexAIExtensions:
 
         return self_uri
     
-    def upload_openapi_file(self, filename: str):
+    def upload_openapi_file(self, filename: str, vac:str=None):
+        if vac:
+            from ..agents.route import route_vac
+            import yaml
+
+            new_url = route_vac(vac)
+
+            log.info(f'Overwriting extension URL with VAC url for {vac=} - {new_url=}')
+            
+            openapi = yaml.safe_load(filename)
+
+            openapi['servers'][0]['url'] = new_url
+            with open(filename, 'w') as file:
+                yaml.dump(openapi, file, sort_keys=False)
+
         self.validate_openapi(filename)
         if not self.bucket_name:
             raise ValueError('Please specify env var EXTENSIONS_BUCKET for location to upload openapi spec')
         
-
         self.openapi_file_gcs = self.upload_to_gcs(filename)
     
     def load_tool_use_examples(self, filename: str):
@@ -126,21 +141,25 @@ class VertexAIExtensions:
         # google.cloud.aiplatform_v1beta1.types.ToolUseExample
         return self.tool_use_examples
     
+    def get_auth_token(self):
+        from google.auth import default
+        from google.auth.transport.requests import Request
+
+        credentials, project_id = default()
+        credentials.refresh(Request())
+        self.access_token = credentials.token
+
+        return self.access_token
 
     def update_tool_use_examples_via_patch(self):
         import requests
         import json
-        from google.auth import default
-        from google.auth.transport.requests import Request
 
         extension = self.created_extension
         if extension is None:
             raise ValueError("Need to create the extension first")
 
-        # Get the access token using Google authentication
-        credentials, project_id = default()
-        credentials.refresh(Request())
-        access_token = credentials.token
+        self.get_auth_token()
 
         ENDPOINT=f"{self.location}-aiplatform.googleapis.com"
         URL=f"https://{ENDPOINT}/v1beta1"
@@ -151,7 +170,7 @@ class VertexAIExtensions:
         url = f"{URL}/{extension_id}"
         log.info(f"PATCH {url}")
         headers = {
-            "Authorization": f"Bearer {access_token}",
+            "Authorization": f"Bearer {self.access_token}",
             "Content-Type": "application/json"
         }
 
@@ -202,25 +221,24 @@ class VertexAIExtensions:
                          tool_example_file: str = None,
                          runtime_config: dict = None,
                          service_account: str = None,
-                         project_id: str = None,
-                         bucket_name: str = None):
+                         bucket_name: str = None,
+                         vac: str = None):
         
-        project_id = project_id or get_gcp_project()
-        log.info(f"Creating extension within {project_id=}")
-        extension_name = f"projects/{project_id}/locations/us-central1/extensions/{validate_extension_id(display_name)}"
+        log.info(f"Creating extension within {self.project_id=}")
+        extension_name = f"projects/{self.project_id}/locations/us-central1/extensions/{validate_extension_id(display_name)}"
 
         if bucket_name:
             log.info(f"Setting extension bucket name to {bucket_name}")
             self.bucket_name = bucket_name
 
-        listed_extensions = self.list_extensions(project_id)
+        listed_extensions = self.list_extensions()
         log.info(f"Listing extensions:\n {listed_extensions}")
         for ext in listed_extensions:
             if ext.get('display_name') == display_name:
                 raise NameError(f"display_name {display_name} already exists.  Delete it or rename your new extension")
 
         if open_api_file:
-            self.upload_openapi_file(open_api_file)
+            self.upload_openapi_file(open_api_file, vac)
 
         manifest = self.create_extension_manifest(
             display_name,
@@ -254,48 +272,49 @@ class VertexAIExtensions:
             operation_id: str, 
             operation_params: dict, 
             extension_id: str=None, 
-            project_id: str=None,
+            extension_display_name: str=None,
             vac: str=None):
-        
-        init_vertex(location=self.location, project_id=project_id)
 
-        if not extension_id:
-            extension_name = self.created_extension.resource_name
-            if extension_name is None:
-                raise ValueError("Must specify extension_id or init one with class")
-        else:  
+        if extension_display_name:
+            extensions = self.list_extensions()
+            for extension in extensions:
+                if extension.get('display_name') == extension_display_name:
+                    log.info(f"Found extension_id for '{extension_display_name}'")
+                    extension_id = extension['resource_name']
+                    break
+        
+        if extension_id:
             extension_id = str(extension_id)
             if not extension_id.startswith("projects/"):
-                project_id = project_id or get_gcp_project()
-                extension_name = f"projects/{project_id}/locations/{self.location}/extensions/{extension_id}"
+                extension_name = f"projects/{self.project_id}/locations/{self.location}/extensions/{extension_id}"
             else:
                 extension_name = extension_id
+        else: 
+            extension_name = self.created_extension.resource_name
+            if not extension_name:
+                raise ValueError("Must specify extension_id or extension_name - both were None")
 
         extension = extensions.Extension(extension_name)
 
-        log.info(f"Executing extension {extension_name=} with {operation_id=} and {operation_params=}")
-
-        # local testing auth
-        from ..utils.gcp import is_running_on_cloudrun
-        auth_config=None # on cloud run it sorts itself out via default creds(?)
-
+        auth_config=None
         if not is_running_on_cloudrun():
             
             log.warning("Using local authentication via gcloud")
             auth_config = {
                     "authType": "OAUTH",
-                    "oauth_config": {"access_token": f"'{get_local_gcloud_token()}'"}
+                    "oauth_config": {"access_token": f"{get_local_gcloud_token()}"}
                 }
         elif vac:
             log.info(f"Using authentication via Cloud Run via {vac=}")
             
             auth_config = {
                     "authType": "OAUTH",
-                    "oauth_config": {"access_token": f"'{get_cloud_run_token(vac)}'"}
+                    "oauth_config": {"access_token": f"{get_cloud_run_token(vac)}"}
                 }
         else:
             log.warning("No vac configuration and not running locally so no authentication being set for this extension API call")
 
+        log.info(f"Executing extension {extension_name=} with {operation_id=} and {operation_params=}")
         response = extension.execute(
             operation_id=operation_id,
             operation_params=operation_params,

{sunholo-0.76.5.dist-info → sunholo-0.76.7.dist-info}/METADATA

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

{sunholo-0.76.5.dist-info → sunholo-0.76.7.dist-info}/RECORD

@@ -20,9 +20,9 @@ sunholo/archive/archive.py,sha256=C-UhG5x-XtZ8VheQp92IYJqgD0V3NFQjniqlit94t18,11
 sunholo/auth/__init__.py,sha256=TeP-OY0XGxYV_8AQcVGoh35bvyWhNUcMRfhuD5l44Sk,91
 sunholo/auth/gcloud.py,sha256=PdbwkuTdRi4RKBmgG9uwsReegqC4VG15_tw5uzmA7Fs,298
 sunholo/auth/refresh.py,sha256=uOdT7oQRVl0YsUP__NXj6PdUdLyXFSv2ylwF283esuw,1831
-sunholo/auth/run.py,sha256=TMuJrgHKm_4Tu9GafX844LNjDwOFfbEJRr7ve7H87kg,2724
+sunholo/auth/run.py,sha256=3f2VKjIPePWz7o5EPetXF7JBCr-FNk9lOPJ-2qNTk0I,2724
 sunholo/azure/__init__.py,sha256=S1WQ5jndzNgzhSBh9UpX_yw7hRVm3hCzkAWNxUdK4dA,48
-sunholo/azure/event_grid.py,sha256=Gky7D5a-xxMzbcst_wOFfcI8AH5qOzWbKbt5iqOTr6U,2606
+sunholo/azure/event_grid.py,sha256=uXunwdjVLxNRf38aTRPoC9HXxFEFlL8JH9dijaOlF8M,2567
 sunholo/bots/__init__.py,sha256=EMFd7e2z68l6pzYOnkzHbLd2xJRvxTKFRNCTuhZ8hIw,130
 sunholo/bots/discord.py,sha256=cCFae5K1BCa6JVkWGLh_iZ9qFO1JpXb6K4eJrlDfEro,2442
 sunholo/bots/github_webhook.py,sha256=5pQPRLM_wxxcILVaIzUDV8Kt7Arcm2dL1r1kMMHA524,9629
@@ -49,7 +49,7 @@ sunholo/cli/merge_texts.py,sha256=U9vdMwKmcPoc6iPOWX5MKSxn49dNGbNzVLw8ui5PhEU,18
 sunholo/cli/run_proxy.py,sha256=OeR12ZfnasbJ-smBZQznmGufoDa4iNjUN9FCFo5JxSc,11520
 sunholo/cli/sun_rich.py,sha256=UpMqeJ0C8i0pkue1AHnnyyX0bFJ9zZeJ7HBR6yhuA8A,54
 sunholo/cli/swagger.py,sha256=absYKAU-7Yd2eiVNUY-g_WLl2zJfeRUNdWQ0oH8M_HM,1564
-sunholo/cli/vertex.py,sha256=yN1ezeiweV1UIBZYvDYgtyMS0dXH374rYMxVVHid9UY,2101
+sunholo/cli/vertex.py,sha256=8130YCarxHL1UC3aqblNmUwGZTXbkdL4Y_FOnZJsWiI,2056
 sunholo/components/__init__.py,sha256=IDoylb74zFKo6NIS3RQqUl0PDFBGVxM1dfUmO7OJ44U,176
 sunholo/components/llm.py,sha256=T4we3tGmqUj4tPwxQr9M6AXv_BALqZV_dRSvINan-oU,10374
 sunholo/components/retriever.py,sha256=BFUw_6turT3CQJZWv_uXylmH5fHdb0gKfKJrQ_j6MGY,6533
@@ -120,13 +120,13 @@ sunholo/utils/timedelta.py,sha256=BbLabEx7_rbErj_YbNM0MBcaFN76DC4PTe4zD2ucezg,49
 sunholo/utils/user_ids.py,sha256=SQd5_H7FE7vcTZp9AQuQDWBXd4FEEd7TeVMQe1H4Ny8,292
 sunholo/utils/version.py,sha256=P1QAJQdZfT2cMqdTSmXmcxrD2PssMPEGM-WI6083Fck,237
 sunholo/vertex/__init__.py,sha256=XH7FUKxdIgN9H2iDcWxL3sRnVHC3297G24RqEn4Ob0Y,240
-sunholo/vertex/extensions_class.py,sha256=TsPU3N-peHTrP3ObMdyfi3wiYKrcpcCY56GurcXsOFU,18345
+sunholo/vertex/extensions_class.py,sha256=UARBnhOmxuqRGX3ooWrJujMXc0iKtx1HkCTnK0VEJmY,19006
 sunholo/vertex/init.py,sha256=aLdNjrX3bUPfnWRhKUg5KUxSu0Qnq2YvuFNsgml4QEY,2866
 sunholo/vertex/memory_tools.py,sha256=pomHrDKqvY8MZxfUqoEwhdlpCvSGP6KmFJMVKOimXjs,6842
 sunholo/vertex/safety.py,sha256=S9PgQT1O_BQAkcqauWncRJaydiP8Q_Jzmu9gxYfy1VA,2482
-sunholo-0.76.5.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.76.5.dist-info/METADATA,sha256=2R-hFbzaL8QjpAGtqR5iAtM7fD82_98tWT92vUU1FdY,7136
-sunholo-0.76.5.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
-sunholo-0.76.5.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.76.5.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.76.5.dist-info/RECORD,,
+sunholo-0.76.7.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.76.7.dist-info/METADATA,sha256=CpUNghG6Y3R7SvzGvB-Mr4HVcMxh_H4fI8phNUs5SSw,7136
+sunholo-0.76.7.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
+sunholo-0.76.7.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.76.7.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.76.7.dist-info/RECORD,,