sunholo 0.81.0__py3-none-any.whl → 0.81.2__py3-none-any.whl

sunholo/auth/refresh.py

@@ -4,17 +4,17 @@ import os
 import google.auth 
 from google.auth.transport import requests
 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
@@ -26,7 +26,7 @@ def get_default_email():
             return None
     
     log.info(f"Found default email: {service_account_email=} for {project_id=}")
-    return service_account_email
+    return service_account_email, gcs_credentials
 
 def get_default_creds():
     gcs_credentials = None
@@ -36,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/add_file.py

@@ -22,7 +22,7 @@ except ImportError:
     storage = None
 
 from ..custom_logging import log
-from ..utils import load_config_key, ConfigManager
+from ..utils import ConfigManager
 
 
 def handle_base64_image(base64_data: str, vector_name: str, extension: str):

sunholo/gcs/download_url.py

@@ -1,3 +1,9 @@
+from __future__ import annotations
+from typing import Optional, Tuple, TYPE_CHECKING
+if TYPE_CHECKING:
+    from PIL import Image
+    from google.cloud.storage.bucket import Bucket
+
 import os
 from urllib.parse import quote
 from datetime import datetime, timedelta
@@ -6,25 +12,20 @@ from datetime import datetime, timedelta
 from google.auth.exceptions import RefreshError
 
 try:
-    from google.cloud import storage 
+    from google.cloud import storage
 except ImportError:
     storage = None
 
 from ..custom_logging import log
-from ..utils.gcp import is_running_on_gcp
-from ..auth.refresh import refresh_credentials, get_default_creds, get_default_email
+from ..auth.refresh import refresh_credentials, get_default_email
 from io import BytesIO
 try:
     from PIL import Image
 except ImportError:
     Image = None
 
-gcs_credentials = None
-project_id = None
-gcs_client = None
-gcs_bucket_cache = {}
 
-def get_image_from_gcs(gs_uri: str):
+def get_image_from_gcs(gs_uri: str) -> Image.Image: # type: ignore
     """Converts image bytes from GCS to a PIL Image object."""
     image_bytes = get_bytes_from_gcs(gs_uri)
     if not Image:
@@ -35,7 +36,7 @@ def get_image_from_gcs(gs_uri: str):
     except IOError as e:
         raise ValueError("Unable to open image from bytes:", e)
 
-def get_bytes_from_gcs(gs_uri):
+def get_bytes_from_gcs(gs_uri) -> Optional[bytes]:
     """
     Downloads a file from Google Cloud Storage and returns its bytes.
 
@@ -73,22 +74,39 @@ def get_bytes_from_gcs(gs_uri):
         log.error(f"Error downloading file from GCS: {str(err)}")
         return None
 
+gcs_bucket_cache = {}
+def get_bucket(bucket_name: str) -> Optional[Bucket]:
+    """
+    Gets a Cloud Storage bucket and initialised GCS client
+
+    Args:
+        bucket_name: Name of the bucket 
 
-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 = get_default_creds()
-    # Prepare global variables for client reuse
+    Returns:
+
+    """
     if storage:
         gcs_client = storage.Client()
+    else:
+        raise ImportError("google storage pip required - install via `pip install sunholo[gcp]`")
 
-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):
+def sign_gcs_url(bucket_name:str, object_name:str, expiry_secs:int = 86400) -> Optional[str]:
+    """
+    Creates a signed URL so that users can download a file from Google Cloud Storage without authentication
+
+    Args:
+        bucket_name: Name of the bucket where the object lies
+        object_name: Object within the bucket
+        expiry_secs: How long the link will be valid - default 24hrs
     
-    service_account_email = get_default_email()
+    Returns:
+        str: The signed URL or None if not avialable
+    """
+    service_account_email, gcs_credentials = get_default_email()
 
     expires = datetime.now() + timedelta(seconds=expiry_secs)
 
@@ -105,8 +123,8 @@ def sign_gcs_url(bucket_name:str, object_name:str, expiry_secs = 86400):
         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
@@ -115,7 +133,7 @@ def sign_gcs_url(bucket_name:str, object_name:str, expiry_secs = 86400):
         return None
 
 
-def construct_download_link(source_uri: str) -> tuple[str, str, bool]:
+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://
@@ -132,7 +150,7 @@ def construct_download_link(source_uri: str) -> tuple[str, str, bool]:
     return construct_download_link_simple(bucket_name, object_name)
 
 
-def construct_download_link_simple(bucket_name:str, object_name:str) -> tuple[str, str, bool]:
+def construct_download_link_simple(bucket_name:str, object_name:str) -> Tuple[str, str, bool]:
     """Creates a viewable Cloud Storage web browser link from a gs:// URI.
 
     Args:
@@ -142,12 +160,14 @@ def construct_download_link_simple(bucket_name:str, object_name:str) -> tuple[st
         A URL that directly access the object in the Cloud Storage web browser.
     """
 
-    public_url = f"https://storage.cloud.google.com/{bucket_name}/{quote(object_name)}"
+    if object_name.startswith("gs://"):
+        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)
-    signed = False
-    return public_url, filename, signed
+    return public_url, filename, False
 
-def parse_gs_uri(gs_uri: str) -> tuple[str, str]:
+def parse_gs_uri(gs_uri: str) -> Tuple[str, str]:
     """Parses a gs:// URI into the bucket name and object name.
 
     Args:

{sunholo-0.81.0.dist-info → sunholo-0.81.2.dist-info}/METADATA

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

{sunholo-0.81.0.dist-info → sunholo-0.81.2.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=dg1ntPeZG51R9RUNnIJgdIzlPua2vbG5JVE1Lr1xB74,1838
+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
@@ -78,9 +78,9 @@ sunholo/discovery_engine/get_ai_search_chunks.py,sha256=VPzdYoBP_E6Bko0KpX656QiI
 sunholo/embedder/__init__.py,sha256=sI4N_CqgEVcrMDxXgxKp1FsfsB4FpjoXgPGkl4N_u4I,44
 sunholo/embedder/embed_chunk.py,sha256=MCbTePWjUbIRVDFFhHJ94BvOZvIom62-mTr0PmfQyt0,6951
 sunholo/gcs/__init__.py,sha256=SZvbsMFDko40sIRHTHppA37IijvJTae54vrhooEF5-4,90
-sunholo/gcs/add_file.py,sha256=0GruAKsvVO9qVddwJ1ugr4ldpk_QKXmhKKVio2QwuPE,7124
+sunholo/gcs/add_file.py,sha256=wkBQBfnjUbItnRNGiG9oBr7Jf2QfLpZf2nA5zT435ss,7107
 sunholo/gcs/download_folder.py,sha256=ijJTnS595JqZhBH8iHFErQilMbkuKgL-bnTCMLGuvlA,1614
-sunholo/gcs/download_url.py,sha256=i_LKd3fJQNDqpUzDgSSehWVSzOPA-HPM7o0Tf8nLrM4,5235
+sunholo/gcs/download_url.py,sha256=Al7IbNXiaZ-zV09GHhUE9hx013lghJtE9nW8SJx_sas,5938
 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.0.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.81.0.dist-info/METADATA,sha256=jscapxO2wqyFdzlfqahL6VpisfqyNsETdfmHZwJR7I0,7348
-sunholo-0.81.0.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-sunholo-0.81.0.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.81.0.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.81.0.dist-info/RECORD,,
+sunholo-0.81.2.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.81.2.dist-info/METADATA,sha256=qIVU2f03S9E678dvZfzckg3hw8bkVTGQ-8ytTlesoek,7348
+sunholo-0.81.2.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+sunholo-0.81.2.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.81.2.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.81.2.dist-info/RECORD,,