digitalhub-runtime-python 0.14.2__tar.gz → 0.15.0b1__tar.gz

{digitalhub_runtime_python-0.14.2 → digitalhub_runtime_python-0.15.0b1}/.github/workflows/release.yml

@@ -132,7 +132,7 @@ jobs:
           branch=${{ github.ref }}
 
           # Define the repositories to trigger
-          repos=("digitalhub-sdk-wrapper-kfp" "digitalhub-serverless" "digitalhub-sdk-wrapper-hera")
+          repos=( "digitalhub-tests" "digitalhub-serverless" "digitalhub-sdk-wrapper-hera")
 
           # Loop over the repositories and trigger the workflow
           for repo in "${repos[@]}"; do

{digitalhub_runtime_python-0.14.2 → digitalhub_runtime_python-0.15.0b1}/.github/workflows/run_local_test.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.10", "3.11", "3.12", "3.13"]
 
     steps:
       - uses: actions/checkout@v4

{digitalhub_runtime_python-0.14.2 → digitalhub_runtime_python-0.15.0b1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: digitalhub-runtime-python
-Version: 0.14.2
+Version: 0.15.0b1
 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>
@@ -209,15 +209,17 @@ License-File: AUTHORS
 License-File: LICENSE
 Keywords: data,dataops,kubernetes
 Classifier: License :: OSI Approved :: Apache Software License
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Python: <3.13,>=3.9
-Requires-Dist: digitalhub[full]<0.15,>=0.14.0
+Classifier: Programming Language :: Python :: 3.13
+Requires-Python: <3.14,>=3.10
+Requires-Dist: digitalhub[full]<0.16,>=0.15.0b
+Requires-Dist: msgpack
 Requires-Dist: nuclio-sdk
+Requires-Dist: pip
 Provides-Extra: dev
-Requires-Dist: digitalhub[dev]<0.15,>=0.14.0; extra == 'dev'
+Requires-Dist: digitalhub[dev]<0.16,>=0.15.0b; extra == 'dev'
 Description-Content-Type: text/markdown
 
 # DigitalHub SDK Runtime Python

{digitalhub_runtime_python-0.14.2 → digitalhub_runtime_python-0.15.0b1}/digitalhub_runtime_python/__init__.py

@@ -9,7 +9,7 @@ from digitalhub_runtime_python.entities.run.serve.builder import RunPythonRunSer
 from digitalhub_runtime_python.entities.task.build.builder import TaskPythonBuildBuilder
 from digitalhub_runtime_python.entities.task.job.builder import TaskPythonJobBuilder
 from digitalhub_runtime_python.entities.task.serve.builder import TaskPythonServeBuilder
-from digitalhub_runtime_python.utils.utils import handler
+from digitalhub_runtime_python.utils.utils import handler, parse_requirements
 
 entity_builders = (
     (EntityKinds.FUNCTION_PYTHON.value, FunctionPythonBuilder),

{digitalhub_runtime_python-0.14.2 → digitalhub_runtime_python-0.15.0b1}/digitalhub_runtime_python/entities/function/python/builder.py

@@ -49,7 +49,7 @@ class FunctionPythonBuilder(FunctionBuilder, RuntimeEntityBuilderPython):
         )
         return source_post_check(obj)
 
-    def from_dict(self, obj: dict, validate: bool = True) -> FunctionPython:
+    def from_dict(self, obj: dict) -> FunctionPython:
         """
         Create a new object from dictionary.
 
@@ -57,18 +57,16 @@ class FunctionPythonBuilder(FunctionBuilder, RuntimeEntityBuilderPython):
         ----------
         obj : dict
             Dictionary to create object from.
-        validate : bool
-            Flag to indicate if arguments must be validated.
 
         Returns
         -------
         FunctionPython
             Object instance.
         """
-        entity = super().from_dict(obj, validate=validate)
+        entity = super().from_dict(obj)
         return source_post_check(entity)
 
-    def _parse_dict(self, obj: dict, validate: bool = True) -> dict:
+    def _parse_dict(self, obj: dict) -> dict:
         """
         Get dictionary and parse it to a valid entity dictionary.
 
@@ -91,4 +89,4 @@ class FunctionPythonBuilder(FunctionBuilder, RuntimeEntityBuilderPython):
             if source:
                 spec_dict["source"] = source_check(source=source)["source"]
 
-        return super()._parse_dict(obj, validate=validate)
+        return super()._parse_dict(obj)

{digitalhub_runtime_python-0.14.2 → digitalhub_runtime_python-0.15.0b1}/digitalhub_runtime_python/entities/function/python/entity.py

@@ -11,6 +11,8 @@ from digitalhub.utils.generic_utils import decode_base64_string
 from digitalhub.utils.io_utils import write_text
 from digitalhub.utils.uri_utils import has_local_scheme
 
+from digitalhub_runtime_python.entities.function.python.utils import read_installed_packages
+
 if typing.TYPE_CHECKING:
     from digitalhub.entities._base.entity.metadata import Metadata
 
@@ -69,3 +71,11 @@ class FunctionPython(Function):
                 return pth
 
         return super().export()
+
+    def _post_create_hook_before_save(self) -> None:
+        """
+        Hook method called after the creation of the entity but before saving
+        in Core.
+        Can be overridden in subclasses to implement custom behavior.
+        """
+        self.spec.requirements = read_installed_packages(self.spec.requirements)

{digitalhub_runtime_python-0.14.2 → digitalhub_runtime_python-0.15.0b1}/digitalhub_runtime_python/entities/function/python/models.py

@@ -14,10 +14,10 @@ class PythonVersion(Enum):
     Python version supported.
     """
 
-    PYTHON3_9 = "PYTHON3_9"
     PYTHON3_10 = "PYTHON3_10"
     PYTHON3_11 = "PYTHON3_11"
     PYTHON3_12 = "PYTHON3_12"
+    PYTHON3_13 = "PYTHON3_13"
 
 
 class Lang(Enum):

{digitalhub_runtime_python-0.14.2 → digitalhub_runtime_python-0.15.0b1}/digitalhub_runtime_python/entities/function/python/spec.py

@@ -42,11 +42,11 @@ class FunctionValidatorPython(FunctionValidator):
     python_version: PythonVersion
     "Python version"
 
-    image: str = None
+    image: str | None = None
     "Image where the function will be executed"
 
-    base_image: str = None
+    base_image: str | None = None
     "Base image used to build the image where the function will be executed"
 
-    requirements: list[str] = None
+    requirements: list[str] | None = None
     "Requirements list to be installed in the image where the function will be executed"

{digitalhub_runtime_python-0.14.2 → digitalhub_runtime_python-0.15.0b1}/digitalhub_runtime_python/entities/function/python/utils.py

@@ -12,6 +12,7 @@ from digitalhub.utils.exceptions import EntityError
 from digitalhub.utils.file_utils import eval_py_type, eval_zip_type
 from digitalhub.utils.generic_utils import encode_string, read_source
 from digitalhub.utils.uri_utils import has_local_scheme
+from pip._internal.operations import freeze
 
 from digitalhub_runtime_python.entities.function.python.models import Lang
 
@@ -19,6 +20,9 @@ if typing.TYPE_CHECKING:
     from digitalhub_runtime_python.entities.function.python.entity import FunctionPython
 
 
+SEPARATORS = ["==", ">=", "<=", ">", "<", "~=", "!="]
+
+
 def source_check(**kwargs) -> dict:
     """
     Check source code.
@@ -156,3 +160,57 @@ def source_post_check(exec: FunctionPython) -> FunctionPython:
                 exec.spec.source["handler"] = f"{Path(code_src).stem}:{exec.spec.source['handler']}"
 
     return exec
+
+
+def read_installed_packages(requirements: list[str] | None = None) -> list[str] | None:
+    """
+    Read installed packages in execution context.
+
+    If requirements is provided, returns only those packages with their
+    versions filled in from the environment. Package names without versions
+    in the requirements list will have their versions added if found.
+
+    Parameters
+    ----------
+    requirements : list[str]
+        Optional list of package names (e.g., ['pandas', 'torch']) or
+        requirements with versions (e.g., ['pandas==2.0.0']).
+
+    Returns
+    -------
+    list[str]
+        List of installed packages in pip freeze format (e.g., ['numpy==1.24.0', 'pandas==2.0.0']).
+    """
+    if requirements is None:
+        return
+
+    # Build a mapping of normalized package names to their installed versions
+    installed_map: dict[str, str] = {}
+    for pkg in freeze.freeze():
+        # Handle different separators
+        for sep in SEPARATORS:
+            if sep in pkg:
+                name, version = pkg.split(sep, 1)
+                # Normalize package name (lowercase, replace _ with -)
+                installed_map[name.lower().replace("_", "-")] = f"{name}{sep}{version}"
+                break
+
+    result = []
+    for req in requirements:
+        # Check if requirement already has a version specifier
+        has_version = any(sep in req for sep in SEPARATORS)
+
+        if has_version:
+            # Keep as-is if version is already specified
+            result.append(req)
+        else:
+            # Normalize the requirement name for lookup
+            normalized_name = req.lower().replace("_", "-")
+            if normalized_name in installed_map:
+                # Use the installed version
+                result.append(installed_map[normalized_name])
+            else:
+                # Package not found in environment, keep without version
+                result.append(req)
+
+    return result

{digitalhub_runtime_python-0.14.2 → digitalhub_runtime_python-0.15.0b1}/digitalhub_runtime_python/entities/run/_base/entity.py

@@ -8,12 +8,10 @@ import time
 import typing
 from typing import Any
 
-import requests
 from digitalhub.entities._commons.enums import Relationship, State
 from digitalhub.entities._commons.utils import get_entity_type_from_key
 from digitalhub.entities.run._base.entity import Run
 from digitalhub.factory.entity import entity_factory
-from digitalhub.utils.exceptions import EntityError
 from digitalhub.utils.logger import LOGGER
 
 from digitalhub_runtime_python.entities._commons.enums import Actions
@@ -225,45 +223,3 @@ class RunPythonRun(Run):
         if self.status.results is None:
             return {}
         return self.status.results
-
-    def invoke(
-        self,
-        method: str = "POST",
-        url: str | None = None,
-        **kwargs,
-    ) -> requests.Response:
-        """
-        Invoke run.
-
-        Parameters
-        ----------
-        method : str
-            Method of the request.
-        url : str
-            URL of the request.
-        **kwargs : dict
-            Keyword arguments to pass to the request.
-
-        Returns
-        -------
-        requests.Response
-            Response from service.
-        """
-        try:
-            base_url: str = self.status.service.get("url")
-        except AttributeError:
-            raise EntityError(
-                "Url not specified and service not found on run status."
-                " If a service is deploying, use run.wait() or try again later."
-            )
-
-        if url is not None and not url.removeprefix("http://").removeprefix("https://").startswith(base_url):
-            raise EntityError(f"Invalid URL: {url}. It must start with the service URL: {base_url}")
-
-        if url is None:
-            url = f"http://{base_url}"
-
-        if "data" not in kwargs and "json" not in kwargs:
-            method = "GET"
-
-        return requests.request(method=method, url=url, **kwargs)

{digitalhub_runtime_python-0.14.2 → digitalhub_runtime_python-0.15.0b1}/digitalhub_runtime_python/entities/run/_base/spec.py

@@ -16,16 +16,11 @@ class RunSpecPythonRun(RunSpec):
         local_execution: bool = False,
         function: str | None = None,
         workflow: str | None = None,
-        node_selector: list[dict] | None = None,
         volumes: list[dict] | None = None,
         resources: dict | None = None,
-        affinity: dict | None = None,
-        tolerations: list[dict] | None = None,
         envs: list[dict] | None = None,
         secrets: list[str] | None = None,
         profile: str | None = None,
-        runtime_class: str | None = None,
-        priority_class: str | None = None,
         source: dict | None = None,
         image: str | None = None,
         base_image: str | None = None,
@@ -45,16 +40,11 @@ class RunSpecPythonRun(RunSpec):
             local_execution,
             function,
             workflow,
-            node_selector,
             volumes,
             resources,
-            affinity,
-            tolerations,
             envs,
             secrets,
             profile,
-            runtime_class,
-            priority_class,
             **kwargs,
         )
         self.source = source
@@ -62,7 +52,6 @@ class RunSpecPythonRun(RunSpec):
         self.base_image = base_image
         self.python_version = python_version
         self.requirements = requirements
-
         self.service_type = service_type
         self.service_name = service_name
         self.replicas = replicas
@@ -76,26 +65,26 @@ class RunValidatorPythonRun(RunValidator):
     """RunValidatorPythonRun validator."""
 
     # Function parameters
-    source: dict = None
-    image: str = None
-    base_image: str = None
-    python_version: str = None
-    requirements: list = None
+    source: dict | None = None
+    image: str | None = None
+    base_image: str | None = None
+    python_version: str | None = None
+    requirements: list | None = None
 
     # Task serve
-    service_type: str = None
-    service_name: str = None
-    replicas: int = None
+    service_type: str | None = None
+    service_name: str | None = None
+    replicas: int | None = None
 
     # Task build
-    instructions: list[str] = None
+    instructions: list[str] | None = None
 
     # Run parameters
-    inputs: dict = None
+    inputs: dict | None = None
     """Run inputs."""
 
-    parameters: dict = None
+    parameters: dict | None = None
     """Run parameters."""
 
-    init_parameters: dict = None
+    init_parameters: dict | None = None
     """Init function parameters."""

{digitalhub_runtime_python-0.14.2 → digitalhub_runtime_python-0.15.0b1}/digitalhub_runtime_python/entities/run/job/entity.py

@@ -34,3 +34,36 @@ class RunPythonRunJob(RunPythonRun):
 
         self.spec: RunSpecPythonRunJob
         self.status: RunStatusPythonRunJob
+
+    def add_output(self, name: str, value: str) -> None:
+        """
+        Add an output to the run job.
+
+        Parameters
+        ----------
+        name : str
+            The name of the output.
+        value : str
+            The value of the output.
+        """
+        if self.status.outputs is None:
+            self.status.outputs = {}
+        self.status.outputs[name] = value
+
+    def set_status(self, status: dict) -> None:
+        """
+        Patch to merge outputs when updating status.
+
+        Parameters
+        ----------
+        status : dict
+            The status dictionary to update.
+        """
+        if self.status.outputs is None:
+            self.status.outputs = {}
+        if "outputs" in status:
+            status["outputs"] = {
+                **self.status.outputs,
+                **status["outputs"],
+            }
+        return super().set_status(status)

digitalhub_runtime_python-0.15.0b1/digitalhub_runtime_python/entities/run/serve/entity.py

@@ -0,0 +1,86 @@
+# SPDX-FileCopyrightText: © 2025 DSLab - Fondazione Bruno Kessler
+#
+# SPDX-License-Identifier: Apache-2.0
+
+from __future__ import annotations
+
+import typing
+
+import requests
+from digitalhub.utils.exceptions import EntityError
+
+from digitalhub_runtime_python.entities.run._base.entity import RunPythonRun
+
+if typing.TYPE_CHECKING:
+    from digitalhub.entities._base.entity.metadata import Metadata
+
+    from digitalhub_runtime_python.entities.run.serve.spec import RunSpecPythonRunServe
+    from digitalhub_runtime_python.entities.run.serve.status import RunStatusPythonRunServe
+
+
+class RunPythonRunServe(RunPythonRun):
+    """
+    RunPythonRunServe class.
+    """
+
+    def __init__(
+        self,
+        project: str,
+        uuid: str,
+        kind: str,
+        metadata: Metadata,
+        spec: RunSpecPythonRunServe,
+        status: RunStatusPythonRunServe,
+        user: str | None = None,
+    ) -> None:
+        super().__init__(project, uuid, kind, metadata, spec, status, user)
+
+        self.spec: RunSpecPythonRunServe
+        self.status: RunStatusPythonRunServe
+
+    def invoke(
+        self,
+        method: str = "POST",
+        url: str | None = None,
+        **kwargs,
+    ) -> requests.Response:
+        """
+        Invoke run service endpoint. It uses the service URL from the run
+        status if no URL is specified.
+        The method defaults to "POST" if data or json is provided in kwargs,
+        otherwise it defaults to "GET". The function returns a requests.Response
+        object.
+
+        Parameters
+        ----------
+        method : str
+            Method of the request (e.g., "GET", "POST").
+        url : str
+            URL to invoke. If specified, it must start with the service URL
+            (http:// or https:// prefixes are required and stripped before comparison).
+        **kwargs : dict
+            Keyword arguments to pass to the request.
+
+        Returns
+        -------
+        requests.Response
+            Response from service.
+        """
+        try:
+            base_url: str = self.status.service.get("url")
+        except AttributeError:
+            raise EntityError(
+                "Url not specified and service not found on run status."
+                " If a service is deploying, use run.wait() or try again later."
+            )
+
+        if url is not None and not url.removeprefix("http://").removeprefix("https://").startswith(base_url):
+            raise EntityError(f"Invalid URL: {url}. It must start with the service URL: {base_url}")
+
+        if url is None:
+            url = f"http://{base_url}"
+
+        if "data" not in kwargs and "json" not in kwargs:
+            method = "GET"
+
+        return requests.request(method=method, url=url, **kwargs)

{digitalhub_runtime_python-0.14.2 → digitalhub_runtime_python-0.15.0b1}/digitalhub_runtime_python/entities/task/build/spec.py

@@ -13,31 +13,21 @@ class TaskSpecPythonBuild(TaskSpecFunction):
     def __init__(
         self,
         function: str,
-        node_selector: list[dict] | None = None,
         volumes: list[dict] | None = None,
         resources: dict | None = None,
-        affinity: dict | None = None,
-        tolerations: list[dict] | None = None,
         envs: list[dict] | None = None,
         secrets: list[str] | None = None,
         profile: str | None = None,
-        runtime_class: str | None = None,
-        priority_class: str | None = None,
         instructions: list | None = None,
         **kwargs,
     ) -> None:
         super().__init__(
             function,
-            node_selector,
             volumes,
             resources,
-            affinity,
-            tolerations,
             envs,
             secrets,
             profile,
-            runtime_class,
-            priority_class,
             **kwargs,
         )
         self.instructions = instructions
@@ -48,5 +38,5 @@ class TaskValidatorPythonBuild(TaskValidatorFunction):
     TaskValidatorPythonBuild validator.
     """
 
-    instructions: list[str] = None
+    instructions: list[str] | None = None
     """Build instructions."""

{digitalhub_runtime_python-0.14.2 → digitalhub_runtime_python-0.15.0b1}/digitalhub_runtime_python/entities/task/serve/spec.py

@@ -15,16 +15,11 @@ class TaskSpecPythonServe(TaskSpecFunction):
     def __init__(
         self,
         function: str,
-        node_selector: list[dict] | None = None,
         volumes: list[dict] | None = None,
         resources: dict | None = None,
-        affinity: dict | None = None,
-        tolerations: list[dict] | None = None,
         envs: list[dict] | None = None,
         secrets: list[str] | None = None,
         profile: str | None = None,
-        runtime_class: str | None = None,
-        priority_class: str | None = None,
         replicas: int | None = None,
         service_type: str | None = None,
         service_name: str | None = None,
@@ -32,16 +27,11 @@ class TaskSpecPythonServe(TaskSpecFunction):
     ) -> None:
         super().__init__(
             function,
-            node_selector,
             volumes,
             resources,
-            affinity,
-            tolerations,
             envs,
             secrets,
             profile,
-            runtime_class,
-            priority_class,
             **kwargs,
         )
         self.replicas = replicas
@@ -54,11 +44,11 @@ class TaskValidatorPythonServe(TaskValidatorFunction):
     TaskValidatorPythonServe validator.
     """
 
-    replicas: int = Field(default=None, ge=1)
+    replicas: int | None = Field(default=None, ge=1)
     """Number of replicas."""
 
-    service_type: CoreServiceType = None
+    service_type: CoreServiceType | None = None
     """Service type."""
 
-    service_name: str = None
+    service_name: str | None = None
     """Service name."""

{digitalhub_runtime_python-0.14.2 → digitalhub_runtime_python-0.15.0b1}/digitalhub_runtime_python/runtimes/runtime.py

@@ -13,7 +13,7 @@ from digitalhub.utils.logger import LOGGER
 from digitalhub_runtime_python.entities._commons.enums import EntityKinds
 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_status, parse_outputs
+from digitalhub_runtime_python.utils.outputs import build_new_status, parse_outputs
 
 
 class RuntimePython(Runtime):
@@ -83,9 +83,9 @@ class RuntimePython(Runtime):
         else:
             exec_result = self._execute(fnc, **fnc_args)
             LOGGER.info("Collecting outputs.")
-            results = parse_outputs(exec_result, list(spec.get("outputs", {})), project, run_key)
+            results = parse_outputs(exec_result, project, run_key)
 
-        status = build_status(results, spec.get("outputs"))
+        status = build_new_status(project, results)
 
         # Return run status
         LOGGER.info("Task completed, returning run status.")