sunholo 0.81.1__py3-none-any.whl → 0.81.3__py3-none-any.whl

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

@@ -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.dist-info → sunholo-0.81.3.dist-info}/RECORD

@@ -19,7 +19,7 @@ sunholo/archive/__init__.py,sha256=qNHWm5rGPVOlxZBZCpA1wTYPbalizRT7f8X4rs2t290,3
 sunholo/archive/archive.py,sha256=PxVfDtO2_2ZEEbnhXSCbXLdeoHoQVImo4y3Jr2XkCFY,1204
 sunholo/auth/__init__.py,sha256=TeP-OY0XGxYV_8AQcVGoh35bvyWhNUcMRfhuD5l44Sk,91
 sunholo/auth/gcloud.py,sha256=PdbwkuTdRi4RKBmgG9uwsReegqC4VG15_tw5uzmA7Fs,298
-sunholo/auth/refresh.py,sha256=V4w_-Hydgh-jNpwYmM8qOFLSueucAXS5B3fs8BHEMlE,1853
+sunholo/auth/refresh.py,sha256=6AEWX87G3I9BCqrgGJjHGrrWABBXHuaGDKU9ZEcVeXM,2017
 sunholo/auth/run.py,sha256=zZWRIxfG93eZMCE-feiHRQTLMcHz4U6-yseGgZfu1LI,2776
 sunholo/azure/__init__.py,sha256=S1WQ5jndzNgzhSBh9UpX_yw7hRVm3hCzkAWNxUdK4dA,48
 sunholo/azure/auth.py,sha256=Y3fDqFLYwbsIyi5hS5L-3hYnwrLWVL96yPng5Sj5c2c,2236
@@ -80,7 +80,7 @@ sunholo/embedder/embed_chunk.py,sha256=MCbTePWjUbIRVDFFhHJ94BvOZvIom62-mTr0PmfQy
 sunholo/gcs/__init__.py,sha256=SZvbsMFDko40sIRHTHppA37IijvJTae54vrhooEF5-4,90
 sunholo/gcs/add_file.py,sha256=wkBQBfnjUbItnRNGiG9oBr7Jf2QfLpZf2nA5zT435ss,7107
 sunholo/gcs/download_folder.py,sha256=ijJTnS595JqZhBH8iHFErQilMbkuKgL-bnTCMLGuvlA,1614
-sunholo/gcs/download_url.py,sha256=kmeMI2yBGbO6y3QTX2Mdc0dtF_DzJ7MDNypJ1Siq2Z8,5915
+sunholo/gcs/download_url.py,sha256=q1NiJSvEhdNrmU5ZJ-sBCMC_J5CxzrajY8LRgdPOV_M,6130
 sunholo/gcs/metadata.py,sha256=oQLcXi4brsZ74aegWyC1JZmhlaEV270HS5_UWtAYYWE,898
 sunholo/invoke/__init__.py,sha256=bELcqIjzKvaupcIN5OQmDgGx_8jARtH9T6PCe8UgcvE,99
 sunholo/invoke/direct_vac_func.py,sha256=wvrYDZNLoLeO_uQiqRdGUlhwjhLr05dVNBST9TxwwBA,4478
@@ -134,9 +134,9 @@ sunholo/vertex/init.py,sha256=1OQwcPBKZYBTDPdyU7IM4X4OmiXLdsNV30C-fee2scQ,2875
 sunholo/vertex/memory_tools.py,sha256=pgSahVDh7GPEulu3nl-w0jb5lTClb4TCnVxPnMokNZY,7533
 sunholo/vertex/safety.py,sha256=S9PgQT1O_BQAkcqauWncRJaydiP8Q_Jzmu9gxYfy1VA,2482
 sunholo/vertex/type_dict_to_json.py,sha256=uTzL4o9tJRao4u-gJOFcACgWGkBOtqACmb6ihvCErL8,4694
-sunholo-0.81.1.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.81.1.dist-info/METADATA,sha256=FzL5AaYW5MbloglNxQuAVT9DDwtpmA-Ai6R8FPmnE7w,7348
-sunholo-0.81.1.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-sunholo-0.81.1.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.81.1.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.81.1.dist-info/RECORD,,
+sunholo-0.81.3.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.81.3.dist-info/METADATA,sha256=RHSnyk7UJS0lcicygM-UGvIz10GGA-7OyA220QmeFkA,7348
+sunholo-0.81.3.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+sunholo-0.81.3.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.81.3.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.81.3.dist-info/RECORD,,