digitalhub 0.9.0b1__py3-none-any.whl → 0.9.0b3__py3-none-any.whl

digitalhub/entities/_base/entity/entity.py

@@ -79,7 +79,7 @@ class Entity(Base):
         Abstract export method.
         """
 
-    def add_relationship(self, relation: str, source: str, dest: str) -> None:
+    def add_relationship(self, relation: str, dest: str, source: str | None = None) -> None:
         """
         Add relationship to entity metadata.
 
@@ -87,10 +87,10 @@ class Entity(Base):
         ----------
         relation : str
             The type of relationship.
+        dest : str
+            The target entity.
         source : str
             The source entity.
-        dest : str
-            The target entity..
 
         Returns
         -------
@@ -98,7 +98,9 @@ class Entity(Base):
         """
         if self.metadata.relationships is None:
             self.metadata.relationships = []
-        obj = {"type": relation, "source": source, "dest": dest}
+        obj = {"type": relation, "dest": dest}
+        if source is not None:
+            obj["source"] = source
         self.metadata.relationships.append(obj)
 
     def to_dict(self) -> dict:

digitalhub/entities/_operations/processor.py

@@ -559,7 +559,7 @@ class OperationsProcessor:
         context = self._get_context(kwargs["project"])
         obj = build_entity_from_params(**kwargs)
         if context.is_running:
-            obj.add_relationship(Relationship.PRODUCEDBY.value, obj.key, context.get_run_ctx())
+            obj.add_relationship(Relationship.PRODUCEDBY.value, context.get_run_ctx())
 
         new_obj: MaterialEntity = self._create_context_entity(context, obj.ENTITY_TYPE, obj.to_dict())
         new_obj = build_entity_from_dict(new_obj)

digitalhub/entities/function/_base/entity.py

@@ -79,11 +79,11 @@ class Function(ExecutableEntity):
         task = self._get_or_create_task(task_kind)
 
         # Run function from task
-        run = task.run(run_kind, local_execution, **kwargs)
+        run = task.run(run_kind, save=False, local_execution=local_execution, **kwargs)
 
         # Set as run's parent
-        run.add_relationship(Relationship.RUN_OF.value, run.key + ":" + run.id, self.key)
-        run.save(update=True)
+        run.add_relationship(Relationship.RUN_OF.value, self.key)
+        run.save()
 
         # If execution is done by DHCore backend, return the object
         if not local_execution:

digitalhub/entities/task/_base/entity.py

@@ -4,8 +4,8 @@ import typing
 
 from digitalhub.entities._base.unversioned.entity import UnversionedEntity
 from digitalhub.entities._commons.enums import EntityTypes
-from digitalhub.entities.run.crud import delete_run, get_run, new_run
-from digitalhub.factory.api import get_entity_type_from_kind, get_executable_kind
+from digitalhub.entities._operations.processor import processor
+from digitalhub.factory.api import build_entity_from_params, get_entity_type_from_kind, get_executable_kind
 
 if typing.TYPE_CHECKING:
     from digitalhub.entities._base.entity.metadata import Metadata
@@ -42,6 +42,7 @@ class Task(UnversionedEntity):
     def run(
         self,
         run_kind: str,
+        save: bool = True,
         local_execution: bool = False,
         **kwargs,
     ) -> Run:
@@ -66,6 +67,7 @@ class Task(UnversionedEntity):
         exec_type = get_entity_type_from_kind(exec_kind)
         kwargs[exec_type] = getattr(self.spec, exec_type)
         return self.new_run(
+            save=save,
             project=self.project,
             task=self._get_task_string(),
             kind=run_kind,
@@ -88,21 +90,25 @@ class Task(UnversionedEntity):
     # CRUD Methods for Run
     ##############################
 
-    def new_run(self, **kwargs) -> Run:
+    def new_run(self, save: bool = True, **kwargs) -> Run:
         """
         Create a new run.
 
         Parameters
         ----------
+        save : bool
+            Flag to indicate save.
         **kwargs : dict
-            Keyword arguments.
+            Keyword arguments to build run. See new_run().
 
         Returns
         -------
         Run
             Run object.
         """
-        return new_run(**kwargs)
+        if save:
+            return processor.create_context_entity(**kwargs)
+        return build_entity_from_params(**kwargs)
 
     def get_run(self, entity_key: str) -> Run:
         """
@@ -118,9 +124,9 @@ class Task(UnversionedEntity):
         Run
             Run object.
         """
-        return get_run(entity_key)
+        return processor.read_context_entity(entity_key)
 
-    def delete_run(self, entity_key: str) -> None:
+    def delete_run(self, entity_key: str) -> dict:
         """
         Delete run.
 
@@ -131,6 +137,7 @@ class Task(UnversionedEntity):
 
         Returns
         -------
-        None
+        dict
+            Response from backend.
         """
-        delete_run(entity_key)
+        return processor.delete_context_entity(entity_key)

digitalhub/entities/workflow/_base/entity.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import typing
 
 from digitalhub.entities._base.executable.entity import ExecutableEntity
-from digitalhub.entities._commons.enums import EntityTypes
+from digitalhub.entities._commons.enums import EntityTypes, Relationship
 from digitalhub.factory.api import get_run_kind, get_task_kind_from_action
 from digitalhub.utils.exceptions import BackendError
 
@@ -44,7 +44,7 @@ class Workflow(ExecutableEntity):
     def run(
         self,
         action: str,
-        wait: bool = True,
+        wait: bool = False,
         log_info: bool = True,
         **kwargs,
     ) -> Run:
@@ -55,7 +55,10 @@ class Workflow(ExecutableEntity):
         ----------
         action : str
             Action to execute.
-
+        wait : bool
+            Flag to wait for execution to finish.
+        log_info : bool
+            Flag to log information while waiting.
         **kwargs : dict
             Keyword arguments passed to Run builder.
 
@@ -76,7 +79,12 @@ class Workflow(ExecutableEntity):
             raise BackendError("Cannot run workflow with local backend.")
 
         # Run task
-        run = task.run(run_kind, local_execution=False, **kwargs)
+        run = task.run(run_kind, save=False, local_execution=False, **kwargs)
+
+        # Set as run's parent
+        run.add_relationship(Relationship.RUN_OF.value, self.key)
+        run.save()
+
         if wait:
             return run.wait(log_info=log_info)
         return run

{digitalhub-0.9.0b1.dist-info → digitalhub-0.9.0b3.dist-info}/METADATA

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

{digitalhub-0.9.0b1.dist-info → digitalhub-0.9.0b3.dist-info}/RECORD

@@ -27,7 +27,7 @@ digitalhub/entities/_base/context/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeR
 digitalhub/entities/_base/context/entity.py,sha256=4IWC6f0YKpEBPCXrKlkkvnOqT1urQ4mbjwre4LUWxk4,3270
 digitalhub/entities/_base/entity/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/entities/_base/entity/builder.py,sha256=vegnR3aBLhuA371vFVQvMXX4KfpVFl-Z7h1ydt6r6Hg,4518
-digitalhub/entities/_base/entity/entity.py,sha256=5QP7ZFZ3fjdC6dL26J4TAc_gAsz4esTYR97PIRiwk04,3162
+digitalhub/entities/_base/entity/entity.py,sha256=BFVKE5CToh4JOdwseAGMhdpoCiD3kaGRhNA9SuRCixE,3223
 digitalhub/entities/_base/entity/metadata.py,sha256=_ogwoo7NOExxVPml9h1vbbAryFiAVpuEuSBQsd_VRjU,2261
 digitalhub/entities/_base/entity/spec.py,sha256=t0sPXHCb8zyWyMW_UvTfGyUkG_CUEGz427kvGhsQ8s0,1500
 digitalhub/entities/_base/entity/status.py,sha256=NHB1kLHefoMhhkt_2BFPNojbWMW_Nc8TTGFQNOiyOt0,1044
@@ -58,7 +58,7 @@ digitalhub/entities/_commons/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 digitalhub/entities/_commons/enums.py,sha256=pjhbOMzAABRPbV6XNt-2Lyn2kLWIFBAwpeboCtvnz1w,1861
 digitalhub/entities/_commons/utils.py,sha256=_HL6zFSCL_2ug4LpXcxK1MJQQhWL34wj1B2q0Ie0TKU,1792
 digitalhub/entities/_operations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-digitalhub/entities/_operations/processor.py,sha256=yi-L_mltue3WN8xM5Y-zpwUCb4x4psW5uwd1Lx7Rxo4,46663
+digitalhub/entities/_operations/processor.py,sha256=C5LHmV19Ovk5e4E329TbkdYqIrJ26UOQjnkYBHQk018,46654
 digitalhub/entities/artifact/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/entities/artifact/crud.py,sha256=y69PyoWAYOx-Pl_wnds3M0xSLNbADpdV_xG4zElJ0aI,7824
 digitalhub/entities/artifact/utils.py,sha256=NNzD2AcIJzmV_Jo_8k5ZcSp2arKcZ07CCIYKn2lvoKM,1320
@@ -100,7 +100,7 @@ digitalhub/entities/function/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 digitalhub/entities/function/crud.py,sha256=1-fRWVmOXVV305p0GW0n02FEcengw7QxLxxgxsCC7eM,6592
 digitalhub/entities/function/_base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/entities/function/_base/builder.py,sha256=xTVOpH3GYU-BqtzMEuI3uMtLLvF9IYfrVYMVPkkJc2g,2035
-digitalhub/entities/function/_base/entity.py,sha256=VhUQsC5EyJQpCU6FMDRqLIrlJt18g8I6AKd1ZO7320U,3100
+digitalhub/entities/function/_base/entity.py,sha256=YYFxtLAZEhcWOzGlGjqRPXmGRb8wBK1KOXyVPo9ZGSw,3093
 digitalhub/entities/function/_base/spec.py,sha256=SjCtp3JBUTPTLMY_TE8wM1HPKVl7jH_wFEqQXBj1rfo,274
 digitalhub/entities/function/_base/status.py,sha256=N-Z1hw13qV7kWFJLQPaH3rRZ2z7AvZeuWYER95lG344,170
 digitalhub/entities/model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -159,7 +159,7 @@ digitalhub/entities/task/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZ
 digitalhub/entities/task/crud.py,sha256=_TOgqPvD4bOcfxMPJLCzPe4fz_87AP27RG5cC2941oY,5199
 digitalhub/entities/task/_base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/entities/task/_base/builder.py,sha256=21WEbycCR8yaOPcLLcAITaoQ4ZmBNXJXB-Oy0VfSPrg,2358
-digitalhub/entities/task/_base/entity.py,sha256=KGueJ64puhS7DAzG0_-XZSlUmVIOPOFJbtj1S8iWrpg,3179
+digitalhub/entities/task/_base/entity.py,sha256=hOTFxWgSrEs2UPrd9pDZAbdWnL_OrkHr6PwxnAkYG2A,3531
 digitalhub/entities/task/_base/models.py,sha256=lrkQfKEqqMboiDgtqVdTdlFx4FCH_ksJ2Jku1nK6ARw,4741
 digitalhub/entities/task/_base/spec.py,sha256=2p_QmhXdTXFrkwNyXtEgzUmc4YyedjS-zsnWsvxJDjw,2412
 digitalhub/entities/task/_base/status.py,sha256=FCSSQscQ0dHEpXdc5vSrIkTXon9FNNOr0M1KVh2ZVAA,162
@@ -168,7 +168,7 @@ digitalhub/entities/workflow/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 digitalhub/entities/workflow/crud.py,sha256=O_Zq30NG-cy7RU1GG88XNi8ids7vrRJAR95PTMYncGM,6517
 digitalhub/entities/workflow/_base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/entities/workflow/_base/builder.py,sha256=wRgot2pbXjc-Cw549uDo1zFOGKdE7wVqxCboeNoXe-Q,2035
-digitalhub/entities/workflow/_base/entity.py,sha256=TFteC2Bpg71qrQ0ni9qnowZUYT3WQ_toEmt2BJIdUeM,2228
+digitalhub/entities/workflow/_base/entity.py,sha256=yQKsoJqWRRgYVQJ0wWvu4krx1DpRM9JL4Irb_874Kqs,2516
 digitalhub/entities/workflow/_base/spec.py,sha256=UoKOUEqKDFACQwctDWfwhro77m3kvjhLDGOhhfRvEzQ,274
 digitalhub/entities/workflow/_base/status.py,sha256=W0j0CNdu9o2vbk0awpnDrpgwf_fZpgdtct4s0BxRdyk,170
 digitalhub/factory/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -222,8 +222,9 @@ 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.9.0b1.dist-info/LICENSE.txt,sha256=_yVOtnbW7Ss28mp058UEEc1X4Rgj8-kQBP_kj8_Sc88,11585
-digitalhub-0.9.0b1.dist-info/METADATA,sha256=US6XAu95Ktv0yNGQJxqOwkfMLyzPDPsKFS5eb8A-wvk,15316
-digitalhub-0.9.0b1.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-digitalhub-0.9.0b1.dist-info/top_level.txt,sha256=ae9pDfCF27ZoaVAxuBKONMP0lm5P-N_I-e-no1WlvD8,16
-digitalhub-0.9.0b1.dist-info/RECORD,,
+test/local/instances/test_validate.py,sha256=bGPKRFR_Tb5nlzzmI_ty_6UVUvYGseE2-pkNVoGWeO0,1842
+digitalhub-0.9.0b3.dist-info/LICENSE.txt,sha256=_yVOtnbW7Ss28mp058UEEc1X4Rgj8-kQBP_kj8_Sc88,11585
+digitalhub-0.9.0b3.dist-info/METADATA,sha256=3AXEwBDEr7vREKj1Jt-IySOXq_h9_QeAAjpuE6eM2VQ,15316
+digitalhub-0.9.0b3.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+digitalhub-0.9.0b3.dist-info/top_level.txt,sha256=ae9pDfCF27ZoaVAxuBKONMP0lm5P-N_I-e-no1WlvD8,16
+digitalhub-0.9.0b3.dist-info/RECORD,,

test/local/instances/test_validate.py

@@ -0,0 +1,55 @@
+import os
+import pytest
+from glob import glob
+from pathlib import Path
+import json
+from jsonschema import validate
+from digitalhub.factory.factory import factory
+
+entities_path = "test/local/instances/entities"
+schemas_path = "test/local/instances/schemas"
+
+# Build dict: kind -> path to schema file
+schemas = {}
+for path_to_schema in glob(f"{schemas_path}/**/*.json", recursive=True):
+    kind = Path(path_to_schema).stem
+    schemas[kind] = path_to_schema
+
+# Build dict: name of file to validate -> full path to file
+entity_paths = {}
+for path_to_file in glob(f"{entities_path}/**/*.json", recursive=True):
+    file_name = os.path.basename(path_to_file)
+
+    # If a file in a nested directory causes a name collision, use its full path as name 
+    if file_name in entity_paths:
+        file_name = path_to_file
+
+    entity_paths[file_name] = path_to_file
+
+# Build object from JSON file using factory
+def build_obj(entity_file_path):
+    with open(entity_file_path) as f:
+        entity = json.load(f)
+        
+    kind = entity["kind"]
+    spec = entity["spec"]
+
+    built = factory.build_spec(kind, **spec)
+    return built.to_dict(), kind
+
+# Validate built object against its kind's schema
+def is_valid(built, kind):
+    with open(schemas[kind]) as schema_file:
+        schema = json.load(schema_file)
+
+    validate(instance=built, schema=schema)
+    return True
+
+# Tests that each JSON file contained in the specified path can successfully be
+# used to generate an object through the factory, and that each generated object,
+# when exported to dict, validates (through jsonschema) against its kind's schema.
+class TestValidate:
+    @pytest.mark.parametrize('file_name', list(entity_paths.keys()))
+    def test_validate(self, file_name):
+        built, kind = build_obj(f"{entity_paths[file_name]}")
+        assert is_valid(built, kind)