digitalhub 0.11.0b1__tar.gz → 0.11.0b3__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: digitalhub
-Version: 0.11.0b1
+Version: 0.11.0b3
 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.0b3}/digitalhub/stores/client/dhcore/configurator.py

@@ -22,8 +22,8 @@ AUTH_KEY = "_auth"
 
 # API levels that are supported
 MAX_API_LEVEL = 20
-MIN_API_LEVEL = 10
-LIB_VERSION = 10
+MIN_API_LEVEL = 11
+LIB_VERSION = 11
 
 
 class ClientDHCoreConfigurator:
@@ -159,10 +159,10 @@ class ClientDHCoreConfigurator:
         None
         """
         # Give priority to access token
-        access_token = configurator.load_var(DhcoreEnvVar.ACCESS_TOKEN.value)
+        access_token = self._load_dhcore_oauth_vars(DhcoreEnvVar.ACCESS_TOKEN.value)
         if access_token is not None:
             configurator.set_credential(AUTH_KEY, AuthType.OAUTH2.value)
-            configurator.set_credential(DhcoreEnvVar.ACCESS_TOKEN.value, access_token)
+            configurator.set_credential(DhcoreEnvVar.ACCESS_TOKEN.value.removeprefix("DHCORE_"), access_token)
 
         # Fallback to basic
         else:
@@ -223,7 +223,7 @@ class ClientDHCoreConfigurator:
         elif self.oauth2_auth():
             if "headers" not in kwargs:
                 kwargs["headers"] = {}
-            access_token = creds[DhcoreEnvVar.ACCESS_TOKEN.value]
+            access_token = creds[DhcoreEnvVar.ACCESS_TOKEN.value.removeprefix("DHCORE_")]
             kwargs["headers"]["Authorization"] = f"Bearer {access_token}"
         return kwargs
 
@@ -246,7 +246,7 @@ class ClientDHCoreConfigurator:
 
         # Otherwise try token from file
         if response.status_code in (400, 401, 403):
-            refresh_token = configurator.load_from_file(DhcoreEnvVar.REFRESH_TOKEN.value)
+            refresh_token = configurator.load_from_file(DhcoreEnvVar.REFRESH_TOKEN.value.removeprefix("DHCORE_"))
             response = self._call_refresh_token_endpoint(url, refresh_token)
 
         response.raise_for_status()
@@ -267,12 +267,42 @@ class ClientDHCoreConfigurator:
         -------
         None
         """
-        keys = list_enum(DhcoreEnvVar) + list_enum(S3StoreEnv) + list_enum(SqlStoreEnv)
+        keys = [
+            *self._remove_prefix_dhcore(list_enum(DhcoreEnvVar)),
+            *list_enum(S3StoreEnv),
+            *list_enum(SqlStoreEnv),
+            ]
         for key in keys:
-            if (value := response.get(key.lower().removeprefix("dhcore_"))) is not None:
+            if (value := response.get(key.lower())) is not None:
                 configurator.set_credential(key, value)
         configurator.write_env(keys)
 
+    def _remove_prefix_dhcore(self, keys: list[str]) -> list[str]:
+        """
+        Remove prefix from selected keys. (Compatibility with CLI)
+
+        Parameters
+        ----------
+        keys : list[str]
+            List of keys.
+
+        Returns
+        -------
+        list[str]
+            List of keys without prefix.
+        """
+        new_list = []
+        for key in keys:
+            if key in (DhcoreEnvVar.REFRESH_TOKEN.value,
+                       DhcoreEnvVar.ACCESS_TOKEN.value,
+                       DhcoreEnvVar.ISSUER.value,
+                       #DhcoreEnvVar.CLIENT_ID.value,
+                       ):
+                new_list.append(key.removeprefix("DHCORE_"))
+            else:
+                new_list.append(key)
+        return new_list
+
     def _get_refresh_endpoint(self) -> str:
         """
         Get the refresh endpoint.
@@ -283,11 +313,11 @@ class ClientDHCoreConfigurator:
             Refresh endpoint.
         """
         # Get issuer endpoint
-        endpoint_issuer = configurator.load_var(DhcoreEnvVar.ISSUER.value)
+        endpoint_issuer = self._load_dhcore_oauth_vars(DhcoreEnvVar.ISSUER.value)
         if endpoint_issuer is None:
             raise ClientError("Issuer endpoint not set.")
         endpoint_issuer = self._sanitize_endpoint(endpoint_issuer)
-        configurator.set_credential(DhcoreEnvVar.ISSUER.value, endpoint_issuer)
+        configurator.set_credential(DhcoreEnvVar.ISSUER.value.removeprefix("DHCORE_"), endpoint_issuer)
 
         # Standard issuer endpoint path
         url = endpoint_issuer + "/.well-known/openid-configuration"
@@ -315,6 +345,7 @@ class ClientDHCoreConfigurator:
         """
         # Get client id
         client_id = configurator.load_var(DhcoreEnvVar.CLIENT_ID.value)
+        #client_id = self._load_dhcore_oauth_vars(DhcoreEnvVar.CLIENT_ID.value)
         if client_id is None:
             raise ClientError("Client id not set.")
 
@@ -327,3 +358,22 @@ class ClientDHCoreConfigurator:
         }
         headers = {"Content-Type": "application/x-www-form-urlencoded"}
         return request("POST", url, data=payload, headers=headers, timeout=60)
+
+    def _load_dhcore_oauth_vars(self, oauth_var: str) -> str | None:
+        """
+        Load DHCore oauth variables.
+
+        Parameters
+        ----------
+        oauth_var : str
+            The oauth variable to load.
+
+        Returns
+        -------
+        str
+            The oauth variable.
+        """
+        read_var = configurator.load_from_env(oauth_var)
+        if read_var is None:
+            read_var = configurator.load_from_file(oauth_var.removeprefix("DHCORE_"))
+        return read_var

{digitalhub-0.11.0b1 → digitalhub-0.11.0b3}/digitalhub/stores/configurator/ini_module.py

@@ -112,7 +112,7 @@ def set_current_env(environment: str) -> None:
         raise ClientError(f"Failed to write env file: {e}")
 
 
-def read_env_from_file() -> str:
+def read_env_from_file() -> str | None:
     """
     Read the current credentials set from the .dhcore.ini file.
 
@@ -124,5 +124,5 @@ def read_env_from_file() -> str:
     try:
         cfg = load_file()
         return cfg["DEFAULT"]["current_environment"]
-    except Exception as e:
-        raise ClientError(f"Failed to read env file: {e}")
+    except Exception:
+        return None

{digitalhub-0.11.0b1 → digitalhub-0.11.0b3}/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.0b3}/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.0b3}/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.0b3}/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.0b3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "digitalhub"
-version = "0.11.0b1"
+version = "0.11.0b3"
 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.0b3"
 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."""