digitalhub-runtime-python 0.15.0b19__tar.gz → 0.15.2__tar.gz

{digitalhub_runtime_python-0.15.0b19 → digitalhub_runtime_python-0.15.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: digitalhub-runtime-python
-Version: 0.15.0b19
+Version: 0.15.2
 Summary: Python runtime for DHCore
 Project-URL: Homepage, https://github.com/scc-digitalhub/digitalhub-sdk-runtime-python
 Author-email: Fondazione Bruno Kessler <digitalhub@fbk.eu>, Matteo Martini <mmartini@fbk.eu>
@@ -215,14 +215,14 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Requires-Python: <3.15,>=3.10
-Requires-Dist: digitalhub[full]<0.16,>=0.15.0b
+Requires-Dist: digitalhub[full]<0.16,>=0.15.1
 Requires-Dist: msgpack
 Requires-Dist: nuclio-sdk
 Requires-Dist: pip
 Requires-Dist: pyyaml
 Requires-Dist: tomli; python_version < '3.11'
 Provides-Extra: dev
-Requires-Dist: digitalhub[dev]<0.16,>=0.15.0b; extra == 'dev'
+Requires-Dist: digitalhub[dev]<0.16,>=0.15.1; extra == 'dev'
 Description-Content-Type: text/markdown
 
 # DigitalHub SDK Runtime Python

{digitalhub_runtime_python-0.15.0b19 → digitalhub_runtime_python-0.15.2}/digitalhub_runtime_python/entities/function/python/utils.py

@@ -147,8 +147,7 @@ def source_post_check(exec: FunctionPython) -> FunctionPython:
 
         # If source is a folder, zip it and upload it
         if not path_src.is_file():
-            archive_path = path_src.parent / f"{path_src.name}.zip"
-            create_archive(path_src, archive_path)
+            archive_path = create_archive(path_src)
             dst = build_zip_path(exec, archive_path.name)
             get_store(dst).upload(str(archive_path), dst)
             exec.spec.source["source"] = dst

{digitalhub_runtime_python-0.15.0b19 → digitalhub_runtime_python-0.15.2}/digitalhub_runtime_python/entities/run/_base/entity.py

@@ -15,18 +15,18 @@ from digitalhub.factory.entity import entity_factory
 from digitalhub.utils.logger.logger import get_logger
 
 from digitalhub_runtime_python.entities._commons.enums import Actions
-from digitalhub_runtime_python.entities.run._base.utils import get_getter_for_material
+from digitalhub_runtime_python.entities.run._base.utils import get_getters
 
 if typing.TYPE_CHECKING:
     from digitalhub.entities._base.material.entity import MaterialEntity
 
-    from digitalhub_runtime_python.entities.run._base.spec import RunSpecPythonRun
-    from digitalhub_runtime_python.entities.run._base.status import RunStatusPythonRun
+    from digitalhub_runtime_python.entities.run._base.spec import RunSpecBaseRun
+    from digitalhub_runtime_python.entities.run._base.status import RunStatusBaseRun
 
 logger = get_logger(__file__)
 
 
-class RunPythonRun(Run):
+class RunBaseRun(Run):
     """
     RunPythonRun class.
     """
@@ -34,8 +34,8 @@ class RunPythonRun(Run):
     def __init__(self, *args, **kwargs) -> None:
         super().__init__(*args, **kwargs)
 
-        self.spec: RunSpecPythonRun
-        self.status: RunStatusPythonRun
+        self.spec: RunSpecBaseRun
+        self.status: RunStatusBaseRun
 
     def _setup_execution(self) -> None:
         """
@@ -120,7 +120,7 @@ class RunPythonRun(Run):
 
         for parameter, key in self.spec.inputs.items():
             entity_type = get_entity_type_from_key(key)
-            entity = get_getter_for_material(entity_type)(key)
+            entity = get_getters(entity_type)(key)
             if as_dict:
                 entity = entity.to_dict()
             inputs[parameter] = entity
@@ -178,7 +178,7 @@ class RunPythonRun(Run):
 
         for parameter, key in self.status.outputs.items():
             entity_type = get_entity_type_from_key(key)
-            entity = get_getter_for_material(entity_type)(key)
+            entity = get_getters(entity_type)(key)
             if as_key:
                 entity = entity.key
             if as_dict:
@@ -215,3 +215,21 @@ class RunPythonRun(Run):
         if self.status.results is None:
             return {}
         return self.status.results
+
+
+class RunBaseBuildRun(RunBaseRun):
+    """
+    RunBaseBuildRun class.
+    """
+
+    @property
+    def image(self) -> str | None:
+        """
+        Get run's image.
+
+        Returns
+        -------
+        str | None
+            The image.
+        """
+        return self.status.outputs.get("image")

{digitalhub_runtime_python-0.15.0b19 → digitalhub_runtime_python-0.15.2}/digitalhub_runtime_python/entities/run/_base/spec.py

@@ -7,8 +7,8 @@ from __future__ import annotations
 from digitalhub.entities.run._base.spec import RunSpec, RunValidator
 
 
-class RunSpecPythonRun(RunSpec):
-    """RunSpecPythonRun specifications."""
+class RunSpecBaseRun(RunSpec):
+    """RunSpecBaseRun specifications."""
 
     def __init__(
         self,
@@ -59,8 +59,8 @@ class RunSpecPythonRun(RunSpec):
         self.init_parameters = init_parameters
 
 
-class RunValidatorPythonRun(RunValidator):
-    """RunValidatorPythonRun validator."""
+class RunValidatorBaseRun(RunValidator):
+    """RunValidatorBaseRun validator."""
 
     # Function parameters
     source: dict | None = None

{digitalhub_runtime_python-0.15.0b19 → digitalhub_runtime_python-0.15.2}/digitalhub_runtime_python/entities/run/_base/status.py

@@ -7,9 +7,9 @@ from __future__ import annotations
 from digitalhub.entities.run._base.status import RunStatus
 
 
-class RunStatusPythonRun(RunStatus):
+class RunStatusBaseRun(RunStatus):
     """
-    RunStatusPythonRun status.
+    RunStatusBaseRun status.
     """
 
     def __init__(

{digitalhub_runtime_python-0.15.0b19 → digitalhub_runtime_python-0.15.2}/digitalhub_runtime_python/entities/run/_base/utils.py

@@ -8,11 +8,12 @@ from typing import Callable
 
 from digitalhub.entities._commons.enums import EntityTypes
 from digitalhub.entities.artifact.crud import get_artifact
+from digitalhub.entities.containerimage.crud import get_containerimage
 from digitalhub.entities.dataitem.crud import get_dataitem
 from digitalhub.entities.model.crud import get_model
 
 
-def get_getter_for_material(entity_type: str) -> Callable:
+def get_getters(entity_type: str) -> Callable:
     """
     Return appropriate getter function.
 
@@ -35,4 +36,7 @@ def get_getter_for_material(entity_type: str) -> Callable:
     if entity_type == EntityTypes.MODEL.value:
         return get_model
 
+    if entity_type == EntityTypes.CONTAINERIMAGE.value:
+        return get_containerimage
+
     raise ValueError(f"Unhandled entity type: {entity_type}")

{digitalhub_runtime_python-0.15.0b19 → digitalhub_runtime_python-0.15.2}/digitalhub_runtime_python/entities/run/guardrail_build/entity.py

@@ -6,14 +6,14 @@ from __future__ import annotations
 
 import typing
 
-from digitalhub_runtime_python.entities.run._base.entity import RunPythonRun
+from digitalhub_runtime_python.entities.run._base.entity import RunBaseBuildRun
 
 if typing.TYPE_CHECKING:
     from digitalhub_runtime_python.entities.run.guardrail_build.spec import RunSpecGuardrailRunBuild
     from digitalhub_runtime_python.entities.run.guardrail_build.status import RunStatusGuardrailRunBuild
 
 
-class RunGuardrailRunBuild(RunPythonRun):
+class RunGuardrailRunBuild(RunBaseBuildRun):
     """
     RunGuardrailRunBuild class.
     """

{digitalhub_runtime_python-0.15.0b19 → digitalhub_runtime_python-0.15.2}/digitalhub_runtime_python/entities/run/guardrail_build/status.py

@@ -4,10 +4,10 @@
 
 from __future__ import annotations
 
-from digitalhub_runtime_python.entities.run._base.status import RunStatusPythonRun
+from digitalhub_runtime_python.entities.run._base.status import RunStatusBaseRun
 
 
-class RunStatusGuardrailRunBuild(RunStatusPythonRun):
+class RunStatusGuardrailRunBuild(RunStatusBaseRun):
     """
     RunStatusGuardrailRunBuild status.
     """

{digitalhub_runtime_python-0.15.0b19 → digitalhub_runtime_python-0.15.2}/digitalhub_runtime_python/entities/run/guardrail_serve/entity.py

@@ -6,14 +6,14 @@ from __future__ import annotations
 
 import typing
 
-from digitalhub_runtime_python.entities.run._base.entity import RunPythonRun
+from digitalhub_runtime_python.entities.run._base.entity import RunBaseRun
 
 if typing.TYPE_CHECKING:
     from digitalhub_runtime_python.entities.run.guardrail_serve.spec import RunSpecGuardrailRunServe
     from digitalhub_runtime_python.entities.run.guardrail_serve.status import RunStatusGuardrailRunServe
 
 
-class RunGuardrailRunServe(RunPythonRun):
+class RunGuardrailRunServe(RunBaseRun):
     """
     RunGuardrailRunServe class.
     """

{digitalhub_runtime_python-0.15.0b19 → digitalhub_runtime_python-0.15.2}/digitalhub_runtime_python/entities/run/guardrail_serve/status.py

@@ -4,10 +4,10 @@
 
 from __future__ import annotations
 
-from digitalhub_runtime_python.entities.run._base.status import RunStatusPythonRun
+from digitalhub_runtime_python.entities.run._base.status import RunStatusBaseRun
 
 
-class RunStatusGuardrailRunServe(RunStatusPythonRun):
+class RunStatusGuardrailRunServe(RunStatusBaseRun):
     """
     RunStatusGuardrailRunServe status.
     """

{digitalhub_runtime_python-0.15.0b19 → digitalhub_runtime_python-0.15.2}/digitalhub_runtime_python/entities/run/openinference_build/entity.py

@@ -6,14 +6,14 @@ from __future__ import annotations
 
 import typing
 
-from digitalhub_runtime_python.entities.run._base.entity import RunPythonRun
+from digitalhub_runtime_python.entities.run._base.entity import RunBaseBuildRun
 
 if typing.TYPE_CHECKING:
     from digitalhub_runtime_python.entities.run.openinference_build.spec import RunSpecOpeninferenceRunBuild
     from digitalhub_runtime_python.entities.run.openinference_build.status import RunStatusOpeninferenceRunBuild
 
 
-class RunOpeninferenceRunBuild(RunPythonRun):
+class RunOpeninferenceRunBuild(RunBaseBuildRun):
     """
     RunOpeninferenceRunBuild class.
     """

{digitalhub_runtime_python-0.15.0b19 → digitalhub_runtime_python-0.15.2}/digitalhub_runtime_python/entities/run/openinference_build/status.py

@@ -4,10 +4,10 @@
 
 from __future__ import annotations
 
-from digitalhub_runtime_python.entities.run._base.status import RunStatusPythonRun
+from digitalhub_runtime_python.entities.run._base.status import RunStatusBaseRun
 
 
-class RunStatusOpeninferenceRunBuild(RunStatusPythonRun):
+class RunStatusOpeninferenceRunBuild(RunStatusBaseRun):
     """
     RunStatusOpeninferenceRunBuild status.
     """

{digitalhub_runtime_python-0.15.0b19 → digitalhub_runtime_python-0.15.2}/digitalhub_runtime_python/entities/run/openinference_serve/entity.py

@@ -6,14 +6,14 @@ from __future__ import annotations
 
 import typing
 
-from digitalhub_runtime_python.entities.run._base.entity import RunPythonRun
+from digitalhub_runtime_python.entities.run._base.entity import RunBaseRun
 
 if typing.TYPE_CHECKING:
     from digitalhub_runtime_python.entities.run.openinference_serve.spec import RunSpecOpeninferenceRunServe
     from digitalhub_runtime_python.entities.run.openinference_serve.status import RunStatusOpeninferenceRunServe
 
 
-class RunOpeninferenceRunServe(RunPythonRun):
+class RunOpeninferenceRunServe(RunBaseRun):
     """
     RunOpeninferenceRunServe class.
     """

{digitalhub_runtime_python-0.15.0b19 → digitalhub_runtime_python-0.15.2}/digitalhub_runtime_python/entities/run/openinference_serve/status.py

@@ -4,10 +4,10 @@
 
 from __future__ import annotations
 
-from digitalhub_runtime_python.entities.run._base.status import RunStatusPythonRun
+from digitalhub_runtime_python.entities.run._base.status import RunStatusBaseRun
 
 
-class RunStatusOpeninferenceRunServe(RunStatusPythonRun):
+class RunStatusOpeninferenceRunServe(RunStatusBaseRun):
     """
     RunStatusOpeninferenceRunServe status.
     """

{digitalhub_runtime_python-0.15.0b19 → digitalhub_runtime_python-0.15.2}/digitalhub_runtime_python/entities/run/python_build/entity.py

@@ -6,14 +6,14 @@ from __future__ import annotations
 
 import typing
 
-from digitalhub_runtime_python.entities.run._base.entity import RunPythonRun
+from digitalhub_runtime_python.entities.run._base.entity import RunBaseBuildRun
 
 if typing.TYPE_CHECKING:
     from digitalhub_runtime_python.entities.run.python_build.spec import RunSpecPythonRunBuild
     from digitalhub_runtime_python.entities.run.python_build.status import RunStatusPythonRunBuild
 
 
-class RunPythonRunBuild(RunPythonRun):
+class RunPythonRunBuild(RunBaseBuildRun):
     """
     RunPythonRunBuild class.
     """

{digitalhub_runtime_python-0.15.0b19 → digitalhub_runtime_python-0.15.2}/digitalhub_runtime_python/entities/run/python_build/spec.py

@@ -4,12 +4,12 @@
 
 from __future__ import annotations
 
-from digitalhub_runtime_python.entities.run._base.spec import RunSpecPythonRun, RunValidatorPythonRun
+from digitalhub_runtime_python.entities.run._base.spec import RunSpecBaseRun, RunValidatorBaseRun
 
 
-class RunSpecPythonRunBuild(RunSpecPythonRun):
+class RunSpecPythonRunBuild(RunSpecBaseRun):
     """RunSpecPythonRunBuild specifications."""
 
 
-class RunValidatorPythonRunBuild(RunValidatorPythonRun):
+class RunValidatorPythonRunBuild(RunValidatorBaseRun):
     """RunValidatorPythonRunBuild validator."""

{digitalhub_runtime_python-0.15.0b19 → digitalhub_runtime_python-0.15.2}/digitalhub_runtime_python/entities/run/python_build/status.py

@@ -4,10 +4,10 @@
 
 from __future__ import annotations
 
-from digitalhub_runtime_python.entities.run._base.status import RunStatusPythonRun
+from digitalhub_runtime_python.entities.run._base.status import RunStatusBaseRun
 
 
-class RunStatusPythonRunBuild(RunStatusPythonRun):
+class RunStatusPythonRunBuild(RunStatusBaseRun):
     """
     RunStatusPythonRunBuild status.
     """

{digitalhub_runtime_python-0.15.0b19 → digitalhub_runtime_python-0.15.2}/digitalhub_runtime_python/entities/run/python_job/entity.py

@@ -6,14 +6,14 @@ from __future__ import annotations
 
 import typing
 
-from digitalhub_runtime_python.entities.run._base.entity import RunPythonRun
+from digitalhub_runtime_python.entities.run._base.entity import RunBaseRun
 
 if typing.TYPE_CHECKING:
     from digitalhub_runtime_python.entities.run.python_job.spec import RunSpecPythonRunJob
     from digitalhub_runtime_python.entities.run.python_job.status import RunStatusPythonRunJob
 
 
-class RunPythonRunJob(RunPythonRun):
+class RunPythonRunJob(RunBaseRun):
     """
     RunPythonRunJob class.
     """

{digitalhub_runtime_python-0.15.0b19 → digitalhub_runtime_python-0.15.2}/digitalhub_runtime_python/entities/run/python_job/spec.py

@@ -4,10 +4,10 @@
 
 from __future__ import annotations
 
-from digitalhub_runtime_python.entities.run._base.spec import RunSpecPythonRun, RunValidatorPythonRun
+from digitalhub_runtime_python.entities.run._base.spec import RunSpecBaseRun, RunValidatorBaseRun
 
 
-class RunSpecPythonRunJob(RunSpecPythonRun):
+class RunSpecPythonRunJob(RunSpecBaseRun):
     """RunSpecPythonRunJob specifications."""
 
     def __init__(
@@ -61,7 +61,7 @@ class RunSpecPythonRunJob(RunSpecPythonRun):
         self.local_execution = local_execution
 
 
-class RunValidatorPythonRunJob(RunValidatorPythonRun):
+class RunValidatorPythonRunJob(RunValidatorBaseRun):
     """RunValidatorPythonRunJob validator."""
 
     local_execution: bool = False

{digitalhub_runtime_python-0.15.0b19 → digitalhub_runtime_python-0.15.2}/digitalhub_runtime_python/entities/run/python_job/status.py

@@ -4,10 +4,10 @@
 
 from __future__ import annotations
 
-from digitalhub_runtime_python.entities.run._base.status import RunStatusPythonRun
+from digitalhub_runtime_python.entities.run._base.status import RunStatusBaseRun
 
 
-class RunStatusPythonRunJob(RunStatusPythonRun):
+class RunStatusPythonRunJob(RunStatusBaseRun):
     """
     RunStatusPythonRunJob status.
     """

{digitalhub_runtime_python-0.15.0b19 → digitalhub_runtime_python-0.15.2}/digitalhub_runtime_python/entities/run/python_serve/entity.py

@@ -9,14 +9,14 @@ import typing
 import requests
 from digitalhub.utils.exceptions import EntityError
 
-from digitalhub_runtime_python.entities.run._base.entity import RunPythonRun
+from digitalhub_runtime_python.entities.run._base.entity import RunBaseRun
 
 if typing.TYPE_CHECKING:
     from digitalhub_runtime_python.entities.run.python_serve.spec import RunSpecPythonRunServe
     from digitalhub_runtime_python.entities.run.python_serve.status import RunStatusPythonRunServe
 
 
-class RunPythonRunServe(RunPythonRun):
+class RunPythonRunServe(RunBaseRun):
     """
     RunPythonRunServe class.
     """

{digitalhub_runtime_python-0.15.0b19 → digitalhub_runtime_python-0.15.2}/digitalhub_runtime_python/entities/run/python_serve/spec.py

@@ -4,12 +4,12 @@
 
 from __future__ import annotations
 
-from digitalhub_runtime_python.entities.run._base.spec import RunSpecPythonRun, RunValidatorPythonRun
+from digitalhub_runtime_python.entities.run._base.spec import RunSpecBaseRun, RunValidatorBaseRun
 
 
-class RunSpecPythonRunServe(RunSpecPythonRun):
+class RunSpecPythonRunServe(RunSpecBaseRun):
     """RunSpecPythonRunServe specifications."""
 
 
-class RunValidatorPythonRunServe(RunValidatorPythonRun):
+class RunValidatorPythonRunServe(RunValidatorBaseRun):
     """RunValidatorPythonRunServe validator."""

{digitalhub_runtime_python-0.15.0b19 → digitalhub_runtime_python-0.15.2}/digitalhub_runtime_python/entities/run/python_serve/status.py

@@ -4,10 +4,10 @@
 
 from __future__ import annotations
 
-from digitalhub_runtime_python.entities.run._base.status import RunStatusPythonRun
+from digitalhub_runtime_python.entities.run._base.status import RunStatusBaseRun
 
 
-class RunStatusPythonRunServe(RunStatusPythonRun):
+class RunStatusPythonRunServe(RunStatusBaseRun):
     """
     RunStatusPythonRunServe status.
     """

{digitalhub_runtime_python-0.15.0b19 → digitalhub_runtime_python-0.15.2}/digitalhub_runtime_python/runtimes/runtime.py

@@ -4,7 +4,7 @@
 
 from __future__ import annotations
 
-from typing import Callable
+from typing import Any, Callable
 
 from digitalhub.context.api import get_context
 from digitalhub.runtimes._base import Runtime
@@ -12,7 +12,7 @@ from digitalhub.utils.logger.logger import get_logger
 
 from digitalhub_runtime_python.utils.configuration import import_function_from_source
 from digitalhub_runtime_python.utils.inputs import compose_inputs
-from digitalhub_runtime_python.utils.outputs import build_new_status, parse_outputs
+from digitalhub_runtime_python.utils.outputs import build_new_status, collect_outputs
 
 logger = get_logger(__file__)
 
@@ -63,7 +63,8 @@ class RuntimePythonJob(Runtime):
         else:
             exec_result = self._execute(fnc, **fnc_args)
             logger.info("Collecting outputs.")
-            results = parse_outputs(exec_result, project, run_key)
+            named_outputs = self._get_named_outputs(exec_result)
+            results = collect_outputs(exec_result, named_outputs, project, run_key)
 
         status = build_new_status(project, results)
 
@@ -118,6 +119,24 @@ class RuntimePythonJob(Runtime):
         local_execution = spec.get("local_execution")
         return compose_inputs(inputs, parameters, local_execution, func, project)
 
+    def _get_named_outputs(self, exec_result: Any) -> list[str]:
+        """
+        Get named outputs.
+
+        Parameters
+        ----------
+        exec_result : Any
+            Function execution result.
+
+        Returns
+        -------
+        list[str]
+            List of named outputs.
+        """
+        if isinstance(exec_result, list):
+            return [f"output_{idx}" for idx in range(len(exec_result))]
+        return []
+
 
 class RuntimeOpeninference(RuntimePython):
     """

{digitalhub_runtime_python-0.15.0b19 → digitalhub_runtime_python-0.15.2}/digitalhub_runtime_python/utils/inputs.py

@@ -18,7 +18,7 @@ if typing.TYPE_CHECKING:
     from digitalhub.entities.project._base.entity import Project
     from nuclio_sdk import Context, Event
 
-    from digitalhub_runtime_python.entities.run._base.entity import RunPythonRun
+    from digitalhub_runtime_python.entities.run._base.entity import RunBaseRun
 
 logger = get_logger(__file__)
 
@@ -45,7 +45,7 @@ def get_project_(project_name: str) -> Project:
         raise RuntimeError(msg)
 
 
-def get_run_(project_name: str) -> RunPythonRun:
+def get_run_(project_name: str) -> RunBaseRun:
     """
     Get run.