sunholo 0.81.1__tar.gz → 0.81.3__tar.gz

{sunholo-0.81.1 → sunholo-0.81.3}/PKG-INFO

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

{sunholo-0.81.1 → sunholo-0.81.3}/setup.py

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

{sunholo-0.81.1 → sunholo-0.81.3}/sunholo/auth/refresh.py

@@ -7,12 +7,14 @@ from ..utils.gcp import is_running_on_gcp
 from ..custom_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()
+    gcs_credentials, project_id = refresh_credentials()
+
+    if gcs_credentials is None:
+        log.error("Could not refresh the credentials properly.")
+        return None
 
     service_account_email = getattr(gcs_credentials, 'service_account_email', None)
     # If you use a service account credential, you can use the embedded email
@@ -34,20 +36,24 @@ def get_default_creds():
     return gcs_credentials, project_id
 
 def refresh_credentials():
+    """
+    Need to refresh to get a valid email/token for signing URLs from a default service account
+    """
     if not is_running_on_gcp():
         log.debug("Not running on Google Cloud so no credentials available for GCS.")
-        return False
+        return None, None
     
     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())
+            r = requests.Request()
+            gcs_credentials.refresh(r)
 
-            return True
+            return gcs_credentials, project_id
         
         except Exception as e:
             log.error(f"Failed to refresh gcs credentials: {e}")
 
-            return False
+            return None, None
     

{sunholo-0.81.1 → sunholo-0.81.3}/sunholo/gcs/download_url.py

@@ -110,6 +110,9 @@ def sign_gcs_url(bucket_name:str, object_name:str, expiry_secs:int = 86400) -> O
 
     expires = datetime.now() + timedelta(seconds=expiry_secs)
 
+    if object_name.startswith("gs://"):
+        object_name = object_name.replace(f"gs://{bucket_name}/","")
+
     try:
         bucket = get_bucket(bucket_name)
         blob = bucket.blob(object_name)
@@ -123,8 +126,8 @@ def sign_gcs_url(bucket_name:str, object_name:str, expiry_secs:int = 86400) -> O
         return url
     except RefreshError:
         log.info("Refreshing gcs_credentials due to token expiration.")
-        refreshed = refresh_credentials()
-        if refreshed:
+        credentials, token = refresh_credentials()
+        if credentials:
             return sign_gcs_url(bucket_name, object_name, expiry_secs)
         log.error("Failed to refresh gcs credentials")
         return None
@@ -136,9 +139,10 @@ def sign_gcs_url(bucket_name:str, object_name:str, expiry_secs:int = 86400) -> O
 def construct_download_link(source_uri: str) -> Tuple[str, str, bool]:
     """Creates a viewable Cloud Storage web browser link from a gs:// URI.""" 
     if not source_uri.startswith("gs://"):
-        return source_uri, source_uri, False  # Return the URI as is if it doesn't start with gs://
-
+        return source_uri, source_uri, False  # Return the URI if it doesn't start with gs://
+    
     bucket_name, object_name = parse_gs_uri(source_uri)
+    log.info(f"Source URL: {source_uri} parsed to {bucket_name=} - {object_name=}")
 
     signed_url = sign_gcs_url(bucket_name, object_name)
     if signed_url:
@@ -161,9 +165,9 @@ def construct_download_link_simple(bucket_name:str, object_name:str) -> Tuple[st
     """
 
     if object_name.startswith("gs://"):
-        object_name = object_name.replace("gs://", "https://storage.cloud.google.com")
-
-    public_url = f"https://storage.cloud.google.com/{bucket_name}/{quote(object_name)}"
+        public_url = object_name.replace("gs://", "https://storage.cloud.google.com")
+    else:
+        public_url = f"https://storage.cloud.google.com/{bucket_name}/{quote(object_name)}"
     filename = os.path.basename(object_name)
     return public_url, filename, False
 

{sunholo-0.81.1 → sunholo-0.81.3}/sunholo.egg-info/PKG-INFO

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