digitalhub 0.11.0b1__tar.gz → 0.11.0b2__tar.gz

{digitalhub-0.11.0b1 → digitalhub-0.11.0b2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: digitalhub
-Version: 0.11.0b1
+Version: 0.11.0b2
 Summary: Python SDK for Digitalhub
 Project-URL: Homepage, https://github.com/scc-digitalhub/digitalhub-sdk
 Author-email: Fondazione Bruno Kessler <dslab@fbk.eu>, Matteo Martini <mmartini@fbk.eu>

{digitalhub-0.11.0b1 → digitalhub-0.11.0b2}/digitalhub/stores/data/s3/configurator.py

@@ -25,9 +25,6 @@ class S3StoreConfigurator:
         S3StoreEnv.SESSION_TOKEN,
     ]
 
-    def __init__(self, config: dict) -> None:
-        ...
-
     ##############################
     # Configuration methods
     ##############################

{digitalhub-0.11.0b1 → digitalhub-0.11.0b2}/digitalhub/stores/data/s3/utils.py

@@ -1,14 +1,13 @@
 from __future__ import annotations
 
-import os
 from pathlib import Path
 from urllib.parse import urlparse
 
 from boto3 import client as boto3_client
 
-from digitalhub.stores.data.s3.enums import S3StoreEnv
-
-DEFAULT_BUCKET = "datalake"
+from digitalhub.stores.configurator.enums import CredsOrigin
+from digitalhub.stores.data.s3.configurator import S3StoreConfigurator
+from digitalhub.utils.exceptions import StoreError
 
 
 def get_bucket_name(path: str) -> str:
@@ -63,17 +62,13 @@ def get_s3_source(bucket: str, key: str, filename: Path) -> None:
     -------
     None
     """
-    s3 = boto3_client("s3", endpoint_url=os.getenv(S3StoreEnv.ENDPOINT_URL.value))
-    s3.download_file(bucket, key, filename)
-
-
-def get_s3_bucket_from_env() -> str | None:
-    """
-    Function to get S3 bucket name.
-
-    Returns
-    -------
-    str
-        The S3 bucket name.
-    """
-    return os.getenv(S3StoreEnv.BUCKET_NAME.value, DEFAULT_BUCKET)
+    # Try to get client from environment variables
+    try:
+        cfg = S3StoreConfigurator().get_boto3_client_config(CredsOrigin.ENV.value)
+        s3 = boto3_client("s3", **cfg)
+        s3.download_file(bucket, key, filename)
+
+    # Fallback to file
+    except StoreError:
+        cfg = S3StoreConfigurator().get_boto3_client_config(CredsOrigin.FILE.value)
+        s3.download_file(bucket, key, filename)

{digitalhub-0.11.0b1 → digitalhub-0.11.0b2}/digitalhub/stores/data/sql/configurator.py

@@ -20,9 +20,6 @@ class SqlStoreConfigurator:
         SqlStoreEnv.DATABASE,
     ]
 
-    def __init__(self) -> None:
-        self.config = self.configure()
-
     ##############################
     # Configuration methods
     ##############################

{digitalhub-0.11.0b1 → digitalhub-0.11.0b2}/digitalhub/stores/data/utils.py

@@ -20,7 +20,7 @@ def get_default_store(project: str) -> str:
         Default store URI.
     """
     context = get_context(project)
-    store = context.config.get("default_files_store")
+    store = context.config.get(StoreEnv.DEFAULT_FILES_STORE.value.lower())
     if store is not None:
         return store
     store = configurator.load_var(StoreEnv.DEFAULT_FILES_STORE.value)

{digitalhub-0.11.0b1 → digitalhub-0.11.0b2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "digitalhub"
-version = "0.11.0b1"
+version = "0.11.0b2"
 description = "Python SDK for Digitalhub"
 readme = "README.md"
 authors = [
@@ -68,7 +68,7 @@ line-length = 120
 convention = "numpy"
 
 [tool.bumpver]
-current_version = "0.11.0b1"
+current_version = "0.11.0b2"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = false

digitalhub-0.11.0b1/digitalhub/stores/data/s3/models.py

@@ -1,21 +0,0 @@
-from __future__ import annotations
-
-from pydantic import BaseModel
-
-
-class S3StoreConfig(BaseModel):
-    """
-    S3 store configuration class.
-    """
-
-    endpoint_url: str
-    """S3 endpoint URL."""
-
-    aws_access_key_id: str
-    """AWS access key ID."""
-
-    aws_secret_access_key: str
-    """AWS secret access key."""
-
-    bucket_name: str
-    """S3 bucket name."""

digitalhub-0.11.0b1/digitalhub/stores/data/sql/models.py

@@ -1,24 +0,0 @@
-from __future__ import annotations
-
-from pydantic import BaseModel
-
-
-class SqlStoreConfig(BaseModel):
-    """
-    SQL store configuration class.
-    """
-
-    host: str
-    """SQL host."""
-
-    port: int
-    """SQL port."""
-
-    user: str
-    """SQL user."""
-
-    password: str
-    """SQL password."""
-
-    database: str
-    """SQL database name."""