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

digitalhub/stores/data/builder.py

@@ -8,38 +8,15 @@ import typing
 
 from digitalhub.stores.data.local.store import LocalStore
 from digitalhub.stores.data.remote.store import RemoteStore
-from digitalhub.stores.data.s3.configurator import S3StoreConfigurator
 from digitalhub.stores.data.s3.store import S3Store
-from digitalhub.stores.data.sql.configurator import SqlStoreConfigurator
 from digitalhub.stores.data.sql.store import SqlStore
 from digitalhub.utils.uri_utils import SchemeCategory, map_uri_scheme
 
 if typing.TYPE_CHECKING:
-    from digitalhub.stores.credentials.configurator import Configurator
     from digitalhub.stores.data._base.store import Store
     from digitalhub.utils.exceptions import StoreError
 
 
-class StoreInfo:
-    """
-    Container for store class and configurator information.
-
-    Holds store class references and their associated configurators
-    for registration and instantiation in the store builder system.
-
-    Attributes
-    ----------
-    _store : Store
-        The store class to be instantiated.
-    _configurator : Configurator or None
-        The configurator class for store configuration, if required.
-    """
-
-    def __init__(self, store: Store, configurator: Configurator | None = None) -> None:
-        self._store = store
-        self._configurator = configurator
-
-
 class StoreBuilder:
     """
     Store factory and registry for managing data store instances.
@@ -58,14 +35,13 @@ class StoreBuilder:
     """
 
     def __init__(self) -> None:
-        self._builders: dict[str, StoreInfo] = {}
+        self._builders: dict[str, Store] = {}
         self._instances: dict[str, dict[str, Store]] = {}
 
     def register(
         self,
         store_type: str,
         store: Store,
-        configurator: Configurator | None = None,
     ) -> None:
         """
         Register a store type with its class and optional configurator.
@@ -89,7 +65,7 @@ class StoreBuilder:
             If the store type is already registered in the builder.
         """
         if store_type not in self._builders:
-            self._builders[store_type] = StoreInfo(store, configurator)
+            self._builders[store_type] = store
         else:
             raise StoreError(f"Store type {store_type} already registered")
 
@@ -122,21 +98,13 @@ class StoreBuilder:
 
         # Build the store instance if not already present
         if store_type not in self._instances:
-            store_info = self._builders[store_type]
-            store_cls = store_info._store
-            cfgrt_cls = store_info._configurator
-
-            if cfgrt_cls is None:
-                store = store_cls()
-            else:
-                store = store_cls(cfgrt_cls())
-            self._instances[store_type] = store
+            self._instances[store_type] = self._builders[store_type]()
 
         return self._instances[store_type]
 
 
 store_builder = StoreBuilder()
-store_builder.register(SchemeCategory.S3.value, S3Store, S3StoreConfigurator)
-store_builder.register(SchemeCategory.SQL.value, SqlStore, SqlStoreConfigurator)
+store_builder.register(SchemeCategory.S3.value, S3Store)
+store_builder.register(SchemeCategory.SQL.value, SqlStore)
 store_builder.register(SchemeCategory.LOCAL.value, LocalStore)
 store_builder.register(SchemeCategory.REMOTE.value, RemoteStore)

digitalhub/stores/data/s3/configurator.py

@@ -4,75 +4,28 @@
 
 from __future__ import annotations
 
-from datetime import datetime, timedelta, timezone
-
 from botocore.config import Config
 
-from digitalhub.stores.client.dhcore.utils import refresh_token
-from digitalhub.stores.credentials.configurator import Configurator
-from digitalhub.stores.credentials.enums import CredsEnvVar
+from digitalhub.stores.configurator.configurator import configurator
+from digitalhub.stores.configurator.enums import ConfigurationVars, CredentialsVars
 
 
-class S3StoreConfigurator(Configurator):
+class S3StoreConfigurator:
     """
-    Configure the store by getting the credentials from user
-    provided config or from environment.
+    Configurator class for S3 store configuration and credentials management.
     """
 
-    keys = [
-        CredsEnvVar.S3_ENDPOINT_URL.value,
-        CredsEnvVar.S3_ACCESS_KEY_ID.value,
-        CredsEnvVar.S3_SECRET_ACCESS_KEY.value,
-        CredsEnvVar.S3_REGION.value,
-        CredsEnvVar.S3_SIGNATURE_VERSION.value,
-        CredsEnvVar.S3_SESSION_TOKEN.value,
-        CredsEnvVar.S3_PATH_STYLE.value,
-        CredsEnvVar.S3_CREDENTIALS_EXPIRATION.value,
-    ]
-    required_keys = [
-        CredsEnvVar.S3_ENDPOINT_URL.value,
-        CredsEnvVar.S3_ACCESS_KEY_ID.value,
-        CredsEnvVar.S3_SECRET_ACCESS_KEY.value,
-    ]
-
     def __init__(self):
-        super().__init__()
-        self.load_configs()
+        self._validate()
 
     ##############################
     # Configuration methods
     ##############################
 
-    def load_env_vars(self) -> None:
-        """
-        Loads the credentials from the environment variables.
-        """
-        env_creds = self._creds_handler.load_from_env(self.keys)
-        self._creds_handler.set_credentials(self._env, env_creds)
-
-    def load_file_vars(self) -> None:
-        """
-        Loads the credentials from a file.
-        """
-        file_creds = self._creds_handler.load_from_file(self.keys)
-        self._creds_handler.set_credentials(self._file, file_creds)
-
     def get_client_config(self) -> dict:
         """
         Gets S3 credentials (access key, secret key, session token, and other config).
 
-        Returns
-        -------
-        dict
-            Dictionary containing S3 credentials and configuration.
-        """
-        creds = self.evaluate_credentials()
-        return self.get_creds_dict(creds)
-
-    def get_creds_dict(self, creds: dict) -> dict:
-        """
-        Returns a dictionary containing the S3 credentials.
-
         Parameters
         ----------
         creds : dict
@@ -83,79 +36,42 @@ class S3StoreConfigurator(Configurator):
         dict
             A dictionary containing the S3 credentials.
         """
+        creds = configurator.get_config_creds()
         return {
-            "endpoint_url": creds[CredsEnvVar.S3_ENDPOINT_URL.value],
-            "aws_access_key_id": creds[CredsEnvVar.S3_ACCESS_KEY_ID.value],
-            "aws_secret_access_key": creds[CredsEnvVar.S3_SECRET_ACCESS_KEY.value],
-            "aws_session_token": creds[CredsEnvVar.S3_SESSION_TOKEN.value],
+            "endpoint_url": creds[ConfigurationVars.S3_ENDPOINT_URL.value],
+            "aws_access_key_id": creds[CredentialsVars.S3_ACCESS_KEY_ID.value],
+            "aws_secret_access_key": creds[CredentialsVars.S3_SECRET_ACCESS_KEY.value],
+            "aws_session_token": creds[CredentialsVars.S3_SESSION_TOKEN.value],
             "config": Config(
-                region_name=creds[CredsEnvVar.S3_REGION.value],
-                signature_version=creds[CredsEnvVar.S3_SIGNATURE_VERSION.value],
+                region_name=creds[ConfigurationVars.S3_REGION.value],
+                signature_version=creds[ConfigurationVars.S3_SIGNATURE_VERSION.value],
             ),
         }
 
-    def evaluate_credentials(self) -> dict:
-        """
-        Evaluates and returns the current valid credentials.
-        If the credentials are expired and were loaded from file,
-        it refreshes them.
-
-        Returns
-        -------
-        dict
-            The current valid credentials.
-        """
-        creds = self.get_credentials(self._origin)
-        expired = creds[CredsEnvVar.S3_CREDENTIALS_EXPIRATION.value]
-        if self._origin == self._file and self._is_expired(expired):
-            refresh_token()
-            self.load_file_vars()
-            creds = self.get_credentials(self._origin)
-        return creds
-
-    def get_file_config(self) -> dict:
-        """
-        Returns the credentials loaded from file.
-
-        Returns
-        -------
-        dict
-            The credentials loaded from file.
-        """
-        creds = self.get_credentials(self._file)
-        return self.get_creds_dict(creds)
-
-    def get_env_config(self) -> dict:
+    def _validate(self) -> None:
         """
-        Returns the credentials loaded from environment variables.
-
-        Returns
-        -------
-        dict
-            The credentials loaded from environment variables.
+        Validate if all required keys are present in the configuration.
         """
-        creds = self.get_credentials(self._env)
-        return self.get_creds_dict(creds)
+        required_keys = [
+            ConfigurationVars.S3_ENDPOINT_URL.value,
+            CredentialsVars.S3_ACCESS_KEY_ID.value,
+            CredentialsVars.S3_SECRET_ACCESS_KEY.value,
+        ]
+        current_keys = configurator.get_config_creds()
+        missing_keys = []
+        for key in required_keys:
+            if key not in current_keys or current_keys[key] is None:
+                missing_keys.append(key)
+        if missing_keys:
+            raise ValueError(f"Missing required variables for S3 store: {', '.join(missing_keys)}")
 
-    @staticmethod
-    def _is_expired(timestamp: str | None) -> bool:
+    def eval_retry(self) -> bool:
         """
-        Determines whether a given timestamp is after the current UTC time.
-
-        Parameters
-        ----------
-        timestamp : str or None
-            Timestamp string in the format 'YYYY-MM-DDTHH:MM:SSZ'.
+        Evaluate the status of retry lifecycle.
 
         Returns
         -------
         bool
-            True if the given timestamp is later than the current UTC time,
-            otherwise False.
+            True if a retry action was performed, otherwise False.
         """
-        if timestamp is None:
-            return False
-        dt = datetime.strptime(timestamp, "%Y-%m-%dT%H:%M:%SZ")
-        dt = dt.replace(tzinfo=timezone.utc)
-        now = datetime.now(timezone.utc) + timedelta(seconds=120)
-        return dt < now
+        return configurator.eval_retry()

digitalhub/stores/data/s3/store.py

@@ -4,7 +4,6 @@
 
 from __future__ import annotations
 
-import typing
 from io import BytesIO
 from pathlib import Path
 from typing import Any, Type
@@ -16,16 +15,12 @@ from boto3.s3.transfer import TransferConfig
 from botocore.exceptions import ClientError, NoCredentialsError
 
 from digitalhub.stores.data._base.store import Store
+from digitalhub.stores.data.s3.configurator import S3StoreConfigurator
 from digitalhub.stores.readers.data.api import get_reader_by_object
 from digitalhub.utils.exceptions import ConfigError, StoreError
 from digitalhub.utils.file_utils import get_file_info_from_s3, get_file_mime_type
 from digitalhub.utils.types import SourcesOrListOfSources
 
-if typing.TYPE_CHECKING:
-    from digitalhub.stores.credentials.configurator import Configurator
-    from digitalhub.stores.data.s3.configurator import S3StoreConfigurator
-
-
 # Type aliases
 S3Client = Type["botocore.client.S3"]
 
@@ -38,9 +33,9 @@ class S3Store(Store):
     artifacts on S3 based storage.
     """
 
-    def __init__(self, configurator: Configurator | None = None) -> None:
-        super().__init__(configurator)
-        self._configurator: S3StoreConfigurator
+    def __init__(self) -> None:
+        super().__init__()
+        self._configurator: S3StoreConfigurator = S3StoreConfigurator()
 
     ##############################
     # I/O methods
@@ -646,7 +641,7 @@ class S3Store(Store):
         """
         return boto3.client("s3", **cfg)
 
-    def _check_factory(self, s3_path: str, retry: bool = True) -> tuple[S3Client, str]:
+    def _check_factory(self, s3_path: str) -> tuple[S3Client, str]:
         """
         Checks if the S3 bucket collected from the URI is accessible.
 
@@ -654,29 +649,21 @@ class S3Store(Store):
         ----------
         s3_path : str
             Path to the S3 bucket (e.g., 's3://bucket/path').
-        retry : bool
-            Whether to retry the operation if a ConfigError is raised. Default is True.
 
         Returns
         -------
         tuple of S3Client and str
             Tuple containing the S3 client object and the name of the S3 bucket.
-
-        Raises
-        ------
-        ConfigError
-            If access to the specified bucket is not available and retry is False.
         """
         bucket = self._get_bucket(s3_path)
+        cfg = self._configurator.get_client_config()
+        client = self._get_client(cfg)
         try:
-            cfg = self._configurator.get_client_config()
-            client = self._get_client(cfg)
             self._check_access_to_storage(client, bucket)
             return client, bucket
         except ConfigError as e:
-            if retry:
-                self._configurator.eval_change_origin()
-                return self._check_factory(s3_path, False)
+            if self._configurator.eval_retry():
+                return self._check_factory(s3_path)
             raise e
 
     def _check_access_to_storage(self, client: S3Client, bucket: str) -> None:

digitalhub/stores/data/sql/configurator.py

@@ -4,81 +4,22 @@
 
 from __future__ import annotations
 
-from digitalhub.stores.credentials.configurator import Configurator
-from digitalhub.stores.credentials.enums import CredsEnvVar
+from digitalhub.stores.configurator.configurator import configurator
+from digitalhub.stores.configurator.enums import ConfigurationVars, CredentialsVars
 
 
-class SqlStoreConfigurator(Configurator):
+class SqlStoreConfigurator:
     """
-    SQL store configuration manager for database connections.
-
-    Handles credential management and configuration for SQL database
-    connections. Loads credentials from environment variables or
-    configuration files and provides connection string generation
-    for database access.
-
-    Attributes
-    ----------
-    keys : list[str]
-        List of all supported credential keys for SQL connections.
-    required_keys : list[str]
-        List of mandatory credential keys that must be provided.
+    Configurator class for SQL store configuration and credentials management.
     """
 
-    keys = [
-        CredsEnvVar.DB_USERNAME.value,
-        CredsEnvVar.DB_PASSWORD.value,
-        CredsEnvVar.DB_HOST.value,
-        CredsEnvVar.DB_PORT.value,
-        CredsEnvVar.DB_DATABASE.value,
-        CredsEnvVar.DB_PLATFORM.value,
-    ]
-    required_keys = [
-        CredsEnvVar.DB_USERNAME.value,
-        CredsEnvVar.DB_PASSWORD.value,
-        CredsEnvVar.DB_HOST.value,
-        CredsEnvVar.DB_PORT.value,
-        CredsEnvVar.DB_DATABASE.value,
-    ]
-
     def __init__(self):
-        super().__init__()
-        self.load_configs()
-
-    ##############################
-    # Configuration methods
-    ##############################
-
-    def load_env_vars(self) -> None:
-        """
-        Load database credentials from environment variables.
-
-        Retrieves SQL database connection credentials from the system
-        environment variables and stores them in the configurator's
-        credential handler for use in database connections.
-        """
-        env_creds = self._creds_handler.load_from_env(self.keys)
-        self._creds_handler.set_credentials(self._env, env_creds)
-
-    def load_file_vars(self) -> None:
-        """
-        Load database credentials from configuration file.
-
-        Retrieves SQL database connection credentials from a
-        configuration file and stores them in the configurator's
-        credential handler for use in database connections.
-        """
-        file_creds = self._creds_handler.load_from_file(self.keys)
-        self._creds_handler.set_credentials(self._file, file_creds)
+        self._validate()
 
     def get_sql_conn_string(self) -> str:
         """
         Generate PostgreSQL connection string from stored credentials.
 
-        Constructs a PostgreSQL connection string using the configured
-        database credentials including username, password, host, port,
-        and database name.
-
         Returns
         -------
         str
@@ -86,11 +27,11 @@ class SqlStoreConfigurator(Configurator):
             'postgresql://username:password@host:port/database'
         """
         creds = self.get_sql_credentials()
-        user = creds[CredsEnvVar.DB_USERNAME.value]
-        password = creds[CredsEnvVar.DB_PASSWORD.value]
-        host = creds[CredsEnvVar.DB_HOST.value]
-        port = creds[CredsEnvVar.DB_PORT.value]
-        database = creds[CredsEnvVar.DB_DATABASE.value]
+        user = creds[CredentialsVars.DB_USERNAME.value]
+        password = creds[CredentialsVars.DB_PASSWORD.value]
+        host = creds[ConfigurationVars.DB_HOST.value]
+        port = creds[ConfigurationVars.DB_PORT.value]
+        database = creds[ConfigurationVars.DB_DATABASE.value]
         return f"postgresql://{user}:{password}@{host}:{port}/{database}"
 
     def get_sql_credentials(self) -> dict:
@@ -108,5 +49,42 @@ class SqlStoreConfigurator(Configurator):
             Keys correspond to database connection parameters such as
             username, password, host, port, database, and platform.
         """
-        creds = self.get_credentials(self._origin)
-        return {key: creds.get(key) for key in self.keys}
+        keys = [
+            CredentialsVars.DB_USERNAME.value,
+            CredentialsVars.DB_PASSWORD.value,
+            ConfigurationVars.DB_HOST.value,
+            ConfigurationVars.DB_PORT.value,
+            ConfigurationVars.DB_DATABASE.value,
+        ]
+        creds = configurator.get_config_creds()
+        return {key: creds.get(key) for key in keys}
+
+    def eval_retry(self) -> bool:
+        """
+        Evaluate the status of retry lifecycle.
+
+        Returns
+        -------
+        bool
+            True if a retry should be attempted, False otherwise.
+        """
+        return configurator.eval_retry()
+
+    def _validate(self) -> None:
+        """
+        Validate if all required keys are present in the configuration.
+        """
+        required_keys = [
+            ConfigurationVars.DB_HOST.value,
+            ConfigurationVars.DB_PORT.value,
+            ConfigurationVars.DB_DATABASE.value,
+            CredentialsVars.DB_USERNAME.value,
+            CredentialsVars.DB_PASSWORD.value,
+        ]
+        current_keys = configurator.get_config_creds()
+        missing_keys = []
+        for key in required_keys:
+            if key not in current_keys or current_keys[key] is None:
+                missing_keys.append(key)
+        if missing_keys:
+            raise ValueError(f"Missing required variables for SQL store: {', '.join(missing_keys)}")

digitalhub/stores/data/sql/store.py

@@ -15,6 +15,7 @@ from sqlalchemy.engine import Engine
 from sqlalchemy.exc import SQLAlchemyError
 
 from digitalhub.stores.data._base.store import Store
+from digitalhub.stores.data.sql.configurator import SqlStoreConfigurator
 from digitalhub.stores.readers.data.api import get_reader_by_object
 from digitalhub.utils.exceptions import ConfigError, StoreError
 from digitalhub.utils.types import SourcesOrListOfSources
@@ -22,8 +23,8 @@ from digitalhub.utils.types import SourcesOrListOfSources
 if typing.TYPE_CHECKING:
     from sqlalchemy.engine.row import Row
 
-    from digitalhub.stores.credentials.configurator import Configurator
-    from digitalhub.stores.data.sql.configurator import SqlStoreConfigurator
+
+ENGINE_CONNECTION_TIMEOUT = 30
 
 
 class SqlStore(Store):
@@ -41,9 +42,9 @@ class SqlStore(Store):
         and connection parameters.
     """
 
-    def __init__(self, configurator: Configurator | None = None) -> None:
-        super().__init__(configurator)
-        self._configurator: SqlStoreConfigurator
+    def __init__(self) -> None:
+        super().__init__()
+        self._configurator: SqlStoreConfigurator = SqlStoreConfigurator()
 
     ##############################
     # I/O methods
@@ -70,7 +71,7 @@ class SqlStore(Store):
         dst : Path
             The destination path on the local filesystem where the
             Parquet file will be saved.
-        overwrite : bool, default False
+        overwrite : bool
             Whether to overwrite existing files at the destination path.
 
         Returns
@@ -350,22 +351,7 @@ class SqlStore(Store):
     # Helper methods
     ##############################
 
-    def _get_connection_string(self) -> str:
-        """
-        Retrieve the database connection string from the configurator.
-
-        Gets the PostgreSQL connection string using the configured
-        database credentials (username, password, host, port, database).
-
-        Returns
-        -------
-        str
-            The PostgreSQL connection string in the format
-            'postgresql://username:password@host:port/database'.
-        """
-        return self._configurator.get_sql_conn_string()
-
-    def _get_engine(self, schema: str | None = None) -> Engine:
+    def _get_engine(self, connection_string: str, schema: str | None = None) -> Engine:
         """
         Create a SQLAlchemy engine from the connection string.
 
@@ -374,6 +360,8 @@ class SqlStore(Store):
 
         Parameters
         ----------
+        connection_string : str
+            The database connection string.
         schema : str
             The database schema to set in the search path.
             If provided, sets the PostgreSQL search_path option.
@@ -382,36 +370,18 @@ class SqlStore(Store):
         -------
         Engine
             A configured SQLAlchemy engine instance.
-
-        Raises
-        ------
-        StoreError
-            If the connection string is invalid or engine creation fails.
         """
-        connection_string = self._get_connection_string()
-        if not isinstance(connection_string, str):
-            raise StoreError("Connection string must be a string.")
-        try:
-            connect_args = {"connect_timeout": 30}
-            if schema is not None:
-                connect_args["options"] = f"-csearch_path={schema}"
-            return create_engine(connection_string, connect_args=connect_args)
-        except Exception as ex:
-            raise StoreError(f"Something wrong with connection string. Arguments: {str(ex.args)}")
-
-    def _check_factory(self, retry: bool = True, schema: str | None = None) -> Engine:
+        connect_args = {"connect_timeout": ENGINE_CONNECTION_TIMEOUT}
+        if schema is not None:
+            connect_args["options"] = f"-csearch_path={schema}"
+        return create_engine(connection_string, connect_args=connect_args)
+
+    def _check_factory(self, schema: str | None = None) -> Engine:
         """
         Validate database accessibility and return a working engine.
 
-        Creates and tests a database engine, with retry capability if
-        the initial connection fails. Handles configuration changes
-        and ensures the database is accessible before returning.
-
         Parameters
         ----------
-        retry : bool, default True
-            Whether to attempt a retry with different configuration
-            if the initial connection fails.
         schema : str
             The database schema to configure in the engine.
 
@@ -419,20 +389,15 @@ class SqlStore(Store):
         -------
         Engine
             A validated SQLAlchemy engine with confirmed database access.
-
-        Raises
-        ------
-        ConfigError
-            If database access fails and retry is exhausted or disabled.
         """
+        connection_string = self._configurator.get_sql_conn_string()
+        engine = self._get_engine(connection_string, schema)
         try:
-            engine = self._get_engine(schema)
             self._check_access_to_storage(engine)
             return engine
         except ConfigError as e:
-            if retry:
-                self._configurator.eval_change_origin()
-                return self._check_factory(retry=False, schema=schema)
+            if self._configurator.eval_retry():
+                return self._check_factory(schema=schema)
             raise e
 
     @staticmethod

{digitalhub-0.14.0b7.dist-info → digitalhub-0.14.1b0.dist-info}/METADATA

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