digitalhub 0.11.0b0__tar.gz → 0.11.0b1__tar.gz

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

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

@@ -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-0.11.0b0 → digitalhub-0.11.0b1}/digitalhub/stores/client/dhcore/configurator.py

@@ -31,10 +31,29 @@ class ClientDHCoreConfigurator:
     Configurator object used to configure the client.
     """
 
+    def __init__(self) -> None:
+        self._current_env = configurator.get_current_env()
+
     ##############################
     # Configuration methods
     ##############################
 
+    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, config: dict | None = None) -> None:
         """
         Configure the client attributes with config (given or from

{digitalhub-0.11.0b0 → digitalhub-0.11.0b1}/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-0.11.0b0 → digitalhub-0.11.0b1}/digitalhub/stores/configurator/configurator.py

@@ -4,7 +4,7 @@ import os
 
 from digitalhub.stores.configurator.credentials_store import CredentialsStore
 from digitalhub.stores.configurator.enums import SetCreds
-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:
@@ -37,6 +37,7 @@ class EnvConfigurator:
         None
         """
         self._environment = creds_set
+        set_current_env(creds_set)
 
     def get_current_env(self) -> str:
         """
@@ -106,6 +107,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-0.11.0b0 → digitalhub-0.11.0b1}/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:
+    """
+    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 as e:
+        raise ClientError(f"Failed to read env file: {e}")

{digitalhub-0.11.0b0 → digitalhub-0.11.0b1}/digitalhub/stores/data/api.py

@@ -2,7 +2,6 @@ from __future__ import annotations
 
 import typing
 
-from digitalhub.context.api import get_context
 from digitalhub.stores.data.builder import store_builder
 
 if typing.TYPE_CHECKING:
@@ -27,5 +26,4 @@ def get_store(project: str, uri: str) -> Store:
     Store
         Store instance.
     """
-    config = get_context(project).config
-    return store_builder.get(project, uri, config)
+    return store_builder.get(project, uri)

{digitalhub-0.11.0b0 → digitalhub-0.11.0b1}/digitalhub/stores/data/builder.py

@@ -46,7 +46,7 @@ class StoreBuilder:
     def __init__(self) -> None:
         self._instances: dict[str, dict[str, Store]] = {}
 
-    def build(self, project: str, store_type: str, config: dict) -> None:
+    def build(self, project: str, store_type: str) -> None:
         """
         Build a store instance and register it.
 
@@ -55,7 +55,6 @@ class StoreBuilder:
         store_type : str
             Store type.
         config : dict
-            Store configuration.
 
         Returns
         -------
@@ -64,9 +63,9 @@ 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, project: str, uri: str, config: dict) -> Store:
+    def get(self, project: str, uri: str) -> Store:
         """
         Get a store instance by URI.
 
@@ -87,7 +86,7 @@ class StoreBuilder:
         try:
             return self._instances[env][store_type]
         except KeyError:
-            self.build(project, store_type, config)
+            self.build(project, store_type)
             return self._instances[env][store_type]
 
 

{digitalhub-0.11.0b0 → digitalhub-0.11.0b1}/digitalhub/stores/data/local/store.py

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

{digitalhub-0.11.0b0 → digitalhub-0.11.0b1}/digitalhub/stores/data/remote/store.py

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

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

@@ -18,40 +18,20 @@ class S3StoreConfigurator:
         S3StoreEnv.ENDPOINT_URL,
         S3StoreEnv.ACCESS_KEY_ID,
         S3StoreEnv.SECRET_ACCESS_KEY,
-        S3StoreEnv.BUCKET_NAME,
     ]
     optional_vars = [
         S3StoreEnv.REGION,
         S3StoreEnv.SIGNATURE_VERSION,
         S3StoreEnv.SESSION_TOKEN,
     ]
-    project_vars = [
-        S3StoreEnv.BUCKET_NAME,
-    ]
 
     def __init__(self, config: dict) -> None:
-        self.config = self.configure(config)
+        ...
 
     ##############################
     # Configuration methods
     ##############################
 
-    def configure(self, config: dict) -> dict:
-        """
-        Configure the store by getting vars from project.
-
-        Parameters
-        ----------
-        config : dict
-            Configuration dictionary.
-
-        Returns
-        -------
-        dict
-            Configuration dictionary.
-        """
-        return {k: v for k, v in config.items() if k in self.project_vars}
-
     def get_boto3_client_config(self, origin: str) -> dict:
         """
         Get S3 credentials (access key, secret key,
@@ -73,7 +53,6 @@ class S3StoreConfigurator:
             creds = self._get_file_config()
         else:
             raise StoreError(f"Unknown origin: {origin}")
-        creds = {**creds, **self.config}
         return {
             "endpoint_url": creds[S3StoreEnv.ENDPOINT_URL.value],
             "aws_access_key_id": creds[S3StoreEnv.ACCESS_KEY_ID.value],

{digitalhub-0.11.0b0 → digitalhub-0.11.0b1}/digitalhub/stores/data/s3/store.py

@@ -28,8 +28,8 @@ class S3Store(Store):
     artifacts on S3 based storage.
     """
 
-    def __init__(self, config: dict) -> None:
-        self._configurator = S3StoreConfigurator(config)
+    def __init__(self) -> None:
+        self._configurator = S3StoreConfigurator()
 
     ##############################
     # I/O methods

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

@@ -19,33 +19,14 @@ class SqlStoreConfigurator:
         SqlStoreEnv.PORT,
         SqlStoreEnv.DATABASE,
     ]
-    project_vars = [
-        SqlStoreEnv.DATABASE,
-    ]
 
-    def __init__(self, config: dict) -> None:
-        self.config = self.configure(config)
+    def __init__(self) -> None:
+        self.config = self.configure()
 
     ##############################
     # Configuration methods
     ##############################
 
-    def configure(self, config: dict) -> dict:
-        """
-        Configure the store by getting vars from project.
-
-        Parameters
-        ----------
-        config : dict
-            Configuration dictionary.
-
-        Returns
-        -------
-        dict
-            Configuration dictionary.
-        """
-        return {k: v for k, v in config.items() if k in self.project_vars}
-
     def get_sql_conn_string(self, origin: str) -> str:
         """
         Get the connection string from environment variables.

{digitalhub-0.11.0b0 → digitalhub-0.11.0b1}/digitalhub/stores/data/sql/store.py

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

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

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