digitalhub 0.9.0b1__tar.gz → 0.9.0b2__tar.gz

{digitalhub-0.9.0b1 → digitalhub-0.9.0b2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: digitalhub
-Version: 0.9.0b1
+Version: 0.9.0b2
 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 → digitalhub-0.9.0b2}/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.save()
 
         # If execution is done by DHCore backend, return the object
         if not local_execution:

{digitalhub-0.9.0b1 → digitalhub-0.9.0b2}/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-0.9.0b1 → digitalhub-0.9.0b2}/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
 
@@ -76,7 +76,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, run.key + ":" + run.id, self.key)
+        run.save()
+
         if wait:
             return run.wait(log_info=log_info)
         return run

{digitalhub-0.9.0b1 → digitalhub-0.9.0b2}/digitalhub.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: digitalhub
-Version: 0.9.0b1
+Version: 0.9.0b2
 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 → digitalhub-0.9.0b2}/digitalhub.egg-info/SOURCES.txt

@@ -229,4 +229,5 @@ test/testkfp_pipeline.py
 test/local/CRUD/test_artifacts.py
 test/local/CRUD/test_dataitems.py
 test/local/CRUD/test_models.py
-test/local/imports/test_imports.py
+test/local/imports/test_imports.py
+test/local/instances/test_validate.py

{digitalhub-0.9.0b1 → digitalhub-0.9.0b2}/pyproject.toml

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

digitalhub-0.9.0b2/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)