digitalhub 0.8.0b12__py3-none-any.whl → 0.8.0b14__py3-none-any.whl

digitalhub/client/dhcore/client.py

@@ -87,7 +87,7 @@ class ClientDHCore(Client):
         """
         if "headers" not in kwargs:
             kwargs["headers"] = {}
-        kwargs["headers"]['Content-Type'] = "application/json"
+        kwargs["headers"]["Content-Type"] = "application/json"
         kwargs["data"] = json.dumps(obj, default=ClientDHCore._json_serialize)
         return self._prepare_call("POST", api, **kwargs)
 
@@ -129,7 +129,7 @@ class ClientDHCore(Client):
         """
         if "headers" not in kwargs:
             kwargs["headers"] = {}
-        kwargs["headers"]['Content-Type'] = "application/json"
+        kwargs["headers"]["Content-Type"] = "application/json"
         kwargs["data"] = json.dumps(obj, default=ClientDHCore._json_serialize)
         return self._prepare_call("PUT", api, **kwargs)
 
@@ -234,7 +234,7 @@ class ClientDHCore(Client):
         """
         if isinstance(obj, (datetime.datetime, datetime.date)):
             return obj.isoformat()
-        raise TypeError ("Type %s not serializable" % type(obj))
+        raise TypeError("Type %s not serializable" % type(obj))
 
     def _prepare_call(self, call_type: str, api: str, **kwargs) -> dict:
         """

digitalhub/entities/project/_base/entity.py

@@ -192,6 +192,7 @@ class Project(Entity):
             filename = f"{self.kind}_{self.name}.yml"
         pth = Path(self.spec.context) / filename
         pth.parent.mkdir(parents=True, exist_ok=True)
+
         obj = self._export_not_embedded(obj)
         write_yaml(pth, obj)
         return str(pth)
@@ -226,11 +227,13 @@ class Project(Entity):
         """
         # Cycle over entity types
         for entity_type in self._get_entity_types():
+
             # Entity types are stored as a list of entities
             for idx, entity in enumerate(obj.get("spec", {}).get(entity_type, [])):
+
                 # Export entity if not embedded is in metadata, else do nothing
-                embedded = entity["metadata"].get("embedded", False)
-                if not embedded:
+                if not self._is_embedded(entity):
+
                     # Get entity object from backend
                     obj_dict: dict = read_entity_api_ctx(entity["key"])
 
@@ -244,10 +247,15 @@ class Project(Entity):
         # Return updated object
         return obj
 
-    def _import_entities(self) -> None:
+    def _import_entities(self, obj: dict) -> None:
         """
         Import project entities.
 
+        Parameters
+        ----------
+        obj : dict
+            Project object in dictionary format.
+
         Returns
         -------
         None
@@ -256,34 +264,62 @@ class Project(Entity):
 
         # Cycle over entity types
         for entity_type in entity_types:
+
             # Entity types are stored as a list of entities
-            for entity in getattr(self.spec, entity_type, []):
-                entity_metadata = entity["metadata"]
-                embedded = entity_metadata.get("embedded", False)
-                ref = entity_metadata.get("ref", None)
+            for entity in obj.get("spec", {}).get(entity_type, []):
+
+                embedded = self._is_embedded(entity)
+                ref = entity["metadata"].get("ref")
 
-                # Import entity if not embedded
+                # Import entity if not embedded and there is a ref
                 if not embedded and ref is not None:
+
                     # Import entity from local ref
                     if map_uri_scheme(ref) == "local":
                         try:
                             # Artifacts, Dataitems and Models
                             if entity_type in entity_types[:3]:
                                 import_context_entity(ref)
+
                             # Functions and Workflows
                             elif entity_type in entity_types[3:]:
                                 import_executable_entity(ref)
+
                         except FileNotFoundError:
                             msg = f"File not found: {ref}."
                             raise EntityError(msg)
 
                 # If entity is embedded, create it and try to save
                 elif embedded:
+
+                    # It's possible that embedded field in metadata is not shown
+                    if entity["metadata"].get("embedded") is None:
+                        entity["metadata"]["embedded"] = True
+
                     try:
                         build_entity_from_dict(entity).save()
                     except EntityAlreadyExistsError:
                         pass
 
+    def _is_embedded(self, entity: dict) -> bool:
+        """
+        Check if entity is embedded.
+
+        Parameters
+        ----------
+        entity : dict
+            Entity in dictionary format.
+
+        Returns
+        -------
+        bool
+            True if entity is embedded.
+        """
+        metadata_embedded = entity["metadata"].get("embedded", False)
+        no_status = entity.get("status", None) is None
+        no_spec = entity.get("spec", None) is None
+        return metadata_embedded or not (no_status and no_spec)
+
     def _get_entity_types(self) -> list[str]:
         """
         Get entity types.
@@ -301,7 +337,7 @@ class Project(Entity):
             f"{EntityTypes.WORKFLOW.value}s",
         ]
 
-    def run(self, workflow: str | None = "main", **kwargs) -> Run:
+    def run(self, workflow: str | None = None, **kwargs) -> Run:
         """
         Run workflow project.
 
@@ -318,15 +354,18 @@ class Project(Entity):
             Run instance.
         """
         self.refresh()
+
+        workflow = workflow if workflow is not None else "main"
+
         for i in self.spec.workflows:
-            if i["name"] == workflow or i["key"] == workflow:
-                workflow = build_entity_from_dict(i)
+            if workflow in [i["name"], i["key"]]:
+                entity = self.get_workflow(i["key"])
                 break
         else:
             msg = f"Workflow {workflow} not found."
             raise EntityError(msg)
 
-        return workflow.run(**kwargs)
+        return entity.run(**kwargs)
 
     ##############################
     #  Artifacts

digitalhub/entities/project/crud.py

@@ -9,7 +9,7 @@ from digitalhub.context.api import delete_context
 from digitalhub.entities._base.api_utils import delete_entity_api_base, read_entity_api_base, update_entity_api_base
 from digitalhub.entities.utils.entity_types import EntityTypes
 from digitalhub.factory.api import build_entity_from_dict, build_entity_from_params
-from digitalhub.utils.exceptions import BackendError, EntityError
+from digitalhub.utils.exceptions import BackendError, EntityAlreadyExistsError, EntityError
 from digitalhub.utils.io_utils import read_yaml
 
 if typing.TYPE_CHECKING:
@@ -151,8 +151,13 @@ def import_project(
     obj = build_entity_from_dict(dict_obj)
     obj = _setup_project(obj, setup_kwargs)
 
+    try:
+        obj.save()
+    except EntityAlreadyExistsError:
+        pass
+
     # Import related entities
-    obj._import_entities()
+    obj._import_entities(dict_obj)
 
     return obj
 

digitalhub/entities/run/_base/builder.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import typing
 
-from digitalhub.entities._base.runtime_entity.builder import RuntimeEntityBuilder, EntityError
+from digitalhub.entities._base.runtime_entity.builder import EntityError, RuntimeEntityBuilder
 from digitalhub.entities._base.unversioned.builder import UnversionedBuilder
 from digitalhub.entities.utils.entity_types import EntityTypes
 

digitalhub/entities/task/_base/builder.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import typing
 
-from digitalhub.entities._base.runtime_entity.builder import RuntimeEntityBuilder, EntityError
+from digitalhub.entities._base.runtime_entity.builder import EntityError, RuntimeEntityBuilder
 from digitalhub.entities._base.unversioned.builder import UnversionedBuilder
 from digitalhub.entities.utils.entity_types import EntityTypes
 

digitalhub/utils/io_utils.py

@@ -37,7 +37,6 @@ def write_yaml(filepath: str | Path, obj: dict | list[dict]) -> None:
 ##############################
 
 
-
 class NoDatesSafeLoader(yaml.SafeLoader):
     """
     Loader implementation to exclude implicit resolvers.
@@ -63,15 +62,17 @@ class NoDatesSafeLoader(yaml.SafeLoader):
         -------
         None
         """
-        if not 'yaml_implicit_resolvers' in cls.__dict__:
+        if not "yaml_implicit_resolvers" in cls.__dict__:
             cls.yaml_implicit_resolvers = cls.yaml_implicit_resolvers.copy()
 
         for first_letter, mappings in cls.yaml_implicit_resolvers.items():
-            cls.yaml_implicit_resolvers[first_letter] = [(tag, regexp)
-                                                         for tag, regexp in mappings
-                                                         if tag != tag_to_remove]
+            cls.yaml_implicit_resolvers[first_letter] = [
+                (tag, regexp) for tag, regexp in mappings if tag != tag_to_remove
+            ]
+
+
+NoDatesSafeLoader.remove_implicit_resolver("tag:yaml.org,2002:timestamp")
 
-NoDatesSafeLoader.remove_implicit_resolver('tag:yaml.org,2002:timestamp')
 
 def read_yaml(filepath: str | Path) -> dict | list[dict]:
     """

{digitalhub-0.8.0b12.dist-info → digitalhub-0.8.0b14.dist-info}/METADATA

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

{digitalhub-0.8.0b12.dist-info → digitalhub-0.8.0b14.dist-info}/RECORD

@@ -5,7 +5,7 @@ digitalhub/client/builder.py,sha256=83PoMCus4s4nbkoWmvcjW2hIpXbNx74sUW93wgQgbuo,
 digitalhub/client/_base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/client/_base/client.py,sha256=HDv9Vr9DZpoaZVsAT5SSBD9j1oHoVuxA4ILGDl0mBz4,1299
 digitalhub/client/dhcore/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-digitalhub/client/dhcore/client.py,sha256=CyCJwPgMqK3hH3nfnRLkNL9XU_lvcXiw0W7phfA_1d8,19170
+digitalhub/client/dhcore/client.py,sha256=eh-IQu72Kz4K82uUlMRtatQAQNymvOCMJZZPjB9TdqQ,19169
 digitalhub/client/dhcore/env.py,sha256=F5A5dPTliwd4UUbpw7hQQ3hoVjZYjcVF8MbniTuTFHE,563
 digitalhub/client/dhcore/models.py,sha256=KiTg5xR8EzI7Xa1pmYmzixabLdnqlnn5kn-IILZDGIw,900
 digitalhub/client/dhcore/utils.py,sha256=TaLjA3LT6heKpPclmufZx-kZKZNOe4OzS_Jtpj2S5wY,2990
@@ -136,16 +136,16 @@ digitalhub/entities/model/sklearn/entity.py,sha256=pPy4mOqOmbkqNkKFUnhrsIQNt2mGN
 digitalhub/entities/model/sklearn/spec.py,sha256=Md0aKlfNHZ2fhZbJgp9wZxF0Hu6XIkcniQHCgwoRdkk,301
 digitalhub/entities/model/sklearn/status.py,sha256=eqkPPtERX-6_BjPb_GD8j1FIeavpl43k-dfXZGqzGI0,187
 digitalhub/entities/project/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-digitalhub/entities/project/crud.py,sha256=ih3mwEJ7bbD3HG9S-8YMu4UyTJMmIZT-mB1m2FGzLz8,8858
+digitalhub/entities/project/crud.py,sha256=P2IhKR2-YNmiNy0rpu0PG-LKD9nJGKsAahxvhsovmJA,8971
 digitalhub/entities/project/_base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/entities/project/_base/builder.py,sha256=Fx_p8M75SkE_ssVBvKGu45wwqwqAZ5N6l6UZZj9LSNc,3612
-digitalhub/entities/project/_base/entity.py,sha256=7lynSFR9sVQJwPJc0qEJLWGg_VxZPYy9Pg2Xc-RIwpI,52727
+digitalhub/entities/project/_base/entity.py,sha256=OZ4vH38ORWTdYS6yE4sxc0jdIpqgKszDJp_IrpeQJMQ,53559
 digitalhub/entities/project/_base/spec.py,sha256=zRJKFztK7z79LU4spxX7Rykv_1sK6kV9F9Qg95HBc6s,1346
 digitalhub/entities/project/_base/status.py,sha256=w1Hj_yFwr_5X7ZH7SmtZRto4qUdCWb010viFfvbqX48,168
 digitalhub/entities/run/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/entities/run/crud.py,sha256=F-t9pI0NPKt0430SwGMdL7ky2eprXqUf6UUz9GzCgGQ,4369
 digitalhub/entities/run/_base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-digitalhub/entities/run/_base/builder.py,sha256=7FpgCUGFr0yCgnUCYuQLLH7_aOZNrByt7fqsWgr5tEg,2427
+digitalhub/entities/run/_base/builder.py,sha256=T1kRlKHQlKPRepXIFr_hecaOmaS6E49L45WZvE7yCpo,2427
 digitalhub/entities/run/_base/entity.py,sha256=H0YViqBYxLQRDnqXUNXoUrxnfxd6Q5jJJu0hCeus4ig,7894
 digitalhub/entities/run/_base/spec.py,sha256=XXPZ5Fl5yLA74XCiuaCjdDGIqMIQ7K1a5cVnDXuohec,1388
 digitalhub/entities/run/_base/status.py,sha256=_oqF8AM-N6XGi-xc-xgthdmCpsuI_rGgVaNKgQ4UDJQ,160
@@ -159,7 +159,7 @@ digitalhub/entities/secret/_base/status.py,sha256=TK9CUKA6eg9qegqgR9t-u1g-vEeFGB
 digitalhub/entities/task/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/entities/task/crud.py,sha256=_DOnCpuBNPWgk4RP1wvgAxNiEa8Bh3MzHQpkRNyqKjk,4666
 digitalhub/entities/task/_base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-digitalhub/entities/task/_base/builder.py,sha256=6UsCo-j5NJH1H_P2CZDYQI78dpuAqNjtwniNKjd_z5g,2320
+digitalhub/entities/task/_base/builder.py,sha256=8NXl9Mp3zjHd1E3mawUVjzOcccpcUE18_dkLMhehVBA,2320
 digitalhub/entities/task/_base/entity.py,sha256=ihGyXV_MDNUnmNOj5uWSkHA2IR8UAF_jfmFQyTH1DH8,3127
 digitalhub/entities/task/_base/models.py,sha256=Vkequ03zsI1n4L-VGO0vMYDnrhK63rB5I0NshB3s6k4,4254
 digitalhub/entities/task/_base/spec.py,sha256=wc9-i0VguS99WG4jQhYF3s2d_mwwtg_Yrkm8RbDa_vk,1289
@@ -211,7 +211,7 @@ digitalhub/utils/exceptions.py,sha256=MjLhgaGSAe0oJXoR-dnEtAh02RYDj3wZ1ZS1SLFUD4
 digitalhub/utils/file_utils.py,sha256=Qe71D2b6mOil_Y0Hy2QCJbnIaQOyXvhjFRbJoZXhsGQ,4006
 digitalhub/utils/generic_utils.py,sha256=YHWCCF77JFqgm4TNr3_U2GbX4SjEQjUmxA6i9PkRqG8,3527
 digitalhub/utils/git_utils.py,sha256=aFYL1cpfY-2VnlW7eHmjjjlTLECc5UUUfjb_IQPOY5k,3244
-digitalhub/utils/io_utils.py,sha256=ggHX10QTM8Glu2IKZ9QAIaCmW7iPvQjgwEe5LRkXzho,3080
+digitalhub/utils/io_utils.py,sha256=Yg24Lt_0aAUaj4Yv5-1iy7VIA0umLxQGW6lkDRWcjrE,2997
 digitalhub/utils/logger.py,sha256=ml3ne6D8wuRdNZ4F6ywmvWotSxjmZWnmKgNiuHb4R5M,437
 digitalhub/utils/s3_utils.py,sha256=oXLzp4K7o45IwK0XOMt4OElDyB09fKRic5WTNA82WUA,1113
 digitalhub/utils/uri_utils.py,sha256=wArWRQ3ygGUNHexGKP3YM-aBE7TyGxhPvfEc7R4T4p4,1144
@@ -224,8 +224,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.0b12.dist-info/LICENSE.txt,sha256=_yVOtnbW7Ss28mp058UEEc1X4Rgj8-kQBP_kj8_Sc88,11585
-digitalhub-0.8.0b12.dist-info/METADATA,sha256=V8RSyRfpcalWbakhY6Twshzxf4oI2Jh8kIo1Krx4c7s,15289
-digitalhub-0.8.0b12.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-digitalhub-0.8.0b12.dist-info/top_level.txt,sha256=ae9pDfCF27ZoaVAxuBKONMP0lm5P-N_I-e-no1WlvD8,16
-digitalhub-0.8.0b12.dist-info/RECORD,,
+digitalhub-0.8.0b14.dist-info/LICENSE.txt,sha256=_yVOtnbW7Ss28mp058UEEc1X4Rgj8-kQBP_kj8_Sc88,11585
+digitalhub-0.8.0b14.dist-info/METADATA,sha256=ZCqntN3pfX1zYGBO3TwzSli4gxGmsyqB8dnJZXXL8Jk,15289
+digitalhub-0.8.0b14.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+digitalhub-0.8.0b14.dist-info/top_level.txt,sha256=ae9pDfCF27ZoaVAxuBKONMP0lm5P-N_I-e-no1WlvD8,16
+digitalhub-0.8.0b14.dist-info/RECORD,,