digitalhub 0.8.0b6__tar.gz → 0.8.0b7__tar.gz

{digitalhub-0.8.0b6 → digitalhub-0.8.0b7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: digitalhub
-Version: 0.8.0b6
+Version: 0.8.0b7
 Summary: Python SDK for Digitalhub
 Author-email: Fondazione Bruno Kessler <dslab@fbk.eu>, Matteo Martini <mmartini@fbk.eu>
 License:                               Apache License

{digitalhub-0.8.0b6 → digitalhub-0.8.0b7}/digitalhub/entities/_base/entity/status.py

@@ -10,9 +10,20 @@ class Status(Base):
     for example, the state of a RUNNING run, and eventual error message.
     """
 
-    def __init__(self, state: str, message: str | None = None) -> None:
+    def __init__(
+        self,
+        state: str,
+        message: str | None = None,
+        transitions: list[dict] | None = None,
+        k8s: dict | None = None,
+        **kwargs,
+    ) -> None:
         self.state = state
         self.message = message
+        self.transitions = transitions
+        self.k8s = k8s
+
+        self._any_setter(**kwargs)
 
     @classmethod
     def from_dict(cls, obj: dict) -> Status:

{digitalhub-0.8.0b6 → digitalhub-0.8.0b7}/digitalhub/entities/run/_base/entity.py

@@ -165,11 +165,6 @@ class Run(UnversionedEntity):
         """
         if not self._context().local and not self.spec.local_execution:
             return stop_api(self.project, self.ENTITY_TYPE, self.id)
-        try:
-            self.status.stop()
-        except AttributeError:
-            raise EntityError("Stop is not supported in local execution.")
-            return
 
     def resume(self) -> None:
         """
@@ -181,14 +176,6 @@ class Run(UnversionedEntity):
         """
         if not self._context().local and not self.spec.local_execution:
             return resume_api(self.project, self.ENTITY_TYPE, self.id)
-
-        try:
-            self.status.resume()
-        except AttributeError:
-            raise EntityError("Resume is not supported in local execution.")
-            return
-        # re-run
-        # TODO verify the logic and order
         self.run()
 
     ##############################

digitalhub-0.8.0b7/digitalhub/entities/run/_base/spec.py

@@ -0,0 +1,50 @@
+from __future__ import annotations
+
+from digitalhub.entities._base.entity.spec import Spec, SpecValidator
+from digitalhub.entities.task._base.models import K8s
+
+
+class RunSpec(Spec):
+    """RunSpec specifications."""
+
+    def __init__(
+        self,
+        task: str,
+        local_execution: bool = False,
+        function: str | None = None,
+        node_selector: dict | None = None,
+        volumes: list | None = None,
+        resources: dict | None = None,
+        affinity: dict | None = None,
+        tolerations: list | None = None,
+        envs: list | None = None,
+        secrets: list | None = None,
+        profile: str | None = None,
+        **kwargs,
+    ) -> None:
+        self.task = task
+        self.local_execution = local_execution
+        self.function = function
+        self.node_selector = node_selector
+        self.volumes = volumes
+        self.resources = resources
+        self.affinity = affinity
+        self.tolerations = tolerations
+        self.envs = envs
+        self.secrets = secrets
+        self.profile = profile
+
+
+class RunValidator(SpecValidator, K8s):
+    """
+    RunValidator validator.
+    """
+
+    function: str = None
+    """The function associated with the run."""
+
+    task: str = None
+    """The task string associated with the run."""
+
+    local_execution: bool = False
+    """Flag to indicate if the run will be executed locally."""

digitalhub-0.8.0b7/digitalhub/entities/run/_base/status.py

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

{digitalhub-0.8.0b6 → digitalhub-0.8.0b7}/digitalhub/entities/secret/_base/builder.py

@@ -62,7 +62,7 @@ class SecretSecretBuilder(VersionedBuilder):
             description=description,
             labels=labels,
         )
-        path = f"kubernetes://dhcore-proj-secrets-{project}/{name}"
+        path = f"secret://{name}"
         provider = "kubernetes"
         spec = self.build_spec(
             path=path,

{digitalhub-0.8.0b6 → digitalhub-0.8.0b7}/digitalhub/entities/utils/utils.py

@@ -182,3 +182,21 @@ def build_log_path_from_source(
         path += f"/{Path(source).name}"
 
     return path
+
+
+def get_entity_type_from_key(key: str) -> str:
+    """
+    Get entity type.
+
+    Parameters
+    ----------
+    key : str
+        The key of the entity.
+
+    Returns
+    -------
+    str
+        The entity type.
+    """
+    _, entity_type, _, _, _ = parse_entity_key(key)
+    return entity_type

{digitalhub-0.8.0b6 → digitalhub-0.8.0b7}/digitalhub.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: digitalhub
-Version: 0.8.0b6
+Version: 0.8.0b7
 Summary: Python SDK for Digitalhub
 Author-email: Fondazione Bruno Kessler <dslab@fbk.eu>, Matteo Martini <mmartini@fbk.eu>
 License:                               Apache License

{digitalhub-0.8.0b6 → digitalhub-0.8.0b7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "digitalhub"
-version = "0.8.0b6"
+version = "0.8.0b7"
 description = "Python SDK for Digitalhub"
 readme = "README.md"
 authors = [
@@ -77,7 +77,7 @@ line-length = 120
 convention = "numpy"
 
 [tool.bumpver]
-current_version = "0.8.0b6"
+current_version = "0.8.0b7"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = false

digitalhub-0.8.0b6/digitalhub/entities/run/_base/spec.py

@@ -1,153 +0,0 @@
-from __future__ import annotations
-
-import typing
-
-from digitalhub.entities._base.entity.spec import Spec, SpecValidator
-from digitalhub.entities.artifact.crud import get_artifact
-from digitalhub.entities.dataitem.crud import get_dataitem
-from digitalhub.entities.model.crud import get_model
-from digitalhub.entities.task._base.models import K8s
-from digitalhub.entities.utils.entity_types import EntityTypes
-from digitalhub.entities.utils.utils import parse_entity_key
-
-if typing.TYPE_CHECKING:
-    from digitalhub.entities._base.entity.entity import Entity
-
-
-ENTITY_FUNC = {
-    EntityTypes.ARTIFACT.value: get_artifact,
-    EntityTypes.DATAITEM.value: get_dataitem,
-    EntityTypes.MODEL.value: get_model,
-}
-
-
-class RunSpec(Spec):
-    """RunSpec specifications."""
-
-    def __init__(
-        self,
-        task: str,
-        local_execution: bool = False,
-        function: str | None = None,
-        node_selector: dict | None = None,
-        volumes: list | None = None,
-        resources: dict | None = None,
-        affinity: dict | None = None,
-        tolerations: list | None = None,
-        envs: list | None = None,
-        secrets: list | None = None,
-        profile: str | None = None,
-        **kwargs,
-    ) -> None:
-        self.task = task
-        self.local_execution = local_execution
-        self.function = function
-        self.node_selector = node_selector
-        self.volumes = volumes
-        self.resources = resources
-        self.affinity = affinity
-        self.tolerations = tolerations
-        self.envs = envs
-        self.secrets = secrets
-        self.profile = profile
-
-    def get_inputs(self, as_dict: bool = False) -> dict:
-        """
-        Get inputs.
-
-        Returns
-        -------
-        dict
-            The inputs.
-        """
-        inputs = {}
-        if not hasattr(self, "inputs") or self.inputs is None:
-            return inputs
-
-        for parameter, item in self.inputs.items():
-            parameter_type = self._parse_parameter(parameter)
-
-            # Get entity from key
-            if parameter_type == "key":
-                key = self._collect_key(item)
-                entity = self._collect_entity(key)
-                if as_dict:
-                    entity = entity.to_dict()
-                inputs[parameter] = entity
-
-            # Create entity from parameter
-            elif parameter_type == "create":
-                raise NotImplementedError
-
-        return inputs
-
-    @staticmethod
-    def _parse_parameter(parameter: str) -> str:
-        """
-        Parse parameter.
-
-        Parameters
-        ----------
-        parameter : str
-            Parameter.
-
-        Returns
-        -------
-        str
-            The parsed parameter.
-        """
-        if len(parameter.split(":")) == 1:
-            return "key"
-        return "create"
-
-    @staticmethod
-    def _collect_key(item: str | dict) -> str:
-        """
-        Collect key from item.
-
-        Parameters
-        ----------
-        item : str | dict
-            Key or dict representation of the entity.
-
-        Returns
-        -------
-        str
-            The key.
-        """
-        if isinstance(item, str):
-            return item
-        return item.get("key")
-
-    @staticmethod
-    def _collect_entity(key: str) -> Entity:
-        """
-        Collect entity from key.
-
-        Parameters
-        ----------
-        key : str
-            Key of the entity.
-
-        Returns
-        -------
-        Entity
-            The entity.
-        """
-        _, entity_type, _, _, _ = parse_entity_key(key)
-        return ENTITY_FUNC[entity_type](key)
-
-
-class RunValidator(SpecValidator, K8s):
-    """
-    RunValidator validator.
-    """
-
-    function: str = None
-    """The function associated with the run."""
-
-    task: str = None
-    """The task string associated with the run."""
-
-    local_execution: bool = False
-    """Flag to indicate if the run will be executed locally."""

digitalhub-0.8.0b6/digitalhub/entities/run/_base/status.py

@@ -1,114 +0,0 @@
-from __future__ import annotations
-
-from digitalhub.entities._base.entity.status import Status
-from digitalhub.entities.artifact.crud import get_artifact
-from digitalhub.entities.dataitem.crud import get_dataitem
-from digitalhub.entities.model.crud import get_model
-from digitalhub.entities.utils.entity_types import EntityTypes
-from digitalhub.entities.utils.utils import parse_entity_key
-
-ENTITY_FUNC = {
-    EntityTypes.ARTIFACT.value: get_artifact,
-    EntityTypes.DATAITEM.value: get_dataitem,
-    EntityTypes.MODEL.value: get_model,
-}
-
-
-class RunStatus(Status):
-    """
-    RunStatus status.
-    """
-
-    def __init__(
-        self,
-        state: str,
-        message: str | None = None,
-        outputs: list | None = None,
-        results: dict | None = None,
-        **kwargs,
-    ) -> None:
-        super().__init__(state, message)
-        self.outputs = outputs
-        self.results = results
-
-        self._any_setter(**kwargs)
-
-    def get_results(self) -> dict:
-        """
-        Get results.
-
-        Returns
-        -------
-        dict
-            The results.
-        """
-        if not hasattr(self, "results") or self.results is None:
-            return {}
-        return self.results
-
-    def get_outputs(self, as_key: bool = False, as_dict: bool = False) -> dict:
-        """
-        Get outputs.
-
-        Parameters
-        ----------
-        as_key : bool
-            If True, return outputs as keys.
-        as_dict : bool
-            If True, return outputs as dictionaries.
-
-        Returns
-        -------
-        dict
-            The outputs.
-        """
-        outputs = {}
-        if not hasattr(self, "outputs") or self.outputs is None:
-            return outputs
-
-        for parameter, key in self.outputs.items():
-            entity_type = self._get_entity_type(key)
-            entity = ENTITY_FUNC[entity_type](key)
-            if as_key:
-                entity = entity.key
-            if as_dict:
-                entity = entity.to_dict()
-            outputs[parameter] = entity
-
-        return outputs
-
-    @staticmethod
-    def _get_entity_type(key: str) -> str:
-        """
-        Get entity type.
-
-        Parameters
-        ----------
-        key : str
-            The key of the entity.
-
-        Returns
-        -------
-        str
-            The entity type.
-        """
-        _, entity_type, _, _, _ = parse_entity_key(key)
-        return entity_type
-
-    def get_values(self, values_list: list) -> dict:
-        """
-        Get values.
-
-        Parameters
-        ----------
-        values_list : list
-            The values list to search in.
-
-        Returns
-        -------
-        dict
-            The values.
-        """
-        if not hasattr(self, "results") or self.results is None:
-            return {}
-        return {k: v for k, v in self.get_results().items() if k in values_list}