sunholo 0.76.3__py3-none-any.whl → 0.76.4__py3-none-any.whl

sunholo/auth/__init__.py

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

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/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 import ConfigManager
 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
+            from ..auth import get_local_gcloud_token, get_cloud_run_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.dist-info → sunholo-0.76.4.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.76.3
+Version: 0.76.4
 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.4.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0

{sunholo-0.76.3.dist-info → sunholo-0.76.4.dist-info}/RECORD

@@ -17,10 +17,10 @@ sunholo/agents/flask/qna_routes.py,sha256=nY0NFgezxw1pEGUq49AIJ5nqIx4lLcUJAMD_FE
 sunholo/agents/flask/vac_routes.py,sha256=l2-w7x437F0Uu3QvwNueEYPtnKuIee6bHJ7LUMt_tkY,19520
 sunholo/archive/__init__.py,sha256=qNHWm5rGPVOlxZBZCpA1wTYPbalizRT7f8X4rs2t290,31
 sunholo/archive/archive.py,sha256=C-UhG5x-XtZ8VheQp92IYJqgD0V3NFQjniqlit94t18,1197
-sunholo/auth/__init__.py,sha256=Y4Wpd6m0d3R7U7Ser51drO0Eg7VrfSS2VphZxRgtih8,70
+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=SG53ToQJ8hyjdN4634osfvDEUv5gJU6dlHe4nGwMMYU,2612
+sunholo/auth/run.py,sha256=TMuJrgHKm_4Tu9GafX844LNjDwOFfbEJRr7ve7H87kg,2724
 sunholo/azure/__init__.py,sha256=S1WQ5jndzNgzhSBh9UpX_yw7hRVm3hCzkAWNxUdK4dA,48
 sunholo/azure/event_grid.py,sha256=Gky7D5a-xxMzbcst_wOFfcI8AH5qOzWbKbt5iqOTr6U,2606
 sunholo/bots/__init__.py,sha256=EMFd7e2z68l6pzYOnkzHbLd2xJRvxTKFRNCTuhZ8hIw,130
@@ -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=cVpr0AbbBQV9WWZ9_X7S52aXclXNxvHywHDoBjDTxl8,17802
+sunholo/vertex/extensions_class.py,sha256=uWoLmIGjoSR4kiKpUrKwhQ8_ouyUNahBgKhKBeaxIu0,18378
 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.3.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.76.3.dist-info/METADATA,sha256=SHLQ84yDXYXlm3Mb1sCqMUZtwXxzsd2UzgEwrd-fU_4,7136
-sunholo-0.76.3.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
-sunholo-0.76.3.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.76.3.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.76.3.dist-info/RECORD,,
+sunholo-0.76.4.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.76.4.dist-info/METADATA,sha256=rhp2wTZu8pxnx9XDd9nNBZgB82QBikrxRMZMnbngTTI,7136
+sunholo-0.76.4.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
+sunholo-0.76.4.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.76.4.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.76.4.dist-info/RECORD,,