digitalhub 0.8.0b6__py3-none-any.whl → 0.8.0b7__py3-none-any.whl

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/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/entities/run/_base/spec.py

@@ -1,24 +1,7 @@
 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):
@@ -51,92 +34,6 @@ class RunSpec(Spec):
         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):
     """

digitalhub/entities/run/_base/status.py

@@ -1,114 +1,9 @@
 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}

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/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.dist-info → digitalhub-0.8.0b7.dist-info}/METADATA

@@ -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.dist-info → digitalhub-0.8.0b7.dist-info}/RECORD

@@ -38,7 +38,7 @@ digitalhub/entities/_base/entity/builder.py,sha256=ZuccRGQaLYyjlDPNR3wi6_9YB4DHE
 digitalhub/entities/_base/entity/entity.py,sha256=273GKmR7dlckvTSHPTFAhvhd-VhHJy2116iooPI_8ug,2744
 digitalhub/entities/_base/entity/metadata.py,sha256=ew0pFBH0u8m5QjkcL21KboRhBkJAJQDl6EjCeiegyEc,1690
 digitalhub/entities/_base/entity/spec.py,sha256=yY6ScqZGRb-Sbw97g-OQ0GPHmmOX6HGYBDkvax6PKkc,1338
-digitalhub/entities/_base/entity/status.py,sha256=UFr-9c1t--3PJDWTYmgsPhuaV0IeHGiUDN0-P_e8JE4,817
+digitalhub/entities/_base/entity/status.py,sha256=NHB1kLHefoMhhkt_2BFPNojbWMW_Nc8TTGFQNOiyOt0,1044
 digitalhub/entities/_base/entity/_constructors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/entities/_base/entity/_constructors/metadata.py,sha256=IGB1l6EJ1xlnGMdeL-b04kT4tFd_h5lJgo5MXzv3h9o,1058
 digitalhub/entities/_base/entity/_constructors/name.py,sha256=sNU54TzzdYug5sqio8uaus6pP5RkEJYIEl6j0fwR4ho,485
@@ -148,14 +148,14 @@ digitalhub/entities/run/builder.py,sha256=Cx8dg_hytb3E0cGhqlpVUNHlQtydXmzP5AT-oq
 digitalhub/entities/run/crud.py,sha256=TE8xbcA8VmUO0Po89yafdIpXNRKM-ZS6mYbRNjPUS4A,5017
 digitalhub/entities/run/_base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/entities/run/_base/builder.py,sha256=UVWaCiI-dXw0YB5_R2hko1FIa4y7qi8t2HkxEs0-peE,1867
-digitalhub/entities/run/_base/entity.py,sha256=O3pX_18Og5YcCQTGT1Y60JTcfpLvmwx1Q7dXsR2DWuY,8291
-digitalhub/entities/run/_base/spec.py,sha256=KKIwKBe2asOQq-CKI7NbveGUvYnQfaVrnS92IEJ-e0s,3929
-digitalhub/entities/run/_base/status.py,sha256=be2TK_KcLwEA5uhpkQXBQHDTc6bPaaIz3e9UZuVhXq4,2850
+digitalhub/entities/run/_base/entity.py,sha256=VjjJhoWuDwH1cPTLm1OY9BbS1KeD8x4TaNkaOW9w_q4,7889
+digitalhub/entities/run/_base/spec.py,sha256=XXPZ5Fl5yLA74XCiuaCjdDGIqMIQ7K1a5cVnDXuohec,1388
+digitalhub/entities/run/_base/status.py,sha256=_oqF8AM-N6XGi-xc-xgthdmCpsuI_rGgVaNKgQ4UDJQ,160
 digitalhub/entities/secret/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/entities/secret/builder.py,sha256=dfSW5dTwiIJJL4w3cIYUJ8f2TPZadX2Qu95xMEyIuVg,1056
 digitalhub/entities/secret/crud.py,sha256=ACtzUUBDOffxCociSprPqOw7Rq0vnCSQOFop_jq-Qb8,6782
 digitalhub/entities/secret/_base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-digitalhub/entities/secret/_base/builder.py,sha256=dQsUDqTQsTmcDOtkMRHlQNwwxcmPMkB_aT2WWmNnOWM,2197
+digitalhub/entities/secret/_base/builder.py,sha256=Y3mJIVqWezwPgwQX1XABlnazdj7VnUYTND8yHoga0Lw,2163
 digitalhub/entities/secret/_base/entity.py,sha256=UF-ibEcnrcaNy_nGCrxxyoJqVrcAfyq3ZFUP-sTiEgw,2035
 digitalhub/entities/secret/_base/spec.py,sha256=Ol4bDVd2lR6uUUtFj80YNSgtRsnfYGE3C7UN2c_LUsc,727
 digitalhub/entities/secret/_base/status.py,sha256=TK9CUKA6eg9qegqgR9t-u1g-vEeFGB6v5dN9YJNukw8,166
@@ -172,7 +172,7 @@ digitalhub/entities/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 digitalhub/entities/utils/api.py,sha256=jSNYoLzoYSvu2wI-fs6u87AFYGAaboPCX4y6f2LqJ5A,6597
 digitalhub/entities/utils/entity_types.py,sha256=PcAh78WAC9DgwSU6LxGncn0g7Wzb0iZXc-3Ooik8-ks,324
 digitalhub/entities/utils/state.py,sha256=gKxDy__MEHlz-1SrwICZnFOIqDoI-CBo4ylIBM9TaoQ,609
-digitalhub/entities/utils/utils.py,sha256=HD4tQcx8MQ8YVjz9aIgUHgYIk1t4Q9AlkhaY0NgN8Mg,4193
+digitalhub/entities/utils/utils.py,sha256=_ZGe4xAO8uSwb2EZqH0nhA3nasaLOzj3x4vw8MvoAU0,4488
 digitalhub/entities/workflow/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/entities/workflow/builder.py,sha256=mNQ49ziCx6mOqRsn_m9WUbD5kApi93b67uTqAO5zsts,1072
 digitalhub/entities/workflow/crud.py,sha256=071LtHfFt6W08ScFKuulzHglQlEUB0wIdCN56jq_1-g,6792
@@ -226,8 +226,8 @@ test/local/CRUD/test_artifacts.py,sha256=Y3J_C7SDRSsQd2SGIZjPIOvyTL92B1sTFrUONG3
 test/local/CRUD/test_dataitems.py,sha256=LQqTzI59uwTGy4zoq8jL0yWVe2W9vXlatkgDU9aB6xg,2968
 test/local/CRUD/test_models.py,sha256=msosbZuRwIMbZtmi3ZaOva4TjQ4lrzkNu9AguIFhrSo,2929
 test/local/imports/test_imports.py,sha256=W-YugO0rpJwvtWp57MXaXfEmE-f5iWuCiLY-n0ZU4z8,1271
-digitalhub-0.8.0b6.dist-info/LICENSE.txt,sha256=_yVOtnbW7Ss28mp058UEEc1X4Rgj8-kQBP_kj8_Sc88,11585
-digitalhub-0.8.0b6.dist-info/METADATA,sha256=x3PXhMDTlwLKyHd6Zx0nStqBQ5EdFP3VYJxdv2_CC7c,15288
-digitalhub-0.8.0b6.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-digitalhub-0.8.0b6.dist-info/top_level.txt,sha256=ae9pDfCF27ZoaVAxuBKONMP0lm5P-N_I-e-no1WlvD8,16
-digitalhub-0.8.0b6.dist-info/RECORD,,
+digitalhub-0.8.0b7.dist-info/LICENSE.txt,sha256=_yVOtnbW7Ss28mp058UEEc1X4Rgj8-kQBP_kj8_Sc88,11585
+digitalhub-0.8.0b7.dist-info/METADATA,sha256=bfLOdtv673n9rN-LCUjKFgwKwj_ZhQdTDrL0xQMrj-s,15288
+digitalhub-0.8.0b7.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+digitalhub-0.8.0b7.dist-info/top_level.txt,sha256=ae9pDfCF27ZoaVAxuBKONMP0lm5P-N_I-e-no1WlvD8,16
+digitalhub-0.8.0b7.dist-info/RECORD,,