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

sunholo/auth/run.py

@@ -66,7 +66,7 @@ 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}")
+    #log.info(f"id_token {id_token}")
     return id_token
 
 def get_header(vector_name) -> Optional[dict]:

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/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
@@ -271,27 +272,31 @@ class VertexAIExtensions:
             operation_id: str, 
             operation_params: dict, 
             extension_id: str=None, 
+            extension_display_name: str=None,
             vac: str=None):
 
-        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/"):
                 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")
@@ -308,10 +313,8 @@ class VertexAIExtensions:
                 }
         else:
             log.warning("No vac configuration and not running locally so no authentication being set for this extension API call")
-        
-        if auth_config:
-            log.info(f"{auth_config=}")
 
+        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.6.dist-info → sunholo-0.76.7.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.76.6
+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.6.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.6.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=_4wdaYmkjsyz35alXZUE7cqEanpCHY5dldrx2uMagq8,2723
+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
@@ -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=6-M2BKO7ET9nxLGPD-mWxxytGtzMPmJarrl78-V3JVk,18745
+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.6.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.76.6.dist-info/METADATA,sha256=i1v5HHKs4rv8B0rlvkIV-fTbe-V0l9ZB7PRakzA56Ps,7136
-sunholo-0.76.6.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
-sunholo-0.76.6.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.76.6.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.76.6.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,,