digitalhub-runtime-python 0.5.0b5__tar.gz → 0.5.0b7__tar.gz

{digitalhub_runtime_python-0.5.0b5 → digitalhub_runtime_python-0.5.0b7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: digitalhub-runtime-python
-Version: 0.5.0b5
+Version: 0.5.0b7
 Summary: Python runtime for DHCore
 Author-email: Fondazione Bruno Kessler <dslab@fbk.eu>, Matteo Martini <mmartini@fbk.eu>
 License:                               Apache License

{digitalhub_runtime_python-0.5.0b5 → digitalhub_runtime_python-0.5.0b7}/digitalhub_runtime_python/runtimes/runtime.py

@@ -9,9 +9,8 @@ from typing import Callable
 from digitalhub_core.runtimes.base import Runtime
 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 +62,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,17 +72,17 @@ 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", {})), project)
 
-        LOGGER.info("Collecting outputs.")
-        status = build_status(
-            results,
-            spec.get("outputs", {}),
-            spec.get("values", {}),
-        )
+        status = build_status(results, spec.get("outputs"))
 
         # Return run status
         LOGGER.info("Task completed, returning run status.")
@@ -105,8 +103,6 @@ class RuntimePython(Runtime):
         Callable
             Function to execute.
         """
-        if action == "job":
-            return run_python
         raise NotImplementedError
 
     ####################
@@ -141,7 +137,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 +151,8 @@ 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.0b5 → digitalhub_runtime_python-0.5.0b7}/digitalhub_runtime_python/utils/configuration.py

@@ -13,6 +13,7 @@ from digitalhub_core.utils.generic_utils import (
 )
 from digitalhub_core.utils.git_utils import clone_repository
 from digitalhub_core.utils.logger import LOGGER
+from digitalhub_core.utils.uri_utils import map_uri_scheme
 
 
 def get_function_from_source(path: Path, source_spec: dict) -> Callable:
@@ -33,14 +34,35 @@ def get_function_from_source(path: Path, source_spec: dict) -> Callable:
     """
     try:
         function_code = save_function_source(path, source_spec)
-        handler = source_spec["handler"]
-        return import_function(function_code, handler)
+        handler_path, function_name = parse_handler(source_spec["handler"])
+        function_path = (function_code / handler_path).with_suffix(".py")
+        return import_function(function_path, function_name)
     except Exception as e:
         msg = f"Some error occurred while getting function. Exception: {e.__class__}. Error: {e.args}"
         LOGGER.exception(msg)
         raise RuntimeError(msg) from e
 
 
+def parse_handler(handler: str) -> tuple:
+    """
+    Parse handler.
+
+    Parameters
+    ----------
+    handler : str
+        Function handler
+
+    Returns
+    -------
+    str
+        Function handler.
+    """
+    parsed = handler.split(":")
+    if len(parsed) == 1:
+        return Path(""), parsed[0]
+    return Path(*parsed[0].split(".")), parsed[1]
+
+
 def save_function_source(path: Path, source_spec: dict) -> Path:
     """
     Save function source.
@@ -63,38 +85,46 @@ def save_function_source(path: Path, source_spec: dict) -> Path:
     # Get relevant information
     base64 = source_spec.get("base64")
     source = source_spec.get("source")
-    handler = source_spec.get("handler")
 
+    scheme = None
+    if source is not None:
+        scheme = map_uri_scheme(source)
+
+    # Base64
     if base64 is not None:
-        path = path / "main.py"
-        path.write_text(decode_base64(base64))
-        return path
 
-    scheme = source.split("://")[0]
+        filename = "main.py"
+        if scheme == "local":
+            filename = Path(source).name
+
+        base64_path = path / filename
+        base64_path.write_text(decode_base64(base64))
+
+        if scheme is None or scheme == "local":
+            return base64_path
+
+    # Git repo
+    if scheme == "git":
+        get_repository(path, source)
 
     # Http(s) or s3 presigned urls
-    if scheme in ["http", "https"]:
+    elif scheme == "remote":
         filename = path / "archive.zip"
         get_remote_source(source, filename)
         unzip(path, filename)
-        return path / handler
-
-    # Git repo
-    if scheme == "git+https":
-        path = path / "repository"
-        get_repository(path, source)
-        return path / handler
 
     # S3 path
-    if scheme == "zip+s3":
+    elif scheme == "s3":
         filename = path / "archive.zip"
         bucket, key = get_bucket_and_key(source)
         get_s3_source(bucket, key, filename)
         unzip(path, filename)
-        return path / handler
 
     # Unsupported scheme
-    raise RuntimeError(f"Unsupported scheme: {scheme}")
+    else:
+        raise RuntimeError(f"Unsupported scheme: {scheme}")
+
+    return path
 
 
 def get_remote_source(source: str, filename: Path) -> None:

{digitalhub_runtime_python-0.5.0b5 → digitalhub_runtime_python-0.5.0b7}/digitalhub_runtime_python/utils/outputs.py

@@ -1,19 +1,16 @@
 from __future__ import annotations
 
 import pickle
-import typing
 from typing import Any
 
 from digitalhub_core.entities._base.status import State
 from digitalhub_core.entities.artifacts.crud import new_artifact
+from digitalhub_core.entities.artifacts.entity import Artifact
 from digitalhub_core.utils.logger import LOGGER
 from digitalhub_data.entities.dataitems.crud import new_dataitem
+from digitalhub_data.entities.dataitems.entity.table import DataitemTable
 from digitalhub_data.readers.registry import DATAFRAME_TYPES
 
-if typing.TYPE_CHECKING:
-    from digitalhub_core.entities.artifacts.entity import Artifact
-    from digitalhub_data.entities.dataitems.entity.table import DataitemTable
-
 
 def collect_outputs(results: Any, outputs: list[str], project_name: str) -> dict:
     """
@@ -52,6 +49,32 @@ def collect_outputs(results: Any, outputs: list[str], project_name: str) -> dict
     return objects
 
 
+def parse_outputs(results: Any, run_outputs: 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, _ in enumerate(results_list):
+        try:
+            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.
@@ -142,7 +165,6 @@ def build_and_load_artifact(name: str, project_name: str, data: Any) -> Artifact
 def build_status(
     parsed_execution: dict,
     mapped_outputs: dict | None = None,
-    values_list: list | None = None,
 ) -> dict:
     """
     Collect outputs.
@@ -153,31 +175,24 @@ def build_status(
         Parsed execution dict.
     mapped_outputs : dict
         Mapped outputs.
-    values_list : list
-        Values list.
 
     Returns
     -------
     dict
         Status dict.
     """
+    results = {}
     outputs = {}
     if mapped_outputs is None:
         mapped_outputs = {}
 
-    results = {}
-    if values_list is None:
-        values_list = []
-
     try:
-        for key, value in mapped_outputs.items():
+        for key, _ in mapped_outputs.items():
             if key in parsed_execution:
-                outputs[key] = parsed_execution[key].key
-
-        for value in values_list:
-            if value in parsed_execution:
-                results[value] = parsed_execution[value]
-
+                if isinstance(parsed_execution[key], (DataitemTable, Artifact)):
+                    outputs[key] = parsed_execution[key].key
+                else:
+                    results[key] = parsed_execution[key]
         return {
             "state": State.COMPLETED.value,
             "outputs": outputs,

{digitalhub_runtime_python-0.5.0b5 → digitalhub_runtime_python-0.5.0b7}/digitalhub_runtime_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: digitalhub-runtime-python
-Version: 0.5.0b5
+Version: 0.5.0b7
 Summary: Python runtime for DHCore
 Author-email: Fondazione Bruno Kessler <dslab@fbk.eu>, Matteo Martini <mmartini@fbk.eu>
 License:                               Apache License

{digitalhub_runtime_python-0.5.0b5 → digitalhub_runtime_python-0.5.0b7}/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.0b5 → digitalhub_runtime_python-0.5.0b7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "digitalhub-runtime-python"
-version = "0.5.0b5"
+version = "0.5.0b7"
 description = "Python runtime for DHCore"
 readme = "README.md"
 authors = [
@@ -39,7 +39,7 @@ line-length = 120
 convention = "numpy"
 
 [tool.bumpver]
-current_version = "0.5.0b5"
+current_version = "0.5.0b7"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = false

digitalhub_runtime_python-0.5.0b5/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)