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

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"])
 
@@ -261,28 +264,34 @@ 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 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
@@ -328,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.
 
@@ -345,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-0.8.0b13.dist-info → digitalhub-0.8.0b14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: digitalhub
-Version: 0.8.0b13
+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.0b13.dist-info → digitalhub-0.8.0b14.dist-info}/RECORD

@@ -139,7 +139,7 @@ digitalhub/entities/project/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMp
 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=nkPrYyn18xrglWT9WZICJ9SyLmmaupMJOL7ce4qeNKY,53532
+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
@@ -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.0b13.dist-info/LICENSE.txt,sha256=_yVOtnbW7Ss28mp058UEEc1X4Rgj8-kQBP_kj8_Sc88,11585
-digitalhub-0.8.0b13.dist-info/METADATA,sha256=nGqQ6XVBy4IemsnJhaksOtDXpUrHOzcikQJW3TRkhoI,15289
-digitalhub-0.8.0b13.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-digitalhub-0.8.0b13.dist-info/top_level.txt,sha256=ae9pDfCF27ZoaVAxuBKONMP0lm5P-N_I-e-no1WlvD8,16
-digitalhub-0.8.0b13.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,,