digitalhub-runtime-python 0.16.0b2__py3-none-any.whl → 0.16.0b3__py3-none-any.whl

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/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/entities/{function/python → _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/entities/function/_base/__init__.py

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

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/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/entities/function/guardrail/builder.py

@@ -4,20 +4,18 @@
 
 from __future__ import annotations
 
-from digitalhub.entities.function._base.builder import FunctionBuilder
-
 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
-from digitalhub_runtime_python.entities.function.python.utils import source_check, source_post_check
 
 
-class FunctionGuardrailBuilder(FunctionBuilder, RuntimeEntityBuilderGuardrail):
+class FunctionGuardrailBuilder(FunctionBaseBuilder, RuntimeEntityBuilderGuardrail):
     """
     FunctionGuardrail builder.
     """
@@ -27,69 +25,3 @@ class FunctionGuardrailBuilder(FunctionBuilder, RuntimeEntityBuilderGuardrail):
     ENTITY_SPEC_VALIDATOR = FunctionValidatorGuardrail
     ENTITY_STATUS_CLASS = FunctionStatusGuardrail
     ENTITY_KIND = EntityKinds.FUNCTION_GUARDRAIL.value
-
-    def build(
-        self,
-        kind: str,
-        project: str,
-        name: str,
-        uuid: str | None = None,
-        version: str | None = None,
-        description: str | None = None,
-        labels: list[str] | None = None,
-        embedded: bool = False,
-        **kwargs,
-    ) -> FunctionGuardrail:
-        kwargs = source_check(**kwargs)
-        obj = super().build(
-            kind=kind,
-            project=project,
-            name=name,
-            uuid=uuid,
-            version=version,
-            description=description,
-            labels=labels,
-            embedded=embedded,
-            **kwargs,
-        )
-        return source_post_check(obj)
-
-    def from_dict(self, obj: dict) -> FunctionGuardrail:
-        """
-        Create a new object from dictionary.
-
-        Parameters
-        ----------
-        obj : dict
-            Dictionary to create object from.
-
-        Returns
-        -------
-        FunctionGuardrail
-            Object instance.
-        """
-        entity = super().from_dict(obj)
-        return source_post_check(entity)
-
-    def _parse_dict(self, obj: dict) -> dict:
-        """
-        Get dictionary and parse it to a valid entity dictionary.
-
-        Parameters
-        ----------
-        obj : dict
-            Dictionary to parse.
-
-        Returns
-        -------
-        dict
-            A dictionary containing the attributes of the entity instance.
-        """
-        # Look for source in spec
-        if spec_dict := obj.get("spec", {}):
-            # Check source
-            source = spec_dict.get("source", {})
-            if source:
-                spec_dict["source"] = source_check(source=source)["source"]
-
-        return super()._parse_dict(obj)

digitalhub_runtime_python/entities/function/guardrail/entity.py

@@ -6,19 +6,14 @@ from __future__ import annotations
 
 import typing
 
-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.utils.uri_utils import has_local_scheme
-
-from digitalhub_runtime_python.entities._commons.requirement_parser.parser import RequirementParser
+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(Function):
+class FunctionGuardrail(FunctionBaseFunction):
     """
     FunctionGuardrail class.
     """
@@ -28,42 +23,3 @@ class FunctionGuardrail(Function):
 
         self.spec: FunctionSpecGuardrail
         self.status: FunctionStatusGuardrail
-
-    def export(self) -> str:
-        """
-        Export object as a YAML file in the context folder.
-
-        Returns
-        -------
-        str
-            Exported filepath.
-        """
-        # Strip base64 from source at following conditions:
-        # - source is local path
-        # - base64 is not None
-
-        # Check source
-        source = self.spec.source.get("source")
-        if source is not None and has_local_scheme(source):
-            # Check base64. If it is set, decode it in a local file
-            # save in variable to restore on object after export
-            base64 = self.spec.source.pop("base64", None)
-            if base64 is not None:
-                # Write local file
-                src_pth = self._context().root / source
-                write_text(src_pth, decode_base64_string(base64))
-
-                # Export and restore base64, then return
-                pth = super().export()
-                self.spec.source["base64"] = base64
-                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 = RequirementParser().parse(self.spec.requirements)

digitalhub_runtime_python/entities/function/hydra/builder.py

@@ -4,18 +4,16 @@
 
 from __future__ import annotations
 
-from digitalhub.entities.function._base.builder import FunctionBuilder
-
 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
-from digitalhub_runtime_python.entities.function.python.utils import source_post_check
 
 
-class FunctionHydraBuilder(FunctionBuilder, RuntimeEntityBuilderHydra):
+class FunctionHydraBuilder(FunctionBaseBuilder, RuntimeEntityBuilderHydra):
     """
     FunctionHydra builder.
     """
@@ -26,69 +24,8 @@ class FunctionHydraBuilder(FunctionBuilder, RuntimeEntityBuilderHydra):
     ENTITY_STATUS_CLASS = FunctionStatusHydra
     ENTITY_KIND = EntityKinds.FUNCTION_HYDRA.value
 
-    def build(
-        self,
-        kind: str,
-        project: str,
-        name: str,
-        uuid: str | None = None,
-        version: str | None = None,
-        description: str | None = None,
-        labels: list[str] | None = None,
-        embedded: bool = False,
-        **kwargs,
-    ) -> FunctionHydra:
-        kwargs = source_check(**kwargs)
-        kwargs = config_check(**kwargs)
-        obj = super().build(
-            kind=kind,
-            project=project,
-            name=name,
-            uuid=uuid,
-            version=version,
-            description=description,
-            labels=labels,
-            embedded=embedded,
-            **kwargs,
-        )
-        return source_post_check(obj)
-
-    def from_dict(self, obj: dict) -> FunctionHydra:
-        """
-        Create a new object from dictionary.
-
-        Parameters
-        ----------
-        obj : dict
-            Dictionary to create object from.
-
-        Returns
-        -------
-        FunctionHydra
-            Object instance.
-        """
-        entity = super().from_dict(obj)
-        return source_post_check(entity)
-
-    def _parse_dict(self, obj: dict) -> dict:
-        """
-        Get dictionary and parse it to a valid entity dictionary.
-
-        Parameters
-        ----------
-        obj : dict
-            Dictionary to parse.
-
-        Returns
-        -------
-        dict
-            A dictionary containing the attributes of the entity instance.
-        """
-        # Look for source in spec
-        if spec_dict := obj.get("spec", {}):
-            # Check source
-            source = spec_dict.get("source", {})
-            if source:
-                spec_dict["source"] = source_check(source=source)["source"]
+    def _prepare_kwargs(self, kwargs: dict) -> dict:
+        return config_check(**source_check(**kwargs))
 
-        return super()._parse_dict(obj)
+    def _prepare_source(self, source: dict) -> dict:
+        return source_check(source=source)["source"]

digitalhub_runtime_python/entities/function/hydra/entity.py

@@ -6,19 +6,14 @@ from __future__ import annotations
 
 import typing
 
-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.utils.uri_utils import has_local_scheme
-
-from digitalhub_runtime_python.entities._commons.requirement_parser.parser import RequirementParser
+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(Function):
+class FunctionHydra(FunctionBaseFunction):
     """
     FunctionHydra class.
     """
@@ -28,54 +23,3 @@ class FunctionHydra(Function):
 
         self.spec: FunctionSpecHydra
         self.status: FunctionStatusHydra
-
-    def export(self) -> str:
-        """
-        Export object as a YAML file in the context folder.
-
-        Returns
-        -------
-        str
-            Exported filepath.
-        """
-        # Strip base64 from source at following conditions:
-        # - source is local path
-        # - base64 is not None
-
-        # Check source
-        source = self.spec.source.get("source")
-        if source is not None and has_local_scheme(source):
-            # Check base64. If it is set, decode it in a local file
-            # save in variable to restore on object after export
-            base64 = self.spec.source.pop("base64", None)
-            if base64 is not None:
-                # Write local file
-                src_pth = self._context().root / source
-                write_text(src_pth, decode_base64_string(base64))
-
-                # Export and restore base64, then return
-                super().export()
-                self.spec.source["base64"] = base64
-
-        config = self.spec.config
-        # Check base64. If it is set, decode it in a local file
-        # save in variable to restore on object after export
-        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))
-
-                # Export and restore base64, then return
-                self.spec.config = base64
-
-        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 = RequirementParser().parse(self.spec.requirements)

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/entities/function/openinference/builder.py

@@ -4,20 +4,18 @@
 
 from __future__ import annotations
 
-from digitalhub.entities.function._base.builder import FunctionBuilder
-
 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
-from digitalhub_runtime_python.entities.function.python.utils import source_check, source_post_check
 
 
-class FunctionOpeninferenceBuilder(FunctionBuilder, RuntimeEntityBuilderOpeninference):
+class FunctionOpeninferenceBuilder(FunctionBaseBuilder, RuntimeEntityBuilderOpeninference):
     """
     FunctionOpeninference builder.
     """
@@ -27,69 +25,3 @@ class FunctionOpeninferenceBuilder(FunctionBuilder, RuntimeEntityBuilderOpeninfe
     ENTITY_SPEC_VALIDATOR = FunctionValidatorOpeninference
     ENTITY_STATUS_CLASS = FunctionStatusOpeninference
     ENTITY_KIND = EntityKinds.FUNCTION_OPENINFERENCE.value
-
-    def build(
-        self,
-        kind: str,
-        project: str,
-        name: str,
-        uuid: str | None = None,
-        version: str | None = None,
-        description: str | None = None,
-        labels: list[str] | None = None,
-        embedded: bool = False,
-        **kwargs,
-    ) -> FunctionOpeninference:
-        kwargs = source_check(**kwargs)
-        obj = super().build(
-            kind=kind,
-            project=project,
-            name=name,
-            uuid=uuid,
-            version=version,
-            description=description,
-            labels=labels,
-            embedded=embedded,
-            **kwargs,
-        )
-        return source_post_check(obj)
-
-    def from_dict(self, obj: dict) -> FunctionOpeninference:
-        """
-        Create a new object from dictionary.
-
-        Parameters
-        ----------
-        obj : dict
-            Dictionary to create object from.
-
-        Returns
-        -------
-        FunctionOpeninference
-            Object instance.
-        """
-        entity = super().from_dict(obj)
-        return source_post_check(entity)
-
-    def _parse_dict(self, obj: dict) -> dict:
-        """
-        Get dictionary and parse it to a valid entity dictionary.
-
-        Parameters
-        ----------
-        obj : dict
-            Dictionary to parse.
-
-        Returns
-        -------
-        dict
-            A dictionary containing the attributes of the entity instance.
-        """
-        # Look for source in spec
-        if spec_dict := obj.get("spec", {}):
-            # Check source
-            source = spec_dict.get("source", {})
-            if source:
-                spec_dict["source"] = source_check(source=source)["source"]
-
-        return super()._parse_dict(obj)

digitalhub_runtime_python/entities/function/openinference/entity.py

@@ -6,19 +6,14 @@ from __future__ import annotations
 
 import typing
 
-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.utils.uri_utils import has_local_scheme
-
-from digitalhub_runtime_python.entities._commons.requirement_parser.parser import RequirementParser
+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(Function):
+class FunctionOpeninference(FunctionBaseFunction):
     """
     FunctionOpeninference class.
     """
@@ -28,42 +23,3 @@ class FunctionOpeninference(Function):
 
         self.spec: FunctionSpecOpeninference
         self.status: FunctionStatusOpeninference
-
-    def export(self) -> str:
-        """
-        Export object as a YAML file in the context folder.
-
-        Returns
-        -------
-        str
-            Exported filepath.
-        """
-        # Strip base64 from source at following conditions:
-        # - source is local path
-        # - base64 is not None
-
-        # Check source
-        source = self.spec.source.get("source")
-        if source is not None and has_local_scheme(source):
-            # Check base64. If it is set, decode it in a local file
-            # save in variable to restore on object after export
-            base64 = self.spec.source.pop("base64", None)
-            if base64 is not None:
-                # Write local file
-                src_pth = self._context().root / source
-                write_text(src_pth, decode_base64_string(base64))
-
-                # Export and restore base64, then return
-                pth = super().export()
-                self.spec.source["base64"] = base64
-                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 = RequirementParser().parse(self.spec.requirements)

digitalhub_runtime_python/entities/function/python/builder.py

@@ -4,17 +4,15 @@
 
 from __future__ import annotations
 
-from digitalhub.entities.function._base.builder import FunctionBuilder
-
 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
-from digitalhub_runtime_python.entities.function.python.utils import source_check, source_post_check
 
 
-class FunctionPythonBuilder(FunctionBuilder, RuntimeEntityBuilderPython):
+class FunctionPythonBuilder(FunctionBaseBuilder, RuntimeEntityBuilderPython):
     """
     FunctionPython builder.
     """
@@ -24,69 +22,3 @@ class FunctionPythonBuilder(FunctionBuilder, RuntimeEntityBuilderPython):
     ENTITY_SPEC_VALIDATOR = FunctionValidatorPython
     ENTITY_STATUS_CLASS = FunctionStatusPython
     ENTITY_KIND = EntityKinds.FUNCTION_PYTHON.value
-
-    def build(
-        self,
-        kind: str,
-        project: str,
-        name: str,
-        uuid: str | None = None,
-        version: str | None = None,
-        description: str | None = None,
-        labels: list[str] | None = None,
-        embedded: bool = False,
-        **kwargs,
-    ) -> FunctionPython:
-        kwargs = source_check(**kwargs)
-        obj = super().build(
-            kind=kind,
-            project=project,
-            name=name,
-            uuid=uuid,
-            version=version,
-            description=description,
-            labels=labels,
-            embedded=embedded,
-            **kwargs,
-        )
-        return source_post_check(obj)
-
-    def from_dict(self, obj: dict) -> FunctionPython:
-        """
-        Create a new object from dictionary.
-
-        Parameters
-        ----------
-        obj : dict
-            Dictionary to create object from.
-
-        Returns
-        -------
-        FunctionPython
-            Object instance.
-        """
-        entity = super().from_dict(obj)
-        return source_post_check(entity)
-
-    def _parse_dict(self, obj: dict) -> dict:
-        """
-        Get dictionary and parse it to a valid entity dictionary.
-
-        Parameters
-        ----------
-        obj : dict
-            Dictionary to parse.
-
-        Returns
-        -------
-        dict
-            A dictionary containing the attributes of the entity instance.
-        """
-        # Look for source in spec
-        if spec_dict := obj.get("spec", {}):
-            # Check source
-            source = spec_dict.get("source", {})
-            if source:
-                spec_dict["source"] = source_check(source=source)["source"]
-
-        return super()._parse_dict(obj)

digitalhub_runtime_python/entities/function/python/entity.py

@@ -6,19 +6,14 @@ from __future__ import annotations
 
 import typing
 
-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.utils.uri_utils import has_local_scheme
-
-from digitalhub_runtime_python.entities._commons.requirement_parser.parser import RequirementParser
+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(Function):
+class FunctionPython(FunctionBaseFunction):
     """
     FunctionPython class.
     """
@@ -28,42 +23,3 @@ class FunctionPython(Function):
 
         self.spec: FunctionSpecPython
         self.status: FunctionStatusPython
-
-    def export(self) -> str:
-        """
-        Export object as a YAML file in the context folder.
-
-        Returns
-        -------
-        str
-            Exported filepath.
-        """
-        # Strip base64 from source at following conditions:
-        # - source is local path
-        # - base64 is not None
-
-        # Check source
-        source = self.spec.source.get("source")
-        if source is not None and has_local_scheme(source):
-            # Check base64. If it is set, decode it in a local file
-            # save in variable to restore on object after export
-            base64 = self.spec.source.pop("base64", None)
-            if base64 is not None:
-                # Write local file
-                src_pth = self._context().root / source
-                write_text(src_pth, decode_base64_string(base64))
-
-                # Export and restore base64, then return
-                pth = super().export()
-                self.spec.source["base64"] = base64
-                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 = RequirementParser().parse(self.spec.requirements)

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.0b2.dist-info → digitalhub_runtime_python-0.16.0b3.dist-info}/METADATA

@@ -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.dist-info → digitalhub_runtime_python-0.16.0b3.dist-info}/RECORD

@@ -2,48 +2,51 @@ digitalhub_runtime_python/__init__.py,sha256=TsiuxnaUlDDpwXUfcjDh0AIZyWsn_vIqh8U
 digitalhub_runtime_python/entities/__init__.py,sha256=IRY2i9U97wptE3OcC_NO-EBmcAH6-Q36gMCspKetQ0k,107
 digitalhub_runtime_python/entities/_base/__init__.py,sha256=IRY2i9U97wptE3OcC_NO-EBmcAH6-Q36gMCspKetQ0k,107
 digitalhub_runtime_python/entities/_base/runtime_entity/__init__.py,sha256=IRY2i9U97wptE3OcC_NO-EBmcAH6-Q36gMCspKetQ0k,107
-digitalhub_runtime_python/entities/_base/runtime_entity/builder.py,sha256=YfmNLOq123OV9v71EasOS--3e9fcmvtTVEpWFiuidSQ,3687
+digitalhub_runtime_python/entities/_base/runtime_entity/builder.py,sha256=THkwWt_iul8fler4KJrHUMKhHtuqYyuk-pRoADqHH0U,3688
 digitalhub_runtime_python/entities/_commons/__init__.py,sha256=IRY2i9U97wptE3OcC_NO-EBmcAH6-Q36gMCspKetQ0k,107
 digitalhub_runtime_python/entities/_commons/enums.py,sha256=G24c6GRO5wkZ4hEvk5tq4AG0Q6Mg-vQq6tk0VsMa5T4,1381
+digitalhub_runtime_python/entities/_commons/utils.py,sha256=nmwB-4KoruimUK0NhGvzMeo2P4ulFnr13zfuxgE9ZMs,5714
 digitalhub_runtime_python/entities/_commons/requirement_parser/__init__.py,sha256=IRY2i9U97wptE3OcC_NO-EBmcAH6-Q36gMCspKetQ0k,107
 digitalhub_runtime_python/entities/_commons/requirement_parser/enums.py,sha256=plZQOcr83YVYxfStdIFFw8U3BG9u8716H0B8KZUYzBc,540
 digitalhub_runtime_python/entities/_commons/requirement_parser/factory.py,sha256=gh4LxQKrIWbPdvCk-OOXc1igcMfk8UqXYolkCBrznDk,2797
-digitalhub_runtime_python/entities/_commons/requirement_parser/parser.py,sha256=2E2IgVHgM7NGYQvOq0vjtFlJ_XxOL61KMbzYdwDBwvc,3598
+digitalhub_runtime_python/entities/_commons/requirement_parser/parser.py,sha256=kcdlFfK0ZDbfuwHVmmMJz4cmzDKAtkeCJLRRl5X4Yiw,4005
 digitalhub_runtime_python/entities/_commons/requirement_parser/modules/__init__.py,sha256=IRY2i9U97wptE3OcC_NO-EBmcAH6-Q36gMCspKetQ0k,107
 digitalhub_runtime_python/entities/_commons/requirement_parser/modules/_base.py,sha256=NxzupYHQsEsGZcd8j7Z_XzPcxRGGTUyk5w2DQHOnlbo,348
 digitalhub_runtime_python/entities/_commons/requirement_parser/modules/_conda.py,sha256=usJWlgQt37vypMPFLxDCApmMC5O4yi0kYjSQGjbhy9I,947
 digitalhub_runtime_python/entities/_commons/requirement_parser/modules/_pip.py,sha256=IUQrkhfUpisSKz2IF3ZhxU52Nh_AYzzx_yty9ziABUU,1326
 digitalhub_runtime_python/entities/_commons/requirement_parser/modules/_pyproject.py,sha256=8J7xRGrtMm9JeBj5-_1fY8l-xYfjP3k3ZkUtRSU9Ta8,988
 digitalhub_runtime_python/entities/function/__init__.py,sha256=IRY2i9U97wptE3OcC_NO-EBmcAH6-Q36gMCspKetQ0k,107
+digitalhub_runtime_python/entities/function/_base/__init__.py,sha256=IRY2i9U97wptE3OcC_NO-EBmcAH6-Q36gMCspKetQ0k,107
+digitalhub_runtime_python/entities/function/_base/builder.py,sha256=JRwF-Q7SqQDCPKIhhg9Clz6efUvJY31MWV3kk1J0EAc,1280
+digitalhub_runtime_python/entities/function/_base/entity.py,sha256=TMSCo8n1xBhGZ3iC3ggs2siBwEkl4FkTu5ETa6A_33g,3981
 digitalhub_runtime_python/entities/function/guardrail/__init__.py,sha256=IRY2i9U97wptE3OcC_NO-EBmcAH6-Q36gMCspKetQ0k,107
-digitalhub_runtime_python/entities/function/guardrail/builder.py,sha256=iJRwfdX1NGOwmMmQLwByKh_0RKoKcWELTOv2XF7p3xI,2915
-digitalhub_runtime_python/entities/function/guardrail/entity.py,sha256=wZA_CxVUxb7-cVLKl1F6pesQnml2KuSr8Au674dbUqc,2341
+digitalhub_runtime_python/entities/function/guardrail/builder.py,sha256=qCymqxCGWC5T0jcR6kZIcOpeRV58TvAKRrdwLT4B5Lw,1113
+digitalhub_runtime_python/entities/function/guardrail/entity.py,sha256=WY3yE2cs4XP1riAj4P3O1krmEhgI-cGWQ3yWVGdwPgs,746
 digitalhub_runtime_python/entities/function/guardrail/models.py,sha256=ZZUb9RWVFO41Hr4ns1ITL02eODfB_TKyAoq3cGJrZMQ,340
 digitalhub_runtime_python/entities/function/guardrail/spec.py,sha256=974KDiSH1UNmSVcNCj_qfWvWLQAeYRc8UcYWpOqIHJg,1676
 digitalhub_runtime_python/entities/function/guardrail/status.py,sha256=tVBsETnnbVBaR1yvJ1nXizkbTTQ9flRg29TVrucwgYA,314
 digitalhub_runtime_python/entities/function/hydra/__init__.py,sha256=IRY2i9U97wptE3OcC_NO-EBmcAH6-Q36gMCspKetQ0k,107
-digitalhub_runtime_python/entities/function/hydra/builder.py,sha256=ZfWJnsmSX4OoucLHgNlSlWpq8tVUTUG89kC3yHid7O4,2947
-digitalhub_runtime_python/entities/function/hydra/entity.py,sha256=ZpYn-SMvKWUKx6wTgVWW2lMrQKGEr4eSmp5kuHrE6OM,2820
+digitalhub_runtime_python/entities/function/hydra/builder.py,sha256=JGgLWe-2Yi908AFhL_Q3pWcNoa2v1Dax_e7VgjuNWB8,1346
+digitalhub_runtime_python/entities/function/hydra/entity.py,sha256=U1h2H8UVDPskpsttXcuzdo3IwSkeFOC1G8qh72g97hY,714
 digitalhub_runtime_python/entities/function/hydra/models.py,sha256=DXQa9DTnHw_YAos2lfcNPFL2LpeWy0VAqa5s7joWflI,1155
 digitalhub_runtime_python/entities/function/hydra/spec.py,sha256=n0meR5mUz6dIzpoa76Zfm6ezKxUHeOKezOXjpd0qlLU,1630
 digitalhub_runtime_python/entities/function/hydra/status.py,sha256=O26R7uqJLRZ_UHrnTgiS7hsmdfHOho1szNrK9lITSEI,306
-digitalhub_runtime_python/entities/function/hydra/utils.py,sha256=K8TMxUO-1EFOLW-tDIjzxWuf9tJCSz0hgtbzQt0qxm8,5503
+digitalhub_runtime_python/entities/function/hydra/utils.py,sha256=wd8Hx_rQzoYjMXuSyJKbX3D5JqXci1OUcTafu030g7I,5570
 digitalhub_runtime_python/entities/function/openinference/__init__.py,sha256=IRY2i9U97wptE3OcC_NO-EBmcAH6-Q36gMCspKetQ0k,107
-digitalhub_runtime_python/entities/function/openinference/builder.py,sha256=-7qxCZDuYIAdOFIFte2pGk8cc4NXHKVQ8p-86Zp4pX8,2991
-digitalhub_runtime_python/entities/function/openinference/entity.py,sha256=cEyWVC1OI39Nkhvu2orBWXI8roSJrZWYTX6nhts0jA8,2373
+digitalhub_runtime_python/entities/function/openinference/builder.py,sha256=jYGi-Qol5Vreyubd_MGB3hG83Hfv75sVJt2evHTtKeo,1177
+digitalhub_runtime_python/entities/function/openinference/entity.py,sha256=43KLWGd-x9Vq7oTeiqXISmelWcBXoLGA_a8TYgwUu7Q,778
 digitalhub_runtime_python/entities/function/openinference/models.py,sha256=qMsjy37P8XVepwx5WHRcmGPuJQ-rsrqYw2x_czoa6G4,887
 digitalhub_runtime_python/entities/function/openinference/spec.py,sha256=bqORpqG6Uun_LcZUo0iFG-cu1aQzLkB2WUdHPy9yYc8,2047
 digitalhub_runtime_python/entities/function/openinference/status.py,sha256=mfvAdnKcr3TUbM42AELirQd6Wr-06TPflkYFWVZEv80,322
 digitalhub_runtime_python/entities/function/python/__init__.py,sha256=IRY2i9U97wptE3OcC_NO-EBmcAH6-Q36gMCspKetQ0k,107
-digitalhub_runtime_python/entities/function/python/builder.py,sha256=Tcuiu-o7YcsyqgDHcNQecimk2vzrHW6Bwwmbpmih6Ro,2845
-digitalhub_runtime_python/entities/function/python/entity.py,sha256=SVUOKoViIX4W8jdkNH9qp39sZL23k1NRQVibuQdKEco,2317
+digitalhub_runtime_python/entities/function/python/builder.py,sha256=4ezReSC-91QD8UGPwL96NR39JuqucPPjrUaiZ7Ix-4g,1052
+digitalhub_runtime_python/entities/function/python/entity.py,sha256=P62w_UKVfFzCGlKD4d-yneWiTN_P9CQTj8PQ3kjb7Ks,722
 digitalhub_runtime_python/entities/function/python/models.py,sha256=pCqGJ1TSZ8-C4jhzzLL4DzZwi7jynxNUvsdX3mYV09M,1001
 digitalhub_runtime_python/entities/function/python/spec.py,sha256=6TkwV0kGVryvZmvMY12RzfsTzw4D2Pm43dRNi3IvGy0,1428
 digitalhub_runtime_python/entities/function/python/status.py,sha256=XK3KPKovCRiMfEFzFeCzaVkoQyuwfci9nI2JzYxCIec,308
-digitalhub_runtime_python/entities/function/python/utils.py,sha256=mtSvxugeq45ylFR44P79AuErWsAVAYCRSM5sF8X3d6g,4382
 digitalhub_runtime_python/entities/run/__init__.py,sha256=IRY2i9U97wptE3OcC_NO-EBmcAH6-Q36gMCspKetQ0k,107
 digitalhub_runtime_python/entities/run/_base/__init__.py,sha256=IRY2i9U97wptE3OcC_NO-EBmcAH6-Q36gMCspKetQ0k,107
-digitalhub_runtime_python/entities/run/_base/entity.py,sha256=6DQ2PRpuU-Vtnwvxo97kLUkiGnpc3QL2HcRE9lfwkHo,6130
+digitalhub_runtime_python/entities/run/_base/entity.py,sha256=BusdxsgFU6pTwxawOodRGqAr_26h0RFBl6_8A2UmVDQ,6130
 digitalhub_runtime_python/entities/run/_base/spec.py,sha256=UevGoyMV_IbriCIOQ4IxRG-HWBW-Ul0l9Ftgm8tWFcs,2532
 digitalhub_runtime_python/entities/run/_base/status.py,sha256=G_Dw5j590Ejk75YwS5eDKqaU6AqhpHKiHbS_IlMts8Y,817
 digitalhub_runtime_python/entities/run/_base/utils.py,sha256=GWHtWUFJwMa7LNnYM6v8MCpLoEmUl9msO5coUqfz7Ig,1117
@@ -156,8 +159,8 @@ digitalhub_runtime_python/utils/configuration.py,sha256=BhrHFsvlCcAHA1hfmx7b5lUR
 digitalhub_runtime_python/utils/inputs.py,sha256=c-dU61jHXrTd-5XJt4LacjfDzi_vWZFKwuJCbqAGdJQ,5806
 digitalhub_runtime_python/utils/outputs.py,sha256=irGUqy43F26NC1_ruH831NDyDTIVQHwIf15oXpR-q2M,9571
 digitalhub_runtime_python/utils/utils.py,sha256=qO-wh-9qJFvoJnWIWNeajtFQuBSYw3xhCI3JqV9gVHE,1936
-digitalhub_runtime_python-0.16.0b2.dist-info/METADATA,sha256=tohILQKFnFyvRH6gm5ySNK5V1R9LdS_Wl1HC8sfferQ,17080
-digitalhub_runtime_python-0.16.0b2.dist-info/WHEEL,sha256=lCkmxWfQsSc9CfIClYeavTdQeEX2toPqufh9gI35EQA,87
-digitalhub_runtime_python-0.16.0b2.dist-info/licenses/AUTHORS,sha256=iDleK_2EAMmh0o8Te_E9mdXQCP4rBfFr9dW9d0-pCno,301
-digitalhub_runtime_python-0.16.0b2.dist-info/licenses/LICENSE,sha256=z3xQCHfGmTnigfoUe3uidW_GUSVeFBdos30w9VNTRec,11361
-digitalhub_runtime_python-0.16.0b2.dist-info/RECORD,,
+digitalhub_runtime_python-0.16.0b3.dist-info/METADATA,sha256=pCj_2StpGdYhl_MaU50S2a3AksLkzpHKTt9CTddiCfQ,17080
+digitalhub_runtime_python-0.16.0b3.dist-info/WHEEL,sha256=zOwg4jB6zX2kU910N-cMawjivD6tO8NEWvE12je1bVk,87
+digitalhub_runtime_python-0.16.0b3.dist-info/licenses/AUTHORS,sha256=iDleK_2EAMmh0o8Te_E9mdXQCP4rBfFr9dW9d0-pCno,301
+digitalhub_runtime_python-0.16.0b3.dist-info/licenses/LICENSE,sha256=z3xQCHfGmTnigfoUe3uidW_GUSVeFBdos30w9VNTRec,11361
+digitalhub_runtime_python-0.16.0b3.dist-info/RECORD,,

{digitalhub_runtime_python-0.16.0b2.dist-info → digitalhub_runtime_python-0.16.0b3.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.31.0
+Generator: hatchling 1.32.0
 Root-Is-Purelib: true
 Tag: py3-none-any