digitalhub 0.8.0b3__py3-none-any.whl → 0.8.0b5__py3-none-any.whl

digitalhub/entities/function/_base/builder.py

@@ -0,0 +1,78 @@
+from __future__ import annotations
+
+import typing
+
+from digitalhub.entities._base.versioned.builder import VersionedBuilder
+from digitalhub.entities.utils.entity_types import EntityTypes
+
+if typing.TYPE_CHECKING:
+    from digitalhub.entities.function._base.entity import Function
+
+
+class FunctionBuilder(VersionedBuilder):
+    """
+    Function builder.
+    """
+
+    ENTITY_TYPE = EntityTypes.FUNCTION.value
+
+    def build(
+        self,
+        kind: str,
+        project: str,
+        name: str,
+        uuid: str | None = None,
+        description: str | None = None,
+        labels: list[str] | None = None,
+        embedded: bool = True,
+        **kwargs,
+    ) -> Function:
+        """
+        Create a new object.
+
+        Parameters
+        ----------
+        project : str
+            Project name.
+        name : str
+            Object name.
+        kind : str
+            Kind the object.
+        uuid : str
+            ID of the object.
+        description : str
+            Description of the object (human readable).
+        labels : list[str]
+            List of labels.
+        embedded : bool
+            Flag to determine if object spec must be embedded in project spec.
+        **kwargs : dict
+            Spec keyword arguments.
+
+        Returns
+        -------
+        Function
+            Object instance.
+        """
+        name = self.build_name(name)
+        uuid = self.build_uuid(uuid)
+        metadata = self.build_metadata(
+            project=project,
+            name=name,
+            description=description,
+            labels=labels,
+            embedded=embedded,
+        )
+        spec = self.build_spec(
+            **kwargs,
+        )
+        status = self.build_status()
+        return self.build_entity(
+            project=project,
+            name=name,
+            uuid=uuid,
+            kind=kind,
+            metadata=metadata,
+            spec=spec,
+            status=status,
+        )

digitalhub/entities/function/_base/entity.py

@@ -5,7 +5,7 @@ from concurrent.futures import ThreadPoolExecutor
 
 from digitalhub.entities._base.executable.entity import ExecutableEntity
 from digitalhub.entities.utils.entity_types import EntityTypes
-from digitalhub.runtimes.builder import get_kind_registry
+from digitalhub.runtimes.utils import get_kind_registry
 from digitalhub.utils.exceptions import BackendError
 
 if typing.TYPE_CHECKING:
@@ -72,7 +72,7 @@ class Function(ExecutableEntity):
             Run instance.
         """
         # Get kind registry
-        kind_reg = get_kind_registry(self.kind)
+        kind_reg = get_kind_registry(self.kind, self.project)
 
         # Get task and run kind
         task_kind = kind_reg.get_task_kind_from_action(action=action)

digitalhub/entities/function/builder.py

@@ -1,72 +1,33 @@
 from __future__ import annotations
 
-from digitalhub.entities._builders.metadata import build_metadata
-from digitalhub.entities._builders.name import build_name
-from digitalhub.entities._builders.spec import build_spec
-from digitalhub.entities._builders.status import build_status
-from digitalhub.entities._builders.uuid import build_uuid
-from digitalhub.entities.function._base.entity import Function
+import typing
 
+from digitalhub.factory.factory import factory
+from digitalhub.utils.exceptions import BuilderError
 
-def function_from_parameters(
-    project: str,
-    name: str,
-    kind: str,
-    uuid: str | None = None,
-    description: str | None = None,
-    labels: list[str] | None = None,
-    embedded: bool = True,
-    **kwargs,
-) -> Function:
+if typing.TYPE_CHECKING:
+    from digitalhub.entities.function._base.entity import Function
+
+
+def function_from_parameters(**kwargs) -> Function:
     """
-    Create a new Function instance and persist it to the backend.
+    Create a new object.
 
     Parameters
     ----------
-    project : str
-        Project name.
-    name : str
-        Object name.
-    kind : str
-        Kind the object.
-    uuid : str
-        ID of the object (UUID4, e.g. 40f25c4b-d26b-4221-b048-9527aff291e2).
-    description : str
-        Description of the object (human readable).
-    labels : list[str]
-        List of labels.
-    embedded : bool
-        Flag to determine if object spec must be embedded in project spec.
-    **kwargs : dict
-        Spec keyword arguments.
+    **kwargs
+        Keyword arguments.
 
     Returns
     -------
     Function
         Object instance.
     """
-    name = build_name(name)
-    uuid = build_uuid(uuid)
-    spec = build_spec(kind, **kwargs)
-    metadata = build_metadata(
-        kind,
-        project=project,
-        name=name,
-        version=uuid,
-        description=description,
-        labels=labels,
-        embedded=embedded,
-    )
-    status = build_status(kind)
-    return Function(
-        project=project,
-        name=name,
-        uuid=uuid,
-        kind=kind,
-        metadata=metadata,
-        spec=spec,
-        status=status,
-    )
+    try:
+        kind = kwargs["kind"]
+    except KeyError:
+        raise BuilderError("Missing 'kind' parameter.")
+    return factory.build_entity_from_params(kind, **kwargs)
 
 
 def function_from_dict(obj: dict) -> Function:
@@ -81,6 +42,10 @@ def function_from_dict(obj: dict) -> Function:
     Returns
     -------
     Function
-        Function object.
+        Object instance.
     """
-    return Function.from_dict(obj)
+    try:
+        kind = obj["kind"]
+    except KeyError:
+        raise BuilderError("Missing 'kind' parameter.")
+    return factory.build_entity_from_dict(kind, obj)

digitalhub/entities/function/crud.py

@@ -42,7 +42,7 @@ def new_function(
     kind : str
         Kind the object.
     uuid : str
-        ID of the object (UUID4, e.g. 40f25c4b-d26b-4221-b048-9527aff291e2).
+        ID of the object.
     description : str
         Description of the object (human readable).
     labels : list[str]

digitalhub/entities/model/_base/builder.py

@@ -0,0 +1,86 @@
+from __future__ import annotations
+
+import typing
+
+from digitalhub.entities._base.versioned.builder import VersionedBuilder
+from digitalhub.entities.utils.entity_types import EntityTypes
+from digitalhub.utils.exceptions import EntityError
+
+if typing.TYPE_CHECKING:
+    from digitalhub.entities.model._base.entity import Model
+
+
+class ModelBuilder(VersionedBuilder):
+    """
+    Model builder.
+    """
+
+    ENTITY_TYPE = EntityTypes.MODEL.value
+
+    def build(
+        self,
+        kind: str,
+        project: str,
+        name: str,
+        uuid: str | None = None,
+        description: str | None = None,
+        labels: list[str] | None = None,
+        embedded: bool = True,
+        path: str | None = None,
+        **kwargs,
+    ) -> Model:
+        """
+        Create a new object.
+
+        Parameters
+        ----------
+        project : str
+            Project name.
+        name : str
+            Object name.
+        kind : str
+            Kind the object.
+        uuid : str
+            ID of the object.
+        description : str
+            Description of the object (human readable).
+        labels : list[str]
+            List of labels.
+        embedded : bool
+            Flag to determine if object spec must be embedded in project spec.
+        path : str
+            Object path on local file system or remote storage. It is also the destination path of upload() method.
+        **kwargs : dict
+            Spec keyword arguments.
+
+        Returns
+        -------
+        Model
+            Object instance.
+        """
+        if path is None:
+            raise EntityError("Path must be provided.")
+
+        name = self.build_name(name)
+        uuid = self.build_uuid(uuid)
+        metadata = self.build_metadata(
+            project=project,
+            name=name,
+            description=description,
+            labels=labels,
+            embedded=embedded,
+        )
+        spec = self.build_spec(
+            path=path,
+            **kwargs,
+        )
+        status = self.build_status()
+        return self.build_entity(
+            project=project,
+            name=name,
+            uuid=uuid,
+            kind=kind,
+            metadata=metadata,
+            spec=spec,
+            status=status,
+        )

digitalhub/entities/model/builder.py

@@ -2,135 +2,32 @@ from __future__ import annotations
 
 import typing
 
-from digitalhub.entities._builders.metadata import build_metadata
-from digitalhub.entities._builders.name import build_name
-from digitalhub.entities._builders.spec import build_spec
-from digitalhub.entities._builders.status import build_status
-from digitalhub.entities._builders.uuid import build_uuid
-from digitalhub.utils.exceptions import EntityError
+from digitalhub.factory.factory import factory
+from digitalhub.utils.exceptions import BuilderError
 
 if typing.TYPE_CHECKING:
     from digitalhub.entities.model._base.entity import Model
 
-# Manage class mapper
-cls_mapper = {}
 
-try:
-    from digitalhub.entities.model.model.entity import ModelModel
-
-    cls_mapper["model"] = ModelModel
-except ImportError:
-    ...
-
-try:
-    from digitalhub.entities.model.mlflow.entity import ModelMlflow
-
-    cls_mapper["mlflow"] = ModelMlflow
-except ImportError:
-    ...
-try:
-    from digitalhub.entities.model.sklearn.entity import ModelSklearn
-
-    cls_mapper["sklearn"] = ModelSklearn
-except ImportError:
-    ...
-try:
-    from digitalhub.entities.model.huggingface.entity import ModelHuggingface
-
-    cls_mapper["huggingface"] = ModelHuggingface
-except ImportError:
-    pass
-
-
-def _choose_model_type(kind: str) -> type[Model]:
-    """
-    Choose class based on kind.
-
-    Parameters
-    ----------
-    kind : str
-        Kind the object.
-
-    Returns
-    -------
-    type[Model]
-        Class of the model.
-    """
-    try:
-        return cls_mapper[kind]
-    except KeyError:
-        raise EntityError(f"Unknown model kind: {kind}")
-
-
-def model_from_parameters(
-    project: str,
-    name: str,
-    kind: str,
-    uuid: str | None = None,
-    description: str | None = None,
-    labels: list[str] | None = None,
-    embedded: bool = True,
-    path: str | None = None,
-    **kwargs,
-) -> Model:
+def model_from_parameters(**kwargs) -> Model:
     """
     Create a new object.
 
     Parameters
     ----------
-    project : str
-        Project name.
-    name : str
-        Object name.
-    kind : str
-        Kind the object.
-    uuid : str
-        ID of the object (UUID4, e.g. 40f25c4b-d26b-4221-b048-9527aff291e2).
-    labels : list[str]
-        List of labels.
-    description : str
-        Description of the object (human readable).
-    embedded : bool
-        Flag to determine if object spec must be embedded in project spec.
-    path : str
-        Object path on local file system or remote storage. It is also the destination path of upload() method.
-    **kwargs : dict
-        Spec keyword arguments.
+    **kwargs
+        Keyword arguments.
 
     Returns
     -------
     Model
         Object instance.
     """
-    if path is None:
-        raise EntityError("Path must be provided.")
-    name = build_name(name)
-    uuid = build_uuid(uuid)
-    metadata = build_metadata(
-        kind,
-        project=project,
-        name=name,
-        version=uuid,
-        description=description,
-        labels=labels,
-        embedded=embedded,
-    )
-    spec = build_spec(
-        kind,
-        path=path,
-        **kwargs,
-    )
-    status = build_status(kind)
-    cls = _choose_model_type(kind)
-    return cls(
-        project=project,
-        name=name,
-        uuid=uuid,
-        kind=kind,
-        metadata=metadata,
-        spec=spec,
-        status=status,
-    )
+    try:
+        kind = kwargs["kind"]
+    except KeyError:
+        raise BuilderError("Missing 'kind' parameter.")
+    return factory.build_entity_from_params(kind, **kwargs)
 
 
 def model_from_dict(obj: dict) -> Model:
@@ -147,6 +44,8 @@ def model_from_dict(obj: dict) -> Model:
     Model
         Object instance.
     """
-    kind = obj.get("kind")
-    cls = _choose_model_type(kind)
-    return cls.from_dict(obj)
+    try:
+        kind = obj["kind"]
+    except KeyError:
+        raise BuilderError("Missing 'kind' parameter.")
+    return factory.build_entity_from_dict(kind, obj)

digitalhub/entities/model/crud.py

@@ -46,7 +46,7 @@ def new_model(
     kind : str
         Kind the object.
     uuid : str
-        ID of the object (UUID4, e.g. 40f25c4b-d26b-4221-b048-9527aff291e2).
+        ID of the object.
     description : str
         Description of the object (human readable).
     labels : list[str]

digitalhub/entities/model/huggingface/builder.py

@@ -0,0 +1,18 @@
+from __future__ import annotations
+
+from digitalhub.entities.model._base.builder import ModelBuilder
+from digitalhub.entities.model.huggingface.entity import ModelHuggingface
+from digitalhub.entities.model.huggingface.spec import ModelSpecHuggingface, ModelValidatorHuggingface
+from digitalhub.entities.model.huggingface.status import ModelStatusHuggingface
+
+
+class ModelHuggingfaceBuilder(ModelBuilder):
+    """
+    ModelHuggingface builder.
+    """
+
+    ENTITY_CLASS = ModelHuggingface
+    ENTITY_SPEC_CLASS = ModelSpecHuggingface
+    ENTITY_SPEC_VALIDATOR = ModelValidatorHuggingface
+    ENTITY_STATUS_CLASS = ModelStatusHuggingface
+    ENTITY_KIND = "huggingface"

digitalhub/entities/model/mlflow/builder.py

@@ -0,0 +1,18 @@
+from __future__ import annotations
+
+from digitalhub.entities.model._base.builder import ModelBuilder
+from digitalhub.entities.model.mlflow.entity import ModelMlflow
+from digitalhub.entities.model.mlflow.spec import ModelSpecMlflow, ModelValidatorMlflow
+from digitalhub.entities.model.mlflow.status import ModelStatusMlflow
+
+
+class ModelModelBuilder(ModelBuilder):
+    """
+    ModelMlflow builder.
+    """
+
+    ENTITY_CLASS = ModelMlflow
+    ENTITY_SPEC_CLASS = ModelSpecMlflow
+    ENTITY_SPEC_VALIDATOR = ModelValidatorMlflow
+    ENTITY_STATUS_CLASS = ModelStatusMlflow
+    ENTITY_KIND = "mlflow"

digitalhub/entities/model/model/builder.py

@@ -0,0 +1,18 @@
+from __future__ import annotations
+
+from digitalhub.entities.model._base.builder import ModelBuilder
+from digitalhub.entities.model.model.entity import ModelModel
+from digitalhub.entities.model.model.spec import ModelSpecModel, ModelValidatorModel
+from digitalhub.entities.model.model.status import ModelStatusModel
+
+
+class ModelMlflowBuilder(ModelBuilder):
+    """
+    ModelModel builder.
+    """
+
+    ENTITY_CLASS = ModelModel
+    ENTITY_SPEC_CLASS = ModelSpecModel
+    ENTITY_SPEC_VALIDATOR = ModelValidatorModel
+    ENTITY_STATUS_CLASS = ModelStatusModel
+    ENTITY_KIND = "model"

digitalhub/entities/model/sklearn/builder.py

@@ -0,0 +1,18 @@
+from __future__ import annotations
+
+from digitalhub.entities.model._base.builder import ModelBuilder
+from digitalhub.entities.model.sklearn.entity import ModelSklearn
+from digitalhub.entities.model.sklearn.spec import ModelSpecSklearn, ModelValidatorSklearn
+from digitalhub.entities.model.sklearn.status import ModelStatusSklearn
+
+
+class ModelSklearnBuilder(ModelBuilder):
+    """
+    ModelSklearn builder.
+    """
+
+    ENTITY_CLASS = ModelSklearn
+    ENTITY_SPEC_CLASS = ModelSpecSklearn
+    ENTITY_SPEC_VALIDATOR = ModelValidatorSklearn
+    ENTITY_STATUS_CLASS = ModelStatusSklearn
+    ENTITY_KIND = "sklearn"

digitalhub/entities/project/_base/builder.py

@@ -0,0 +1,128 @@
+from __future__ import annotations
+
+from digitalhub.entities._builders.entity import EntityBuilder
+from digitalhub.entities.project._base.entity import Project
+from digitalhub.entities.project._base.spec import ProjectSpec, ProjectValidator
+from digitalhub.entities.project._base.status import ProjectStatus
+from digitalhub.entities.utils.entity_types import EntityTypes
+
+
+class ProjectProjectBuilder(EntityBuilder):
+    """
+    ProjectProject builder.
+    """
+
+    ENTITY_TYPE = EntityTypes.PROJECT.value
+    ENTITY_CLASS = Project
+    ENTITY_SPEC_CLASS = ProjectSpec
+    ENTITY_SPEC_VALIDATOR = ProjectValidator
+    ENTITY_STATUS_CLASS = ProjectStatus
+    ENTITY_KIND = "project"
+
+    def build(
+        self,
+        name: str,
+        kind: str,
+        description: str | None = None,
+        labels: list[str] | None = None,
+        local: bool = False,
+        context: str | None = None,
+        **kwargs,
+    ) -> Project:
+        """
+        Create a new object.
+
+        Parameters
+        ----------
+        name : str
+            Object name.
+        kind : str
+            Kind the object.
+        description : str
+            Description of the object (human readable).
+        labels : list[str]
+            List of labels.
+        local : bool
+            If True, use local backend, if False use DHCore backend. Default to False.
+        context : str
+            The context local folder of the project.
+        **kwargs : dict
+            Spec keyword arguments.
+
+        Returns
+        -------
+        Project
+            Object instance.
+        """
+        name = self.build_name(name)
+        metadata = self.build_metadata(
+            project=name,
+            name=name,
+            description=description,
+            labels=labels,
+        )
+        spec = self.build_spec(
+            context=context,
+            **kwargs,
+        )
+        status = self.build_status()
+        return self.build_entity(
+            name=name,
+            kind=kind,
+            metadata=metadata,
+            spec=spec,
+            status=status,
+            local=local,
+        )
+
+    def from_dict(self, obj: dict, validate: bool = True) -> Project:
+        """
+        Create a new object from dictionary.
+
+        Parameters
+        ----------
+        obj : dict
+            Dictionary to create object from.
+        validate : bool
+            Flag to indicate if arguments must be validated.
+
+        Returns
+        -------
+        Project
+            Object instance.
+        """
+        parsed_dict = self._parse_dict(obj, validate=validate)
+        return self.build_entity(**parsed_dict)
+
+    def _parse_dict(self, obj: dict, validate: bool = True) -> dict:
+        """
+        Get dictionary and parse it to a valid entity dictionary.
+
+        Parameters
+        ----------
+        entity : str
+            Entity type.
+        obj : dict
+            Dictionary to parse.
+
+        Returns
+        -------
+        dict
+            A dictionary containing the attributes of the entity instance.
+        """
+        name = self.build_name(obj.get("name"))
+        kind = obj.get("kind")
+        local = obj.get("local", False)
+        metadata = self.build_metadata(**obj.get("metadata", {}))
+        spec = self.build_spec(validate=validate, **obj.get("spec", {}))
+        status = self.build_status(**obj.get("status", {}))
+        user = obj.get("user")
+        return {
+            "name": name,
+            "kind": kind,
+            "metadata": metadata,
+            "spec": spec,
+            "status": status,
+            "user": user,
+            "local": local,
+        }