digitalhub-runtime-python 0.5.0b4__tar.gz → 0.5.0b6__tar.gz

{digitalhub_runtime_python-0.5.0b4 → digitalhub_runtime_python-0.5.0b6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: digitalhub-runtime-python
-Version: 0.5.0b4
+Version: 0.5.0b6
 Summary: Python runtime for DHCore
 Author-email: Fondazione Bruno Kessler <dslab@fbk.eu>, Matteo Martini <mmartini@fbk.eu>
 License:                               Apache License
@@ -228,6 +228,6 @@ Classifier: Programming Language :: Python :: 3.10
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: digitalhub[ml]==0.5.0b4
+Requires-Dist: digitalhub[ml]<0.6,~=0.5.0b
 
 # SDK for DHCore

{digitalhub_runtime_python-0.5.0b4 → digitalhub_runtime_python-0.5.0b6}/digitalhub_runtime_python/entities/tasks/spec.py

@@ -48,6 +48,8 @@ class TaskSpecJob(TaskSpecPythonBase):
         """
         super().__init__(function, k8s)
 
+        k8s = k8s if k8s is not None else {}
+
         self.backoff_limit = k8s.get("backoff_limit")
         self.schedule = k8s.get("schedule")
 
@@ -76,6 +78,8 @@ class TaskSpecBuild(TaskSpecPythonBase):
         Constructor.
         """
         super().__init__(function, k8s)
+
+        k8s = k8s if k8s is not None else {}
         self.context_refs = context_refs
         self.context_sources = context_sources
         self.instructions = instructions

{digitalhub_runtime_python-0.5.0b4 → digitalhub_runtime_python-0.5.0b6}/digitalhub_runtime_python/runtimes/runtime.py

@@ -11,7 +11,7 @@ from digitalhub_core.utils.logger import LOGGER
 from digitalhub_runtime_python.utils.configuration import get_function_from_source
 from digitalhub_runtime_python.utils.functions import run_python
 from digitalhub_runtime_python.utils.inputs import get_inputs_parameters
-from digitalhub_runtime_python.utils.outputs import build_status
+from digitalhub_runtime_python.utils.outputs import build_status, parse_outputs
 
 
 class RuntimePython(Runtime):
@@ -63,8 +63,7 @@ class RuntimePython(Runtime):
             Status of the executed run.
         """
         LOGGER.info("Validating task.")
-        action = self._validate_task(run)
-        executable = self._get_executable(action)
+        self._validate_task(run)
 
         LOGGER.info("Starting task.")
         spec = run.get("spec")
@@ -74,16 +73,23 @@ class RuntimePython(Runtime):
         fnc_args = self._collect_inputs(spec)
 
         LOGGER.info("Configuring execution.")
-        fnc = self._configure_execution(spec)
+        fnc, wrapped = self._configure_execution(spec)
 
         LOGGER.info("Executing run.")
-        results = self._execute(executable, fnc, project, **fnc_args)
+        if wrapped:
+            results: dict = self._execute(fnc, project, **fnc_args)
+        else:
+            exec_result = self._execute(fnc, **fnc_args)
+            LOGGER.info("Collecting outputs.")
+            results = parse_outputs(exec_result,
+                                    list(spec.get("outputs", {})),
+                                    list(spec.get("values", [])),
+                                    project)
 
-        LOGGER.info("Collecting outputs.")
         status = build_status(
             results,
-            spec.get("outputs", {}),
-            spec.get("values", {}),
+            spec.get("outputs"),
+            spec.get("values"),
         )
 
         # Return run status
@@ -141,7 +147,7 @@ class RuntimePython(Runtime):
     # Configuration
     ####################
 
-    def _configure_execution(self, spec: dict) -> Callable:
+    def _configure_execution(self, spec: dict) -> tuple[Callable, bool]:
         """
         Configure execution.
 
@@ -155,7 +161,9 @@ class RuntimePython(Runtime):
         Callable
             Function to execute.
         """
-        return get_function_from_source(
+        fnc = get_function_from_source(
             self.root_path,
             spec.get("source", {}),
         )
+        return fnc, hasattr(fnc, '__wrapped__')
+

{digitalhub_runtime_python-0.5.0b4 → digitalhub_runtime_python-0.5.0b6}/digitalhub_runtime_python/utils/outputs.py

@@ -52,6 +52,34 @@ def collect_outputs(results: Any, outputs: list[str], project_name: str) -> dict
     return objects
 
 
+def parse_outputs(results: Any, run_outputs: list, run_values: list, project_name: str) -> dict:
+    """
+    Parse outputs.
+
+    Parameters
+    ----------
+    results : Any
+        Function outputs.
+    project : Project
+        Project object.
+
+    Returns
+    -------
+    dict
+        Function outputs.
+    """
+    results_list = listify_results(results)
+    out_list = []
+    for idx, item in enumerate(results_list):
+        try:
+            if isinstance(item, (str, int, float, bool, bytes)):
+                out_list.append(run_values.pop(0))
+            else:
+                out_list.append(run_outputs.pop(0))
+        except IndexError:
+            out_list.append(f"output_{idx}")
+    return collect_outputs(results, out_list, project_name)
+
 def listify_results(results: Any) -> list:
     """
     Listify results.

{digitalhub_runtime_python-0.5.0b4 → digitalhub_runtime_python-0.5.0b6}/digitalhub_runtime_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: digitalhub-runtime-python
-Version: 0.5.0b4
+Version: 0.5.0b6
 Summary: Python runtime for DHCore
 Author-email: Fondazione Bruno Kessler <dslab@fbk.eu>, Matteo Martini <mmartini@fbk.eu>
 License:                               Apache License
@@ -228,6 +228,6 @@ Classifier: Programming Language :: Python :: 3.10
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: digitalhub[ml]==0.5.0b4
+Requires-Dist: digitalhub[ml]<0.6,~=0.5.0b
 
 # SDK for DHCore

{digitalhub_runtime_python-0.5.0b4 → digitalhub_runtime_python-0.5.0b6}/digitalhub_runtime_python.egg-info/SOURCES.txt

@@ -24,7 +24,6 @@ digitalhub_runtime_python/entities/tasks/status.py
 digitalhub_runtime_python/runtimes/__init__.py
 digitalhub_runtime_python/runtimes/runtime.py
 digitalhub_runtime_python/utils/configuration.py
-digitalhub_runtime_python/utils/functions.py
 digitalhub_runtime_python/utils/inputs.py
 digitalhub_runtime_python/utils/outputs.py
 digitalhub_runtime_python/utils/utils.py

digitalhub_runtime_python-0.5.0b6/digitalhub_runtime_python.egg-info/requires.txt

@@ -0,0 +1 @@
+digitalhub[ml]<0.6,~=0.5.0b

{digitalhub_runtime_python-0.5.0b4 → digitalhub_runtime_python-0.5.0b6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "digitalhub-runtime-python"
-version = "0.5.0b4"
+version = "0.5.0b6"
 description = "Python runtime for DHCore"
 readme = "README.md"
 authors = [
@@ -20,7 +20,7 @@ classifiers = [
 keywords = ["data", "dataops", "kubernetes"]
 requires-python = ">=3.9"
 dependencies = [
-"digitalhub[ml]==0.5.0b4",
+"digitalhub[ml]~=0.5.0b, <0.6",
 ]
 
 [project.urls]
@@ -39,7 +39,7 @@ line-length = 120
 convention = "numpy"
 
 [tool.bumpver]
-current_version = "0.5.0b4"
+current_version = "0.5.0b6"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = false

digitalhub_runtime_python-0.5.0b4/digitalhub_runtime_python/utils/functions.py

@@ -1,24 +0,0 @@
-from __future__ import annotations
-
-from typing import Callable
-
-
-def run_python(func: Callable, *args, **kwargs) -> dict:
-    """
-    Execute function.
-
-    Parameters
-    ----------
-    func : Callable
-        Function.
-    args : tuple
-        Function arguments.
-    kwargs : dict
-        Function keyword arguments.
-
-    Returns
-    -------
-    dict
-        Outputs from the function.
-    """
-    return func(*args, **kwargs)

digitalhub_runtime_python-0.5.0b4/digitalhub_runtime_python.egg-info/requires.txt

@@ -1 +0,0 @@
-digitalhub[ml]==0.5.0b4