digitalhub-runtime-python 0.16.0b0__tar.gz → 0.16.0b1__tar.gz

{digitalhub_runtime_python-0.16.0b0 → digitalhub_runtime_python-0.16.0b1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: digitalhub-runtime-python
-Version: 0.16.0b0
+Version: 0.16.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>
@@ -215,14 +215,14 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Requires-Python: <3.15,>=3.10
-Requires-Dist: digitalhub[full]<0.16,>=0.15.1
+Requires-Dist: digitalhub[full]<0.17,>=0.16.0b
 Requires-Dist: msgpack
 Requires-Dist: nuclio-sdk
 Requires-Dist: pip
 Requires-Dist: pyyaml
 Requires-Dist: tomli; python_version < '3.11'
 Provides-Extra: dev
-Requires-Dist: digitalhub[dev]<0.16,>=0.15.1; extra == 'dev'
+Requires-Dist: digitalhub[dev]<0.17,>=0.16.0b; extra == 'dev'
 Description-Content-Type: text/markdown
 
 # DigitalHub SDK Runtime Python

{digitalhub_runtime_python-0.16.0b0 → digitalhub_runtime_python-0.16.0b1}/digitalhub_runtime_python/entities/_base/runtime_entity/builder.py

@@ -101,6 +101,7 @@ class RuntimeEntityBuilderGuardrail(RuntimeEntityBuilder):
         ]
     )
 
+
 class RuntimeEntityBuilderHydra(RuntimeEntityBuilder):
     EXECUTABLE_KIND = EntityKinds.FUNCTION_HYDRA.value
     TASKS_KINDS = map_actions(
@@ -134,4 +135,4 @@ class RuntimeEntityBuilderHydra(RuntimeEntityBuilder):
                 Actions.SUBTASK.value,
             ),
         ]
-    )
+    )

{digitalhub_runtime_python-0.16.0b0 → digitalhub_runtime_python-0.16.0b1}/digitalhub_runtime_python/entities/_commons/enums.py

@@ -40,6 +40,7 @@ class EntityKinds(Enum):
     RUN_HYDRA_JOB = "hydra+job:run"
     RUN_HYDRA_SUBTASK = "hydra+subtask:run"
 
+
 class Actions(Enum):
     """
     Task actions.

{digitalhub_runtime_python-0.16.0b0 → digitalhub_runtime_python-0.16.0b1}/digitalhub_runtime_python/entities/function/hydra/builder.py

@@ -11,9 +11,9 @@ from digitalhub_runtime_python.entities._commons.enums import EntityKinds
 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
 
-from digitalhub_runtime_python.entities.function.python.utils import source_check, source_post_check
-from digitalhub_runtime_python.entities.function.hydra.utils import config_check
 
 class FunctionHydraBuilder(FunctionBuilder, RuntimeEntityBuilderHydra):
     """

{digitalhub_runtime_python-0.16.0b0 → digitalhub_runtime_python-0.16.0b1}/digitalhub_runtime_python/entities/function/hydra/entity.py

@@ -54,7 +54,7 @@ class FunctionHydra(Function):
                 write_text(src_pth, decode_base64_string(base64))
 
                 # Export and restore base64, then return
-                pth = super().export()
+                super().export()
                 self.spec.source["base64"] = base64
 
         config = self.spec.config

{digitalhub_runtime_python-0.16.0b0 → digitalhub_runtime_python-0.16.0b1}/digitalhub_runtime_python/entities/function/hydra/models.py

@@ -8,6 +8,7 @@ from enum import Enum
 
 from pydantic import BaseModel, ConfigDict, Field
 
+
 class Lang(Enum):
     """
     Source code language.
@@ -44,10 +45,12 @@ class SourceValidator(BaseModel):
     lang: Lang = Field(default=Lang.PYTHON.value)
     "Source code language (hint)."
 
+
 class ConfigValidator(BaseModel):
     """
     Config params.
     """
+
     model_config = ConfigDict(use_enum_values=True)
 
     source: str = None
@@ -57,4 +60,4 @@ class ConfigValidator(BaseModel):
     "Config path."
 
     base64: str = None
-    "Config (base64 encoded)."
+    "Config (base64 encoded)."

{digitalhub_runtime_python-0.16.0b0 → digitalhub_runtime_python-0.16.0b1}/digitalhub_runtime_python/entities/function/hydra/utils.py

@@ -4,13 +4,123 @@
 
 from __future__ import annotations
 
-import typing
 from pathlib import Path
 
 from digitalhub.utils.exceptions import EntityError
 from digitalhub.utils.generic_utils import encode_string, read_source
 from digitalhub.utils.uri_utils import has_local_scheme
 
+from digitalhub_runtime_python.entities.function.python.models import Lang
+
+
+def source_check(**kwargs) -> dict:
+    """
+    Check source code.
+
+    Parameters
+    ----------
+    **kwargs
+        Keyword arguments.
+
+    Returns
+    -------
+    dict
+        Checked source.
+    """
+    source: dict = kwargs.pop("source", None)
+    code_src = kwargs.pop("code_src", None)
+    code = kwargs.pop("code", None)
+    base64 = kwargs.pop("base64", None)
+    handler = kwargs.pop("handler", None)
+    init_function = kwargs.pop("init_function", None)
+    complete_function = kwargs.pop("complete_function", None)
+    lang = kwargs.pop("lang", None)
+
+    if source is not None:
+        code_src = source.pop("source", None)
+        code = source.pop("code", None)
+        base64 = source.pop("base64", None)
+        handler = source.pop("handler", None)
+        init_function = source.pop("init_function", None)
+        complete_function = source.pop("complete_function", None)
+        lang = source.pop("lang", None)
+
+    kwargs["source"] = _check_params(
+        code_src=code_src,
+        code=code,
+        base64=base64,
+        handler=handler,
+        init_function=init_function,
+        complete_function=complete_function,
+        lang=lang,
+    )
+    return kwargs
+
+
+def _check_params(
+    code_src: str | None = None,
+    code: str | None = None,
+    base64: str | None = None,
+    handler: str | None = None,
+    init_function: str | None = None,
+    complete_function: str | None = None,
+    lang: str | None = None,
+) -> dict:
+    """
+    Check source.
+
+    Parameters
+    ----------
+    code_src : str
+        Source code source.
+    code : str
+        Source code.
+    base64 : str
+        Source code base64.
+    handler : str
+        Function handler.
+    init_function : str
+        Init function.
+    complete_function : str
+        Complete function.
+    lang : str
+        Source code language.
+
+    Returns
+    -------
+    dict
+        Checked source.
+    """
+    source = {}
+
+    if handler is None:
+        raise EntityError("Handler must be provided.")
+    source["handler"] = handler
+
+    if init_function is not None:
+        source["init_function"] = init_function
+
+    if complete_function is not None:
+        source["complete_function"] = complete_function
+
+    if lang is None:
+        source["lang"] = Lang.PYTHON.value
+
+    if code_src is None and code is None and base64 is None:
+        raise EntityError("Source must be provided.")
+
+    if code_src is not None:
+        source["source"] = code_src
+
+    if base64 is not None:
+        source["base64"] = base64
+
+    if code is not None:
+        source["base64"] = encode_string(code)
+
+    return source
+
+
 def config_check(**kwargs) -> dict:
     """
     Check config.
@@ -38,7 +148,7 @@ def config_check(**kwargs) -> dict:
         config_content = None
         config_path = config.pop("path", None)
 
-    config = _check_params(
+    config = _check_config_params(
         config_src=config_src,
         config_content=config_content,
         config_base64=config_base64,
@@ -52,7 +162,7 @@ def config_check(**kwargs) -> dict:
     return kwargs
 
 
-def _check_params(
+def _check_config_params(
     config_src: str | None = None,
     config_content: str | None = None,
     config_base64: str | None = None,

{digitalhub_runtime_python-0.16.0b0 → digitalhub_runtime_python-0.16.0b1}/digitalhub_runtime_python/entities/run/hydra_build/entity.py

@@ -12,7 +12,7 @@ if typing.TYPE_CHECKING:
     from digitalhub_runtime_python.entities.run.hydra_build.spec import RunSpecHydraRunBuild
     from digitalhub_runtime_python.entities.run.hydra_build.status import RunStatusHydraRunBuild
 
-    
+
 class RunHydraRunBuild(RunBaseRun):
     """
     RunHydraRunBuild class.

{digitalhub_runtime_python-0.16.0b0 → digitalhub_runtime_python-0.16.0b1}/digitalhub_runtime_python/entities/run/hydra_job/spec.py

@@ -65,6 +65,7 @@ class RunSpecHydraRunJob(RunSpecBaseRun):
         self.config = config
         self.workers = workers
 
+
 class RunValidatorHydraRunJob(RunValidatorBaseRun):
     """RunValidatorHydraRunJob validator."""
 
@@ -75,4 +76,4 @@ class RunValidatorHydraRunJob(RunValidatorBaseRun):
     """Configuration for the run."""
 
     workers: int | None = None
-    """Number of workers to use for the run."""
+    """Number of workers to use for the run."""

{digitalhub_runtime_python-0.16.0b0 → digitalhub_runtime_python-0.16.0b1}/digitalhub_runtime_python/entities/run/hydra_subtask/builder.py

@@ -9,7 +9,10 @@ from digitalhub.entities.run._base.builder import RunBuilder
 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.run.hydra_subtask.entity import RunHydraRunSubtask
-from digitalhub_runtime_python.entities.run.hydra_subtask.spec import RunSpecHydraRunSubtask, RunValidatorHydraRunSubtask
+from digitalhub_runtime_python.entities.run.hydra_subtask.spec import (
+    RunSpecHydraRunSubtask,
+    RunValidatorHydraRunSubtask,
+)
 from digitalhub_runtime_python.entities.run.hydra_subtask.status import RunStatusHydraRunSubtask
 
 
@@ -39,4 +42,4 @@ class RunHydraRunSubtaskBuilder(RunBuilder, RuntimeEntityBuilderHydra):
             Spec object.
         """
         res = super().build_spec(**kwargs)
-        return res
+        return res

{digitalhub_runtime_python-0.16.0b0 → digitalhub_runtime_python-0.16.0b1}/digitalhub_runtime_python/entities/run/hydra_subtask/entity.py

@@ -7,10 +7,12 @@ from __future__ import annotations
 import typing
 
 from digitalhub_runtime_python.entities.run.hydra_job.entity import RunHydraRunJob
+
 if typing.TYPE_CHECKING:
     from digitalhub_runtime_python.entities.run.hydra_subtask.spec import RunSpecHydraRunSubtask
     from digitalhub_runtime_python.entities.run.hydra_subtask.status import RunStatusHydraRunSubtask
 
+
 class RunHydraRunSubtask(RunHydraRunJob):
     """
     RunHydraRunSubtask class.
@@ -20,4 +22,4 @@ class RunHydraRunSubtask(RunHydraRunJob):
         super().__init__(*args, **kwargs)
 
         self.spec: RunSpecHydraRunSubtask
-        self.status: RunStatusHydraRunSubtask
+        self.status: RunStatusHydraRunSubtask

{digitalhub_runtime_python-0.16.0b0 → digitalhub_runtime_python-0.16.0b1}/digitalhub_runtime_python/entities/run/hydra_subtask/spec.py

@@ -64,7 +64,9 @@ class RunSpecHydraRunSubtask(RunSpecHydraRunJob):
         )
         self.job_ref = job_ref
 
+
 class RunValidatorHydraRunSubtask(RunValidatorHydraRunJob):
     """RunValidatorHydraRunSubtask validator."""
+
     job_ref: str | None = None
     """Reference to the parent job, used for launching the subtask in the same job."""

{digitalhub_runtime_python-0.16.0b0 → digitalhub_runtime_python-0.16.0b1}/digitalhub_runtime_python/entities/task/hydra_job/entity.py

@@ -7,6 +7,7 @@ from __future__ import annotations
 import typing
 
 from digitalhub.entities.task._base.entity import Task
+
 if typing.TYPE_CHECKING:
     from digitalhub_runtime_python.entities.task.hydra_job.spec import TaskSpecHydraJob
     from digitalhub_runtime_python.entities.task.hydra_job.status import TaskStatusHydraJob

{digitalhub_runtime_python-0.16.0b0 → digitalhub_runtime_python-0.16.0b1}/digitalhub_runtime_python/entities/task/hydra_subtask/entity.py

@@ -7,6 +7,7 @@ from __future__ import annotations
 import typing
 
 from digitalhub.entities.task._base.entity import Task
+
 if typing.TYPE_CHECKING:
     from digitalhub_runtime_python.entities.task.hydra_subtask.spec import TaskSpecHydraSubtask
     from digitalhub_runtime_python.entities.task.hydra_subtask.status import TaskStatusHydraSubtask

{digitalhub_runtime_python-0.16.0b0 → digitalhub_runtime_python-0.16.0b1}/digitalhub_runtime_python/runtimes/builder.py

@@ -6,6 +6,11 @@ from __future__ import annotations
 
 from digitalhub.runtimes.builder import RuntimeBuilder
 
+from digitalhub_runtime_python.runtimes.hydra_runtime import (
+    RuntimeHydra,
+    RuntimeHydraJob,
+    RuntimeHydraSubtask,
+)
 from digitalhub_runtime_python.runtimes.runtime import (
     RuntimeGuardrail,
     RuntimeOpeninference,
@@ -13,11 +18,6 @@ from digitalhub_runtime_python.runtimes.runtime import (
     RuntimePythonJob,
 )
 
-from digitalhub_runtime_python.runtimes.hydra_runtime import (
-    RuntimeHydra,
-    RuntimeHydraJob,
-    RuntimeHydraSubtask,
-)
 
 class RuntimePythonBuilder(RuntimeBuilder):
     """RuntimePythonBuilder class."""
@@ -42,18 +42,20 @@ class RuntimeGuardrailBuilder(RuntimeBuilder):
 
     RUNTIME_CLASS = RuntimeGuardrail
 
+
 class RuntimeHydraBuilder(RuntimeBuilder):
     """RuntimeHydraBuilder class."""
 
     RUNTIME_CLASS = RuntimeHydra
 
+
 class RuntimeHydraJobBuilder(RuntimeBuilder):
     """RuntimeHydraJobBuilder class."""
 
     RUNTIME_CLASS = RuntimeHydraJob
 
+
 class RuntimeHydraSubtaskBuilder(RuntimeBuilder):
     """RuntimeHydraSubtaskBuilder class."""
 
     RUNTIME_CLASS = RuntimeHydraSubtask
-    

{digitalhub_runtime_python-0.16.0b0 → digitalhub_runtime_python-0.16.0b1}/digitalhub_runtime_python/runtimes/hydra_runtime.py

@@ -1,29 +1,32 @@
 import sys
 from typing import Callable
+
 import yaml
+from digitalhub.utils.generic_utils import decode_base64_string
+from digitalhub.utils.logger.logger import get_logger
 
 from digitalhub_runtime_python.runtimes.runtime import RuntimePython, RuntimePythonJob
-
 from digitalhub_runtime_python.utils.configuration import (
-    _get_function_path, _import_function_from_path, has_git_scheme, has_remote_scheme, has_s3_scheme, 
-    _clone_git_source, _download_remote_source, _download_s3_source
+    _clone_git_source,
+    _download_remote_source,
+    _download_s3_source,
+    _get_function_path,
+    _import_function_from_path,
+    has_git_scheme,
+    has_remote_scheme,
+    has_s3_scheme,
 )
-
-from digitalhub.utils.generic_utils import (
-    decode_base64_string
-)
-from digitalhub.utils.logger.logger import get_logger
-
 from digitalhub_runtime_python.utils.outputs import build_new_status, collect_outputs
 
-
 logger = get_logger(__file__)
 
+
 class RuntimeHydra(RuntimePython):
     """
     Runtime Hydra class.
     """
 
+
 class RuntimeHydraJob(RuntimePythonJob):
     """
     Runtime Hydra Job class.
@@ -88,7 +91,7 @@ class RuntimeHydraJob(RuntimePythonJob):
                 # Call overwriting the launcher and other overwrites
                 # but with dh launcher, multirun, run execution attributes, and custom overwrites
                 sys.argv = args + [f"--config-path={path.absolute()}", "--config-name=config"]
-            
+
             # download config to runtime dir
             elif "source" in config:
                 path = self.runtime_dir / "config"
@@ -109,16 +112,22 @@ class RuntimeHydraJob(RuntimePythonJob):
                 path = self.runtime_dir / config["path"]
                 sys.argv = args + [f"--config-path={path.absolute()}"]
 
-        sys.argv += [f"--config-dir={(self.runtime_dir / "dh_extra_conf" ).absolute()}", "hydra/launcher=dh_launcher", f"hydra.launcher.job_ref={run['id']}"]
+        sys.argv += [
+            f"--config-dir={(self.runtime_dir / 'dh_extra_conf').absolute()}",
+            "hydra/launcher=dh_launcher",
+            f"hydra.launcher.job_ref={run['id']}",
+        ]
 
         fnc, _ = super()._configure_execution(spec)
         # treat as not wrapped, as the wrapping is done by hydra.main and we do not need to pass the extra attributes
         return fnc, {"cfg_passthrough": None}
 
+
 class RuntimeHydraSubtask(RuntimePythonJob):
     """
     Runtime Hydra Subtask class.
     """
+
     def _configure_execution(self, spec: dict) -> tuple[Callable, bool]:
         source_spec = spec.get("source", {})
         path = self.runtime_dir
@@ -131,11 +140,11 @@ class RuntimeHydraSubtask(RuntimePythonJob):
     def _compose_args(self, func, spec, project):
         # expect to be wrapped with hydra.main, 'cfg' is in the parameters, and Omecaconf is present
         from omegaconf import OmegaConf
+
         args = super()._compose_args(func, spec, project)
         try:
             args["cfg_passthrough"] = OmegaConf.create(spec.get("parameters", {}).get("cfg_passthrough", {}))
         except Exception as e:
             print(f"Failed to convert cfg to container. Exception: {e.__class__}. Error: {e.args}")
             args["cfg_passthrough"] = {}
-        return args 
-    
+        return args

{digitalhub_runtime_python-0.16.0b0 → digitalhub_runtime_python-0.16.0b1}/digitalhub_runtime_python/runtimes/runtime.py

@@ -11,14 +11,14 @@ from digitalhub.runtimes._base import Runtime
 from digitalhub.utils.logger.logger import get_logger
 
 from digitalhub_runtime_python.utils.configuration import (
-    import_function_from_source, 
+    import_function_from_source,
 )
 from digitalhub_runtime_python.utils.inputs import compose_inputs
 from digitalhub_runtime_python.utils.outputs import build_new_status, collect_outputs
 
-
 logger = get_logger(__file__)
 
+
 class RuntimePython(Runtime):
     """
     Runtime Python class.

{digitalhub_runtime_python-0.16.0b0 → digitalhub_runtime_python-0.16.0b1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "digitalhub-runtime-python"
-version = "0.16.0b0"
+version = "0.16.0b1"
 description = "Python runtime for DHCore"
 readme = "README.md"
 authors = [
@@ -23,7 +23,7 @@ classifiers = [
 keywords = ["data", "dataops", "kubernetes"]
 requires-python = ">=3.10, <3.15"
 dependencies = [
-"digitalhub[full]>=0.15.1, <0.16",
+"digitalhub[full]>=0.16.0b, <0.17",
 "nuclio-sdk",
 "msgpack",
 "pip",
@@ -33,7 +33,7 @@ dependencies = [
 
 [project.optional-dependencies]
 dev = [
-    "digitalhub[dev]>=0.15.1, <0.16"
+    "digitalhub[dev]>=0.16.0b, <0.17"
 ]
 
 [project.urls]
@@ -54,7 +54,7 @@ docstring-code-line-length = 120
 convention = "numpy"
 
 [tool.bumpver]
-current_version = "0.16.0b0"
+current_version = "0.16.0b1"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = false

{digitalhub_runtime_python-0.16.0b0 → digitalhub_runtime_python-0.16.0b1}/digitalhub_runtime_python/__init__.py

@@ -58,12 +58,12 @@ entity_builders = (
 try:
     from digitalhub_runtime_python.runtimes.builder import (
         RuntimeGuardrailBuilder,
+        RuntimeHydraBuilder,
+        RuntimeHydraJobBuilder,
+        RuntimeHydraSubtaskBuilder,
         RuntimeOpeninferenceBuilder,
         RuntimePythonBuilder,
         RuntimePythonJobBuilder,
-        RuntimeHydraBuilder,
-        RuntimeHydraSubtaskBuilder,
-        RuntimeHydraJobBuilder,
     )
 
     runtime_builders = (

{digitalhub_runtime_python-0.16.0b0 → digitalhub_runtime_python-0.16.0b1}/digitalhub_runtime_python/entities/function/hydra/spec.py

@@ -6,8 +6,8 @@ from __future__ import annotations
 
 from digitalhub.entities.function._base.spec import FunctionSpec, FunctionValidator
 
-from digitalhub_runtime_python.entities.function.python.models import PythonVersion
 from digitalhub_runtime_python.entities.function.hydra.models import ConfigValidator, SourceValidator
+from digitalhub_runtime_python.entities.function.python.models import PythonVersion
 
 
 class FunctionSpecHydra(FunctionSpec):