digitalhub 0.10.0b6__py3-none-any.whl → 0.10.1__py3-none-any.whl

digitalhub/__init__.py

@@ -88,11 +88,10 @@ try:
 except ImportError:
     ...
 
-from digitalhub.client.dhcore.utils import refresh_token, set_dhcore_env
-from digitalhub.configurator.api import get_current_env, set_current_env
-
 # Register entities into registry
 from digitalhub.factory.utils import register_entities, register_runtimes_entities
+from digitalhub.stores.client.dhcore.utils import refresh_token, set_dhcore_env
+from digitalhub.stores.configurator.api import get_current_env, set_current_env
 
 register_entities()
 register_runtimes_entities()

digitalhub/entities/_base/material/entity.py

@@ -5,7 +5,7 @@ from pathlib import Path
 
 from digitalhub.entities._base.versioned.entity import VersionedEntity
 from digitalhub.entities._processors.context import context_processor
-from digitalhub.stores.api import get_store
+from digitalhub.stores.data.api import get_store
 from digitalhub.utils.types import SourcesOrListOfSources
 
 if typing.TYPE_CHECKING:

digitalhub/entities/_base/material/utils.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from pathlib import Path
 
-from digitalhub.stores.s3.utils import get_s3_bucket_from_env
+from digitalhub.stores.data.s3.utils import get_s3_bucket_from_env
 from digitalhub.utils.file_utils import eval_zip_type
 from digitalhub.utils.uri_utils import S3Schemes, has_local_scheme
 

digitalhub/entities/_processors/base.py

@@ -2,16 +2,16 @@ from __future__ import annotations
 
 import typing
 
-from digitalhub.client.api import get_client
 from digitalhub.context.api import delete_context
 from digitalhub.entities._commons.enums import ApiCategories, BackendOperations
 from digitalhub.factory.api import build_entity_from_dict, build_entity_from_params
+from digitalhub.stores.client.api import get_client
 from digitalhub.utils.exceptions import EntityAlreadyExistsError, EntityError, EntityNotExistsError
 from digitalhub.utils.io_utils import read_yaml
 
 if typing.TYPE_CHECKING:
-    from digitalhub.client._base.client import Client
     from digitalhub.entities.project._base.entity import Project
+    from digitalhub.stores.client._base.client import Client
 
 
 class BaseEntityOperationsProcessor:

digitalhub/entities/_processors/context.py

@@ -437,7 +437,7 @@ class ContextEntityOperationsProcessor:
 
         kwargs = context.client.build_parameters(
             ApiCategories.CONTEXT.value,
-            BackendOperations.READ.value,
+            BackendOperations.READ_ALL_VERSIONS.value,
             entity_name=entity_name,
             **kwargs,
         )

digitalhub/entities/_processors/utils.py

@@ -2,16 +2,16 @@ from __future__ import annotations
 
 import typing
 
-from digitalhub.client.api import get_client
 from digitalhub.context.api import get_context
 from digitalhub.entities._commons.enums import ApiCategories, BackendOperations, EntityTypes
 from digitalhub.entities._commons.utils import get_project_from_key, parse_entity_key
 from digitalhub.factory.api import build_entity_from_dict
+from digitalhub.stores.client.api import get_client
 from digitalhub.utils.exceptions import ContextError, EntityError, EntityNotExistsError
 
 if typing.TYPE_CHECKING:
-    from digitalhub.client._base.client import Client
     from digitalhub.context.context import Context
+    from digitalhub.stores.client._base.client import Client
 
 
 def parse_identifier(

digitalhub/entities/dataitem/table/entity.py

@@ -6,7 +6,7 @@ from pathlib import Path
 from typing import Any
 
 from digitalhub.entities.dataitem._base.entity import Dataitem
-from digitalhub.stores.api import get_store
+from digitalhub.stores.data.api import get_store
 from digitalhub.utils.uri_utils import has_sql_scheme
 
 if typing.TYPE_CHECKING:

digitalhub/entities/dataitem/utils.py

@@ -8,8 +8,8 @@ from digitalhub.context.api import get_context
 from digitalhub.entities._base.entity._constructors.uuid import build_uuid
 from digitalhub.entities._base.material.utils import build_log_path_from_source, eval_local_source
 from digitalhub.entities._commons.enums import EntityKinds, EntityTypes
-from digitalhub.readers.data.api import get_reader_by_object
-from digitalhub.stores.api import get_store
+from digitalhub.stores.data.api import get_store
+from digitalhub.stores.readers.data.api import get_reader_by_object
 from digitalhub.utils.enums import FileExtensions
 from digitalhub.utils.generic_utils import slugify_string
 from digitalhub.utils.types import SourcesOrListOfSources

digitalhub/entities/model/_base/entity.py

@@ -101,6 +101,36 @@ class Model(MaterialEntity):
         self._set_metrics(key, value, overwrite, single_value)
         context_processor.update_metric(self.project, self.ENTITY_TYPE, self.id, key, self.status.metrics[key])
 
+    def log_metrics(
+        self,
+        metrics: dict[str, MetricType],
+        overwrite: bool = False,
+    ) -> None:
+        """
+        Log metrics into entity status. If a metric is a list, it will be logged as a list.
+        Otherwise, it will be logged as a single value.
+
+        Parameters
+        ----------
+        metrics : dict[str, MetricType]
+            Dict of metrics to log.
+        overwrite : bool
+            If True, overwrite existing metrics.
+
+        Returns
+        -------
+        None
+
+        See also
+        --------
+        log_metric
+        """
+        for key, value in metrics.items():
+            if isinstance(value, list):
+                self.log_metric(key, value, overwrite)
+            else:
+                self.log_metric(key, value, overwrite, single_value=True)
+
     ##############################
     # Helper methods
     ##############################

digitalhub/entities/project/_base/entity.py

@@ -4,7 +4,6 @@ import typing
 from pathlib import Path
 from typing import Any
 
-from digitalhub.client.api import get_client
 from digitalhub.context.api import build_context
 from digitalhub.entities._base.entity.entity import Entity
 from digitalhub.entities._commons.enums import EntityTypes
@@ -69,6 +68,7 @@ from digitalhub.entities.workflow.crud import (
     update_workflow,
 )
 from digitalhub.factory.api import build_entity_from_dict
+from digitalhub.stores.client.api import get_client
 from digitalhub.utils.exceptions import BackendError, EntityAlreadyExistsError, EntityError
 from digitalhub.utils.generic_utils import get_timestamp
 from digitalhub.utils.io_utils import write_yaml

digitalhub/entities/run/_base/entity.py

@@ -210,6 +210,36 @@ class Run(UnversionedEntity):
         self._set_metrics(key, value, overwrite, single_value)
         context_processor.update_metric(self.project, self.ENTITY_TYPE, self.id, key, self.status.metrics[key])
 
+    def log_metrics(
+        self,
+        metrics: dict[str, MetricType],
+        overwrite: bool = False,
+    ) -> None:
+        """
+        Log metrics into entity status. If a metric is a list, it will be logged as a list.
+        Otherwise, it will be logged as a single value.
+
+        Parameters
+        ----------
+        metrics : dict[str, MetricType]
+            Dict of metrics to log.
+        overwrite : bool
+            If True, overwrite existing metrics.
+
+        Returns
+        -------
+        None
+
+        See also
+        --------
+        log_metric
+        """
+        for key, value in metrics.items():
+            if isinstance(value, list):
+                self.log_metric(key, value, overwrite)
+            else:
+                self.log_metric(key, value, overwrite, single_value=True)
+
     ##############################
     #  Helpers
     ##############################

digitalhub/{client → stores/client}/_base/client.py

@@ -5,9 +5,9 @@ from abc import abstractmethod
 from typing import Any
 
 if typing.TYPE_CHECKING:
-    from digitalhub.client._base.api_builder import ClientApiBuilder
-    from digitalhub.client._base.key_builder import ClientKeyBuilder
-    from digitalhub.client._base.params_builder import ClientParametersBuilder
+    from digitalhub.stores.client._base.api_builder import ClientApiBuilder
+    from digitalhub.stores.client._base.key_builder import ClientKeyBuilder
+    from digitalhub.stores.client._base.params_builder import ClientParametersBuilder
 
 
 class Client:

digitalhub/{client → stores/client}/api.py

@@ -2,10 +2,10 @@ from __future__ import annotations
 
 import typing
 
-from digitalhub.client.builder import client_builder
+from digitalhub.stores.client.builder import client_builder
 
 if typing.TYPE_CHECKING:
-    from digitalhub.client._base.client import Client
+    from digitalhub.stores.client._base.client import Client
 
 
 def get_client(local: bool = False, config: dict | None = None) -> Client:

digitalhub/{client → stores/client}/builder.py

@@ -2,11 +2,11 @@ from __future__ import annotations
 
 import typing
 
-from digitalhub.client.dhcore.client import ClientDHCore
-from digitalhub.client.local.client import ClientLocal
+from digitalhub.stores.client.dhcore.client import ClientDHCore
+from digitalhub.stores.client.local.client import ClientLocal
 
 if typing.TYPE_CHECKING:
-    from digitalhub.client._base.client import Client
+    from digitalhub.stores.client._base.client import Client
 
 
 class ClientBuilder:

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

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
-from digitalhub.client._base.api_builder import ClientApiBuilder
 from digitalhub.entities._commons.enums import ApiCategories, BackendOperations
+from digitalhub.stores.client._base.api_builder import ClientApiBuilder
 from digitalhub.utils.exceptions import BackendError
 
 API_BASE = "/api/v1"

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

@@ -6,12 +6,12 @@ from typing import Any
 from requests import request
 from requests.exceptions import JSONDecodeError
 
-from digitalhub.client._base.client import Client
-from digitalhub.client.dhcore.api_builder import ClientDHCoreApiBuilder
-from digitalhub.client.dhcore.configurator import ClientDHCoreConfigurator
-from digitalhub.client.dhcore.error_parser import ErrorParser
-from digitalhub.client.dhcore.key_builder import ClientDHCoreKeyBuilder
-from digitalhub.client.dhcore.params_builder import ClientDHCoreParametersBuilder
+from digitalhub.stores.client._base.client import Client
+from digitalhub.stores.client.dhcore.api_builder import ClientDHCoreApiBuilder
+from digitalhub.stores.client.dhcore.configurator import ClientDHCoreConfigurator
+from digitalhub.stores.client.dhcore.error_parser import ErrorParser
+from digitalhub.stores.client.dhcore.key_builder import ClientDHCoreKeyBuilder
+from digitalhub.stores.client.dhcore.params_builder import ClientDHCoreParametersBuilder
 from digitalhub.utils.exceptions import BackendError
 from digitalhub.utils.generic_utils import dump_json
 

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

@@ -1,17 +1,16 @@
 from __future__ import annotations
 
-import os
 import typing
 from warnings import warn
 
 from requests import request
 
-from digitalhub.client.dhcore.enums import AuthType, DhcoreEnvVar
-from digitalhub.client.dhcore.models import BasicAuth, OAuth2TokenAuth
-from digitalhub.configurator.configurator import configurator
-from digitalhub.stores.s3.enums import S3StoreEnv
-from digitalhub.stores.sql.enums import SqlStoreEnv
+from digitalhub.stores.client.dhcore.enums import AuthType, DhcoreEnvVar
+from digitalhub.stores.configurator.configurator import configurator
+from digitalhub.stores.data.s3.enums import S3StoreEnv
+from digitalhub.stores.data.sql.enums import SqlStoreEnv
 from digitalhub.utils.exceptions import ClientError
+from digitalhub.utils.generic_utils import list_enum
 from digitalhub.utils.uri_utils import has_remote_scheme
 
 if typing.TYPE_CHECKING:
@@ -54,37 +53,8 @@ class ClientDHCoreConfigurator:
         -------
         None
         """
-        if config is None:
-            self._get_core_endpoint()
-            self._get_auth_vars()
-            return
-
-        # Read passed config
-        # Validate and save credentials
-        if config.get("access_token") is not None:
-            config = OAuth2TokenAuth(**config)
-            for pair in [
-                (AUTH_KEY, AuthType.OAUTH2.value),
-                (DhcoreEnvVar.ENDPOINT.value, config.endpoint),
-                (DhcoreEnvVar.ISSUER.value, config.issuer),
-                (DhcoreEnvVar.ACCESS_TOKEN.value, config.access_token),
-                (DhcoreEnvVar.REFRESH_TOKEN.value, config.refresh_token),
-                (DhcoreEnvVar.CLIENT_ID.value, config.client_id),
-            ]:
-                configurator.set_credential(*pair)
-
-        elif config.get("user") is not None and config.get("password") is not None:
-            config = BasicAuth(**config)
-            for pair in [
-                (AUTH_KEY, AuthType.BASIC.value),
-                (DhcoreEnvVar.ENDPOINT.value, config.endpoint),
-                (DhcoreEnvVar.USER.value, config.user),
-                (DhcoreEnvVar.PASSWORD.value, config.password),
-            ]:
-                configurator.set_credential(*pair)
-
-        else:
-            raise ClientError("Invalid credentials format.")
+        self._get_core_endpoint()
+        self._get_auth_vars()
 
     def check_core_version(self, response: Response) -> None:
         """
@@ -257,52 +227,32 @@ class ClientDHCoreConfigurator:
 
         # Otherwise try token from file
         if response.status_code in (400, 401, 403):
-            refresh_token = configurator.load_from_config(DhcoreEnvVar.REFRESH_TOKEN.value)
+            refresh_token = configurator.load_from_file(DhcoreEnvVar.REFRESH_TOKEN.value)
             response = self._call_refresh_token_endpoint(url, refresh_token)
 
         response.raise_for_status()
-        dict_response = response.json()
-
-        # Read new access token and refresh token
-        configurator.set_credential(DhcoreEnvVar.ACCESS_TOKEN.value, dict_response["access_token"])
-        configurator.set_credential(DhcoreEnvVar.REFRESH_TOKEN.value, dict_response["refresh_token"])
-
-        # Set new credential in stores
-        if (access_key := dict_response.get("aws_access_key_id")) is not None:
-            configurator.set_credential(S3StoreEnv.ACCESS_KEY_ID.value, access_key)
-            os.environ[S3StoreEnv.ACCESS_KEY_ID.value] = access_key
-        if (secret_key := dict_response.get("aws_secret_access_key")) is not None:
-            configurator.set_credential(S3StoreEnv.SECRET_ACCESS_KEY.value,secret_key )
-            os.environ[S3StoreEnv.SECRET_ACCESS_KEY.value] = secret_key
-        if (db_username := dict_response.get("db_username")) is not None:
-            configurator.set_credential(SqlStoreEnv.USERNAME.value, db_username)
-            os.environ[SqlStoreEnv.USERNAME.value] = db_username
-        if (db_password := dict_response.get("db_password")) is not None:
-            configurator.set_credential(SqlStoreEnv.PASSWORD.value, db_password)
-            os.environ[SqlStoreEnv.PASSWORD.value] = db_password
-
-        # Propagate new access token to config file
-        self._write_env()
-
-    def _write_env(self) -> None:
+
+        # Read new credentials and propagate to config file
+        self._set_creds(response.json())
+
+    def _set_creds(self, response: dict) -> None:
         """
-        Write the env variables to the .dhcore.ini file.
-        It will overwrite any existing env variables.
+        Set new credentials.
+
+        Parameters
+        ----------
+        response : dict
+            Response from refresh token endpoint.
 
         Returns
         -------
         None
         """
-        configurator.write_env(
-            [
-                DhcoreEnvVar.ACCESS_TOKEN.value,
-                DhcoreEnvVar.REFRESH_TOKEN.value,
-                S3StoreEnv.ACCESS_KEY_ID.value,
-                S3StoreEnv.SECRET_ACCESS_KEY.value,
-                SqlStoreEnv.USERNAME.value,
-                SqlStoreEnv.PASSWORD.value
-            ]
-        )
+        keys = list_enum(DhcoreEnvVar) + list_enum(S3StoreEnv) + list_enum(SqlStoreEnv)
+        for key in keys:
+            if (value := response.get(key.lower().removeprefix("dhcore_"))) is not None:
+                configurator.set_credential(key, value)
+        configurator.write_env(keys)
 
     def _get_refresh_endpoint(self) -> str:
         """
@@ -315,11 +265,10 @@ class ClientDHCoreConfigurator:
         """
         # Get issuer endpoint
         endpoint_issuer = configurator.load_var(DhcoreEnvVar.ISSUER.value)
-        if endpoint_issuer is not None:
-            endpoint_issuer = self._sanitize_endpoint(endpoint_issuer)
-            configurator.set_credential(DhcoreEnvVar.ISSUER.value, endpoint_issuer)
-        else:
+        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)
 
         # Standard issuer endpoint path
         url = endpoint_issuer + "/.well-known/openid-configuration"

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

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from digitalhub.client._base.key_builder import ClientKeyBuilder
+from digitalhub.stores.client._base.key_builder import ClientKeyBuilder
 
 
 class ClientDHCoreKeyBuilder(ClientKeyBuilder):

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

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
-from digitalhub.client._base.params_builder import ClientParametersBuilder
 from digitalhub.entities._commons.enums import ApiCategories, BackendOperations
+from digitalhub.stores.client._base.params_builder import ClientParametersBuilder
 
 
 class ClientDHCoreParametersBuilder(ClientParametersBuilder):
@@ -77,7 +77,11 @@ class ClientDHCoreParametersBuilder(ClientParametersBuilder):
         kwargs = self._set_params(**kwargs)
 
         # Handle read
-        if operation == BackendOperations.READ_ALL_VERSIONS.value:
+        if operation == BackendOperations.READ.value:
+            name = kwargs.pop("entity_name", None)
+            if name is not None:
+                kwargs["params"]["name"] = name
+        elif operation == BackendOperations.READ_ALL_VERSIONS.value:
             kwargs["params"]["versions"] = "all"
             kwargs["params"]["name"] = kwargs.pop("entity_name")
         # Handle delete

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

@@ -3,11 +3,11 @@ from __future__ import annotations
 import os
 import typing
 
-from digitalhub.client.api import get_client
-from digitalhub.client.dhcore.enums import DhcoreEnvVar
+from digitalhub.stores.client.api import get_client
+from digitalhub.stores.client.dhcore.enums import DhcoreEnvVar
 
 if typing.TYPE_CHECKING:
-    from digitalhub.client.dhcore.client import ClientDHCore
+    from digitalhub.stores.client.dhcore.client import ClientDHCore
 
 
 def set_dhcore_env(

digitalhub/{client → stores/client}/local/api_builder.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 
-from digitalhub.client._base.api_builder import ClientApiBuilder
-from digitalhub.client.local.enums import LocalClientVar
 from digitalhub.entities._commons.enums import ApiCategories, BackendOperations
+from digitalhub.stores.client._base.api_builder import ClientApiBuilder
+from digitalhub.stores.client.local.enums import LocalClientVar
 from digitalhub.utils.exceptions import BackendError
 
 API_BASE = "/api/v1"

digitalhub/{client → stores/client}/local/client.py

@@ -4,11 +4,11 @@ from copy import deepcopy
 from datetime import datetime, timezone
 from typing import Any
 
-from digitalhub.client._base.client import Client
-from digitalhub.client.local.api_builder import ClientLocalApiBuilder
-from digitalhub.client.local.enums import LocalClientVar
-from digitalhub.client.local.key_builder import ClientLocalKeyBuilder
-from digitalhub.client.local.params_builder import ClientLocalParametersBuilder
+from digitalhub.stores.client._base.client import Client
+from digitalhub.stores.client.local.api_builder import ClientLocalApiBuilder
+from digitalhub.stores.client.local.enums import LocalClientVar
+from digitalhub.stores.client.local.key_builder import ClientLocalKeyBuilder
+from digitalhub.stores.client.local.params_builder import ClientLocalParametersBuilder
 from digitalhub.utils.exceptions import BackendError
 
 

digitalhub/{client → stores/client}/local/key_builder.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from digitalhub.client._base.key_builder import ClientKeyBuilder
+from digitalhub.stores.client._base.key_builder import ClientKeyBuilder
 
 
 class ClientLocalKeyBuilder(ClientKeyBuilder):

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

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
-from digitalhub.client._base.params_builder import ClientParametersBuilder
 from digitalhub.entities._commons.enums import ApiCategories, BackendOperations
+from digitalhub.stores.client._base.params_builder import ClientParametersBuilder
 
 
 class ClientLocalParametersBuilder(ClientParametersBuilder):

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

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from digitalhub.configurator.configurator import configurator
+from digitalhub.stores.configurator.configurator import configurator
 
 
 def set_current_env(environment: str) -> None:

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

@@ -2,8 +2,8 @@ from __future__ import annotations
 
 import os
 
-from digitalhub.configurator.credentials_store import CredentialsStore
-from digitalhub.configurator.ini_module import load_from_config, write_config
+from digitalhub.stores.configurator.credentials_store import CredentialsStore
+from digitalhub.stores.configurator.ini_module import load_from_file, write_config
 
 
 class EnvConfigurator:
@@ -70,7 +70,7 @@ class EnvConfigurator:
         if var is None:
             var = self.load_from_env(var_name)
         if var is None:
-            var = self.load_from_config(var_name)
+            var = self.load_from_file(var_name)
         return var
 
     def load_from_env(self, var: str) -> str | None:
@@ -91,7 +91,7 @@ class EnvConfigurator:
         if env_var != "":
             return env_var
 
-    def load_from_config(self, var: str) -> str | None:
+    def load_from_file(self, var: str) -> str | None:
         """
         Load variable from config file.
 
@@ -105,7 +105,7 @@ class EnvConfigurator:
         str | None
             Environment variable value.
         """
-        return load_from_config(var)
+        return load_from_file(var)
 
     def write_env(self, key_to_include: list[str] | None = None) -> None:
         """

digitalhub/stores/configurator/enums.py

@@ -0,0 +1,12 @@
+from __future__ import annotations
+
+from enum import Enum
+
+
+class CredsOrigin(Enum):
+    """
+    List credential origins.
+    """
+
+    ENV = "env"
+    FILE = "file"

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

@@ -13,7 +13,7 @@ from digitalhub.utils.exceptions import ClientError
 ENV_FILE = Path.home() / ".dhcore.ini"
 
 
-def load_from_config(var: str) -> str | None:
+def load_from_file(var: str) -> str | None:
     """
     Load variable from config file.
 

digitalhub/stores/{_base → data/_base}/store.py

@@ -6,13 +6,13 @@ from pathlib import Path
 from tempfile import mkdtemp
 from typing import Any
 
-from digitalhub.readers.data.api import get_reader_by_engine
+from digitalhub.stores.readers.data.api import get_reader_by_engine
 from digitalhub.utils.exceptions import StoreError
 from digitalhub.utils.types import SourcesOrListOfSources
 from digitalhub.utils.uri_utils import has_local_scheme
 
 if typing.TYPE_CHECKING:
-    from digitalhub.readers.data._base.reader import DataframeReader
+    from digitalhub.stores.readers.data._base.reader import DataframeReader
 
 
 class Store:

digitalhub/stores/{api.py → data/api.py}

@@ -2,10 +2,10 @@ from __future__ import annotations
 
 import typing
 
-from digitalhub.stores.builder import store_builder
+from digitalhub.stores.data.builder import store_builder
 
 if typing.TYPE_CHECKING:
-    from digitalhub.stores._base.store import Store
+    from digitalhub.stores.data._base.store import Store
 
 
 def get_store(project: str, uri: str, config: dict | None = None) -> Store:

digitalhub/stores/{builder.py → data/builder.py}

@@ -2,15 +2,15 @@ from __future__ import annotations
 
 import typing
 
-from digitalhub.configurator.api import get_current_env
-from digitalhub.stores.local.store import LocalStore
-from digitalhub.stores.remote.store import RemoteStore
-from digitalhub.stores.s3.store import S3Store
-from digitalhub.stores.sql.store import SqlStore
+from digitalhub.stores.configurator.api import get_current_env
+from digitalhub.stores.data.local.store import LocalStore
+from digitalhub.stores.data.remote.store import RemoteStore
+from digitalhub.stores.data.s3.store import S3Store
+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._base.store import Store
+    from digitalhub.stores.data._base.store import Store
 
 
 def _get_class_from_type(type: str) -> Store:

digitalhub/stores/{local → data/local}/store.py

@@ -4,8 +4,8 @@ import shutil
 from pathlib import Path
 from typing import Any
 
-from digitalhub.readers.data.api import get_reader_by_object
-from digitalhub.stores._base.store import Store
+from digitalhub.stores.data._base.store import Store
+from digitalhub.stores.readers.data.api import get_reader_by_object
 from digitalhub.utils.exceptions import StoreError
 from digitalhub.utils.file_utils import get_file_info_from_local
 from digitalhub.utils.types import SourcesOrListOfSources