digitalhub 0.13.3__py3-none-any.whl → 0.14.0__py3-none-any.whl

digitalhub/factory/utils.py

@@ -9,7 +9,7 @@ import pkgutil
 import re
 from types import ModuleType
 
-from digitalhub.factory.factory import factory
+from digitalhub.factory.enums import FactoryEnum
 
 
 def import_module(package: str) -> ModuleType:
@@ -58,62 +58,11 @@ def list_runtimes() -> list[str]:
     RuntimeError
         If an error occurs while scanning for runtime packages.
     """
-    pattern = r"digitalhub_runtime_.*"
-    runtimes: list[str] = []
     try:
+        runtimes: list[str] = []
         for _, name, _ in pkgutil.iter_modules():
-            if re.match(pattern, name):
+            if re.match(FactoryEnum.RGX_RUNTIMES.value, name):
                 runtimes.append(name)
         return runtimes
     except Exception as e:
         raise RuntimeError("Error listing installed runtimes.") from e
-
-
-def register_runtimes_entities() -> None:
-    """
-    Register all runtime builders and their entities into the factory.
-
-    Imports each runtime package and registers its entity and runtime
-    builders with the global factory instance.
-
-    Returns
-    -------
-    None
-    """
-    for package in list_runtimes():
-        module = import_module(package)
-        entity_builders = getattr(module, "entity_builders")
-        for entity_builder_tuple in entity_builders:
-            kind, builder = entity_builder_tuple
-            factory.add_entity_builder(kind, builder)
-
-        runtime_builders = getattr(module, "runtime_builders")
-        for runtime_builder_tuple in runtime_builders:
-            kind, builder = runtime_builder_tuple
-            factory.add_runtime_builder(kind, builder)
-
-
-def register_entities() -> None:
-    """
-    Register core entity builders into the factory.
-
-    Imports the core entities module and registers all entity
-    builders with the global factory instance.
-
-    Returns
-    -------
-    None
-
-    Raises
-    ------
-    RuntimeError
-        If registration of core entities fails.
-    """
-    try:
-        module = import_module("digitalhub.entities.builders")
-        entities_builders_list = getattr(module, "entity_builders")
-        for entity_builder_tuple in entities_builders_list:
-            kind, builder = entity_builder_tuple
-            factory.add_entity_builder(kind, builder)
-    except Exception as e:
-        raise RuntimeError("Error registering entities.") from e

digitalhub/runtimes/_base.py

@@ -7,7 +7,7 @@ from __future__ import annotations
 from abc import abstractmethod
 from typing import Any, Callable
 
-from digitalhub.factory.factory import factory
+from digitalhub.factory.entity import entity_factory
 from digitalhub.utils.exceptions import EntityError
 from digitalhub.utils.logger import LOGGER
 
@@ -72,7 +72,7 @@ class Runtime:
             raise RuntimeError(msg)
 
         try:
-            return factory.get_action_from_task_kind(task_kind, task_kind)
+            return entity_factory.get_action_from_task_kind(task_kind, task_kind)
         except EntityError:
             msg = f"Task {task_kind} not allowed."
             LOGGER.exception(msg)

digitalhub/stores/client/_base/enums.py

@@ -0,0 +1,39 @@
+# SPDX-FileCopyrightText: © 2025 DSLab - Fondazione Bruno Kessler
+#
+# SPDX-License-Identifier: Apache-2.0
+
+from __future__ import annotations
+
+from enum import Enum
+
+
+class ApiCategories(Enum):
+    """
+    API categories.
+    """
+
+    BASE = "base"
+    CONTEXT = "context"
+
+
+class BackendOperations(Enum):
+    """
+    Backend operations.
+    """
+
+    CREATE = "create"
+    READ = "read"
+    READ_ALL_VERSIONS = "read_all_versions"
+    UPDATE = "update"
+    DELETE = "delete"
+    DELETE_ALL_VERSIONS = "delete_all_versions"
+    LIST = "list"
+    LIST_FIRST = "list_first"
+    STOP = "stop"
+    RESUME = "resume"
+    DATA = "data"
+    FILES = "files"
+    LOGS = "logs"
+    SEARCH = "search"
+    SHARE = "share"
+    METRICS = "metrics"

digitalhub/stores/client/_base/key_builder.py

@@ -6,7 +6,7 @@ from __future__ import annotations
 
 from abc import abstractmethod
 
-from digitalhub.entities._commons.enums import ApiCategories
+from digitalhub.stores.client._base.enums import ApiCategories
 
 
 class ClientKeyBuilder:
@@ -74,7 +74,7 @@ class ClientKeyBuilder:
             The entity kind.
         entity_name : str
             The entity name.
-        entity_id : str, optional
+        entity_id : str
             The entity identifier. If None, key will not include version.
 
         Returns

digitalhub/stores/client/_base/params_builder.py

@@ -5,6 +5,7 @@
 from __future__ import annotations
 
 from abc import abstractmethod
+from typing import Any
 
 
 class ClientParametersBuilder:
@@ -32,3 +33,50 @@ class ClientParametersBuilder:
         dict
             The formatted parameters for the client call.
         """
+
+    @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

digitalhub/stores/client/api.py

@@ -9,10 +9,11 @@ import typing
 from digitalhub.stores.client.builder import client_builder
 
 if typing.TYPE_CHECKING:
-    from digitalhub.stores.client._base.client import Client
+    from digitalhub.stores.client.dhcore.client import ClientDHCore
+    from digitalhub.stores.client.local.client import ClientLocal
 
 
-def get_client(local: bool = False, config: dict | None = None) -> Client:
+def get_client(local: bool = False) -> ClientLocal | ClientDHCore:
     """
     Wrapper around ClientBuilder.build.
 
@@ -22,15 +23,10 @@ def get_client(local: bool = False, config: dict | None = None) -> Client:
         Whether to create a local client or not. If True, creates a
         ClientLocal instance that operates in-memory. If False, creates
         a ClientDHCore instance that communicates with a remote backend.
-    config : dict, optional
-        DHCore environment configuration. Only used when local=False.
-        If None, configuration will be loaded from environment variables
-        and configuration files.
 
     Returns
     -------
-    Client
-        The client instance. Either ClientLocal or ClientDHCore depending
-        on the local parameter.
+    ClientLocal | ClientDHCore
+        The client instance.
     """
-    return client_builder.build(local, config)
+    return client_builder.build(local)

digitalhub/stores/client/builder.py

@@ -10,7 +10,7 @@ from digitalhub.stores.client.dhcore.client import ClientDHCore
 from digitalhub.stores.client.local.client import ClientLocal
 
 if typing.TYPE_CHECKING:
-    from digitalhub.stores.client._base.client import Client
+    pass
 
 
 class ClientBuilder:
@@ -27,7 +27,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, config: dict | None = None) -> ClientLocal | ClientDHCore:
         """
         Method to create a client instance.
 
@@ -35,12 +35,12 @@ class ClientBuilder:
         ----------
         local : bool, default False
             Whether to create a local client or not.
-        config : dict, optional
+        config : dict
             DHCore environment configuration.
 
         Returns
         -------
-        Client
+        ClientLocal | ClientDHCore
             Returns the client instance.
         """
         if local:

digitalhub/stores/client/dhcore/api_builder.py

@@ -4,8 +4,8 @@
 
 from __future__ import annotations
 
-from digitalhub.entities._commons.enums import ApiCategories, BackendOperations
 from digitalhub.stores.client._base.api_builder import ClientApiBuilder
+from digitalhub.stores.client._base.enums import ApiCategories, BackendOperations
 from digitalhub.utils.exceptions import BackendError
 
 API_BASE = "/api/v1"
@@ -100,6 +100,7 @@ class ClientDHCoreApiBuilder(ClientApiBuilder):
         if operation in (
             BackendOperations.CREATE.value,
             BackendOperations.LIST.value,
+            BackendOperations.DELETE_ALL_VERSIONS.value,
         ):
             return f"{API_CONTEXT}/{project}/{entity_type}"
         elif operation in (