digitalhub 0.14.0b7__py3-none-any.whl → 0.14.1b0__py3-none-any.whl

digitalhub/stores/client/{dhcore/params_builder.py → params_builder.py}

@@ -4,15 +4,16 @@
 
 from __future__ import annotations
 
-from digitalhub.stores.client._base.enums import ApiCategories, BackendOperations
-from digitalhub.stores.client._base.params_builder import ClientParametersBuilder
+from typing import Any
+
+from digitalhub.stores.client.enums import ApiCategories, BackendOperations
 
 DEFAULT_START_PAGE = 0
 DEFAULT_SIZE = 25
 DEFAULT_SORT = "metadata.updated,DESC"
 
 
-class ClientDHCoreParametersBuilder(ClientParametersBuilder):
+class ClientParametersBuilder:
     """
     Parameter builder for DHCore client API calls.
 
@@ -22,15 +23,6 @@ class ClientDHCoreParametersBuilder(ClientParametersBuilder):
     within projects). Supports query parameter formatting, search filter
     construction for Solr-based searches, cascade deletion options,
     versioning parameters, and entity sharing parameters.
-
-    Methods
-    -------
-    build_parameters(category, operation, **kwargs)
-        Main entry point for parameter building based on API category.
-    build_parameters_base(operation, **kwargs)
-        Builds parameters for base-level API operations.
-    build_parameters_context(operation, **kwargs)
-        Builds parameters for context-level API operations.
     """
 
     def build_parameters(self, category: str, operation: str, **kwargs) -> dict:
@@ -236,6 +228,53 @@ class ClientDHCoreParametersBuilder(ClientParametersBuilder):
 
         return kwargs
 
+    @staticmethod
+    def _ensure_params(**kwargs) -> dict:
+        """
+        Initialize parameter dictionary with query parameters structure.
+
+        Ensures parameter dictionary has 'params' key for HTTP query parameters,
+        guaranteeing consistent structure for all parameter building methods.
+
+        Parameters
+        ----------
+        **kwargs : dict
+            Keyword arguments to format. May be empty or contain various
+            parameters for API operations.
+
+        Returns
+        -------
+        dict
+            Parameters dictionary with guaranteed 'params' key containing
+            empty dict if not already present.
+        """
+        if "params" not in kwargs:
+            kwargs["params"] = {}
+        return kwargs
+
+    @staticmethod
+    def _add_param(key: str, value: Any | None, **kwargs) -> dict:
+        """
+        Add a single query parameter to kwargs.
+
+        Parameters
+        ----------
+        key : str
+            Parameter key.
+        value : Any
+            Parameter value.
+        **kwargs : dict
+            Keyword arguments to format. May be empty or contain various
+            parameters for API operations.
+
+        Returns
+        -------
+        dict
+            Parameters dictionary with added key-value pair in 'params'.
+        """
+        kwargs["params"][key] = value
+        return kwargs
+
     @staticmethod
     def read_page_number(**kwargs) -> int:
         """

digitalhub/stores/client/{dhcore/response_processor.py → response_processor.py}

@@ -9,7 +9,7 @@ from warnings import warn
 
 from requests.exceptions import JSONDecodeError
 
-from digitalhub.stores.client.dhcore.error_parser import ErrorParser
+from digitalhub.stores.client.error_parser import ErrorParser
 from digitalhub.utils.exceptions import BackendError, ClientError
 
 if typing.TYPE_CHECKING:

digitalhub/stores/client/{dhcore/utils.py → utils.py}

@@ -4,12 +4,7 @@
 
 from __future__ import annotations
 
-import typing
-
-from digitalhub.stores.client.api import get_client
-
-if typing.TYPE_CHECKING:
-    pass
+from digitalhub.stores.client.builder import get_client
 
 
 def refresh_token() -> None:
@@ -25,4 +20,4 @@ def refresh_token() -> None:
     ClientError
         If client not properly configured or token refresh fails.
     """
-    get_client(local=False).refresh_token()
+    get_client().refresh_token()

digitalhub/stores/{credentials → configurator}/api.py

@@ -4,19 +4,19 @@
 
 from __future__ import annotations
 
-from digitalhub.stores.credentials.handler import creds_handler
+from digitalhub.stores.configurator.configurator import configurator
 
 
-def set_current_profile(environment: str) -> None:
+def set_current_profile(profile: str) -> None:
     """
     Set the current credentials profile.
 
     Parameters
     ----------
-    environment : str
+    profile : str
         Name of the credentials profile to set.
     """
-    creds_handler.set_current_profile(environment)
+    configurator.set_current_profile(profile)
 
 
 def get_current_profile() -> str:
@@ -28,4 +28,4 @@ def get_current_profile() -> str:
     str
         Name of the current credentials profile.
     """
-    return creds_handler.get_current_profile()
+    return configurator.get_current_profile()

digitalhub/stores/configurator/configurator.py

@@ -0,0 +1,123 @@
+# SPDX-FileCopyrightText: © 2025 DSLab - Fondazione Bruno Kessler
+#
+# SPDX-License-Identifier: Apache-2.0
+
+from __future__ import annotations
+
+from digitalhub.stores.configurator.handler import ConfigurationHandler
+
+
+class Configurator:
+    """
+    Configurator class for configuration and credentials management.
+    """
+
+    def __init__(self):
+        self._handler = ConfigurationHandler()
+        self._reload_from_env = False
+
+    ##############################
+    # Configuration
+    ##############################
+
+    def get_configuration(self) -> dict:
+        """
+        Retrieve the current configuration.
+
+        Returns
+        -------
+        dict
+            Dictionary of configuration variables.
+        """
+        return self._handler.get_configuration()
+
+    ##############################
+    # Credentials
+    ##############################
+
+    def get_credentials(self) -> dict:
+        """
+        Retrieve the current credentials.
+
+        Returns
+        -------
+        dict
+            Dictionary of credentials.
+        """
+        return self._handler.get_credentials()
+
+    def eval_retry(self) -> bool:
+        """
+        Evaluate credentials reload based on retry logic.
+
+        Returns
+        -------
+        bool
+            True if a retry action was performed, otherwise False.
+        """
+        current_creds = self.get_credentials()
+        reread_creds = self._handler.load_credentials()
+
+        # Compare cached and file credentials.
+        # If different, reload in cache.
+        if current_creds != reread_creds:
+            self.reload_credentials()
+            return True
+
+        # Check if we need to reload from env only
+        if not self._reload_from_env:
+            self._handler.reload_credentials_from_env()
+            self._reload_from_env = True
+            return True
+
+        return False
+
+    def reload_credentials(self) -> None:
+        """
+        Reload credentials from environment and file.
+        """
+        self._handler.reload_credentials()
+
+    ###############################
+    # Profile methods
+    ###############################
+
+    def set_current_profile(self, profile: str) -> None:
+        """
+        Set the current profile.
+
+        Parameters
+        ----------
+        profile : str
+            Name of the profile to set.
+        """
+        self._handler.set_current_profile(profile)
+
+    ################################
+    # Other methods
+    ################################
+
+    def write_file(self, variables: dict) -> None:
+        """
+        Write the current configuration and credentials to file.
+
+        Parameters
+        ----------
+        variables : dict
+            Dictionary of variables to write.
+        """
+        self._handler.write_file(variables)
+
+    def get_config_creds(self) -> dict:
+        """
+        Get merged configuration and credentials.
+
+        Returns
+        -------
+        dict
+            Merged configuration and credentials dictionary.
+        """
+        return {**self.get_configuration(), **self.get_credentials()}
+
+
+configurator = Configurator()

digitalhub/stores/{credentials → configurator}/enums.py

@@ -32,26 +32,20 @@ class SetCreds(Enum):
     DH_PROFILE = "DH_NAME"
 
 
-class CredsEnvVar(Enum):
+class ConfigurationVars(Enum):
     """
-    Supported credential environment variables.
+    List of supported configuration variables.
     """
 
     # S3
     S3_ENDPOINT_URL = "AWS_ENDPOINT_URL"
-    S3_ACCESS_KEY_ID = "AWS_ACCESS_KEY_ID"
-    S3_SECRET_ACCESS_KEY = "AWS_SECRET_ACCESS_KEY"
-    S3_SESSION_TOKEN = "AWS_SESSION_TOKEN"
     S3_REGION = "AWS_REGION"
     S3_SIGNATURE_VERSION = "S3_SIGNATURE_VERSION"
-    S3_CREDENTIALS_EXPIRATION = "AWS_CREDENTIALS_EXPIRATION"
     S3_PATH_STYLE = "S3_PATH_STYLE"
 
     # SQL
     DB_HOST = "DB_HOST"
     DB_PORT = "DB_PORT"
-    DB_USERNAME = "DB_USERNAME"
-    DB_PASSWORD = "DB_PASSWORD"
     DB_DATABASE = "DB_DATABASE"
     DB_PLATFORM = "DB_PLATFORM"
     DB_PG_SCHEMA = "DB_SCHEMA"
@@ -59,10 +53,31 @@ class CredsEnvVar(Enum):
     # DHCORE
     DHCORE_ENDPOINT = "DHCORE_ENDPOINT"
     DHCORE_ISSUER = "DHCORE_ISSUER"
+    DHCORE_WORKFLOW_IMAGE = "DHCORE_WORKFLOW_IMAGE"
+    DHCORE_CLIENT_ID = "DHCORE_CLIENT_ID"
+
+    # OAUTH2
+    OAUTH2_TOKEN_ENDPOINT = "OAUTH2_TOKEN_ENDPOINT"
+
+
+class CredentialsVars(Enum):
+    """
+    List of supported credential variables.
+    """
+
+    # S3
+    S3_ACCESS_KEY_ID = "AWS_ACCESS_KEY_ID"
+    S3_SECRET_ACCESS_KEY = "AWS_SECRET_ACCESS_KEY"
+    S3_SESSION_TOKEN = "AWS_SESSION_TOKEN"
+    S3_CREDENTIALS_EXPIRATION = "AWS_CREDENTIALS_EXPIRATION"
+
+    # SQL
+    DB_USERNAME = "DB_USERNAME"
+    DB_PASSWORD = "DB_PASSWORD"
+
+    # DHCORE
     DHCORE_USER = "DHCORE_USER"
     DHCORE_PASSWORD = "DHCORE_PASSWORD"
-    DHCORE_CLIENT_ID = "DHCORE_CLIENT_ID"
     DHCORE_ACCESS_TOKEN = "DHCORE_ACCESS_TOKEN"
     DHCORE_REFRESH_TOKEN = "DHCORE_REFRESH_TOKEN"
     DHCORE_PERSONAL_ACCESS_TOKEN = "DHCORE_PERSONAL_ACCESS_TOKEN"
-    DHCORE_WORKFLOW_IMAGE = "DHCORE_WORKFLOW_IMAGE"

digitalhub/stores/configurator/handler.py

@@ -0,0 +1,213 @@
+# SPDX-FileCopyrightText: © 2025 DSLab - Fondazione Bruno Kessler
+#
+# SPDX-License-Identifier: Apache-2.0
+
+from __future__ import annotations
+
+import os
+from typing import Any
+
+from digitalhub.stores.configurator.enums import ConfigurationVars, CredentialsVars, SetCreds
+from digitalhub.stores.configurator.ini_module import (
+    load_file,
+    load_key,
+    load_profile,
+    set_current_profile,
+    write_file,
+)
+from digitalhub.utils.generic_utils import list_enum
+
+
+class ConfigurationHandler:
+    """
+    Handler for loading and writing configuration variables.
+    """
+
+    def __init__(self):
+        self._current_profile = self._read_current_profile()
+        self._configuration: dict[str, Any] = self.load_configuration()
+        self._credentials: dict[str, Any] = self.load_credentials()
+
+    @staticmethod
+    def _read_env(variables: list) -> dict:
+        """
+        Read configuration variables from the .dhcore file.
+
+        Parameters
+        ----------
+        variables : list
+            List of environment variable names to read.
+
+        Returns
+        -------
+        dict
+            Dictionary of environment variables.
+        """
+        return {var: os.getenv(var) for var in variables}
+
+    @staticmethod
+    def _read_file(variables: list, profile: str) -> dict:
+        """
+        Read configuration variables from the .dhcore file.
+
+        Parameters
+        ----------
+        variables : list
+            List of environment variable names to read.
+        profile : str
+            Profile name to read from.
+
+        Returns
+        -------
+        dict
+            Dictionary of configuration variables.
+        """
+        file = load_file()
+        return {var: load_key(file, profile, var) for var in variables}
+
+    ##############################
+    # Configuration methods
+    ##############################
+
+    def load_configuration(self) -> dict[str, Any]:
+        """
+        Load configuration with env > file precedence.
+
+        Returns
+        -------
+        dict
+            Merged configuration dictionary.
+        """
+        profile = self.get_current_profile()
+        variables = list_enum(ConfigurationVars)
+        env_config = self._read_env(variables)
+        file_config = self._read_file(variables, profile)
+        return {**file_config, **{k: v for k, v in env_config.items() if v is not None}}
+
+    def reload_configuration(self) -> None:
+        """
+        Reload configuration from environment and file.
+        """
+        self._configuration = self.load_configuration()
+
+    def get_configuration(self) -> dict[str, Any]:
+        """
+        Get the merged configuration dictionary.
+
+        Returns
+        -------
+        dict[str, Any]
+            The configuration dictionary.
+        """
+        return self._configuration
+
+    ##############################
+    # Credentials methods
+    ##############################
+
+    def load_credentials(self) -> dict[str, Any]:
+        """
+        Load credentials with file > env precedence.
+
+        Parameters
+        ----------
+        profile : str
+            Profile name to load credentials from.
+
+        Returns
+        -------
+        dict
+            Merged credentials dictionary.
+        """
+        variables = list_enum(CredentialsVars)
+        env_config = self._read_env(variables)
+        file_config = self._read_file(variables, self.get_current_profile())
+        return {**env_config, **{k: v for k, v in file_config.items() if v is not None}}
+
+    def reload_credentials(self) -> None:
+        """
+        Reload credentials from environment and file.
+        """
+        self._credentials = self.load_credentials()
+
+    def reload_credentials_from_env(self) -> None:
+        """
+        Reload credentials from environment where env > file precedence.
+        Its a partial reload only from env variables used as fallback.
+        """
+        variables = list_enum(CredentialsVars)
+        env_config = self._read_env(variables)
+        file_config = self._read_file(variables, self.get_current_profile())
+        self._credentials = {**file_config, **{k: v for k, v in env_config.items() if v is not None}}
+
+    def get_credentials(self) -> dict[str, Any]:
+        """
+        Get the merged credentials dictionary.
+
+        Returns
+        -------
+        dict[str, Any]
+            The credentials dictionary.
+        """
+        return self._credentials
+
+    ##############################
+    # Profile Methods
+    ##############################
+
+    @staticmethod
+    def _read_current_profile() -> str:
+        """
+        Read the current credentials profile name.
+
+        Returns
+        -------
+        str
+            Name of the credentials profile.
+        """
+        profile = os.getenv(SetCreds.DH_PROFILE.value)
+        if profile is not None:
+            return profile
+        file = load_file()
+        profile = load_profile(file)
+        if profile is not None:
+            return profile
+        return SetCreds.DEFAULT.value
+
+    def set_current_profile(self, profile: str) -> None:
+        """
+        Set the current credentials profile name.
+
+        Parameters
+        ----------
+        profile : str
+            Name of the credentials profile to set.
+        """
+        self._current_profile = profile
+        set_current_profile(profile)
+        self.reload_configuration()
+        self.reload_credentials()
+
+    def get_current_profile(self) -> str:
+        """
+        Get the current credentials profile name.
+
+        Returns
+        -------
+        str
+            Name of the current credentials profile.
+        """
+        return self._current_profile
+
+    def write_file(self, variables: dict) -> None:
+        """
+        Write variables to the .dhcore file for the current profile.
+
+        Parameters
+        ----------
+        infos : dict
+            Information to write.
+        profile : str
+            Profile name to write to.
+        """
+        write_file(variables, self._current_profile)

digitalhub/stores/{credentials → configurator}/ini_module.py

@@ -117,6 +117,37 @@ def write_config(creds: dict, environment: str) -> None:
         raise ClientError(f"Failed to write env file: {e}")
 
 
+def write_file(variables: dict, profile: str) -> None:
+    """
+    Write variables to the .dhcore.ini file for the specified profile.
+    Overwrites any existing values for that profile.
+
+    Parameters
+    ----------
+    variables : dict
+        Dictionary of variables to write.
+    profile : str
+        Name of the credentials profile to write to.
+    """
+    try:
+        cfg = load_file()
+
+        sections = cfg.sections()
+        if profile not in sections:
+            cfg.add_section(profile)
+
+        cfg["DEFAULT"]["current_environment"] = profile
+        for k, v in variables.items():
+            cfg[profile][k] = str(v)
+
+        ENV_FILE.touch(exist_ok=True)
+        with open(ENV_FILE, "w") as inifile:
+            cfg.write(inifile)
+
+    except Exception as e:
+        raise ClientError(f"Failed to write env file: {e}")
+
+
 def set_current_profile(environment: str) -> None:
     """
     Set the current credentials profile in the .dhcore.ini file.

digitalhub/stores/data/_base/store.py

@@ -16,7 +16,6 @@ from digitalhub.utils.types import SourcesOrListOfSources
 from digitalhub.utils.uri_utils import has_local_scheme
 
 if typing.TYPE_CHECKING:
-    from digitalhub.stores.credentials.configurator import Configurator
     from digitalhub.stores.readers.data._base.reader import DataframeReader
 
 
@@ -25,9 +24,6 @@ class Store:
     Store abstract class.
     """
 
-    def __init__(self, configurator: Configurator | None = None) -> None:
-        self._configurator = configurator
-
     ##############################
     # I/O methods
     ##############################

digitalhub/stores/data/api.py

@@ -7,7 +7,7 @@ from __future__ import annotations
 import typing
 
 from digitalhub.context.api import get_context
-from digitalhub.stores.credentials.handler import creds_handler
+from digitalhub.stores.configurator.configurator import configurator
 from digitalhub.stores.data.builder import store_builder
 from digitalhub.stores.data.enums import StoreEnv
 
@@ -41,9 +41,7 @@ def get_default_store(project: str) -> str:
     if store is not None:
         return store
 
-    store = creds_handler.load_from_env([var]).get(var)
-    if store is None:
-        store = creds_handler.load_from_file([var]).get(var)
+    store = configurator.get_configuration().get(var)
 
     if store is None or store == "":
         raise ValueError(