digitalhub-runtime-python 0.5.0b7__tar.gz → 0.5.0b9__tar.gz

{digitalhub_runtime_python-0.5.0b7 → digitalhub_runtime_python-0.5.0b9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: digitalhub-runtime-python
-Version: 0.5.0b7
+Version: 0.5.0b9
 Summary: Python runtime for DHCore
 Author-email: Fondazione Bruno Kessler <dslab@fbk.eu>, Matteo Martini <mmartini@fbk.eu>
 License:                               Apache License

digitalhub_runtime_python-0.5.0b9/digitalhub_runtime_python/entities/tasks/spec.py

@@ -0,0 +1,76 @@
+"""
+Task Python specification module.
+"""
+from __future__ import annotations
+
+from digitalhub_core.entities.tasks.spec import TaskParamsK8s, TaskSpecK8s
+from digitalhub_runtime_python.entities.tasks.models import ContextRef, ContextSource
+
+
+class TaskSpecJob(TaskSpecK8s):
+    """Task Job specification."""
+
+    def __init__(
+        self,
+        function: str,
+        **kwargs,
+    ) -> None:
+        """
+        Constructor.
+        """
+        super().__init__(function, **kwargs)
+
+        self.backoff_limit = kwargs.get("backoff_limit")
+        self.schedule = kwargs.get("schedule")
+
+
+class TaskParamsJob(TaskParamsK8s):
+    """
+    TaskParamsJob model.
+    """
+
+
+class TaskSpecBuild(TaskSpecK8s):
+    """Task Build specification."""
+
+    def __init__(
+        self,
+        function: str,
+        context_refs: list | None = None,
+        context_sources: list | None = None,
+        instructions: list | None = None,
+        **kwargs,
+    ) -> None:
+        """
+        Constructor.
+        """
+        super().__init__(function, **kwargs)
+
+        self.context_refs = context_refs
+        self.context_sources = context_sources
+        self.instructions = instructions
+
+
+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."""
+
+
+class TaskSpecServe(TaskSpecK8s):
+    """Task Serve specification."""
+
+
+class TaskParamsServe(TaskParamsK8s):
+    """
+    TaskParamsServe model.
+    """

{digitalhub_runtime_python-0.5.0b7 → digitalhub_runtime_python-0.5.0b9}/digitalhub_runtime_python/runtimes/runtime.py

@@ -7,18 +7,29 @@ from pathlib import Path
 from typing import Callable
 
 from digitalhub_core.runtimes.base import Runtime
+from digitalhub_core.runtimes.registry import KindRegistry
 from digitalhub_core.utils.logger import LOGGER
 from digitalhub_runtime_python.utils.configuration import get_function_from_source
 from digitalhub_runtime_python.utils.inputs import get_inputs_parameters
 from digitalhub_runtime_python.utils.outputs import build_status, parse_outputs
 
+data = {
+    "executable": {"kind": "python"},
+    "task": [
+        {"kind": "python+job", "action": "job"},
+        {"kind": "python+serve", "action": "serve"},
+        {"kind": "python+build", "action": "build"},
+    ],
+    "run": {"kind": "python+run"},
+}
+
 
 class RuntimePython(Runtime):
     """
     Runtime Python class.
     """
 
-    allowed_actions = ["job", "nuclio"]
+    kind_registry = KindRegistry(data)
 
     def __init__(self) -> None:
         """

{digitalhub_runtime_python-0.5.0b7 → digitalhub_runtime_python-0.5.0b9}/digitalhub_runtime_python/utils/configuration.py

@@ -92,7 +92,6 @@ def save_function_source(path: Path, source_spec: dict) -> Path:
 
     # Base64
     if base64 is not None:
-
         filename = "main.py"
         if scheme == "local":
             filename = Path(source).name

{digitalhub_runtime_python-0.5.0b7 → digitalhub_runtime_python-0.5.0b9}/digitalhub_runtime_python/utils/inputs.py

@@ -13,18 +13,17 @@ from digitalhub_ml.entities.models.crud import model_from_dict
 if typing.TYPE_CHECKING:
     from digitalhub_core.entities._base.entity import Entity
     from digitalhub_core.entities.artifacts.entity import Artifact
-    from digitalhub_data.entities.dataitems.entity._base import Dataitem
+    from digitalhub_data.entities.dataitems.entity.table import DataitemTable
     from digitalhub_ml.entities.models.entity import Model
-    from pandas import DataFrame
 
 
-def persist_dataitem(dataitem: Dataitem, tmp_dir: Path) -> str:
+def persist_dataitem(dataitem: DataitemTable, tmp_dir: Path) -> str:
     """
     Persist dataitem locally.
 
     Parameters
     ----------
-    dataitem : Dataitem
+    dataitem : DataitemTable
         The dataitem to persist.
     tmp_dir : Path
         Temporary download directory.
@@ -42,10 +41,9 @@ def persist_dataitem(dataitem: Dataitem, tmp_dir: Path) -> str:
     name = dataitem.name
     try:
         LOGGER.info(f"Persisting dataitem '{name}' locally.")
-        tmp_path = tmp_dir / f"{name}.csv"
-        dataframe: DataFrame = dataitem.as_df()
-        dataframe.to_csv(tmp_path, sep=",", index=False)
-        return str(tmp_path)
+        tmp_path = str(tmp_dir / f"{name}.csv")
+        dataitem.write_df(target_path=tmp_path, extension="csv", sep=",")
+        return tmp_path
     except Exception as e:
         msg = f"Error during dataitem '{name}' collection. Exception: {e.__class__}. Error: {e.args}"
         LOGGER.exception(msg)
@@ -77,9 +75,8 @@ def persist_artifact(artifact: Artifact, tmp_dir: Path) -> str:
     try:
         LOGGER.info(f"Persisting artifact '{name}' locally.")
         filename = Path(artifact.spec.path).name
-        dst = tmp_dir / filename
-        tmp_path = artifact.download(dst=dst)
-        return str(tmp_path)
+        dst = str(tmp_dir / filename)
+        return artifact.download(dst=dst)
     except Exception as e:
         msg = f"Error during artifact '{name}' collection. Exception: {e.__class__}. Error: {e.args}"
         LOGGER.exception(msg)
@@ -111,9 +108,8 @@ def persist_model(model: Model, tmp_dir: Path) -> str:
     try:
         LOGGER.info(f"Persisting model '{name}' locally.")
         filename = Path(model.spec.path).name
-        dst = tmp_dir / filename
-        tmp_path = model.download(dst=dst)
-        return str(tmp_path)
+        dst = str(tmp_dir / filename)
+        return model.download(dst=dst)
     except Exception as e:
         msg = f"Error during model '{name}' collection. Exception: {e.__class__}. Error: {e.args}"
         LOGGER.exception(msg)

{digitalhub_runtime_python-0.5.0b7 → digitalhub_runtime_python-0.5.0b9}/digitalhub_runtime_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: digitalhub-runtime-python
-Version: 0.5.0b7
+Version: 0.5.0b9
 Summary: Python runtime for DHCore
 Author-email: Fondazione Bruno Kessler <dslab@fbk.eu>, Matteo Martini <mmartini@fbk.eu>
 License:                               Apache License

{digitalhub_runtime_python-0.5.0b7 → digitalhub_runtime_python-0.5.0b9}/digitalhub_runtime_python.egg-info/SOURCES.txt

@@ -9,15 +9,12 @@ digitalhub_runtime_python.egg-info/requires.txt
 digitalhub_runtime_python.egg-info/top_level.txt
 digitalhub_runtime_python/entities/__init__.py
 digitalhub_runtime_python/entities/functions/__init__.py
-digitalhub_runtime_python/entities/functions/metadata.py
 digitalhub_runtime_python/entities/functions/spec.py
 digitalhub_runtime_python/entities/functions/status.py
 digitalhub_runtime_python/entities/runs/__init__.py
-digitalhub_runtime_python/entities/runs/metadata.py
 digitalhub_runtime_python/entities/runs/spec.py
 digitalhub_runtime_python/entities/runs/status.py
 digitalhub_runtime_python/entities/tasks/__init__.py
-digitalhub_runtime_python/entities/tasks/metadata.py
 digitalhub_runtime_python/entities/tasks/models.py
 digitalhub_runtime_python/entities/tasks/spec.py
 digitalhub_runtime_python/entities/tasks/status.py

{digitalhub_runtime_python-0.5.0b7 → digitalhub_runtime_python-0.5.0b9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "digitalhub-runtime-python"
-version = "0.5.0b7"
+version = "0.5.0b9"
 description = "Python runtime for DHCore"
 readme = "README.md"
 authors = [
@@ -39,7 +39,7 @@ line-length = 120
 convention = "numpy"
 
 [tool.bumpver]
-current_version = "0.5.0b7"
+current_version = "0.5.0b9"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = false

digitalhub_runtime_python-0.5.0b7/digitalhub_runtime_python/entities/functions/metadata.py

@@ -1,9 +0,0 @@
-from __future__ import annotations
-
-from digitalhub_core.entities.functions.metadata import FunctionMetadata
-
-
-class FunctionMetadataPython(FunctionMetadata):
-    """
-    Function Python metadata.
-    """

digitalhub_runtime_python-0.5.0b7/digitalhub_runtime_python/entities/runs/metadata.py

@@ -1,9 +0,0 @@
-from __future__ import annotations
-
-from digitalhub_core.entities.runs.metadata import RunMetadata
-
-
-class RunMetadataPython(RunMetadata):
-    """
-    Run Python metadata.
-    """

digitalhub_runtime_python-0.5.0b7/digitalhub_runtime_python/entities/tasks/metadata.py

@@ -1,15 +0,0 @@
-from __future__ import annotations
-
-from digitalhub_core.entities.tasks.metadata import TaskMetadata
-
-
-class TaskMetadataJob(TaskMetadata):
-    """
-    Task Job metadata.
-    """
-
-
-class TaskMetadataBuild(TaskMetadata):
-    """
-    Task Build metadata.
-    """

digitalhub_runtime_python-0.5.0b7/digitalhub_runtime_python/entities/tasks/spec.py

@@ -1,103 +0,0 @@
-"""
-Task Python specification module.
-"""
-from __future__ import annotations
-
-from digitalhub_core.entities.tasks.models import K8s
-from digitalhub_core.entities.tasks.spec import TaskParams, TaskSpec
-from digitalhub_runtime_python.entities.tasks.models import ContextRef, ContextSource
-
-
-class TaskSpecPythonBase(TaskSpec):
-    """Task Python specification for Kubernetes."""
-
-    def __init__(
-        self,
-        function: str,
-        k8s: dict | None = None,
-    ) -> None:
-        """
-        Constructor.
-        """
-        super().__init__(function)
-        if k8s is None:
-            k8s = {}
-        k8s = K8s(**k8s).dict(by_alias=True)
-        self.node_selector = k8s.get("node_selector")
-        self.volumes = k8s.get("volumes")
-        self.resources = k8s.get("resources")
-        self.affinity = k8s.get("affinity")
-        self.tolerations = k8s.get("tolerations")
-        self.envs = k8s.get("envs")
-        self.secrets = k8s.get("secrets")
-        self.backoff_limit = k8s.get("backoff_limit")
-        self.schedule = k8s.get("schedule")
-        self.replicas = k8s.get("replicas")
-
-
-class TaskSpecJob(TaskSpecPythonBase):
-    """Task Job specification."""
-
-    def __init__(
-        self,
-        function: str,
-        k8s: dict | None = None,
-    ) -> None:
-        """
-        Constructor.
-        """
-        super().__init__(function, k8s)
-
-        k8s = k8s if k8s is not None else {}
-
-        self.backoff_limit = k8s.get("backoff_limit")
-        self.schedule = k8s.get("schedule")
-
-
-class TaskParamsJob(TaskParams):
-    """
-    TaskParamsJob model.
-    """
-
-    k8s: K8s = None
-    """Kubernetes resources."""
-
-
-class TaskSpecBuild(TaskSpecPythonBase):
-    """Task Build specification."""
-
-    def __init__(
-        self,
-        function: str,
-        k8s: dict | None = None,
-        context_refs: list | None = None,
-        context_sources: list | None = None,
-        instructions: list | None = None,
-    ) -> None:
-        """
-        Constructor.
-        """
-        super().__init__(function, k8s)
-
-        k8s = k8s if k8s is not None else {}
-        self.context_refs = context_refs
-        self.context_sources = context_sources
-        self.instructions = instructions
-
-
-class TaskParamsBuild(TaskParams):
-    """
-    TaskParamsBuild model.
-    """
-
-    k8s: K8s = None
-    """Kubernetes resources."""
-
-    context_refs: list[ContextRef] = None
-    """Context references."""
-
-    context_sources: list[ContextSource] = None
-    """Context sources."""
-
-    instructions: list[str] = None
-    """Build instructions."""