digitalhub 0.8.0b2__py3-none-any.whl → 0.8.0b4__py3-none-any.whl

digitalhub/entities/_builders/spec.py

@@ -2,29 +2,22 @@ from __future__ import annotations
 
 import typing
 
-from digitalhub.registry.registry import registry
-from digitalhub.registry.utils import import_class
-
 if typing.TYPE_CHECKING:
-    from digitalhub.entities._base.spec.base import Spec
-    from digitalhub.registry.models import RegistryEntry
+    from digitalhub.entities._base.entity.spec import Spec, SpecValidator
 
 
-def build_spec(kind: str, validate: bool = True, **kwargs) -> Spec:
+def build_spec(spec_cls: Spec, spec_validator: SpecValidator, validate: bool = True, **kwargs) -> Spec:
     """
-    Build entity spec object. The builder takes as input
-    the kind of spec's object to build, a validation flag
-    and the keyword arguments to pass to the spec's constructor.
-    The specific Spec class is searched in the global registry,
-    where lies info about where to find the class.
-    If the validation flag is set to True, the arguments are
-    validated against a pydantic schema and then passed to the
-    constructor.
+    Build entity spec object. This method is used to build entity
+    specifications and is used to validate the parameters passed
+    to the constructor.
 
     Parameters
     ----------
-    kind : str
-        Registry entry kind.
+    spec_cls : Spec
+        Spec class.
+    spec_validator : SpecValidator
+        Spec validator class.
     validate : bool
         Flag to determine if validate kwargs.
     **kwargs : dict
@@ -35,9 +28,6 @@ def build_spec(kind: str, validate: bool = True, **kwargs) -> Spec:
     Spec
         Spec object.
     """
-    infos: RegistryEntry = getattr(registry, kind)
-    spec = import_class(infos.spec.module, infos.spec.class_name)
     if validate:
-        validator = import_class(infos.spec.module, infos.spec.parameters_validator)
-        kwargs = validator(**kwargs).dict(by_alias=True, exclude_none=True)
-    return spec(**kwargs)
+        kwargs = spec_validator(**kwargs).dict(by_alias=True, exclude_none=True)
+    return spec_cls(**kwargs)

digitalhub/entities/_builders/status.py

@@ -2,41 +2,31 @@ from __future__ import annotations
 
 import typing
 
-from digitalhub.entities._base.state import State
-from digitalhub.registry.registry import registry
-from digitalhub.registry.utils import import_class
+from digitalhub.entities.utils.state import State
 
 if typing.TYPE_CHECKING:
-    from digitalhub.entities._base.status.base import Status
-    from digitalhub.registry.models import RegistryEntry
+    from digitalhub.entities._base.entity.status import Status
 
 
-def build_status(kind: str, **kwargs) -> Status:
+def build_status(status_cls: Status, **kwargs) -> Status:
     """
-    Build entity status object. The builder takes as input
-    the kind of status's object to build and the keyword
-    arguments to pass to the status's constructor.
-    The specific Status class is searched in the global
-    registry, where lies info about where to find the class.
-    The arguments are parsed, eventually adding default values,
-    and then passed to the constructor.
+    Build entity status object. This method is used to build entity
+    status.
 
     Parameters
     ----------
-    kind : str
-        Registry entry kind.
+    status_cls : Status
+        Entity status class.
     **kwargs : dict
-        Keyword arguments for the constructor.
+        Keyword arguments.
 
     Returns
     -------
     Status
-        Status object.
+        Entity status object.
     """
-    infos: RegistryEntry = getattr(registry, kind)
-    status = import_class(infos.status.module, infos.status.class_name)
     kwargs = parse_arguments(**kwargs)
-    return status(**kwargs)
+    return status_cls(**kwargs)
 
 
 def parse_arguments(**kwargs) -> dict:

digitalhub/entities/_builders/uuid.py

@@ -2,15 +2,7 @@ from __future__ import annotations
 
 from uuid import uuid4
 
-from pydantic import UUID4, BaseModel
-
-
-class UUIDValidator(BaseModel):
-    """
-    Validate UUID format.
-    """
-
-    uuid: UUID4
+from digitalhub.utils.generic_utils import slugify_string
 
 
 def build_uuid(uuid: str | None = None) -> str:
@@ -20,7 +12,7 @@ def build_uuid(uuid: str | None = None) -> str:
     Parameters
     ----------
     uuid : str
-        ID of the object (UUID4, e.g. 40f25c4b-d26b-4221-b048-9527aff291e2).
+        ID of the object.
 
     Returns
     -------
@@ -28,6 +20,7 @@ def build_uuid(uuid: str | None = None) -> str:
         Validated UUID4.
     """
     if uuid is not None:
-        UUIDValidator(uuid=uuid)
+        if slugify_string(uuid) != uuid:
+            raise ValueError(f"Invalid ID: {uuid}. Must pass slugified ID.")
         return uuid
     return str(uuid4())

digitalhub/entities/artifact/_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.artifact._base.entity import Artifact
+
+
+class ArtifactBuilder(VersionedBuilder):
+    """
+    Artifact builder.
+    """
+
+    ENTITY_TYPE = EntityTypes.ARTIFACT.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,
+    ) -> Artifact:
+        """
+        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
+        -------
+        Artifact
+            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/artifact/{entity/_base.py → _base/entity.py}

@@ -2,13 +2,13 @@ from __future__ import annotations
 
 import typing
 
-from digitalhub.entities._base.entity.material import MaterialEntity
-from digitalhub.entities.entity_types import EntityTypes
+from digitalhub.entities._base.material.entity import MaterialEntity
+from digitalhub.entities.utils.entity_types import EntityTypes
 
 if typing.TYPE_CHECKING:
-    from digitalhub.entities._base.metadata import Metadata
-    from digitalhub.entities.artifact.spec import ArtifactSpec
-    from digitalhub.entities.artifact.status import ArtifactStatus
+    from digitalhub.entities._base.entity.metadata import Metadata
+    from digitalhub.entities.artifact._base.spec import ArtifactSpec
+    from digitalhub.entities.artifact._base.status import ArtifactStatus
 
 
 class Artifact(MaterialEntity):

digitalhub/entities/artifact/_base/spec.py

@@ -0,0 +1,15 @@
+from __future__ import annotations
+
+from digitalhub.entities._base.material.spec import MaterialSpec, MaterialValidator
+
+
+class ArtifactSpec(MaterialSpec):
+    """
+    ArtifactSpec specifications.
+    """
+
+
+class ArtifactValidator(MaterialValidator):
+    """
+    ArtifactValidator validator.
+    """

digitalhub/entities/artifact/_base/status.py

@@ -0,0 +1,9 @@
+from __future__ import annotations
+
+from digitalhub.entities._base.material.status import MaterialStatus
+
+
+class ArtifactStatus(MaterialStatus):
+    """
+    ArtifactStatus status.
+    """

digitalhub/entities/artifact/artifact/builder.py

@@ -0,0 +1,18 @@
+from __future__ import annotations
+
+from digitalhub.entities.artifact._base.builder import ArtifactBuilder
+from digitalhub.entities.artifact.artifact.entity import ArtifactArtifact
+from digitalhub.entities.artifact.artifact.spec import ArtifactSpecArtifact, ArtifactValidatorArtifact
+from digitalhub.entities.artifact.artifact.status import ArtifactStatusArtifact
+
+
+class ArtifactArtifactBuilder(ArtifactBuilder):
+    """
+    ArtifactArtifact builder.
+    """
+
+    ENTITY_CLASS = ArtifactArtifact
+    ENTITY_SPEC_CLASS = ArtifactSpecArtifact
+    ENTITY_SPEC_VALIDATOR = ArtifactValidatorArtifact
+    ENTITY_STATUS_CLASS = ArtifactStatusArtifact
+    ENTITY_KIND = "artifact"

digitalhub/entities/artifact/artifact/entity.py

@@ -0,0 +1,32 @@
+from __future__ import annotations
+
+import typing
+
+from digitalhub.entities.artifact._base.entity import Artifact
+
+if typing.TYPE_CHECKING:
+    from digitalhub.entities._base.entity.metadata import Metadata
+    from digitalhub.entities.artifact.artifact.spec import ArtifactSpecArtifact
+    from digitalhub.entities.artifact.artifact.status import ArtifactStatusArtifact
+
+
+class ArtifactArtifact(Artifact):
+    """
+    ArtifactArtifact class.
+    """
+
+    def __init__(
+        self,
+        project: str,
+        name: str,
+        uuid: str,
+        kind: str,
+        metadata: Metadata,
+        spec: ArtifactSpecArtifact,
+        status: ArtifactStatusArtifact,
+        user: str | None = None,
+    ) -> None:
+        super().__init__(project, name, uuid, kind, metadata, spec, status, user)
+
+        self.spec: ArtifactSpecArtifact
+        self.status: ArtifactStatusArtifact

digitalhub/entities/artifact/{spec.py → artifact/spec.py}

@@ -1,23 +1,11 @@
 from __future__ import annotations
 
-from digitalhub.entities._base.spec.material import MaterialParams, MaterialSpec
-
-
-class ArtifactSpec(MaterialSpec):
-    """
-    Artifact specification.
-    """
-
-
-class ArtifactParams(MaterialParams):
-    """
-    Artifact base parameters.
-    """
+from digitalhub.entities.artifact._base.spec import ArtifactSpec, ArtifactValidator
 
 
 class ArtifactSpecArtifact(ArtifactSpec):
     """
-    Artifact specification.
+    ArtifactSpecArtifact specifications.
     """
 
     def __init__(
@@ -30,9 +18,9 @@ class ArtifactSpecArtifact(ArtifactSpec):
         self.src_path = src_path
 
 
-class ArtifactParamsArtifact(ArtifactParams):
+class ArtifactValidatorArtifact(ArtifactValidator):
     """
-    Artifact parameters.
+    ArtifactValidatorArtifact validator.
     """
 
     src_path: str = None

digitalhub/entities/artifact/{status.py → artifact/status.py}

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from digitalhub.entities._base.status.material import MaterialStatus
+from digitalhub.entities._base.material.status import MaterialStatus
 
 
 class ArtifactStatus(MaterialStatus):

digitalhub/entities/artifact/builder.py

@@ -2,116 +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.artifact.entity._base import Artifact
+    from digitalhub.entities.artifact._base.entity import Artifact
 
-# Manage class mapper
-cls_mapper = {}
 
-try:
-    from digitalhub.entities.artifact.entity.artifact import ArtifactArtifact
-
-    cls_mapper["artifact"] = ArtifactArtifact
-except ImportError:
-    pass
-
-
-def _choose_artifact_type(kind: str) -> type[Artifact]:
-    """
-    Choose class based on kind.
-
-    Parameters
-    ----------
-    kind : str
-        Kind the object.
-
-    Returns
-    -------
-    type[Artifact]
-        Class of the artifact.
-    """
-    try:
-        return cls_mapper[kind]
-    except KeyError:
-        raise EntityError(f"Unknown artifact kind: {kind}")
-
-
-def artifact_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,
-) -> Artifact:
+def artifact_from_parameters(**kwargs) -> Artifact:
     """
     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.
-    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
     -------
     Artifact
         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_artifact_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 artifact_from_dict(obj: dict) -> Artifact:
@@ -128,6 +44,8 @@ def artifact_from_dict(obj: dict) -> Artifact:
     Artifact
         Object instance.
     """
-    kind = obj.get("kind")
-    cls = _choose_artifact_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/artifact/crud.py

@@ -11,13 +11,13 @@ from digitalhub.entities._base.crud import (
 )
 from digitalhub.entities._builders.uuid import build_uuid
 from digitalhub.entities.artifact.builder import artifact_from_dict, artifact_from_parameters
-from digitalhub.entities.entity_types import EntityTypes
-from digitalhub.entities.utils import build_log_path_from_source, eval_local_source
+from digitalhub.entities.utils.entity_types import EntityTypes
+from digitalhub.entities.utils.utils import build_log_path_from_source, eval_local_source
 from digitalhub.utils.exceptions import EntityAlreadyExistsError
 from digitalhub.utils.io_utils import read_yaml
 
 if typing.TYPE_CHECKING:
-    from digitalhub.entities.artifact.entity._base import Artifact
+    from digitalhub.entities.artifact._base.entity import Artifact
 
 
 ENTITY_TYPE = EntityTypes.ARTIFACT.value
@@ -46,7 +46,7 @@ def new_artifact(
     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/builders.py

@@ -0,0 +1,63 @@
+from __future__ import annotations
+
+from digitalhub.entities.artifact.artifact.builder import ArtifactArtifactBuilder
+from digitalhub.entities.dataitem.dataitem.builder import DataitemDataitemBuilder
+from digitalhub.entities.dataitem.table.builder import DataitemTableBuilder
+from digitalhub.entities.model.mlflow.builder import ModelModelBuilder
+from digitalhub.entities.project._base.builder import ProjectProjectBuilder
+from digitalhub.entities.secret._base.builder import SecretSecretBuilder
+
+entity_builders = (
+    (ProjectProjectBuilder.ENTITY_KIND, ProjectProjectBuilder),
+    (SecretSecretBuilder.ENTITY_KIND, SecretSecretBuilder),
+    (ArtifactArtifactBuilder.ENTITY_KIND, ArtifactArtifactBuilder),
+    (DataitemDataitemBuilder.ENTITY_KIND, DataitemDataitemBuilder),
+    (DataitemTableBuilder.ENTITY_KIND, DataitemTableBuilder),
+    (ModelModelBuilder.ENTITY_KIND, ModelModelBuilder),
+)
+
+##############################
+#  Potential uninstalled entities
+##############################
+
+
+try:
+    from digitalhub.entities.dataitem.iceberg.builder import DataitemIcebergBuilder
+
+    entity_builders = (
+        *entity_builders,
+        (DataitemIcebergBuilder.ENTITY_KIND, DataitemIcebergBuilder),
+    )
+except ImportError:
+    ...
+
+
+try:
+    from digitalhub.entities.model.model.builder import ModelMlflowBuilder
+
+    entity_builders = (
+        *entity_builders,
+        (ModelMlflowBuilder.ENTITY_KIND, ModelMlflowBuilder),
+    )
+except ImportError:
+    ...
+
+try:
+    from digitalhub.entities.model.sklearn.builder import ModelSklearnBuilder
+
+    entity_builders = (
+        *entity_builders,
+        (ModelSklearnBuilder.ENTITY_KIND, ModelSklearnBuilder),
+    )
+except ImportError:
+    ...
+
+try:
+    from digitalhub.entities.model.huggingface.builder import ModelHuggingfaceBuilder
+
+    entity_builders = (
+        *entity_builders,
+        (ModelHuggingfaceBuilder.ENTITY_KIND, ModelHuggingfaceBuilder),
+    )
+except ImportError:
+    ...