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

digitalhub/entities/secret/{entity.py → _base/entity.py}

@@ -3,13 +3,13 @@ from __future__ import annotations
 import typing
 
 from digitalhub.entities._base.crud import get_data_api, set_data_api
-from digitalhub.entities._base.entity.versioned import VersionedEntity
-from digitalhub.entities.entity_types import EntityTypes
+from digitalhub.entities._base.versioned.entity import VersionedEntity
+from digitalhub.entities.utils.entity_types import EntityTypes
 
 if typing.TYPE_CHECKING:
-    from digitalhub.entities._base.metadata import Metadata
-    from digitalhub.entities.secret.spec import SecretSpec
-    from digitalhub.entities.secret.status import SecretStatus
+    from digitalhub.entities._base.entity.metadata import Metadata
+    from digitalhub.entities.secret._base.spec import SecretSpec
+    from digitalhub.entities.secret._base.status import SecretStatus
 
 
 class Secret(VersionedEntity):
@@ -70,4 +70,5 @@ class Secret(VersionedEntity):
             raise NotImplementedError("read_secret() is not implemented for local projects.")
 
         params = {"keys": self.name}
-        return get_data_api(self.project, self.ENTITY_TYPE, params=params)
+        data = get_data_api(self.project, self.ENTITY_TYPE, params=params)
+        return data[self.name]

digitalhub/entities/secret/{spec.py → _base/spec.py}

@@ -1,11 +1,11 @@
 from __future__ import annotations
 
-from digitalhub.entities._base.spec.base import Spec, SpecParams
+from digitalhub.entities._base.entity.spec import Spec, SpecValidator
 
 
 class SecretSpec(Spec):
     """
-    Secret specifications.
+    SecretSpec specifications.
     """
 
     def __init__(self, path: str | None = None, provider: str | None = None, **kwargs) -> None:
@@ -23,9 +23,9 @@ class SecretSpec(Spec):
         self.provider = provider
 
 
-class SecretParams(SpecParams):
+class SecretValidator(SpecValidator):
     """
-    Secret parameters.
+    SecretValidator validator.
     """
 
     path: str = None

digitalhub/entities/secret/_base/status.py

@@ -0,0 +1,9 @@
+from __future__ import annotations
+
+from digitalhub.entities._base.entity.status import Status
+
+
+class SecretStatus(Status):
+    """
+    SecretStatus status.
+    """

digitalhub/entities/secret/builder.py

@@ -1,79 +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.secret.entity import Secret
+import typing
 
+from digitalhub.factory.factory import factory
+from digitalhub.utils.exceptions import BuilderError
 
-def secret_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,
-) -> Secret:
+if typing.TYPE_CHECKING:
+    from digitalhub.entities.secret._base.entity import Secret
+
+
+def secret_from_parameters(**kwargs) -> Secret:
     """
     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.
-    **kwargs : dict
-        Spec keyword arguments.
+    **kwargs
+        Keyword arguments.
 
     Returns
     -------
     Secret
         Object instance.
     """
-    name = build_name(name)
-    uuid = build_uuid(uuid)
-    metadata = build_metadata(
-        kind,
-        project=project,
-        name=name,
-        version=uuid,
-        description=description,
-        labels=labels,
-        embedded=embedded,
-    )
-    path = f"kubernetes://dhcore-proj-secrets-{project}/{name}"
-    provider = "kubernetes"
-    spec = build_spec(
-        kind,
-        path=path,
-        provider=provider,
-        **kwargs,
-    )
-    status = build_status(kind)
-    return Secret(
-        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 secret_from_dict(obj: dict) -> Secret:
@@ -90,4 +44,8 @@ def secret_from_dict(obj: dict) -> Secret:
     Secret
         Object instance.
     """
-    return Secret.from_dict(obj)
+    try:
+        kind = obj["kind"]
+    except KeyError:
+        raise BuilderError("Missing 'kind' parameter.")
+    return factory.build_entity_from_dict(kind, obj)

digitalhub/entities/secret/crud.py

@@ -9,13 +9,13 @@ from digitalhub.entities._base.crud import (
     read_entity_api_ctx,
     read_entity_api_ctx_versions,
 )
-from digitalhub.entities.entity_types import EntityTypes
 from digitalhub.entities.secret.builder import secret_from_dict, secret_from_parameters
-from digitalhub.utils.exceptions import EntityAlreadyExistsError
+from digitalhub.entities.utils.entity_types import EntityTypes
+from digitalhub.utils.exceptions import EntityAlreadyExistsError, EntityNotExistsError
 from digitalhub.utils.io_utils import read_yaml
 
 if typing.TYPE_CHECKING:
-    from digitalhub.entities.secret.entity import Secret
+    from digitalhub.entities.secret._base.entity import Secret
 
 
 ENTITY_TYPE = EntityTypes.SECRET.value
@@ -41,7 +41,7 @@ def new_secret(
     name : str
         Object name.
     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]
@@ -119,6 +119,14 @@ def get_secret(
     >>>                  project="my-project",
     >>>                  entity_id="my-secret-id")
     """
+    if not identifier.startswith("store://"):
+        secrets = list_secrets(project=project, **kwargs)
+        for secret in secrets:
+            if secret.name == identifier:
+                return secret
+        else:
+            raise EntityNotExistsError(f"Secret {identifier} not found.")
+
     obj = read_entity_api_ctx(
         identifier,
         ENTITY_TYPE,

digitalhub/entities/task/_base/builder.py

@@ -0,0 +1,76 @@
+from __future__ import annotations
+
+import typing
+
+from digitalhub.entities._base.unversioned.builder import UnversionedBuilder
+from digitalhub.entities.utils.entity_types import EntityTypes
+from digitalhub.utils.exceptions import BuilderError
+
+if typing.TYPE_CHECKING:
+    from digitalhub.entities.task._base.entity import Task
+
+
+class TaskBuilder(UnversionedBuilder):
+    """
+    Task builder.
+    """
+
+    ACTION: str = None
+    ENTITY_TYPE = EntityTypes.TASK.value
+
+    def __init__(self) -> None:
+        super().__init__()
+        if self.ACTION is None:
+            raise BuilderError("ACTION must be set")
+
+    def build(
+        self,
+        project: str,
+        kind: str,
+        uuid: str | None = None,
+        labels: list[str] | None = None,
+        function: str | None = None,
+        **kwargs,
+    ) -> Task:
+        """
+        Create a new object.
+
+        Parameters
+        ----------
+        project : str
+            Project name.
+        kind : str
+            Kind the object.
+        uuid : str
+            ID of the object.
+        labels : list[str]
+            List of labels.
+        function : str
+            Name of the executable associated with the task.
+        **kwargs : dict
+            Spec keyword arguments.
+
+        Returns
+        -------
+        Task
+            Object instance.
+        """
+        uuid = self.build_uuid(uuid)
+        metadata = self.build_metadata(
+            project=project,
+            name=uuid,
+            labels=labels,
+        )
+        spec = self.build_spec(
+            function=function,
+            **kwargs,
+        )
+        status = self.build_status()
+        return self.build_entity(
+            project=project,
+            uuid=uuid,
+            kind=kind,
+            metadata=metadata,
+            spec=spec,
+            status=status,
+        )

digitalhub/entities/task/{entity.py → _base/entity.py}

@@ -2,15 +2,15 @@ from __future__ import annotations
 
 import typing
 
-from digitalhub.entities._base.entity.unversioned import UnversionedEntity
-from digitalhub.entities.entity_types import EntityTypes
+from digitalhub.entities._base.unversioned.entity import UnversionedEntity
 from digitalhub.entities.run.crud import delete_run, get_run, new_run, run_from_parameters
+from digitalhub.entities.utils.entity_types import EntityTypes
 
 if typing.TYPE_CHECKING:
-    from digitalhub.entities._base.metadata import Metadata
-    from digitalhub.entities.run.entity import Run
-    from digitalhub.entities.task.spec import TaskSpec
-    from digitalhub.entities.task.status import TaskStatus
+    from digitalhub.entities._base.entity.metadata import Metadata
+    from digitalhub.entities.run._base.entity import Run
+    from digitalhub.entities.task._base.spec import TaskSpec
+    from digitalhub.entities.task._base.status import TaskStatus
 
 
 class Task(UnversionedEntity):

digitalhub/entities/task/{models.py → _base/models.py}

@@ -197,3 +197,12 @@ class K8s(BaseModel):
 
     profile: str = None
     """Profile template."""
+
+
+class CorePort(BaseModel):
+    """
+    Port mapper model.
+    """
+
+    port: int
+    target_port: int

digitalhub/entities/task/{spec.py → _base/spec.py}

@@ -1,17 +1,19 @@
 from __future__ import annotations
 
-from digitalhub.entities._base.spec.base import Spec, SpecParams
-from digitalhub.entities.task.models import K8s
+from digitalhub.entities._base.entity.spec import Spec, SpecValidator
+from digitalhub.entities.task._base.models import K8s
 
 
 class TaskSpec(Spec):
-    """Task specification."""
+    """TaskSpec specifications."""
 
     def __init__(self, function: str) -> None:
         self.function = function
 
 
 class TaskSpecK8s(TaskSpec):
+    """TaskSpecK8s specifications."""
+
     def __init__(
         self,
         function: str,
@@ -36,16 +38,16 @@ class TaskSpecK8s(TaskSpec):
         self.profile = profile
 
 
-class TaskParams(SpecParams):
+class TaskValidator(SpecValidator):
     """
-    Base task model.
+    TaskValidator validator.
     """
 
     function: str
     """Function string."""
 
 
-class TaskParamsK8s(TaskParams, K8s):
+class TaskValidatorK8s(TaskValidator, K8s):
     """
-    Kubernetes task model.
+    TaskValidatorK8s validator.
     """

digitalhub/entities/task/_base/status.py

@@ -0,0 +1,9 @@
+from __future__ import annotations
+
+from digitalhub.entities._base.entity.status import Status
+
+
+class TaskStatus(Status):
+    """
+    TaskStatus status.
+    """

digitalhub/entities/task/builder.py

@@ -1,60 +1,33 @@
 from __future__ import annotations
 
-from digitalhub.entities._builders.metadata import build_metadata
-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.task.entity import Task
+import typing
 
+from digitalhub.factory.factory import factory
+from digitalhub.utils.exceptions import BuilderError
 
-def task_from_parameters(
-    project: str,
-    kind: str,
-    uuid: str | None = None,
-    labels: list[str] | None = None,
-    function: str | None = None,
-    **kwargs,
-) -> Task:
+if typing.TYPE_CHECKING:
+    from digitalhub.entities.task._base.entity import Task
+
+
+def task_from_parameters(**kwargs) -> Task:
     """
     Create a new object.
 
     Parameters
     ----------
-    project : str
-        Project 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.
-    function : str
-        Name of the executable associated with the task.
-    **kwargs : dict
-        Spec keyword arguments.
+    **kwargs
+        Keyword arguments.
 
     Returns
     -------
     Task
         Object instance.
     """
-    uuid = build_uuid(uuid)
-    metadata = build_metadata(
-        kind=kind,
-        project=project,
-        name=uuid,
-        labels=labels,
-    )
-    spec = build_spec(kind, function=function, **kwargs)
-    status = build_status(kind)
-    return Task(
-        project=project,
-        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 task_from_dict(obj: dict) -> Task:
@@ -64,11 +37,15 @@ def task_from_dict(obj: dict) -> Task:
     Parameters
     ----------
     obj : dict
-        Dictionary representation of Task.
+        Dictionary to create object from.
 
     Returns
     -------
     Task
         Object instance.
     """
-    return Task.from_dict(obj)
+    try:
+        kind = obj["kind"]
+    except KeyError:
+        raise BuilderError("Missing 'kind' parameter.")
+    return factory.build_entity_from_dict(kind, obj)

digitalhub/entities/task/crud.py

@@ -4,13 +4,13 @@ import typing
 
 from digitalhub.context.builder import check_context
 from digitalhub.entities._base.crud import delete_entity_api_ctx, list_entity_api_ctx, read_entity_api_ctx
-from digitalhub.entities.entity_types import EntityTypes
 from digitalhub.entities.task.builder import task_from_dict, task_from_parameters
+from digitalhub.entities.utils.entity_types import EntityTypes
 from digitalhub.utils.exceptions import EntityAlreadyExistsError, EntityError
 from digitalhub.utils.io_utils import read_yaml
 
 if typing.TYPE_CHECKING:
-    from digitalhub.entities.task.entity import Task
+    from digitalhub.entities.task._base.entity import Task
 
 
 ENTITY_TYPE = EntityTypes.TASK.value
@@ -34,7 +34,7 @@ def new_task(
     kind : str
         Kind the object.
     uuid : str
-        ID of the object (UUID4, e.g. 40f25c4b-d26b-4221-b048-9527aff291e2).
+        ID of the object.
     labels : list[str]
         List of labels.
     function : str

digitalhub/entities/{utils.py → utils/utils.py}

@@ -2,9 +2,9 @@ from __future__ import annotations
 
 from pathlib import Path
 
-from digitalhub.entities.entity_types import EntityTypes
-from digitalhub.utils.env_utils import get_s3_bucket
+from digitalhub.entities.utils.entity_types import EntityTypes
 from digitalhub.utils.file_utils import get_file_mime_type
+from digitalhub.utils.s3_utils import get_s3_bucket
 from digitalhub.utils.uri_utils import check_local_path
 
 

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

@@ -2,16 +2,16 @@ from __future__ import annotations
 
 import typing
 
-from digitalhub.entities._base.entity.executable import ExecutableEntity
-from digitalhub.entities.entity_types import EntityTypes
-from digitalhub.runtimes.builder import get_kind_registry
+from digitalhub.entities._base.executable.entity import ExecutableEntity
+from digitalhub.entities.utils.entity_types import EntityTypes
+from digitalhub.runtimes.utils import get_kind_registry
 from digitalhub.utils.exceptions import BackendError
 
 if typing.TYPE_CHECKING:
-    from digitalhub.entities._base.metadata import Metadata
-    from digitalhub.entities.run.entity import Run
-    from digitalhub.entities.workflow.spec import WorkflowSpec
-    from digitalhub.entities.workflow.status import WorkflowStatus
+    from digitalhub.entities._base.entity.metadata import Metadata
+    from digitalhub.entities.run._base.entity import Run
+    from digitalhub.entities.workflow._base.spec import WorkflowSpec
+    from digitalhub.entities.workflow._base.status import WorkflowStatus
 
 
 class Workflow(ExecutableEntity):
@@ -61,7 +61,7 @@ class Workflow(ExecutableEntity):
             action = "pipeline"
 
         # 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/workflow/_base/spec.py

@@ -0,0 +1,15 @@
+from __future__ import annotations
+
+from digitalhub.entities._base.entity.spec import Spec, SpecValidator
+
+
+class WorkflowSpec(Spec):
+    """
+    WorkflowSpec specifications.
+    """
+
+
+class WorkflowValidator(SpecValidator):
+    """
+    WorkflowValidator validator.
+    """

digitalhub/entities/workflow/_base/status.py

@@ -0,0 +1,9 @@
+from __future__ import annotations
+
+from digitalhub.entities._base.entity.status import Status
+
+
+class WorkflowStatus(Status):
+    """
+    WorkflowStatus status.
+    """