digitalhub 0.9.0b0__py3-none-any.whl → 0.9.0b2__py3-none-any.whl

digitalhub/client/dhcore/client.py

@@ -12,7 +12,7 @@ from requests.exceptions import HTTPError, JSONDecodeError, RequestException
 
 from digitalhub.client._base.client import Client
 from digitalhub.client.dhcore.api_builder import ClientDHCoreApiBuilder
-from digitalhub.client.dhcore.enums import AuthType, EnvVar
+from digitalhub.client.dhcore.enums import AuthType, DhcoreEnvVar
 from digitalhub.client.dhcore.env import ENV_FILE, FALLBACK_USER, LIB_VERSION, MAX_API_LEVEL, MIN_API_LEVEL
 from digitalhub.client.dhcore.models import BasicAuth, OAuth2TokenAuth
 from digitalhub.utils.exceptions import (
@@ -520,7 +520,6 @@ class ClientDHCore(Client):
         -------
         None
         """
-
         self._get_endpoints_from_env()
 
         if config is not None:
@@ -558,12 +557,12 @@ class ClientDHCore(Client):
         Exception
             If the endpoint of DHCore is not set in the env variables.
         """
-        core_endpt = os.getenv(EnvVar.ENDPOINT.value)
+        core_endpt = os.getenv(DhcoreEnvVar.ENDPOINT.value)
         if core_endpt is None:
             raise BackendError("Endpoint not set as environment variables.")
         self._endpoint_core = self._sanitize_endpoint(core_endpt)
 
-        issr_endpt = os.getenv(EnvVar.ISSUER.value)
+        issr_endpt = os.getenv(DhcoreEnvVar.ISSUER.value)
         if issr_endpt is not None:
             self._endpoint_issuer = self._sanitize_endpoint(issr_endpt)
 
@@ -589,17 +588,17 @@ class ClientDHCore(Client):
         -------
         None
         """
-        self._user = os.getenv(EnvVar.USER.value, FALLBACK_USER)
-        self._refresh_token = os.getenv(EnvVar.REFRESH_TOKEN.value)
-        self._client_id = os.getenv(EnvVar.CLIENT_ID.value)
+        self._user = os.getenv(DhcoreEnvVar.USER.value, FALLBACK_USER)
+        self._refresh_token = os.getenv(DhcoreEnvVar.REFRESH_TOKEN.value)
+        self._client_id = os.getenv(DhcoreEnvVar.CLIENT_ID.value)
 
-        token = os.getenv(EnvVar.ACCESS_TOKEN.value)
+        token = os.getenv(DhcoreEnvVar.ACCESS_TOKEN.value)
         if token is not None and token != "":
             self._auth_type = AuthType.OAUTH2.value
             self._access_token = token
             return
 
-        password = os.getenv(EnvVar.PASSWORD.value)
+        password = os.getenv(DhcoreEnvVar.PASSWORD.value)
         if self._user is not None and password is not None:
             self._auth_type = AuthType.BASIC.value
             self._password = password
@@ -619,12 +618,12 @@ class ClientDHCore(Client):
 
         # Call refresh token endpoint
         # Try token from env
-        refresh_token = os.getenv(EnvVar.REFRESH_TOKEN.value)
+        refresh_token = os.getenv(DhcoreEnvVar.REFRESH_TOKEN.value)
         response = self._call_refresh_token_endpoint(url, refresh_token)
 
         # Otherwise try token from file
         if response.status_code in (400, 401, 403):
-            refresh_token = get_key(ENV_FILE, EnvVar.REFRESH_TOKEN.value)
+            refresh_token = get_key(ENV_FILE, DhcoreEnvVar.REFRESH_TOKEN.value)
             response = self._call_refresh_token_endpoint(url, refresh_token)
 
         response.raise_for_status()
@@ -694,9 +693,9 @@ class ClientDHCore(Client):
         """
         keys = {}
         if self._access_token is not None:
-            keys[EnvVar.ACCESS_TOKEN.value] = self._access_token
+            keys[DhcoreEnvVar.ACCESS_TOKEN.value] = self._access_token
         if self._refresh_token is not None:
-            keys[EnvVar.REFRESH_TOKEN.value] = self._refresh_token
+            keys[DhcoreEnvVar.REFRESH_TOKEN.value] = self._refresh_token
 
         for k, v in keys.items():
             set_key(dotenv_path=ENV_FILE, key_to_set=k, value_to_set=v)

digitalhub/client/dhcore/enums.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from enum import Enum
 
 
-class EnvVar(Enum):
+class DhcoreEnvVar(Enum):
     """
     Environment variables.
     """
@@ -15,6 +15,7 @@ class EnvVar(Enum):
     CLIENT_ID = "DHCORE_CLIENT_ID"
     ACCESS_TOKEN = "DHCORE_ACCESS_TOKEN"
     REFRESH_TOKEN = "DHCORE_REFRESH_TOKEN"
+    WORKFLOW_IMAGE = "DHCORE_WORKFLOW_IMAGE"
 
 
 class AuthType(Enum):

digitalhub/client/dhcore/utils.py

@@ -4,7 +4,7 @@ import os
 import typing
 
 from digitalhub.client.api import get_client
-from digitalhub.client.dhcore.enums import AuthType, EnvVar
+from digitalhub.client.dhcore.enums import AuthType, DhcoreEnvVar
 
 if typing.TYPE_CHECKING:
     from digitalhub.client.dhcore.client import ClientDHCore
@@ -44,17 +44,17 @@ def set_dhcore_env(
     None
     """
     if endpoint is not None:
-        os.environ[EnvVar.ENDPOINT.value] = endpoint
+        os.environ[DhcoreEnvVar.ENDPOINT.value] = endpoint
     if user is not None:
-        os.environ[EnvVar.USER.value] = user
+        os.environ[DhcoreEnvVar.USER.value] = user
     if password is not None:
-        os.environ[EnvVar.PASSWORD.value] = password
+        os.environ[DhcoreEnvVar.PASSWORD.value] = password
     if access_token is not None:
-        os.environ[EnvVar.ACCESS_TOKEN.value] = access_token
+        os.environ[DhcoreEnvVar.ACCESS_TOKEN.value] = access_token
     if refresh_token is not None:
-        os.environ[EnvVar.REFRESH_TOKEN.value] = refresh_token
+        os.environ[DhcoreEnvVar.REFRESH_TOKEN.value] = refresh_token
     if client_id is not None:
-        os.environ[EnvVar.CLIENT_ID.value] = client_id
+        os.environ[DhcoreEnvVar.CLIENT_ID.value] = client_id
 
     update_client_from_env()
 
@@ -70,16 +70,16 @@ def update_client_from_env() -> None:
     client: ClientDHCore = get_client(local=False)
 
     # Update endpoint
-    endpoint = os.getenv(EnvVar.ENDPOINT.value)
+    endpoint = os.getenv(DhcoreEnvVar.ENDPOINT.value)
     if endpoint is not None:
         client._endpoint_core = endpoint
 
     # Update auth
 
     # If token is set, it will override the other auth options
-    access_token = os.getenv(EnvVar.ACCESS_TOKEN.value)
-    refresh_token = os.getenv(EnvVar.REFRESH_TOKEN.value)
-    client_id = os.getenv(EnvVar.CLIENT_ID.value)
+    access_token = os.getenv(DhcoreEnvVar.ACCESS_TOKEN.value)
+    refresh_token = os.getenv(DhcoreEnvVar.REFRESH_TOKEN.value)
+    client_id = os.getenv(DhcoreEnvVar.CLIENT_ID.value)
 
     if access_token is not None:
         if refresh_token is not None:
@@ -91,8 +91,8 @@ def update_client_from_env() -> None:
         return
 
     # Otherwise, if user and password are set, basic auth will be used
-    username = os.getenv(EnvVar.USER.value)
-    password = os.getenv(EnvVar.PASSWORD.value)
+    username = os.getenv(DhcoreEnvVar.USER.value)
+    password = os.getenv(DhcoreEnvVar.PASSWORD.value)
     if username is not None and password is not None:
         client._user = username
         client._password = password

digitalhub/entities/_base/entity/metadata.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from pydantic import BaseModel, Field, ConfigDict
+from pydantic import BaseModel, ConfigDict, Field
 
 from digitalhub.entities._base._base.entity import Base
 from digitalhub.entities._commons.enums import Relationship

digitalhub/entities/_operations/processor.py

@@ -538,7 +538,10 @@ class OperationsProcessor:
         new_obj = self._create_context_entity(context, obj.ENTITY_TYPE, obj.to_dict())
         return build_entity_from_dict(new_obj)
 
-    def log_material_entity(self, **kwargs,) -> MaterialEntity:
+    def log_material_entity(
+        self,
+        **kwargs,
+    ) -> MaterialEntity:
         """
         Create object in backend and upload file.
 

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

@@ -21,6 +21,8 @@ class RunSpec(Spec):
         envs: list[dict] | None = None,
         secrets: list[str] | None = None,
         profile: str | None = None,
+        runtime_class: str | None = None,
+        priority_class: str | None = None,
         **kwargs,
     ) -> None:
         self.task = task
@@ -35,6 +37,8 @@ class RunSpec(Spec):
         self.envs = envs
         self.secrets = secrets
         self.profile = profile
+        self.runtime_class = runtime_class
+        self.priority_class = priority_class
 
 
 class RunValidator(SpecValidator, K8s):

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/task/_base/models.py

@@ -210,6 +210,12 @@ class K8s(BaseModel):
     profile: str = None
     """Profile template."""
 
+    runtime_class: str = None
+    """Runtime class name."""
+
+    priority_class: str = None
+    """Priority class."""
+
 
 class CorePort(BaseModel):
     """

digitalhub/entities/task/_base/spec.py

@@ -22,6 +22,8 @@ class TaskSpecFunction(TaskSpec):
         envs: list[dict] | None = None,
         secrets: list[str] | None = None,
         profile: str | None = None,
+        runtime_class: str | None = None,
+        priority_class: str | None = None,
         **kwargs,
     ) -> None:
         self.function = function
@@ -33,6 +35,8 @@ class TaskSpecFunction(TaskSpec):
         self.envs = envs
         self.secrets = secrets
         self.profile = profile
+        self.runtime_class = runtime_class
+        self.priority_class = priority_class
 
 
 class TaskSpecWorkflow(TaskSpec):
@@ -49,6 +53,8 @@ class TaskSpecWorkflow(TaskSpec):
         envs: list[dict] | None = None,
         secrets: list[str] | None = None,
         profile: str | None = None,
+        runtime_class: str | None = None,
+        priority_class: str | None = None,
         **kwargs,
     ) -> None:
         self.workflow = workflow

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/runtimes/enums.py

@@ -0,0 +1,12 @@
+from __future__ import annotations
+
+from enum import Enum
+
+
+class RuntimeEnvVar(Enum):
+    """
+    Environment variables.
+    """
+
+    PROJECT = "PROJECT_NAME"
+    RUN_ID = "RUN_ID"

{digitalhub-0.9.0b0.dist-info → digitalhub-0.9.0b2.dist-info}/METADATA

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

@@ -7,11 +7,11 @@ digitalhub/client/_base/api_builder.py,sha256=kB0phBqaPTLayyXyA1GbHgnbo4bBkadBti
 digitalhub/client/_base/client.py,sha256=wXHfHQANnv_2AlW6yh7dnxI3i0bBASsP_gYSbc-YQHk,2063
 digitalhub/client/dhcore/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/client/dhcore/api_builder.py,sha256=IkRnANGG3dQmu4t1KmSnpDxGqkZDnJpBP9CcUhWZliQ,3652
-digitalhub/client/dhcore/client.py,sha256=GXAL1UQGO5wU_36KnlOTyjLIsYt9YdmeCJo3hw_jOUU,21078
-digitalhub/client/dhcore/enums.py,sha256=CSmLJxMNCLj7pjrG_On_cJ1f_g_yjCULpHhtJdCNI6c,472
+digitalhub/client/dhcore/client.py,sha256=Vl0ZRX1CHxOg9awR-liFagTMkbNLcW2B4jGfxJt0udk,21149
+digitalhub/client/dhcore/enums.py,sha256=kaVXZTTa2WmsFbcc1CKWNLOM0JtUtcjL-KpspnTOhEE,523
 digitalhub/client/dhcore/env.py,sha256=zBUNbK8G8PyMGAw_65BnX2Z_WUkrmTyQmYhLE6Jqgvk,618
 digitalhub/client/dhcore/models.py,sha256=KiTg5xR8EzI7Xa1pmYmzixabLdnqlnn5kn-IILZDGIw,900
-digitalhub/client/dhcore/utils.py,sha256=7nHGkDnSy4N-y3SX4UJ3KtAbOGPoDvhNql8p-u5y-Sw,3058
+digitalhub/client/dhcore/utils.py,sha256=I6m26WiGMCEyPa6Yv5hk3nmqWV4jDFjYyI590f86Ebs,3136
 digitalhub/client/local/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/client/local/api_builder.py,sha256=WR24zuWguJqzUkD7xReO12LtvSkn020UG6LKFcKq77g,3592
 digitalhub/client/local/client.py,sha256=WLpEymgxysRLDdMGm9ds4kKOqHqEXk8MmrU01NR938o,17338
@@ -28,7 +28,7 @@ digitalhub/entities/_base/context/entity.py,sha256=4IWC6f0YKpEBPCXrKlkkvnOqT1urQ
 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/metadata.py,sha256=rQaDCJE5GfSSIJT5UgXcbUQth5b8BTbv8N_RLaEzLjI,2261
+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
 digitalhub/entities/_base/entity/_constructors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -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=5RjHDkoI-IjdEL0HF9QOn_XH5mcmrWsA9OO0r5NejdE,46641
+digitalhub/entities/_operations/processor.py,sha256=yi-L_mltue3WN8xM5Y-zpwUCb4x4psW5uwd1Lx7Rxo4,46663
 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=ZQRbnHbD-pdESiTLCg5LHqF7vUHh800n2FFP3A_ZWcE,3117
 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
@@ -146,7 +146,7 @@ digitalhub/entities/run/crud.py,sha256=0_9zlW4aId4x1rGlvjOdAHkNaJwpR5vgLCuMt7rE-
 digitalhub/entities/run/_base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/entities/run/_base/builder.py,sha256=e4P4gegD1DjHv_-Rhe3bIkGfRwgRbC8J6hdSSw2M8b4,2454
 digitalhub/entities/run/_base/entity.py,sha256=-bQqY1vhEsAaBYwXIzQwiFKmwA9FPH3wJ9XtennWvKo,7549
-digitalhub/entities/run/_base/spec.py,sha256=EDF9oVjR7pkIc2Tp-K56pge5tLYNjiXVPrpmUSgRnNA,1500
+digitalhub/entities/run/_base/spec.py,sha256=nAyIAcnIXgGEhyI1TvOhZfKxB2ZC25VuFhAECgG--KU,1673
 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/crud.py,sha256=tKXNHqpxCsBMOYtHadQz70-mcExskdQ8Lt9lezmiZzU,6816
@@ -159,16 +159,16 @@ 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/models.py,sha256=kfOclRdqrE_FJuYpp9VRcFXZIFOOhFoTHGX9fF8jewQ,4622
-digitalhub/entities/task/_base/spec.py,sha256=kocTiJHyl2z4te9t8ZDSU7bhQOjUXgvAnytMV8ZNZUA,2154
+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
 digitalhub/entities/task/_base/utils.py,sha256=P0ajA8SQcDaEC9BBIIc_M8UL1_qBcZE8loUTkP7xVYY,436
 digitalhub/entities/workflow/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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=DsbyimpJj5Hqn0afLB_NgP2wmY4p55OAsUs4h4LQlZU,2395
 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
@@ -189,6 +189,7 @@ digitalhub/readers/pandas/reader.py,sha256=pdBKUWiKettQmh6N48LYOfnwqrOWoo-GpHdSB
 digitalhub/runtimes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/runtimes/_base.py,sha256=uDvSXAEytZr-BFpj1BA59vdERBk79j5pTDiG0__tazA,2510
 digitalhub/runtimes/builder.py,sha256=CtwutbxRdLo6Qj5PfvmYnCusRG89yS1jI4Qu-Ha3XGY,705
+digitalhub/runtimes/enums.py,sha256=hhGNyuBcchqCcDKdR_foOyeNJn41nHCNEyRmoxE5dNA,182
 digitalhub/stores/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/stores/api.py,sha256=TwD8WXVuEPwtrmcyhP9SC0i7xkVHov5fpu94nHhZRHg,994
 digitalhub/stores/builder.py,sha256=kraGDfgV5cZ2QivXTWwbyz1FgAehgjlL9dmI6dxEc0U,5927
@@ -221,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.0b0.dist-info/LICENSE.txt,sha256=_yVOtnbW7Ss28mp058UEEc1X4Rgj8-kQBP_kj8_Sc88,11585
-digitalhub-0.9.0b0.dist-info/METADATA,sha256=moaWh_7G0-OFP0ZOg2bjOlIUM_8XsasvBKFNxti4stw,15316
-digitalhub-0.9.0b0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-digitalhub-0.9.0b0.dist-info/top_level.txt,sha256=ae9pDfCF27ZoaVAxuBKONMP0lm5P-N_I-e-no1WlvD8,16
-digitalhub-0.9.0b0.dist-info/RECORD,,
+test/local/instances/test_validate.py,sha256=bGPKRFR_Tb5nlzzmI_ty_6UVUvYGseE2-pkNVoGWeO0,1842
+digitalhub-0.9.0b2.dist-info/LICENSE.txt,sha256=_yVOtnbW7Ss28mp058UEEc1X4Rgj8-kQBP_kj8_Sc88,11585
+digitalhub-0.9.0b2.dist-info/METADATA,sha256=jmoukYGBnexueJ7RF8k-YxeZQ8SuzCjMdwxh8nyOPI0,15316
+digitalhub-0.9.0b2.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+digitalhub-0.9.0b2.dist-info/top_level.txt,sha256=ae9pDfCF27ZoaVAxuBKONMP0lm5P-N_I-e-no1WlvD8,16
+digitalhub-0.9.0b2.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)