digitalhub-runtime-python 0.5.0b11__tar.gz → 0.6.0b0__tar.gz

{digitalhub_runtime_python-0.5.0b11 → digitalhub_runtime_python-0.6.0b0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: digitalhub-runtime-python
-Version: 0.5.0b11
+Version: 0.6.0b0
 Summary: Python runtime for DHCore
 Author-email: Fondazione Bruno Kessler <dslab@fbk.eu>, Matteo Martini <mmartini@fbk.eu>
 License:                               Apache License
@@ -228,6 +228,6 @@ Classifier: Programming Language :: Python :: 3.10
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: digitalhub[ml]<0.6,~=0.5.0b
+Requires-Dist: digitalhub[ml]<0.7,~=0.6.0b
 
 # SDK for DHCore

{digitalhub_runtime_python-0.5.0b11 → digitalhub_runtime_python-0.6.0b0}/digitalhub_runtime_python/entities/functions/spec.py

@@ -21,6 +21,7 @@ class FunctionSpecPython(FunctionSpec):
         source: dict,
         image: str | None = None,
         base_image: str | None = None,
+        python_version: str | None = None,
         requirements: list | None = None,
     ) -> None:
         """
@@ -30,6 +31,7 @@ class FunctionSpecPython(FunctionSpec):
 
         self.image = image
         self.base_image = base_image
+        self.python_version = python_version
         self.requirements = requirements
 
         source = self._source_check(source)
@@ -135,5 +137,8 @@ class FunctionParamsPython(FunctionParams):
     base_image: str = None
     "Base image"
 
+    python_version: str = None
+    "Python version"
+
     requirements: list = None
     "Requirements list, as used by the runtime"

digitalhub_runtime_python-0.6.0b0/digitalhub_runtime_python/entities/runs/spec.py

@@ -0,0 +1,81 @@
+from __future__ import annotations
+
+from digitalhub_ml.entities.runs.spec import RunParamsMl, RunSpecMl
+
+
+class RunSpecPython(RunSpecMl):
+    """Run Python specification."""
+
+    def __init__(
+        self,
+        task: str,
+        local_execution: bool = False,
+        **kwargs,
+    ) -> None:
+        """
+        Constructor.
+        """
+        super().__init__(task, local_execution)
+
+        self.source = kwargs.get("source")
+        self.image = kwargs.get("image")
+        self.base_image = kwargs.get("base_image")
+        self.python_version = kwargs.get("python_version")
+        self.requirements = kwargs.get("requirements")
+
+        self.function = kwargs.get("function")
+        self.node_selector = kwargs.get("node_selector")
+        self.volumes = kwargs.get("volumes")
+        self.resources = kwargs.get("resources")
+        self.affinity = kwargs.get("affinity")
+        self.tolerations = kwargs.get("tolerations")
+        self.env = kwargs.get("env")
+        self.secrets = kwargs.get("secrets")
+        self.backoff_limit = kwargs.get("backoff_limit")
+        self.schedule = kwargs.get("schedule")
+        self.replicas = kwargs.get("replicas")
+
+        # Task job
+
+        # Task build
+        self.instructions = kwargs.get("instructions")
+
+        self.inputs = kwargs.get("inputs")
+        self.outputs = kwargs.get("outputs")
+        self.parameters = kwargs.get("parameters")
+
+
+class RunParamsPython(RunParamsMl):
+    """Run Python parameters."""
+
+    # Function parameters
+    source: dict = None
+    image: str = None
+    base_image: str = None
+    python_version: str = None
+    requirements: list = None
+
+    # Task parameters
+    function: str = None
+    node_selector: list[dict] = None
+    volumes: list[dict] = None
+    resources: list[dict] = None
+    affinity: dict = None
+    tolerations: list[dict] = None
+    env: list[dict] = None
+    secrets: list[str] = None
+
+    # Task job
+    backoff_limit: int = None
+
+    # Task serve
+    service_type: str = None
+    replicas: int = None
+
+    # Task build
+    instructions: list[str] = None
+
+    # Run parameters
+    inputs: dict = None
+    outputs: dict = None
+    parameters: dict = None

{digitalhub_runtime_python-0.5.0b11 → digitalhub_runtime_python-0.6.0b0}/digitalhub_runtime_python/entities/tasks/spec.py

@@ -3,8 +3,9 @@ Task Python specification module.
 """
 from __future__ import annotations
 
+from typing import Literal
+
 from digitalhub_core.entities.tasks.spec import TaskParamsK8s, TaskSpecK8s
-from digitalhub_runtime_python.entities.tasks.models import ContextRef, ContextSource
 
 
 class TaskSpecJob(TaskSpecK8s):
@@ -21,7 +22,6 @@ class TaskSpecJob(TaskSpecK8s):
         super().__init__(function, **kwargs)
 
         self.backoff_limit = kwargs.get("backoff_limit")
-        self.schedule = kwargs.get("schedule")
 
 
 class TaskParamsJob(TaskParamsK8s):
@@ -29,6 +29,9 @@ class TaskParamsJob(TaskParamsK8s):
     TaskParamsJob model.
     """
 
+    backoff_limit: int = None
+    """Backoff limit."""
+
 
 class TaskSpecBuild(TaskSpecK8s):
     """Task Build specification."""
@@ -36,8 +39,6 @@ class TaskSpecBuild(TaskSpecK8s):
     def __init__(
         self,
         function: str,
-        context_refs: list | None = None,
-        context_sources: list | None = None,
         instructions: list | None = None,
         **kwargs,
     ) -> None:
@@ -46,8 +47,6 @@ class TaskSpecBuild(TaskSpecK8s):
         """
         super().__init__(function, **kwargs)
 
-        self.context_refs = context_refs
-        self.context_sources = context_sources
         self.instructions = instructions
 
 
@@ -56,12 +55,6 @@ class TaskParamsBuild(TaskParamsK8s):
     TaskParamsBuild model.
     """
 
-    context_refs: list[ContextRef] = None
-    """Context references."""
-
-    context_sources: list[ContextSource] = None
-    """Context sources."""
-
     instructions: list[str] = None
     """Build instructions."""
 
@@ -69,8 +62,26 @@ class TaskParamsBuild(TaskParamsK8s):
 class TaskSpecServe(TaskSpecK8s):
     """Task Serve specification."""
 
+    def __init__(
+        self,
+        function: str,
+        replicas: int | None = None,
+        service_type: str | None = None,
+        **kwargs,
+    ) -> None:
+        """
+        Constructor.
+        """
+        super().__init__(function, **kwargs)
+
+        self.replicas = replicas
+        self.service_type = service_type
+
 
 class TaskParamsServe(TaskParamsK8s):
     """
     TaskParamsServe model.
     """
+
+    replicas: int = None
+    service_type: Literal["ClusterIP", "NodePort", "LoadBalancer"] = "NodePort"

{digitalhub_runtime_python-0.5.0b11 → digitalhub_runtime_python-0.6.0b0}/digitalhub_runtime_python/runtimes/runtime.py

@@ -70,6 +70,9 @@ class RuntimePython(Runtime):
         LOGGER.info("Validating task.")
         self._validate_task(run)
 
+        LOGGER.info("Validating run.")
+        self._validate_run(run)
+
         LOGGER.info("Starting task.")
         spec = run.get("spec")
         project = run.get("project")
@@ -111,6 +114,27 @@ class RuntimePython(Runtime):
         """
         raise NotImplementedError
 
+    @staticmethod
+    def _validate_run(run: dict) -> None:
+        """
+        Check if run is locally allowed.
+
+        Parameters
+        ----------
+        run : dict
+            Run object dictionary.
+
+        Returns
+        -------
+        None
+        """
+        task_kind = run["spec"]["task"].split(":")[0]
+        local_execution = run["spec"]["local_execution"]
+        if task_kind != "python+job" and local_execution:
+            msg = f"Local execution not allowed for task kind {task_kind}."
+            LOGGER.exception(msg)
+            raise RuntimeError(msg)
+
     ####################
     # Configuration
     ####################

{digitalhub_runtime_python-0.5.0b11 → digitalhub_runtime_python-0.6.0b0}/digitalhub_runtime_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: digitalhub-runtime-python
-Version: 0.5.0b11
+Version: 0.6.0b0
 Summary: Python runtime for DHCore
 Author-email: Fondazione Bruno Kessler <dslab@fbk.eu>, Matteo Martini <mmartini@fbk.eu>
 License:                               Apache License
@@ -228,6 +228,6 @@ Classifier: Programming Language :: Python :: 3.10
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: digitalhub[ml]<0.6,~=0.5.0b
+Requires-Dist: digitalhub[ml]<0.7,~=0.6.0b
 
 # SDK for DHCore

digitalhub_runtime_python-0.6.0b0/digitalhub_runtime_python.egg-info/requires.txt

@@ -0,0 +1 @@
+digitalhub[ml]<0.7,~=0.6.0b

{digitalhub_runtime_python-0.5.0b11 → digitalhub_runtime_python-0.6.0b0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "digitalhub-runtime-python"
-version = "0.5.0b11"
+version = "0.6.0b0"
 description = "Python runtime for DHCore"
 readme = "README.md"
 authors = [
@@ -20,7 +20,7 @@ classifiers = [
 keywords = ["data", "dataops", "kubernetes"]
 requires-python = ">=3.9"
 dependencies = [
-"digitalhub[ml]~=0.5.0b, <0.6",
+"digitalhub[ml]~=0.6.0b, <0.7",
 ]
 
 [project.urls]
@@ -39,7 +39,7 @@ line-length = 120
 convention = "numpy"
 
 [tool.bumpver]
-current_version = "0.5.0b11"
+current_version = "0.6.0b0"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = false

digitalhub_runtime_python-0.5.0b11/digitalhub_runtime_python/entities/runs/spec.py

@@ -1,53 +0,0 @@
-from __future__ import annotations
-
-from digitalhub_ml.entities.runs.spec import RunParamsMl, RunSpecMl
-
-
-class RunSpecPython(RunSpecMl):
-    """Run Python specification."""
-
-    def __init__(
-        self,
-        task: str,
-        inputs: dict | None = None,
-        outputs: dict | None = None,
-        parameters: dict | None = None,
-        values: list | None = None,
-        local_execution: bool = False,
-        **kwargs,
-    ) -> None:
-        """
-        Constructor.
-        """
-        super().__init__(task, inputs, outputs, parameters, values, local_execution)
-
-        # Set function and task parameters
-        self._any_setter(**kwargs)
-
-
-class RunParamsPython(RunParamsMl):
-    """Run Python parameters."""
-
-    # Function parameters
-    source: dict = None
-    image: str = None
-    base_image: str = None
-    requirements: list = None
-
-    # Task parameters
-    function: str = None
-    node_selector: list[dict] = None
-    volumes: list[dict] = None
-    resources: list[dict] = None
-    affinity: dict = None
-    tolerations: list[dict] = None
-    env: list[dict] = None
-    secrets: list[str] = None
-    backoff_limit: int = None
-    schedule: str = None
-    replicas: int = None
-
-    # Task build
-    context_refs: list[dict] = None
-    context_sources: list[dict] = None
-    instructions: list[str] = None

digitalhub_runtime_python-0.5.0b11/digitalhub_runtime_python.egg-info/requires.txt

@@ -1 +0,0 @@
-digitalhub[ml]<0.6,~=0.5.0b