digitalhub 0.10.2__py3-none-any.whl → 0.10.3__py3-none-any.whl

digitalhub/stores/client/api.py

@@ -24,4 +24,4 @@ def get_client(local: bool = False, config: dict | None = None) -> Client:
     Client
         The client instance.
     """
-    return client_builder.build(local, config)
+    return client_builder.build(local)

digitalhub/stores/client/builder.py

@@ -23,7 +23,7 @@ class ClientBuilder:
         self._local = None
         self._dhcore = None
 
-    def build(self, local: bool = False, config: dict | None = None) -> Client:
+    def build(self, local: bool = False) -> Client:
         """
         Method to create a client instance.
 
@@ -43,7 +43,7 @@ class ClientBuilder:
             return self._local
 
         if self._dhcore is None:
-            self._dhcore = ClientDHCore(config)
+            self._dhcore = ClientDHCore()
         return self._dhcore
 
 

digitalhub/stores/client/dhcore/client.py

@@ -35,7 +35,7 @@ class ClientDHCore(Client):
     configuration, otherwise it simply set the environment variables.
     """
 
-    def __init__(self, config: dict | None = None) -> None:
+    def __init__(self) -> None:
         super().__init__()
 
         # API builder
@@ -52,7 +52,7 @@ class ClientDHCore(Client):
 
         # Client Configurator
         self._configurator = ClientDHCoreConfigurator()
-        self._configurator.configure(config)
+        self._configurator.configure()
 
     ##############################
     # CRUD methods
@@ -276,6 +276,7 @@ class ClientDHCore(Client):
         dict
             Response object.
         """
+        self._configurator.check_config()
         if kwargs is None:
             kwargs = {}
         url = self._configurator.build_url(api)

digitalhub/stores/client/dhcore/configurator.py

@@ -31,11 +31,30 @@ class ClientDHCoreConfigurator:
     Configurator object used to configure the client.
     """
 
+    def __init__(self) -> None:
+        self._current_env = configurator.get_current_env()
+
     ##############################
     # Configuration methods
     ##############################
 
-    def configure(self, config: dict | None = None) -> None:
+    def check_config(self) -> None:
+        """
+        Check if the config is valid.
+
+        Parameters
+        ----------
+        config : dict
+            Configuration dictionary.
+
+        Returns
+        -------
+        None
+        """
+        if configurator.get_current_env() != self._current_env:
+            self.configure()
+
+    def configure(self) -> None:
         """
         Configure the client attributes with config (given or from
         environment).
@@ -44,11 +63,6 @@ class ClientDHCoreConfigurator:
         over the basic auth. Furthermore, the config parameter is
         validated against the proper pydantic model.
 
-        Parameters
-        ----------
-        config : dict
-            Configuration dictionary.
-
         Returns
         -------
         None
@@ -140,10 +154,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:
@@ -204,7 +218,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
 
@@ -227,7 +241,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()
@@ -248,12 +262,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,
+            ):
+                new_list.append(key.removeprefix("DHCORE_"))
+            else:
+                new_list.append(key)
+        return new_list
+
     def _get_refresh_endpoint(self) -> str:
         """
         Get the refresh endpoint.
@@ -264,11 +308,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"
@@ -308,3 +352,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/stores/client/dhcore/utils.py

@@ -68,4 +68,5 @@ def refresh_token() -> None:
     None
     """
     client: ClientDHCore = get_client(local=False)
+    client._configurator.check_config()
     client._configurator.get_new_access_token()

digitalhub/stores/configurator/configurator.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import os
 
 from digitalhub.stores.configurator.credentials_store import CredentialsStore
-from digitalhub.stores.configurator.ini_module import load_from_file, write_config
+from digitalhub.stores.configurator.ini_module import load_from_file, read_env_from_file, set_current_env, write_config
 
 
 class EnvConfigurator:
@@ -36,6 +36,7 @@ class EnvConfigurator:
         None
         """
         self._environment = creds_set
+        set_current_env(creds_set)
 
     def get_current_env(self) -> str:
         """
@@ -105,6 +106,7 @@ class EnvConfigurator:
         str | None
             Environment variable value.
         """
+        self._environment = read_env_from_file()
         return load_from_file(var)
 
     def write_env(self, key_to_include: list[str] | None = None) -> None:

digitalhub/stores/configurator/ini_module.py

@@ -13,6 +13,23 @@ from digitalhub.utils.exceptions import ClientError
 ENV_FILE = Path.home() / ".dhcore.ini"
 
 
+def load_file() -> ConfigParser:
+    """
+    Load current credentials set from the .dhcore.ini file.
+
+    Returns
+    -------
+    ConfigParser
+        Credentials set name.
+    """
+    try:
+        file = ConfigParser()
+        file.read(ENV_FILE)
+        return file
+    except Exception as e:
+        raise ClientError(f"Failed to read env file: {e}")
+
+
 def load_from_file(var: str) -> str | None:
     """
     Load variable from config file.
@@ -29,9 +46,8 @@ def load_from_file(var: str) -> str | None:
     str | None
         Environment variable value.
     """
-    cfg = ConfigParser()
-    cfg.read(ENV_FILE)
     try:
+        cfg = load_file()
         profile = cfg["DEFAULT"]["current_environment"]
         return cfg[profile].get(var)
     except KeyError:
@@ -55,8 +71,7 @@ def write_config(creds: dict, environment: str) -> None:
     None
     """
     try:
-        cfg = ConfigParser()
-        cfg.read(ENV_FILE)
+        cfg = load_file()
 
         sections = cfg.sections()
         if environment not in sections:
@@ -72,3 +87,42 @@ def write_config(creds: dict, environment: str) -> None:
 
     except Exception as e:
         raise ClientError(f"Failed to write env file: {e}")
+
+
+def set_current_env(environment: str) -> None:
+    """
+    Set the current credentials set.
+
+    Parameters
+    ----------
+    environment : str
+        Credentials set name.
+
+    Returns
+    -------
+    None
+    """
+    try:
+        cfg = load_file()
+        cfg["DEFAULT"]["current_environment"] = environment
+        with open(ENV_FILE, "w") as inifile:
+            cfg.write(inifile)
+
+    except Exception as e:
+        raise ClientError(f"Failed to write env file: {e}")
+
+
+def read_env_from_file() -> str | None:
+    """
+    Read the current credentials set from the .dhcore.ini file.
+
+    Returns
+    -------
+    str
+        Credentials set name.
+    """
+    try:
+        cfg = load_file()
+        return cfg["DEFAULT"]["current_environment"]
+    except Exception:
+        return None

digitalhub/stores/data/builder.py

@@ -64,7 +64,7 @@ class StoreBuilder:
         env = get_current_env()
         if env not in self._instances:
             self._instances[env] = {}
-        self._instances[env][store_type] = _get_class_from_type(store_type)(config)
+        self._instances[env][store_type] = _get_class_from_type(store_type)()
 
     def get(self, uri: str, config: dict | None = None) -> Store:
         """

digitalhub/stores/data/local/store.py

@@ -17,9 +17,6 @@ class LocalStore(Store):
     artifacts on local filesystem based storage.
     """
 
-    def __init__(self, config: dict | None = None) -> None:
-        super().__init__()
-
     ##############################
     # I/O methods
     ##############################

digitalhub/stores/data/remote/store.py

@@ -16,9 +16,6 @@ class RemoteStore(Store):
     artifacts from remote HTTP based storage.
     """
 
-    def __init__(self, config: dict | None = None) -> None:
-        super().__init__()
-
     ##############################
     # I/O methods
     ##############################

digitalhub/stores/data/s3/configurator.py

@@ -26,29 +26,10 @@ class S3StoreConfigurator:
         S3StoreEnv.SESSION_TOKEN,
     ]
 
-    def __init__(self, config: dict | None = None) -> None:
-        self.configure(config)
-
     ##############################
     # Configuration methods
     ##############################
 
-    def configure(self, config: dict | None = None) -> None:
-        """
-        Configure the store by getting the credentials from user
-        provided config or from environment.
-
-        Parameters
-        ----------
-        config : dict
-            Configuration dictionary.
-
-        Returns
-        -------
-        None
-        """
-        self._get_env_config()
-
     def get_boto3_client_config(self, origin: str) -> dict:
         """
         Get S3 credentials (access key, secret key,

digitalhub/stores/data/s3/store.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import typing
 from io import BytesIO
 from pathlib import Path
 from typing import Any, Type
@@ -8,7 +7,7 @@ from urllib.parse import urlparse
 
 import boto3
 import botocore.client  # pylint: disable=unused-import
-from botocore.exceptions import ClientError
+from botocore.exceptions import ClientError, NoCredentialsError
 
 from digitalhub.stores.configurator.enums import CredsOrigin
 from digitalhub.stores.data._base.store import Store
@@ -19,9 +18,6 @@ from digitalhub.utils.exceptions import 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:
-    pass
-
 # Type aliases
 S3Client = Type["botocore.client.S3"]
 
@@ -32,10 +28,9 @@ class S3Store(Store):
     artifacts on S3 based storage.
     """
 
-    def __init__(self, config: dict | None = None) -> None:
+    def __init__(self) -> None:
         super().__init__()
         self._configurator = S3StoreConfigurator()
-        self._configurator.configure(config)
 
     ##############################
     # I/O methods
@@ -655,7 +650,7 @@ class S3Store(Store):
         """
         try:
             client.head_bucket(Bucket=bucket)
-        except ClientError:
+        except (ClientError, NoCredentialsError):
             raise StoreError("No access to s3 bucket!")
 
     @staticmethod

digitalhub/stores/data/sql/configurator.py

@@ -12,31 +12,18 @@ class SqlStoreConfigurator:
     provided config or from environment.
     """
 
-    variables = [SqlStoreEnv.USERNAME, SqlStoreEnv.PASSWORD, SqlStoreEnv.HOST, SqlStoreEnv.PORT, SqlStoreEnv.DATABASE]
-
-    def __init__(self, config: dict | None = None) -> None:
-        self.configure(config)
+    variables = [
+        SqlStoreEnv.USERNAME,
+        SqlStoreEnv.PASSWORD,
+        SqlStoreEnv.HOST,
+        SqlStoreEnv.PORT,
+        SqlStoreEnv.DATABASE,
+    ]
 
     ##############################
     # Configuration methods
     ##############################
 
-    def configure(self, config: dict | None = None) -> None:
-        """
-        Configure the store by getting the credentials from user
-        provided config or from environment.
-
-        Parameters
-        ----------
-        config : dict
-            Configuration dictionary.
-
-        Returns
-        -------
-        None
-        """
-        self._get_env_config()
-
     def get_sql_conn_string(self, origin: str) -> str:
         """
         Get the connection string from environment variables.

digitalhub/stores/data/sql/store.py

@@ -27,10 +27,9 @@ class SqlStore(Store):
     artifacts on SQL based storage.
     """
 
-    def __init__(self, config: dict | None = None) -> None:
+    def __init__(self) -> None:
         super().__init__()
         self._configurator = SqlStoreConfigurator()
-        self._configurator.configure(config)
 
     ##############################
     # I/O methods

{digitalhub-0.10.2.dist-info → digitalhub-0.10.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: digitalhub
-Version: 0.10.2
+Version: 0.10.3
 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.10.2.dist-info → digitalhub-0.10.3.dist-info}/RECORD

@@ -168,8 +168,8 @@ digitalhub/runtimes/builder.py,sha256=CtwutbxRdLo6Qj5PfvmYnCusRG89yS1jI4Qu-Ha3XG
 digitalhub/runtimes/enums.py,sha256=hhGNyuBcchqCcDKdR_foOyeNJn41nHCNEyRmoxE5dNA,182
 digitalhub/stores/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/stores/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-digitalhub/stores/client/api.py,sha256=BCVQjsuRLz8hWjybuEW-5RHxdX7ryk6KKRWO9Ex2ApU,600
-digitalhub/stores/client/builder.py,sha256=7XeCzYmQXWFAX_HHYKH0BFdemdFh4csEM9BJUp2mqMw,1216
+digitalhub/stores/client/api.py,sha256=jERu4_9VXMdCnzhbpNkmL2ks8NWOm85PPDh_uMTfWLc,592
+digitalhub/stores/client/builder.py,sha256=wgMaporY00TS14tICwhYMKuzGkBo-J5yllotRO0Z57U,1182
 digitalhub/stores/client/_base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/stores/client/_base/api_builder.py,sha256=2-3JPP9Q1xYvBbrxFYaw2cChC6zwDregpRtFwuowdF8,380
 digitalhub/stores/client/_base/client.py,sha256=x0IezwqesbcsDZzx9vxtFwZoiOwIxIgn3kmVNLOkxlQ,3672
@@ -177,14 +177,14 @@ digitalhub/stores/client/_base/key_builder.py,sha256=xl3jM7z2eLP6HfPXusmZyLqsvfK
 digitalhub/stores/client/_base/params_builder.py,sha256=lCk4WE6DqvGP7-cx0anZEC8GtwsA7win7MVqACQQF9g,427
 digitalhub/stores/client/dhcore/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/stores/client/dhcore/api_builder.py,sha256=J1kOMw4B4_PZKkEs7GPNcEkd1w-ZyJeB9G1UBZiMbl0,3975
-digitalhub/stores/client/dhcore/client.py,sha256=lZDZipcLu5ZjojTmrim5C5s3NvPsKxMpNALRGyoChqI,9848
-digitalhub/stores/client/dhcore/configurator.py,sha256=_7u1CXwRnmyhgYVIHFsvOxOmqKRwlotyLweVUz1yJR0,9331
+digitalhub/stores/client/dhcore/client.py,sha256=dkMOPzYyv6bjkkc_21a2MUwSzUa6x02BzLdtbkDoNrU,9856
+digitalhub/stores/client/dhcore/configurator.py,sha256=fxdYGKeE4HKuRP9l5VsFJNEK466G-1kmj3JzyopzZDU,11013
 digitalhub/stores/client/dhcore/enums.py,sha256=kaVXZTTa2WmsFbcc1CKWNLOM0JtUtcjL-KpspnTOhEE,523
 digitalhub/stores/client/dhcore/error_parser.py,sha256=GJUUkhp12cvC_LBIrC0teh4msmyb5WFxY2g4WNOkUwM,3305
 digitalhub/stores/client/dhcore/key_builder.py,sha256=YuSS5tRNRJTYlH14buetFSCU_bLuBBKLqMFO3MQ6r4g,1324
 digitalhub/stores/client/dhcore/models.py,sha256=WX53m8B9YiUqebH9ZZuUm2fhIWGoqHkagrHn3swOQDI,642
 digitalhub/stores/client/dhcore/params_builder.py,sha256=TOOiZ3UlfgGFbvQpEVfsqnKxlDqgbOHQRxp71o-Z4AU,5847
-digitalhub/stores/client/dhcore/utils.py,sha256=Gmk-jsv0jG3u39sO88HKhjkaP2cNKWN0LhqgyWmMGSI,1899
+digitalhub/stores/client/dhcore/utils.py,sha256=kYRs-3tpOWzbwToHyIjJUoZlEG_w-bK7QFz57JPMQdY,1939
 digitalhub/stores/client/local/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/stores/client/local/api_builder.py,sha256=nUO92IpPgnXBnPOh2486NzWfqQX4RE2t9nfIUSd-rAg,3043
 digitalhub/stores/client/local/client.py,sha256=Vp93yq_Z-D03SNM6pmZrhThKvAbdgMCUjMFXNV1fUHk,18115
@@ -193,30 +193,28 @@ digitalhub/stores/client/local/key_builder.py,sha256=bS-a2zc3rklNGuhc94d04_CnL7O
 digitalhub/stores/client/local/params_builder.py,sha256=ke8toBUDuSZiSo3WN6jeALnt-EPXZKi8_i5BHJx0HDk,3481
 digitalhub/stores/configurator/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/stores/configurator/api.py,sha256=-dRdkXh99SztWaeRfqztVXhT8f95aVBjDK7JPElj_ug,560
-digitalhub/stores/configurator/configurator.py,sha256=RF1aUBVWenI2HgBzueh9baw_1PVANRWXGW3RqZZSzBQ,4538
+digitalhub/stores/configurator/configurator.py,sha256=RLSo9G-kGFO-UCSnY3me0azU58LNxfiS9o0H15X2ngo,4659
 digitalhub/stores/configurator/credentials_store.py,sha256=kiaCm37Sl1SN9OaMbsfZA1l1a9Xg6R6a00H7Upcf8Vg,1508
 digitalhub/stores/configurator/enums.py,sha256=t0R-FJjiWAyEN3w2B6NQuaStohj8mZFQMPHjvFw7Clw,165
-digitalhub/stores/configurator/ini_module.py,sha256=3NfAFAwIoAV4QhHoY-_4frCk2A2iYANuIvWMbn5vG_Y,1826
+digitalhub/stores/configurator/ini_module.py,sha256=VfBPFo-EVrFokDk2j9CtzstlKuxTXtsG1ro-nfTPSfs,2923
 digitalhub/stores/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/stores/data/api.py,sha256=xWOwkqCcmTg2n75C6JBAG9_0UjGXrILJtMABIxysf50,570
-digitalhub/stores/data/builder.py,sha256=wnLyncrXOE8YF1Ajdqga57ZHG0OaunR0cT236MTy8XI,2346
+digitalhub/stores/data/builder.py,sha256=5SEmMQ1Prrele3OQsksBm6CkzinqgnyiUeaHETPZXCs,2340
 digitalhub/stores/data/_base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/stores/data/_base/store.py,sha256=VC1r7b9EIoObuG2DiqtFk2DQDSOgaS9jYL_UmiOTMHg,5241
 digitalhub/stores/data/local/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-digitalhub/stores/data/local/store.py,sha256=P8m1LTA_kjTU44_OGrISanp0pfqAOKH2evIuDmRZ-pE,7424
+digitalhub/stores/data/local/store.py,sha256=lzagCi_3-bvH5IaMNMNnGGT2mNE-KG_F-CMS45elcMo,7336
 digitalhub/stores/data/remote/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-digitalhub/stores/data/remote/store.py,sha256=dG9hwohwBbQc4t_knPvc1tjKyN7q2po58zveTtcMKb4,6186
+digitalhub/stores/data/remote/store.py,sha256=9KCFk8Fz1Mr7AK8gEITMh2sMw_jQldNPaVpk5_Oko9w,6098
 digitalhub/stores/data/s3/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-digitalhub/stores/data/s3/configurator.py,sha256=HO98fZPqyUllSm972j-52_58tf0RElsutGVzkQgszLk,4144
+digitalhub/stores/data/s3/configurator.py,sha256=28cNphR-rhCgd06o-d_rL8hFzd36wwHmIYCaoRTfm5Q,3680
 digitalhub/stores/data/s3/enums.py,sha256=tmSavz83jr6SBW-Gqn4D21TJpFytxvbtbW63htmZG2A,392
-digitalhub/stores/data/s3/models.py,sha256=qeXeL7iP76EBO35wzP6bYeMj-sBOY634Tjwx8h3Di2g,371
-digitalhub/stores/data/s3/store.py,sha256=pCoJ8DQWHWaXG8DdkTYUycgxzjFGgtFHtNtb4pcelyM,19771
+digitalhub/stores/data/s3/store.py,sha256=obKis2BttQCeG-Ft-48DsxSSa0el3nMwbLOTOzp38QA,19691
 digitalhub/stores/data/s3/utils.py,sha256=Su-7AbIuDItbaA2BSrnl7Tm-BrrqPQPOaDXb06C_BRw,1505
 digitalhub/stores/data/sql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-digitalhub/stores/data/sql/configurator.py,sha256=CfOvuB-3cIb7QFXk9Jo3t1EnrmNL960681rZO_g5apo,3635
+digitalhub/stores/data/sql/configurator.py,sha256=CsK8ZUFldgjR3SWCo01-SEWo_7xZdnHSwmC_yxgebgM,3218
 digitalhub/stores/data/sql/enums.py,sha256=FCpmIXxef6SQIX_564a1hYvaSVrpvld8gi7YAv25H-o,284
-digitalhub/stores/data/sql/models.py,sha256=_itIXoCfRLzUpG0OaM44qbv2u87Lyl5e0tmAXNTvfjQ,349
-digitalhub/stores/data/sql/store.py,sha256=75piNVIHIZoHIwpHmbo8D9JifATqxXhK42gA35_vN-w,11801
+digitalhub/stores/data/sql/store.py,sha256=hETZ56NtmcH9ZsbqKELX0Z1AXCBrxPnkipZjzcUfPls,11728
 digitalhub/stores/readers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/stores/readers/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/stores/readers/data/api.py,sha256=rHnhzsUWp6s23qVqXcBO3jGkI2IeiWyBictHnOPbBEw,1858
@@ -238,7 +236,7 @@ digitalhub/utils/io_utils.py,sha256=8jD4Rp_b7LZEpY5JSMxVUowZsnifKnbGpHT5Hijx9-g,
 digitalhub/utils/logger.py,sha256=ml3ne6D8wuRdNZ4F6ywmvWotSxjmZWnmKgNiuHb4R5M,437
 digitalhub/utils/types.py,sha256=x8zXsbivD8vdaNeNRZLKOPvGbz6d-59nncuvO0FsueY,109
 digitalhub/utils/uri_utils.py,sha256=6W3ITWcOwlpmA42rmgld7f2t1RpNF2pYXadWpmEQeBM,3832
-digitalhub-0.10.2.dist-info/METADATA,sha256=XA_sS63tKJ-Nm4U0V6nvl9PWVaYs4n7obuot5Dw8m1k,15035
-digitalhub-0.10.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-digitalhub-0.10.2.dist-info/licenses/LICENSE.txt,sha256=qmrTTXPlgU0kSRlRVbjhlyGs1IXs2QPxo_Y-Mn06J0k,11589
-digitalhub-0.10.2.dist-info/RECORD,,
+digitalhub-0.10.3.dist-info/METADATA,sha256=9F04ShnBo7GRwFe64mbEEUOJEeBq4oIq9-UXwBMscB8,15035
+digitalhub-0.10.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+digitalhub-0.10.3.dist-info/licenses/LICENSE.txt,sha256=qmrTTXPlgU0kSRlRVbjhlyGs1IXs2QPxo_Y-Mn06J0k,11589
+digitalhub-0.10.3.dist-info/RECORD,,

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/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."""