sunholo 0.76.2__tar.gz → 0.76.4__tar.gz

{sunholo-0.76.2 → sunholo-0.76.4}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.76.2
+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.2.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.2 → sunholo-0.76.4}/setup.py

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

sunholo-0.76.4/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.4/sunholo/auth/refresh.py

@@ -0,0 +1,55 @@
+# needs to be in minimal to check gcp
+import os
+
+import google.auth 
+from google.auth.transport import requests
+from ..utils.gcp import is_running_on_gcp
+
+
+from ..logging import log
+
+def get_default_email():
+    if not refresh_credentials():
+        log.error("Could not refresh the credentials properly.")
+        return None
+    # https://stackoverflow.com/questions/64234214/how-to-generate-a-blob-signed-url-in-google-cloud-run
+
+    gcs_credentials, project_id = get_default_creds()
+
+    service_account_email = getattr(gcs_credentials, 'service_account_email', None)
+    # If you use a service account credential, you can use the embedded email
+    if not service_account_email:
+        service_account_email = os.getenv('GCS_MAIL_USER')
+        if not service_account_email:
+            log.error("Could not create the credentials for signed requests - no credentials.service_account_email or GCS_MAIL_USER with roles/iam.serviceAccountTokenCreator")
+            
+            return None
+    
+    log.info(f"Found default email: {service_account_email=} for {project_id=}")
+    return service_account_email
+
+def get_default_creds():
+    gcs_credentials = None
+    project_id = None
+    gcs_credentials, project_id = google.auth.default()
+
+    return gcs_credentials, project_id
+
+def refresh_credentials():
+    if not is_running_on_gcp():
+        log.debug("Not running on Google Cloud so no credentials available for GCS.")
+        return False
+    
+    gcs_credentials, project_id = get_default_creds()
+
+    if not gcs_credentials.token or gcs_credentials.expired or not gcs_credentials.valid:
+        try:
+            gcs_credentials.refresh(requests.Request())
+
+            return True
+        
+        except Exception as e:
+            log.error(f"Failed to refresh gcs credentials: {e}")
+
+            return False
+    

{sunholo-0.76.2 → sunholo-0.76.4}/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.2 → sunholo-0.76.4}/sunholo/cli/vertex.py

@@ -3,8 +3,8 @@ from ..vertex import VertexAIExtensions
 from .sun_rich import console
 
 def deploy_extension(args):
-    vex = VertexAIExtensions()
-    console.rule(f"Creating Vertex extension '{args.display_name}'")
+    vex = VertexAIExtensions(args.project)
+    console.rule(f"Creating Vertex extension '{args.display_name}' within '{args.project}'")
 
     vex.create_extension(
         args.display_name,

{sunholo-0.76.2 → sunholo-0.76.4}/sunholo/gcs/download_url.py

@@ -3,8 +3,6 @@ from urllib.parse import quote
 from datetime import datetime, timedelta
 
 # needs to be in minimal to check gcp
-import google.auth 
-from google.auth.transport import requests
 from google.auth.exceptions import RefreshError
 
 try:
@@ -14,6 +12,7 @@ except ImportError:
 
 from ..logging import log
 from ..utils.gcp import is_running_on_gcp
+from ..auth.refresh import refresh_credentials, get_default_creds, get_default_email
 from io import BytesIO
 try:
     from PIL import Image
@@ -77,47 +76,22 @@ def get_bytes_from_gcs(gs_uri):
 
 if is_running_on_gcp():
     # Perform a refresh request to get the access token of the current credentials (Else, it's None)
-    gcs_credentials, project_id = google.auth.default()
+    gcs_credentials, project_id = get_default_creds()
     # Prepare global variables for client reuse
     if storage:
         gcs_client = storage.Client()
 
-def refresh_credentials():
-    if not is_running_on_gcp():
-        log.debug("Not running on Google Cloud so no credentials available for GCS.")
-        return False
-    if not gcs_credentials.token or gcs_credentials.expired or not gcs_credentials.valid:
-        try:
-            gcs_credentials.refresh(requests.Request())
-        except Exception as e:
-            log.error(f"Failed to refresh gcs credentials: {e}")
-            return False
-    return True
-
-refresh_credentials()
-
 def get_bucket(bucket_name):
     if bucket_name not in gcs_bucket_cache:
         gcs_bucket_cache[bucket_name] = gcs_client.get_bucket(bucket_name)
     return gcs_bucket_cache[bucket_name]
 
 def sign_gcs_url(bucket_name:str, object_name:str, expiry_secs = 86400):
-    if not refresh_credentials():
-        log.error("Could not refresh the credentials properly.")
-        return None
-    # https://stackoverflow.com/questions/64234214/how-to-generate-a-blob-signed-url-in-google-cloud-run
+    
+    service_account_email = get_default_email()
 
     expires = datetime.now() + timedelta(seconds=expiry_secs)
 
-    service_account_email = getattr(gcs_credentials, 'service_account_email', None)
-    # If you use a service account credential, you can use the embedded email
-    if not service_account_email:
-        service_account_email = os.getenv('GCS_MAIL_USER')
-        if service_account_email is None:
-            log.error("For local testing must set a GCS_MAIL_USER to sign GCS URLs")
-        log.error("Could not create the credentials for signed requests - no credentials.service_account_email or GCS_MAIL_USER with roles/iam.serviceAccountTokenCreator")
-        return None
-
     try:
         bucket = get_bucket(bucket_name)
         blob = bucket.blob(object_name)

{sunholo-0.76.2 → sunholo-0.76.4}/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
@@ -50,7 +51,7 @@ class VertexAIExtensions:
                           operation_params = operation_params)
     ```
     """
-    def __init__(self):
+    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]`")
         
@@ -70,6 +71,7 @@ class VertexAIExtensions:
         self.manifest = {}
         self.created_extensions = []
         self.bucket_name = os.getenv('EXTENSIONS_BUCKET')
+        init_vertex(location=self.location, project_id=project_id)
 
     def list_extensions(self, project_id:str=None):
         project_id = project_id or get_gcp_project()
@@ -113,7 +115,7 @@ class VertexAIExtensions:
             raise ValueError('Please specify env var EXTENSIONS_BUCKET for location to upload openapi spec')
         
 
-        self.openapi_file_gcs = self.upload_to_gcs(filename, bucket_name=self.bucket_name)
+        self.openapi_file_gcs = self.upload_to_gcs(filename)
     
     def load_tool_use_examples(self, filename: str):
         import yaml
@@ -211,7 +213,7 @@ class VertexAIExtensions:
             log.info(f"Setting extension bucket name to {bucket_name}")
             self.bucket_name = bucket_name
 
-        listed_extensions = self.list_extensions()
+        listed_extensions = self.list_extensions(project_id)
         log.info(f"Listing extensions:\n {listed_extensions}")
         for ext in listed_extensions:
             if ext.get('display_name') == display_name:
@@ -247,8 +249,15 @@ class VertexAIExtensions:
 
         return extension.resource_name
 
-    def execute_extension(self, operation_id: str, operation_params: dict, extension_id: str=None, project_id: str=None):
-        init_vertex(location=self.location)
+    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:
             extension_name = self.created_extension.resource_name
@@ -271,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.2 → sunholo-0.76.4}/sunholo/vertex/init.py

@@ -1,5 +1,6 @@
 from ..logging import log
 from ..utils.gcp_project import get_gcp_project
+from ..auth.refresh import get_default_email
 import os
 
 def init_genai():
@@ -19,7 +20,7 @@ def init_genai():
 
     genai.configure(api_key=GOOGLE_API_KEY)
 
-def init_vertex(gcp_config=None, location="eu"):
+def init_vertex(gcp_config=None, location="eu", project_id=None):
     """
     Initializes the Vertex AI environment using the provided Google Cloud Platform configuration.
 
@@ -62,6 +63,10 @@ def init_vertex(gcp_config=None, location="eu"):
         project_id = gcp_config.get('project_id')
         location = gcp_config.get('location') or location
     else:
-        project_id = get_gcp_project()
+        project_id = project_id or get_gcp_project()
+
+    log.info(f"Auth with email: {get_default_email()} in {project_id}")
 
     vertexai.init(project=project_id, location=location)
+
+

{sunholo-0.76.2 → sunholo-0.76.4}/sunholo.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.76.2
+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.2.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.2 → sunholo-0.76.4}/sunholo.egg-info/SOURCES.txt

@@ -30,6 +30,7 @@ sunholo/archive/__init__.py
 sunholo/archive/archive.py
 sunholo/auth/__init__.py
 sunholo/auth/gcloud.py
+sunholo/auth/refresh.py
 sunholo/auth/run.py
 sunholo/azure/__init__.py
 sunholo/azure/event_grid.py

sunholo-0.76.2/sunholo/auth/__init__.py

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