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

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/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/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/vertex/extensions_class.py

@@ -50,7 +50,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 +70,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 +114,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 +212,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:
@@ -248,7 +249,7 @@ 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)
+        init_vertex(location=self.location, project_id=project_id)
 
         if not extension_id:
             extension_name = self.created_extension.resource_name

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.dist-info → sunholo-0.76.3.dist-info}/METADATA

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

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

@@ -19,6 +19,7 @@ sunholo/archive/__init__.py,sha256=qNHWm5rGPVOlxZBZCpA1wTYPbalizRT7f8X4rs2t290,3
 sunholo/archive/archive.py,sha256=C-UhG5x-XtZ8VheQp92IYJqgD0V3NFQjniqlit94t18,1197
 sunholo/auth/__init__.py,sha256=Y4Wpd6m0d3R7U7Ser51drO0Eg7VrfSS2VphZxRgtih8,70
 sunholo/auth/gcloud.py,sha256=PdbwkuTdRi4RKBmgG9uwsReegqC4VG15_tw5uzmA7Fs,298
+sunholo/auth/refresh.py,sha256=uOdT7oQRVl0YsUP__NXj6PdUdLyXFSv2ylwF283esuw,1831
 sunholo/auth/run.py,sha256=SG53ToQJ8hyjdN4634osfvDEUv5gJU6dlHe4nGwMMYU,2612
 sunholo/azure/__init__.py,sha256=S1WQ5jndzNgzhSBh9UpX_yw7hRVm3hCzkAWNxUdK4dA,48
 sunholo/azure/event_grid.py,sha256=Gky7D5a-xxMzbcst_wOFfcI8AH5qOzWbKbt5iqOTr6U,2606
@@ -48,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=SJkYBvzf2zyFLdYD8iBJhsrt-iSmw4pUtSflAG053Iw,2065
+sunholo/cli/vertex.py,sha256=yN1ezeiweV1UIBZYvDYgtyMS0dXH374rYMxVVHid9UY,2101
 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
@@ -74,7 +75,7 @@ sunholo/embedder/__init__.py,sha256=sI4N_CqgEVcrMDxXgxKp1FsfsB4FpjoXgPGkl4N_u4I,
 sunholo/embedder/embed_chunk.py,sha256=d_dIzeNF630Q0Ar-u1hxos60s0tLIImJccAvuo_LTIw,6814
 sunholo/gcs/__init__.py,sha256=SZvbsMFDko40sIRHTHppA37IijvJTae54vrhooEF5-4,90
 sunholo/gcs/add_file.py,sha256=vWRjxuHBQkrPNrr9tRSFGT0N_nVIw120mqDEHiaHwuQ,7115
-sunholo/gcs/download_url.py,sha256=Kg9EdPnc---YSUTAZEdzJeITjDtQSLMYwb4uiU9LhIQ,6440
+sunholo/gcs/download_url.py,sha256=iCIPESi2viQ-TcCINpbJXxUt7XJFFpF0KiVgSA6zFis,5228
 sunholo/gcs/metadata.py,sha256=C9sMPsHsq1ETetdQCqB3EBs3Kws8b8QHS9L7ei_v5aw,891
 sunholo/invoke/__init__.py,sha256=Dxivd9cU92X4v2JAZet4f7L2RJ5l_30rt9t2NiD-iLA,55
 sunholo/invoke/invoke_vac_utils.py,sha256=0JkCZDBEkRImzuB-nf70dF75t0WKtgA9G4TdaQJUB08,5240
@@ -119,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=14DyrCvoLanICL11QR0Lzf7lwFcIRQRLNuF6pw9E0l0,17715
-sunholo/vertex/init.py,sha256=-w7b9GKsyJnAJpYHYz6_zBUtmeJeLXlEkgOfwoe4DEI,2715
+sunholo/vertex/extensions_class.py,sha256=cVpr0AbbBQV9WWZ9_X7S52aXclXNxvHywHDoBjDTxl8,17802
+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.2.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.76.2.dist-info/METADATA,sha256=PBcc_hvS8Nce_I-MY_lfpMo6VxhE5PIZ42vsv21COiM,7136
-sunholo-0.76.2.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
-sunholo-0.76.2.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.76.2.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.76.2.dist-info/RECORD,,
+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,,