sunholo 0.76.3__tar.gz → 0.76.5__tar.gz

{sunholo-0.76.3 → sunholo-0.76.5}/PKG-INFO

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

{sunholo-0.76.3 → sunholo-0.76.5}/setup.py

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

sunholo-0.76.5/sunholo/auth/__init__.py

@@ -0,0 +1,2 @@
+from .run import get_header, get_cloud_run_token
+from .gcloud import get_local_gcloud_token

{sunholo-0.76.3 → sunholo-0.76.5}/sunholo/auth/run.py

@@ -39,8 +39,7 @@ def get_id_token(url: str) -> str:
 
     return get_local_gcloud_token()
 
-
-def get_header(vector_name) -> Optional[dict]:
+def get_cloud_run_token(vector_name):
     if has_multivac_api_key():
         
         return {"x-api-key": get_multivac_api_key()}
@@ -67,6 +66,12 @@ def get_header(vector_name) -> Optional[dict]:
             }
     log.info(f"Authenticating for run_url {run_url} from {caller_frame.f_code.co_name}")
     id_token = get_id_token(run_url)
+
+    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-0.76.3 → sunholo-0.76.5}/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 ..auth import get_local_gcloud_token, get_cloud_run_token
 import base64
 import json
 from io import StringIO
@@ -248,7 +249,14 @@ class VertexAIExtensions:
 
         return extension.resource_name
 
-    def execute_extension(self, operation_id: str, operation_params: dict, extension_id: str=None, project_id: str=None):
+    def execute_extension(
+            self, 
+            operation_id: str, 
+            operation_params: dict, 
+            extension_id: str=None, 
+            project_id: str=None,
+            vac: str=None):
+        
         init_vertex(location=self.location, project_id=project_id)
 
         if not extension_id:
@@ -272,12 +280,21 @@ class VertexAIExtensions:
         auth_config=None # on cloud run it sorts itself out via default creds(?)
 
         if not is_running_on_cloudrun():
-            from ..auth import get_local_gcloud_token
+            
             log.warning("Using local authentication via gcloud")
             auth_config = {
                     "authType": "OAUTH",
                     "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)}'"}
+                }
+        else:
+            log.warning("No vac configuration and not running locally so no authentication being set for this extension API call")
 
         response = extension.execute(
             operation_id=operation_id,

{sunholo-0.76.3 → sunholo-0.76.5}/sunholo.egg-info/PKG-INFO

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

sunholo-0.76.3/sunholo/auth/__init__.py

@@ -1,2 +0,0 @@
-from .run import get_header
-from .gcloud import get_local_gcloud_token