digitalhub-runtime-python 0.16.0b2__tar.gz → 0.16.0b3__tar.gz

{digitalhub_runtime_python-0.16.0b2 → digitalhub_runtime_python-0.16.0b3}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: digitalhub-runtime-python
-Version: 0.16.0b2
+Version: 0.16.0b3
 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>

{digitalhub_runtime_python-0.16.0b2 → digitalhub_runtime_python-0.16.0b3}/digitalhub_runtime_python/entities/_base/runtime_entity/builder.py

@@ -4,8 +4,8 @@
 
 from __future__ import annotations
 
-from digitalhub.entities._base.runtime_entity.builder import RuntimeEntityBuilder
 from digitalhub.entities._commons.utils import map_actions
+from digitalhub.entities._mixin.runtime_entity.builder import RuntimeEntityBuilder
 
 from digitalhub_runtime_python.entities._commons.enums import Actions, EntityKinds
 

{digitalhub_runtime_python-0.16.0b2 → digitalhub_runtime_python-0.16.0b3}/digitalhub_runtime_python/entities/_commons/requirement_parser/parser.py

@@ -5,10 +5,13 @@ from __future__ import annotations
 
 from pathlib import Path
 
+from digitalhub.utils.logger.logger import get_logger
 from pip._internal.operations import freeze
 
 from digitalhub_runtime_python.entities._commons.requirement_parser.factory import RequirementParserFactory
 
+logger = get_logger(__file__)
+
 
 class RequirementParser:
     """
@@ -88,7 +91,12 @@ class RequirementParser:
                 normalized_name = req.lower().replace("_", "-")
                 if normalized_name in installed_map:
                     # Use the installed version
-                    result.append(installed_map[normalized_name])
+                    installed_requirement = installed_map[normalized_name]
+                    logger.warning(
+                        f"Warning: {req} version unspecified, using version {installed_requirement} inferred "
+                        "from local environment. To override set an explicit version."
+                    )
+                    result.append(installed_requirement)
                 else:
                     # Package not found in environment, keep without version
                     result.append(req)

{digitalhub_runtime_python-0.16.0b2/digitalhub_runtime_python/entities/function/python → digitalhub_runtime_python-0.16.0b3/digitalhub_runtime_python/entities/_commons}/utils.py

@@ -11,7 +11,8 @@ from digitalhub.entities._commons.utils import build_zip_path
 from digitalhub.stores.data.api import get_store
 from digitalhub.utils.exceptions import EntityError
 from digitalhub.utils.file_utils import eval_py_type, eval_zip_type
-from digitalhub.utils.generic_utils import create_archive, encode_string, read_source
+from digitalhub.utils.generic_utils import create_archive, decode_base64_string, encode_string, read_source
+from digitalhub.utils.io_utils import write_text
 from digitalhub.utils.uri_utils import has_local_scheme
 
 from digitalhub_runtime_python.entities.function.python.models import Lang
@@ -20,6 +21,38 @@ if typing.TYPE_CHECKING:
     from digitalhub_runtime_python.entities.function.python.entity import FunctionPython
 
 
+class _LocalSourceExport:
+    def __init__(self, source: dict, root: Path) -> None:
+        self.source = source
+        self.root = root
+        self.base64 = None
+
+    def __enter__(self) -> None:
+        # Strip base64 from source at following conditions:
+        # - source is local path
+        # - base64 is not None
+        source_path = self.source.get("source")
+        if source_path is None or not has_local_scheme(source_path):
+            return
+
+        # Check base64. If it is set, decode it in a local file
+        # save in variable to restore on object after export
+        self.base64 = self.source.pop("base64", None)
+        if self.base64 is not None:
+            # Write local file
+            write_text(self.root / source_path, decode_base64_string(self.base64))
+        return
+
+    def __exit__(self, exc_type, exc_value, traceback) -> None:
+        # Restore base64 after export, including when export raises an exception.
+        if self.base64 is not None:
+            self.source["base64"] = self.base64
+
+
+def export_local_source(source: dict, root: Path) -> _LocalSourceExport:
+    return _LocalSourceExport(source, root)
+
+
 def source_check(**kwargs) -> dict:
     """
     Check source code.
@@ -43,6 +76,7 @@ def source_check(**kwargs) -> dict:
     lang = kwargs.pop("lang", None)
 
     if source is not None:
+        source = source.copy()
         code_src = source.pop("source", None)
         code = source.pop("code", None)
         base64 = source.pop("base64", None)
@@ -101,8 +135,7 @@ def _check_params(
     if init_function is not None:
         source["init_function"] = init_function
 
-    if lang is None:
-        source["lang"] = Lang.PYTHON.value
+    source["lang"] = lang if lang is not None else Lang.PYTHON.value
 
     if code_src is None and code is None and base64 is None:
         raise EntityError("Source must be provided.")
@@ -148,10 +181,12 @@ 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 = 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
-            archive_path.unlink()
+            try:
+                dst = build_zip_path(exec, archive_path.name)
+                get_store(dst).upload(str(archive_path), dst)
+                exec.spec.source["source"] = dst
+            finally:
+                archive_path.unlink(missing_ok=True)
 
         # If source is a file, read it and encode it in base64
         elif eval_py_type(code_src):

digitalhub_runtime_python-0.16.0b3/digitalhub_runtime_python/entities/function/_base/builder.py

@@ -0,0 +1,38 @@
+# SPDX-FileCopyrightText: © 2025 DSLab - Fondazione Bruno Kessler
+#
+# SPDX-License-Identifier: Apache-2.0
+
+from __future__ import annotations
+
+from digitalhub.entities.function._base.builder import FunctionBuilder
+
+from digitalhub_runtime_python.entities._base.runtime_entity.builder import RuntimeEntityBuilder
+from digitalhub_runtime_python.entities._commons.utils import source_check, source_post_check
+
+
+class FunctionBaseBuilder(FunctionBuilder, RuntimeEntityBuilder):
+    """
+    Base builder for runtime Python functions.
+    """
+
+    def _prepare_kwargs(self, kwargs: dict) -> dict:
+        return source_check(**kwargs)
+
+    def _prepare_source(self, source: dict) -> dict:
+        return source_check(source=source)["source"]
+
+    def build(self, *args, **kwargs):
+        kwargs = self._prepare_kwargs(kwargs)
+        return source_post_check(super().build(*args, **kwargs))
+
+    def from_dict(self, obj: dict):
+        return source_post_check(super().from_dict(obj))
+
+    def _parse_dict(self, obj: dict) -> dict:
+        if spec_dict := obj.get("spec", {}):
+            # Check source
+            source = spec_dict.get("source", {})
+            if source:
+                spec_dict["source"] = self._prepare_source(source)
+
+        return super()._parse_dict(obj)

digitalhub_runtime_python-0.16.0b3/digitalhub_runtime_python/entities/function/_base/entity.py

@@ -0,0 +1,134 @@
+# SPDX-FileCopyrightText: © 2025 DSLab - Fondazione Bruno Kessler
+#
+# SPDX-License-Identifier: Apache-2.0
+
+from __future__ import annotations
+
+from digitalhub.entities.function._base.entity import Function
+from digitalhub.utils.generic_utils import decode_base64_string
+from digitalhub.utils.io_utils import write_text
+
+from digitalhub_runtime_python.entities._commons.enums import Actions
+from digitalhub_runtime_python.entities._commons.requirement_parser.parser import RequirementParser
+from digitalhub_runtime_python.entities._commons.utils import export_local_source
+
+
+class FunctionBaseFunction(Function):
+    """
+    Base class for runtime Python functions.
+    """
+
+    def _post_create_hook_before_save(self) -> None:
+        """
+        Parse function requirements before saving the entity.
+
+        Returns
+        -------
+        None
+            This method updates the function requirements in place.
+        """
+        self.spec.requirements = RequirementParser().parse(self.spec.requirements)
+
+    def export(self) -> str:
+        """
+        Export the function to the context folder.
+
+        Returns
+        -------
+        str
+            Exported filepath.
+        """
+        with export_local_source(self.spec.source, self._context().root):
+            config = getattr(self.spec, "config", None)
+            # Check base64. If it is set, decode it in a local file
+            # save in variable to restore on object after export
+            base64 = None
+            if config is not None:
+                base64 = config.pop("base64", None)
+                if base64 is not None:
+                    # Write local file
+                    config_pth = self._context().root / "config.yaml"
+                    write_text(config_pth, decode_base64_string(base64))
+
+            try:
+                return super().export()
+            finally:
+                if config is not None and base64 is not None:
+                    config["base64"] = base64
+
+    def build(
+        self,
+        wait: bool = True,
+        log_info: bool = True,
+        extensions: list[dict] | None = None,
+        **kwargs,
+    ):
+        """
+        Build the function using the build action.
+
+        Parameters
+        ----------
+        wait : bool
+            Whether to wait for the build to complete.
+        log_info : bool
+            Whether to log information while waiting.
+        extensions : list[dict] | None
+            List of extensions to apply.
+        **kwargs : dict
+            Keyword arguments passed to the run builder.
+
+        Returns
+        -------
+        Run
+            Build run instance.
+        """
+        return super().run(
+            Actions.BUILD.value,
+            wait=wait,
+            log_info=log_info,
+            extensions=extensions,
+            **kwargs,
+        )
+
+    def run(
+        self,
+        action: str,
+        wait: bool = False,
+        log_info: bool = True,
+        extensions: list[dict] | None = None,
+        auto_build: bool = True,
+        **kwargs,
+    ):
+        """
+        Run the function, building it first when no image is available.
+
+        Parameters
+        ----------
+        action : str
+            Action to execute.
+        wait : bool
+            Whether to wait for execution to complete.
+        log_info : bool
+            Whether to log information while waiting.
+        extensions : list[dict] | None
+            List of extensions to apply.
+        auto_build : bool
+            Whether to build the function when ``spec.image`` is ``None``.
+        **kwargs : dict
+            Keyword arguments passed to the run builder.
+
+        Returns
+        -------
+        Run
+            Run instance.
+        """
+        if auto_build and self.spec.image is None:
+            self.build(wait=True, log_info=log_info)
+
+        return super().run(
+            action,
+            wait=wait,
+            log_info=log_info,
+            extensions=extensions,
+            **kwargs,
+        )

digitalhub_runtime_python-0.16.0b3/digitalhub_runtime_python/entities/function/guardrail/builder.py

@@ -0,0 +1,27 @@
+# SPDX-FileCopyrightText: © 2025 DSLab - Fondazione Bruno Kessler
+#
+# SPDX-License-Identifier: Apache-2.0
+
+from __future__ import annotations
+
+from digitalhub_runtime_python.entities._base.runtime_entity.builder import RuntimeEntityBuilderGuardrail
+from digitalhub_runtime_python.entities._commons.enums import EntityKinds
+from digitalhub_runtime_python.entities.function._base.builder import FunctionBaseBuilder
+from digitalhub_runtime_python.entities.function.guardrail.entity import FunctionGuardrail
+from digitalhub_runtime_python.entities.function.guardrail.spec import (
+    FunctionSpecGuardrail,
+    FunctionValidatorGuardrail,
+)
+from digitalhub_runtime_python.entities.function.guardrail.status import FunctionStatusGuardrail
+
+
+class FunctionGuardrailBuilder(FunctionBaseBuilder, RuntimeEntityBuilderGuardrail):
+    """
+    FunctionGuardrail builder.
+    """
+
+    ENTITY_CLASS = FunctionGuardrail
+    ENTITY_SPEC_CLASS = FunctionSpecGuardrail
+    ENTITY_SPEC_VALIDATOR = FunctionValidatorGuardrail
+    ENTITY_STATUS_CLASS = FunctionStatusGuardrail
+    ENTITY_KIND = EntityKinds.FUNCTION_GUARDRAIL.value

digitalhub_runtime_python-0.16.0b3/digitalhub_runtime_python/entities/function/guardrail/entity.py

@@ -0,0 +1,25 @@
+# SPDX-FileCopyrightText: © 2025 DSLab - Fondazione Bruno Kessler
+#
+# SPDX-License-Identifier: Apache-2.0
+
+from __future__ import annotations
+
+import typing
+
+from digitalhub_runtime_python.entities.function._base.entity import FunctionBaseFunction
+
+if typing.TYPE_CHECKING:
+    from digitalhub_runtime_python.entities.function.guardrail.spec import FunctionSpecGuardrail
+    from digitalhub_runtime_python.entities.function.guardrail.status import FunctionStatusGuardrail
+
+
+class FunctionGuardrail(FunctionBaseFunction):
+    """
+    FunctionGuardrail class.
+    """
+
+    def __init__(self, *args, **kwargs) -> None:
+        super().__init__(*args, **kwargs)
+
+        self.spec: FunctionSpecGuardrail
+        self.status: FunctionStatusGuardrail

digitalhub_runtime_python-0.16.0b3/digitalhub_runtime_python/entities/function/hydra/builder.py

@@ -0,0 +1,31 @@
+# SPDX-FileCopyrightText: © 2025 DSLab - Fondazione Bruno Kessler
+#
+# SPDX-License-Identifier: Apache-2.0
+
+from __future__ import annotations
+
+from digitalhub_runtime_python.entities._base.runtime_entity.builder import RuntimeEntityBuilderHydra
+from digitalhub_runtime_python.entities._commons.enums import EntityKinds
+from digitalhub_runtime_python.entities.function._base.builder import FunctionBaseBuilder
+from digitalhub_runtime_python.entities.function.hydra.entity import FunctionHydra
+from digitalhub_runtime_python.entities.function.hydra.spec import FunctionSpecHydra, FunctionValidatorHydra
+from digitalhub_runtime_python.entities.function.hydra.status import FunctionStatusHydra
+from digitalhub_runtime_python.entities.function.hydra.utils import config_check, source_check
+
+
+class FunctionHydraBuilder(FunctionBaseBuilder, RuntimeEntityBuilderHydra):
+    """
+    FunctionHydra builder.
+    """
+
+    ENTITY_CLASS = FunctionHydra
+    ENTITY_SPEC_CLASS = FunctionSpecHydra
+    ENTITY_SPEC_VALIDATOR = FunctionValidatorHydra
+    ENTITY_STATUS_CLASS = FunctionStatusHydra
+    ENTITY_KIND = EntityKinds.FUNCTION_HYDRA.value
+
+    def _prepare_kwargs(self, kwargs: dict) -> dict:
+        return config_check(**source_check(**kwargs))
+
+    def _prepare_source(self, source: dict) -> dict:
+        return source_check(source=source)["source"]

digitalhub_runtime_python-0.16.0b3/digitalhub_runtime_python/entities/function/hydra/entity.py

@@ -0,0 +1,25 @@
+# SPDX-FileCopyrightText: © 2025 DSLab - Fondazione Bruno Kessler
+#
+# SPDX-License-Identifier: Apache-2.0
+
+from __future__ import annotations
+
+import typing
+
+from digitalhub_runtime_python.entities.function._base.entity import FunctionBaseFunction
+
+if typing.TYPE_CHECKING:
+    from digitalhub_runtime_python.entities.function.hydra.spec import FunctionSpecHydra
+    from digitalhub_runtime_python.entities.function.hydra.status import FunctionStatusHydra
+
+
+class FunctionHydra(FunctionBaseFunction):
+    """
+    FunctionHydra class.
+    """
+
+    def __init__(self, *args, **kwargs) -> None:
+        super().__init__(*args, **kwargs)
+
+        self.spec: FunctionSpecHydra
+        self.status: FunctionStatusHydra

{digitalhub_runtime_python-0.16.0b2 → digitalhub_runtime_python-0.16.0b3}/digitalhub_runtime_python/entities/function/hydra/utils.py

@@ -37,6 +37,7 @@ def source_check(**kwargs) -> dict:
     lang = kwargs.pop("lang", None)
 
     if source is not None:
+        source = source.copy()
         code_src = source.pop("source", None)
         code = source.pop("code", None)
         base64 = source.pop("base64", None)
@@ -103,8 +104,7 @@ def _check_params(
     if complete_function is not None:
         source["complete_function"] = complete_function
 
-    if lang is None:
-        source["lang"] = Lang.PYTHON.value
+    source["lang"] = lang if lang is not None else Lang.PYTHON.value
 
     if code_src is None and code is None and base64 is None:
         raise EntityError("Source must be provided.")
@@ -143,6 +143,7 @@ def config_check(**kwargs) -> dict:
     config_path = kwargs.pop("config_path", None)
 
     if config is not None:
+        config = config.copy()
         config_src = config.pop("source", None)
         config_base64 = config.pop("base64", None)
         config_content = None

digitalhub_runtime_python-0.16.0b3/digitalhub_runtime_python/entities/function/openinference/builder.py

@@ -0,0 +1,27 @@
+# SPDX-FileCopyrightText: © 2025 DSLab - Fondazione Bruno Kessler
+#
+# SPDX-License-Identifier: Apache-2.0
+
+from __future__ import annotations
+
+from digitalhub_runtime_python.entities._base.runtime_entity.builder import RuntimeEntityBuilderOpeninference
+from digitalhub_runtime_python.entities._commons.enums import EntityKinds
+from digitalhub_runtime_python.entities.function._base.builder import FunctionBaseBuilder
+from digitalhub_runtime_python.entities.function.openinference.entity import FunctionOpeninference
+from digitalhub_runtime_python.entities.function.openinference.spec import (
+    FunctionSpecOpeninference,
+    FunctionValidatorOpeninference,
+)
+from digitalhub_runtime_python.entities.function.openinference.status import FunctionStatusOpeninference
+
+
+class FunctionOpeninferenceBuilder(FunctionBaseBuilder, RuntimeEntityBuilderOpeninference):
+    """
+    FunctionOpeninference builder.
+    """
+
+    ENTITY_CLASS = FunctionOpeninference
+    ENTITY_SPEC_CLASS = FunctionSpecOpeninference
+    ENTITY_SPEC_VALIDATOR = FunctionValidatorOpeninference
+    ENTITY_STATUS_CLASS = FunctionStatusOpeninference
+    ENTITY_KIND = EntityKinds.FUNCTION_OPENINFERENCE.value

digitalhub_runtime_python-0.16.0b3/digitalhub_runtime_python/entities/function/openinference/entity.py

@@ -0,0 +1,25 @@
+# SPDX-FileCopyrightText: © 2025 DSLab - Fondazione Bruno Kessler
+#
+# SPDX-License-Identifier: Apache-2.0
+
+from __future__ import annotations
+
+import typing
+
+from digitalhub_runtime_python.entities.function._base.entity import FunctionBaseFunction
+
+if typing.TYPE_CHECKING:
+    from digitalhub_runtime_python.entities.function.openinference.spec import FunctionSpecOpeninference
+    from digitalhub_runtime_python.entities.function.openinference.status import FunctionStatusOpeninference
+
+
+class FunctionOpeninference(FunctionBaseFunction):
+    """
+    FunctionOpeninference class.
+    """
+
+    def __init__(self, *args, **kwargs) -> None:
+        super().__init__(*args, **kwargs)
+
+        self.spec: FunctionSpecOpeninference
+        self.status: FunctionStatusOpeninference

digitalhub_runtime_python-0.16.0b3/digitalhub_runtime_python/entities/function/python/builder.py

@@ -0,0 +1,24 @@
+# SPDX-FileCopyrightText: © 2025 DSLab - Fondazione Bruno Kessler
+#
+# SPDX-License-Identifier: Apache-2.0
+
+from __future__ import annotations
+
+from digitalhub_runtime_python.entities._base.runtime_entity.builder import RuntimeEntityBuilderPython
+from digitalhub_runtime_python.entities._commons.enums import EntityKinds
+from digitalhub_runtime_python.entities.function._base.builder import FunctionBaseBuilder
+from digitalhub_runtime_python.entities.function.python.entity import FunctionPython
+from digitalhub_runtime_python.entities.function.python.spec import FunctionSpecPython, FunctionValidatorPython
+from digitalhub_runtime_python.entities.function.python.status import FunctionStatusPython
+
+
+class FunctionPythonBuilder(FunctionBaseBuilder, RuntimeEntityBuilderPython):
+    """
+    FunctionPython builder.
+    """
+
+    ENTITY_CLASS = FunctionPython
+    ENTITY_SPEC_CLASS = FunctionSpecPython
+    ENTITY_SPEC_VALIDATOR = FunctionValidatorPython
+    ENTITY_STATUS_CLASS = FunctionStatusPython
+    ENTITY_KIND = EntityKinds.FUNCTION_PYTHON.value

digitalhub_runtime_python-0.16.0b3/digitalhub_runtime_python/entities/function/python/entity.py

@@ -0,0 +1,25 @@
+# SPDX-FileCopyrightText: © 2025 DSLab - Fondazione Bruno Kessler
+#
+# SPDX-License-Identifier: Apache-2.0
+
+from __future__ import annotations
+
+import typing
+
+from digitalhub_runtime_python.entities.function._base.entity import FunctionBaseFunction
+
+if typing.TYPE_CHECKING:
+    from digitalhub_runtime_python.entities.function.python.spec import FunctionSpecPython
+    from digitalhub_runtime_python.entities.function.python.status import FunctionStatusPython
+
+
+class FunctionPython(FunctionBaseFunction):
+    """
+    FunctionPython class.
+    """
+
+    def __init__(self, *args, **kwargs) -> None:
+        super().__init__(*args, **kwargs)
+
+        self.spec: FunctionSpecPython
+        self.status: FunctionStatusPython

{digitalhub_runtime_python-0.16.0b2 → digitalhub_runtime_python-0.16.0b3}/digitalhub_runtime_python/entities/run/_base/entity.py

@@ -18,7 +18,7 @@ from digitalhub_runtime_python.entities._commons.enums import Actions
 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.entities._mixin.material.mixin import MaterialEntity
 
     from digitalhub_runtime_python.entities.run._base.spec import RunSpecBaseRun
     from digitalhub_runtime_python.entities.run._base.status import RunStatusBaseRun

digitalhub_runtime_python-0.16.0b3/digitalhub_runtime_python/runtimes/__init__.py

@@ -0,0 +1,3 @@
+# SPDX-FileCopyrightText: © 2025 DSLab - Fondazione Bruno Kessler
+#
+# SPDX-License-Identifier: Apache-2.0

{digitalhub_runtime_python-0.16.0b2 → digitalhub_runtime_python-0.16.0b3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "digitalhub-runtime-python"
-version = "0.16.0b2"
+version = "0.16.0b3"
 description = "Python runtime for DHCore"
 readme = "README.md"
 authors = [
@@ -54,7 +54,7 @@ docstring-code-line-length = 120
 convention = "numpy"
 
 [tool.bumpver]
-current_version = "0.16.0b2"
+current_version = "0.16.0b3"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = false