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

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

@@ -13,10 +13,6 @@ from digitalhub.entities._base.crud import (
     update_entity_api_base,
 )
 from digitalhub.entities._base.entity.entity import Entity
-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.artifact.crud import (
     artifact_from_dict,
     delete_artifact,
@@ -92,10 +88,10 @@ if typing.TYPE_CHECKING:
     from digitalhub.entities.dataitem._base.entity import Dataitem
     from digitalhub.entities.function._base.entity import Function
     from digitalhub.entities.model._base.entity import Model
-    from digitalhub.entities.project.project.spec import ProjectSpec
-    from digitalhub.entities.project.project.status import ProjectStatus
+    from digitalhub.entities.project._base.spec import ProjectSpec
+    from digitalhub.entities.project._base.status import ProjectStatus
     from digitalhub.entities.run._base.entity import Run
-    from digitalhub.entities.secret.secret.entity import Secret
+    from digitalhub.entities.secret._base.entity import Secret
     from digitalhub.entities.workflow._base.entity import Workflow
 
 
@@ -308,44 +304,6 @@ class Project(Entity):
                     except EntityAlreadyExistsError:
                         pass
 
-    ##############################
-    #  Static interface methods
-    ##############################
-
-    @staticmethod
-    def _parse_dict(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 = build_name(obj.get("name"))
-        kind = obj.get("kind")
-        metadata = build_metadata(kind, **obj.get("metadata", {}))
-        spec = build_spec(kind, validate=validate, **obj.get("spec", {}))
-        status = build_status(kind, **obj.get("status", {}))
-        user = obj.get("user")
-        local = obj.get("local", False)
-        return {
-            "name": name,
-            "kind": kind,
-            "metadata": metadata,
-            "spec": spec,
-            "status": status,
-            "user": user,
-            "local": local,
-        }
-
     ##############################
     #  Artifacts
     ##############################
@@ -371,7 +329,7 @@ class Project(Entity):
         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]
@@ -662,7 +620,7 @@ class Project(Entity):
         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]
@@ -966,7 +924,7 @@ class Project(Entity):
         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]
@@ -1257,7 +1215,7 @@ class Project(Entity):
         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]
@@ -1503,7 +1461,7 @@ class Project(Entity):
         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]
@@ -1747,7 +1705,7 @@ class Project(Entity):
         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]

digitalhub/entities/project/builder.py

@@ -1,68 +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.project.project.entity import Project
+import typing
 
+from digitalhub.factory.factory import factory
+from digitalhub.utils.exceptions import BuilderError
 
-def project_from_parameters(
-    name: str,
-    kind: str,
-    description: str | None = None,
-    labels: list[str] | None = None,
-    local: bool = False,
-    context: str | None = None,
-    **kwargs,
-) -> Project:
+if typing.TYPE_CHECKING:
+    from digitalhub.entities.project._base.entity import Project
+
+
+def project_from_parameters(**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.
+    **kwargs
+        Keyword arguments.
 
     Returns
     -------
     Project
         Object instance.
     """
-    name = build_name(name)
-    spec = build_spec(
-        kind,
-        context=context,
-        **kwargs,
-    )
-    metadata = build_metadata(
-        kind,
-        project=name,
-        name=name,
-        description=description,
-        labels=labels,
-    )
-    status = build_status(kind)
-    return Project(
-        name=name,
-        kind=kind,
-        metadata=metadata,
-        spec=spec,
-        status=status,
-        local=local,
-    )
+    try:
+        kind = kwargs["kind"]
+    except KeyError:
+        raise BuilderError("Missing 'kind' parameter.")
+    return factory.build_entity_from_params(kind, **kwargs)
 
 
 def project_from_dict(obj: dict) -> Project:
@@ -79,4 +44,8 @@ def project_from_dict(obj: dict) -> Project:
     Project
         Object instance.
     """
-    return Project.from_dict(obj)
+    try:
+        kind = obj["kind"]
+    except KeyError:
+        raise BuilderError("Missing 'kind' parameter.")
+    return factory.build_entity_from_dict(kind, obj)

digitalhub/entities/project/crud.py

@@ -13,7 +13,7 @@ from digitalhub.utils.exceptions import BackendError, EntityError
 from digitalhub.utils.io_utils import read_yaml
 
 if typing.TYPE_CHECKING:
-    from digitalhub.entities.project.project.entity import Project
+    from digitalhub.entities.project._base.entity import Project
 
 
 ENTITY_TYPE = EntityTypes.PROJECT.value

digitalhub/entities/run/_base/builder.py

@@ -0,0 +1,73 @@
+from __future__ import annotations
+
+import typing
+
+from digitalhub.entities._base.unversioned.builder import UnversionedBuilder
+from digitalhub.entities.utils.entity_types import EntityTypes
+
+if typing.TYPE_CHECKING:
+    from digitalhub.entities.run._base.entity import Run
+
+
+class RunBuilder(UnversionedBuilder):
+    """
+    Run builder.
+    """
+
+    ENTITY_TYPE = EntityTypes.RUN.value
+
+    def build(
+        self,
+        project: str,
+        kind: str,
+        uuid: str | None = None,
+        labels: list[str] | None = None,
+        task: str | None = None,
+        local_execution: bool = False,
+        **kwargs,
+    ) -> Run:
+        """
+        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.
+        task : str
+            Name of the task associated with the run.
+        local_execution : bool
+            Flag to determine if object has local execution.
+        **kwargs : dict
+            Spec keyword arguments.
+
+        Returns
+        -------
+        Run
+            Object instance.
+        """
+        uuid = self.build_uuid(uuid)
+        metadata = self.build_metadata(
+            project=project,
+            name=uuid,
+            labels=labels,
+        )
+        spec = self.build_spec(
+            task=task,
+            local_execution=local_execution,
+            **kwargs,
+        )
+        status = self.build_status()
+        return self.build_entity(
+            project=project,
+            uuid=uuid,
+            kind=kind,
+            metadata=metadata,
+            spec=spec,
+            status=status,
+        )

digitalhub/entities/run/_base/entity.py

@@ -2,9 +2,6 @@ from __future__ import annotations
 
 import time
 import typing
-from typing import Any
-
-import requests
 
 from digitalhub.entities._base.crud import (
     list_entity_api_base,
@@ -15,21 +12,17 @@ from digitalhub.entities._base.crud import (
     stop_api,
 )
 from digitalhub.entities._base.unversioned.entity import UnversionedEntity
-from digitalhub.entities._builders.spec import build_spec
-from digitalhub.entities._builders.status import build_status
 from digitalhub.entities.utils.entity_types import EntityTypes
 from digitalhub.entities.utils.state import State
-from digitalhub.registry.registry import registry
-from digitalhub.runtimes.builder import build_runtime
+from digitalhub.factory.factory import factory
 from digitalhub.utils.exceptions import EntityError
 from digitalhub.utils.logger import LOGGER
 
 if typing.TYPE_CHECKING:
     from digitalhub.entities._base.entity.metadata import Metadata
-    from digitalhub.entities._base.material.entity import MaterialEntity
     from digitalhub.entities.run._base.spec import RunSpec
     from digitalhub.entities.run._base.status import RunStatus
-    from digitalhub.runtimes.base import Runtime
+    from digitalhub.runtimes._base import Runtime
 
 
 class Run(UnversionedEntity):
@@ -70,7 +63,7 @@ class Run(UnversionedEntity):
         executable = self._get_executable(runtime)
         task = self._get_task(runtime)
         new_spec = runtime.build(executable, task, self.to_dict())
-        self.spec = build_spec(
+        self.spec = factory.build_spec(
             self.kind,
             **new_spec,
         )
@@ -93,16 +86,15 @@ class Run(UnversionedEntity):
             self._set_state(State.RUNNING.value)
             self.save(update=True)
 
-        # Try to get inputs if they exist
-        try:
-            self.spec.inputs = self.inputs(as_dict=True)
-        except EntityError:
-            pass
+        self._setup_execution()
 
         try:
             status = self._get_runtime().run(self.to_dict())
         except Exception as e:
             self.refresh()
+            import pdb
+
+            pdb.set_trace()
             if self.spec.local_execution:
                 self._set_state(State.ERROR.value)
             self._set_message(str(e))
@@ -147,116 +139,6 @@ class Run(UnversionedEntity):
                     LOGGER.info(f"Run {self.id} finished in {current:.2f} seconds.")
                 return self
 
-    def inputs(self, as_dict: bool = False) -> list[dict]:
-        """
-        Get inputs passed in spec as objects or as dictionaries.
-
-        Parameters
-        ----------
-        as_dict : bool
-            If True, return inputs as dictionaries.
-
-        Returns
-        -------
-        list[dict]
-            List of input objects.
-        """
-        try:
-            return self.spec.get_inputs(as_dict=as_dict)
-        except AttributeError:
-            msg = f"Run of type {self.kind} has no inputs."
-            raise EntityError(msg)
-
-    def results(self) -> dict:
-        """
-        Get results from runtime execution.
-
-        Returns
-        -------
-        dict
-            Results.
-        """
-        try:
-            return self.status.get_results()
-        except AttributeError:
-            msg = f"Run of type {self.kind} has no results."
-            raise EntityError(msg)
-
-    def result(self, key: str) -> Any:
-        """
-        Get result from runtime execution by key.
-
-        Parameters
-        ----------
-        key : str
-            Key of the result.
-
-        Returns
-        -------
-        Any
-            Result.
-        """
-        return self.results().get(key)
-
-    def outputs(self, as_key: bool = False, as_dict: bool = False) -> dict:
-        """
-        Get run objects results.
-
-        Parameters
-        ----------
-        as_key : bool
-            If True, return results as keys.
-        as_dict : bool
-            If True, return results as dictionaries.
-
-        Returns
-        -------
-        dict
-            List of output objects.
-        """
-        try:
-            return self.status.get_outputs(as_key=as_key, as_dict=as_dict)
-        except AttributeError:
-            msg = f"Run of type {self.kind} has no outputs."
-            raise EntityError(msg)
-
-    def output(self, key: str, as_key: bool = False, as_dict: bool = False) -> MaterialEntity | dict | str | None:
-        """
-        Get run object result by key.
-
-        Parameters
-        ----------
-        key : str
-            Key of the result.
-        as_key : bool
-            If True, return result as key.
-        as_dict : bool
-            If True, return result as dictionary.
-
-        Returns
-        -------
-        Entity | dict | str | None
-            Result.
-        """
-        return self.outputs(as_key=as_key, as_dict=as_dict).get(key)
-
-    def values(self) -> dict:
-        """
-        Get values from runtime execution.
-
-        Returns
-        -------
-        dict
-            Values from backend.
-        """
-        try:
-            value_list = getattr(self.spec, "values", [])
-            value_list = value_list if value_list is not None else []
-            return self.status.get_values(value_list)
-        except AttributeError:
-            msg = f"Run of type {self.kind} has no values."
-            raise EntityError(msg)
-
     def logs(self) -> dict:
         """
         Get object from backend.
@@ -307,35 +189,18 @@ class Run(UnversionedEntity):
         # TODO verify the logic and order
         self.run()
 
-    def invoke(self, **kwargs) -> requests.Response:
-        """
-        Invoke run.
+    ##############################
+    #  Helpers
+    ##############################
 
-        Parameters
-        ----------
-        kwargs
-            Keyword arguments to pass to the request.
+    def _setup_execution(self) -> None:
+        """
+        Setup run execution. In base class, nothing to do.
 
         Returns
         -------
-        requests.Response
-            Response from service.
+        None
         """
-        try:
-            if not self._context().local and not self.spec.local_execution:
-                local = False
-            else:
-                local = True
-            if kwargs is None:
-                kwargs = {}
-            return self.status.invoke(local, **kwargs)
-        except AttributeError:
-            msg = f"Run of type {self.kind} has no invoke operation."
-            raise EntityError(msg)
-
-    ##############################
-    #  Helpers
-    ##############################
 
     def _is_ready_to_run(self) -> bool:
         """
@@ -361,7 +226,7 @@ class Run(UnversionedEntity):
         -------
         None
         """
-        self.status: RunStatus = build_status(self.kind, **status)
+        self.status: RunStatus = factory.build_status(self.kind, **status)
 
     def _set_state(self, state: str) -> None:
         """
@@ -402,7 +267,7 @@ class Run(UnversionedEntity):
         Runtime
             Runtime object.
         """
-        return build_runtime(self.kind, self.project)
+        return factory.build_runtime(self.kind, self.project)
 
     def _get_executable(self, runtime: Runtime) -> dict:
         """
@@ -419,7 +284,7 @@ class Run(UnversionedEntity):
             Executable (function or workflow) from backend.
         """
         exec_kind = runtime.get_executable_kind()
-        entity_type = registry.get_entity_type(exec_kind)
+        entity_type = factory.get_entity_type_from_builder(exec_kind)
         splitted = self.spec.task.split("/")
         exec_name = splitted[-1].split(":")[0]
         exec_id = splitted[-1].split(":")[1]

digitalhub/entities/run/builder.py

@@ -1,63 +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.run._base.entity import Run
+import typing
 
+from digitalhub.factory.factory import factory
+from digitalhub.utils.exceptions import BuilderError
 
-def run_from_parameters(
-    project: str,
-    kind: str,
-    uuid: str | None = None,
-    labels: list[str] | None = None,
-    task: str | None = None,
-    local_execution: bool = False,
-    **kwargs,
-) -> Run:
+if typing.TYPE_CHECKING:
+    from digitalhub.entities.run._base.entity import Run
+
+
+def run_from_parameters(**kwargs) -> Run:
     """
-    Create run.
+    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.
-    task : str
-        Name of the task associated with the run.
-    local_execution : bool
-        Flag to determine if object has local execution.
-    **kwargs : dict
-        Spec keyword arguments.
+    **kwargs
+        Keyword arguments.
 
     Returns
     -------
     Run
         Object instance.
     """
-    uuid = build_uuid(uuid)
-    metadata = build_metadata(
-        kind=kind,
-        project=project,
-        name=uuid,
-        labels=labels,
-    )
-    spec = build_spec(kind, task=task, local_execution=local_execution, **kwargs)
-    status = build_status(kind)
-    return Run(
-        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 run_from_dict(obj: dict) -> Run:
@@ -74,4 +44,8 @@ def run_from_dict(obj: dict) -> Run:
     Run
         Object instance.
     """
-    return Run.from_dict(obj)
+    try:
+        kind = obj["kind"]
+    except KeyError:
+        raise BuilderError("Missing 'kind' parameter.")
+    return factory.build_entity_from_dict(kind, obj)

digitalhub/entities/run/crud.py

@@ -35,7 +35,7 @@ def new_run(
     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.
     task : str