digitalhub-runtime-python 0.8.0__tar.gz → 0.8.0b1__tar.gz

{digitalhub_runtime_python-0.8.0 → digitalhub_runtime_python-0.8.0b1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: digitalhub-runtime-python
-Version: 0.8.0
+Version: 0.8.0b1
 Summary: Python runtime for DHCore
 Author-email: Fondazione Bruno Kessler <dslab@fbk.eu>, Matteo Martini <mmartini@fbk.eu>
 License:                               Apache License
@@ -229,6 +229,6 @@ Classifier: Programming Language :: Python :: 3.11
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: digitalhub[full]<0.9,>=0.8.0
+Requires-Dist: digitalhub[ml]<0.9,>=0.8.0b
 
 # SDK for DHCore

digitalhub_runtime_python-0.8.0b1/digitalhub_runtime_python/__init__.py

@@ -0,0 +1,45 @@
+from __future__ import annotations
+
+from digitalhub_runtime_python.utils.utils import handler
+
+from digitalhub.entities.entity_types import EntityTypes
+from digitalhub.registry.registry import registry
+from digitalhub.registry.utils import create_info
+
+root = "digitalhub_runtime_python"
+runtime_info = {
+    "module": f"{root}.runtimes.runtime",
+    "class_name": "RuntimePython",
+    "kind_registry_module": f"{root}.runtimes.kind_registry",
+    "kind_registry_class_name": "kind_registry",
+}
+
+root_ent = f"{root}.entities"
+
+
+# Function
+entity_type = EntityTypes.FUNCTION.value
+func_kind = "python"
+prefix = entity_type.capitalize()
+suffix = func_kind.capitalize()
+func_info = create_info(root_ent, entity_type, prefix, suffix, runtime_info)
+registry.register(func_kind, func_info)
+
+
+# Tasks
+entity_type = EntityTypes.TASK.value
+for i in ["job", "build", "serve"]:
+    task_kind = f"{func_kind}+{i}"
+    prefix = entity_type.capitalize()
+    suffix = i.capitalize()
+    task_info = create_info(root_ent, entity_type, prefix, suffix, runtime_info)
+    registry.register(task_kind, task_info)
+
+
+# Runs
+entity_type = EntityTypes.RUN.value
+run_kind = f"{func_kind}+run"
+prefix = entity_type.capitalize()
+suffix = func_kind.capitalize()
+run_info = create_info(root_ent, entity_type, prefix, suffix, runtime_info)
+registry.register(run_kind, run_info)

{digitalhub_runtime_python-0.8.0/digitalhub_runtime_python/entities/function/python → digitalhub_runtime_python-0.8.0b1/digitalhub_runtime_python/entities/function}/models.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from pathlib import Path
 
-from digitalhub.entities.function._base.models import SourceCodeStruct, SourceCodeValidator
+from digitalhub.entities.function.models import SourceCodeParams, SourceCodeStruct
 from digitalhub.utils.exceptions import EntityError
 from digitalhub.utils.generic_utils import encode_source, encode_string
 from digitalhub.utils.uri_utils import map_uri_scheme
@@ -92,9 +92,9 @@ class SourceCodeStructPython(SourceCodeStruct):
         return dict_
 
 
-class SourceCodeValidatorPython(SourceCodeValidator):
+class SourceCodeParamsPython(SourceCodeParams):
     """
-    SourceCodeValidatorPython validator.
+    Source code params for python.
     """
 
     init_function: str = None

{digitalhub_runtime_python-0.8.0/digitalhub_runtime_python/entities/function/python → digitalhub_runtime_python-0.8.0b1/digitalhub_runtime_python/entities/function}/spec.py

@@ -2,14 +2,14 @@ from __future__ import annotations
 
 from typing import Literal
 
-from digitalhub_runtime_python.entities.function.python.models import SourceCodeStructPython, SourceCodeValidatorPython
+from digitalhub_runtime_python.entities.function.models import SourceCodeParamsPython, SourceCodeStructPython
 
-from digitalhub.entities.function._base.spec import FunctionSpec, FunctionValidator
+from digitalhub.entities.function.spec import FunctionParams, FunctionSpec
 
 
 class FunctionSpecPython(FunctionSpec):
     """
-    FunctionSpecPython specifications.
+    Specification for a Function job.
     """
 
     def __init__(
@@ -91,9 +91,9 @@ class FunctionSpecPython(FunctionSpec):
         return dict_
 
 
-class FunctionValidatorPython(FunctionValidator, SourceCodeValidatorPython):
+class FunctionParamsPython(FunctionParams, SourceCodeParamsPython):
     """
-    FunctionValidatorPython validator.
+    Function python parameters model.
     """
 
     python_version: Literal["PYTHON3_9", "PYTHON3_10", "PYTHON3_11"]

digitalhub_runtime_python-0.8.0b1/digitalhub_runtime_python/entities/function/status.py

@@ -0,0 +1,9 @@
+from __future__ import annotations
+
+from digitalhub.entities.function.status import FunctionStatus
+
+
+class FunctionStatusPython(FunctionStatus):
+    """
+    Function Python status.
+    """

{digitalhub_runtime_python-0.8.0/digitalhub_runtime_python/entities/run/python_run → digitalhub_runtime_python-0.8.0b1/digitalhub_runtime_python/entities/run}/spec.py

@@ -1,10 +1,10 @@
 from __future__ import annotations
 
-from digitalhub.entities.run._base.spec import RunSpec, RunValidator
+from digitalhub.entities.run.spec import RunParams, RunSpec
 
 
-class RunSpecPythonRun(RunSpec):
-    """RunSpecPythonRun specifications."""
+class RunSpecPython(RunSpec):
+    """Run Python specification."""
 
     def __init__(
         self,
@@ -24,10 +24,6 @@ class RunSpecPythonRun(RunSpec):
         base_image: str | None = None,
         python_version: str | None = None,
         requirements: list | None = None,
-        backoff_limit: int | None = None,
-        schedule: str | None = None,
-        service_type: str | None = None,
-        replicas: int | None = None,
         instructions: dict | None = None,
         inputs: dict | None = None,
         outputs: dict | None = None,
@@ -53,18 +49,14 @@ class RunSpecPythonRun(RunSpec):
         self.base_image = base_image
         self.python_version = python_version
         self.requirements = requirements
-        self.backoff_limit = backoff_limit
-        self.schedule = schedule
-        self.service_type = service_type
-        self.replicas = replicas
         self.instructions = instructions
         self.inputs = inputs
         self.outputs = outputs
         self.parameters = parameters
 
 
-class RunValidatorPythonRun(RunValidator):
-    """RunValidatorPythonRun validator."""
+class RunParamsPython(RunParams):
+    """Run Python parameters."""
 
     # Function parameters
     source: dict = None
@@ -75,7 +67,6 @@ class RunValidatorPythonRun(RunValidator):
 
     # Task job
     backoff_limit: int = None
-    schedule: str = None
 
     # Task serve
     service_type: str = None

digitalhub_runtime_python-0.8.0b1/digitalhub_runtime_python/entities/run/status.py

@@ -0,0 +1,40 @@
+from __future__ import annotations
+
+import requests
+
+from digitalhub.entities.run.status import RunStatus
+from digitalhub.utils.exceptions import EntityError
+
+
+class RunStatusPython(RunStatus):
+    """
+    Run Python status.
+    """
+
+    def invoke(self, local: bool, **kwargs) -> requests.Response:
+        """
+        Invoke running process.
+
+        Parameters
+        ----------
+        kwargs
+            Keyword arguments to pass to the request.
+
+        Returns
+        -------
+        requests.Response
+            Response from service.
+        """
+        try:
+            if local:
+                raise EntityError("Invoke not supported locally.")
+
+            method = kwargs.pop("method", "POST")
+            url = kwargs.get("url", "http://" + self.service.get("url"))
+
+            response = requests.request(method=method, url=url, **kwargs)
+            response.raise_for_status()
+            return response
+        except Exception as e:
+            msg = f"Something got wrong during model serving. Exception: {e.__class__}. Error: {e.args}"
+            raise EntityError(msg)

digitalhub_runtime_python-0.8.0b1/digitalhub_runtime_python/entities/task/spec.py

@@ -0,0 +1,138 @@
+from __future__ import annotations
+
+from typing import Literal
+
+from digitalhub.entities.task.spec import TaskParamsK8s, TaskSpecK8s
+
+
+class TaskSpecJob(TaskSpecK8s):
+    """Task Job specification."""
+
+    def __init__(
+        self,
+        function: str,
+        node_selector: dict | None = None,
+        volumes: list | None = None,
+        resources: dict | None = None,
+        affinity: dict | None = None,
+        tolerations: list | None = None,
+        envs: list | None = None,
+        secrets: list | None = None,
+        profile: str | None = None,
+        backoff_limit: int | None = None,
+        schedule: str | None = None,
+        **kwargs,
+    ) -> None:
+        super().__init__(
+            function,
+            node_selector,
+            volumes,
+            resources,
+            affinity,
+            tolerations,
+            envs,
+            secrets,
+            profile,
+            **kwargs,
+        )
+
+        self.backoff_limit = backoff_limit
+        self.schedule = schedule
+
+
+class TaskParamsJob(TaskParamsK8s):
+    """
+    TaskParamsJob model.
+    """
+
+    backoff_limit: int = None
+    """Backoff limit."""
+
+    schedule: str = None
+    """Schedule."""
+
+
+class TaskSpecBuild(TaskSpecK8s):
+    """Task Build specification."""
+
+    def __init__(
+        self,
+        function: str,
+        node_selector: dict | None = None,
+        volumes: list | None = None,
+        resources: dict | None = None,
+        affinity: dict | None = None,
+        tolerations: list | None = None,
+        envs: list | None = None,
+        secrets: list | None = None,
+        profile: str | None = None,
+        instructions: list | None = None,
+        **kwargs,
+    ) -> None:
+        super().__init__(
+            function,
+            node_selector,
+            volumes,
+            resources,
+            affinity,
+            tolerations,
+            envs,
+            secrets,
+            profile,
+            **kwargs,
+        )
+
+        self.instructions = instructions
+
+
+class TaskParamsBuild(TaskParamsK8s):
+    """
+    TaskParamsBuild model.
+    """
+
+    instructions: list[str] = None
+    """Build instructions."""
+
+
+class TaskSpecServe(TaskSpecK8s):
+    """Task Serve specification."""
+
+    def __init__(
+        self,
+        function: str,
+        node_selector: dict | None = None,
+        volumes: list | None = None,
+        resources: dict | None = None,
+        affinity: dict | None = None,
+        tolerations: list | None = None,
+        envs: list | None = None,
+        secrets: list | None = None,
+        profile: str | None = None,
+        replicas: int | None = None,
+        service_type: str | None = None,
+        **kwargs,
+    ) -> None:
+        super().__init__(
+            function,
+            node_selector,
+            volumes,
+            resources,
+            affinity,
+            tolerations,
+            envs,
+            secrets,
+            profile,
+            **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.8.0b1/digitalhub_runtime_python/entities/task/status.py

@@ -0,0 +1,21 @@
+from __future__ import annotations
+
+from digitalhub.entities.task.status import TaskStatus
+
+
+class TaskStatusJob(TaskStatus):
+    """
+    Task Job status.
+    """
+
+
+class TaskStatusBuild(TaskStatus):
+    """
+    Task Build status.
+    """
+
+
+class TaskStatusServe(TaskStatus):
+    """
+    Task Serve status.
+    """

digitalhub_runtime_python-0.8.0b1/digitalhub_runtime_python/runtimes/kind_registry.py

@@ -0,0 +1,15 @@
+from __future__ import annotations
+
+from digitalhub.runtimes.kind_registry import KindRegistry
+
+kind_registry = KindRegistry(
+    {
+        "executable": {"kind": "python"},
+        "task": [
+            {"kind": "python+job", "action": "job"},
+            {"kind": "python+serve", "action": "serve"},
+            {"kind": "python+build", "action": "build"},
+        ],
+        "run": {"kind": "python+run"},
+    }
+)

{digitalhub_runtime_python-0.8.0 → digitalhub_runtime_python-0.8.0b1}/digitalhub_runtime_python/runtimes/runtime.py

@@ -1,23 +1,27 @@
 from __future__ import annotations
 
+import typing
 from typing import Callable
 
 from digitalhub_runtime_python.utils.configuration import get_function_from_source
 from digitalhub_runtime_python.utils.inputs import compose_inputs
 from digitalhub_runtime_python.utils.outputs import build_status, parse_outputs
 
-from digitalhub.context.api import get_context
-from digitalhub.runtimes._base import Runtime
+from digitalhub.context.builder import get_context
+from digitalhub.runtimes.base import Runtime
 from digitalhub.utils.logger import LOGGER
 
+if typing.TYPE_CHECKING:
+    from digitalhub.runtimes.kind_registry import KindRegistry
+
 
 class RuntimePython(Runtime):
     """
     Runtime Python class.
     """
 
-    def __init__(self, project: str) -> None:
-        super().__init__(project)
+    def __init__(self, kind_registry: KindRegistry, project: str) -> None:
+        super().__init__(kind_registry, project)
         ctx = get_context(self.project)
         self.runtime_dir = ctx.root / "runtime_python"
         self.runtime_dir.mkdir(parents=True, exist_ok=True)

{digitalhub_runtime_python-0.8.0 → digitalhub_runtime_python-0.8.0b1}/digitalhub_runtime_python/utils/configuration.py

@@ -4,10 +4,15 @@ import importlib.util as imputil
 from pathlib import Path
 from typing import Callable
 
-from digitalhub.utils.generic_utils import decode_string, extract_archive, requests_chunk_download
+from digitalhub.utils.generic_utils import (
+    decode_string,
+    extract_archive,
+    get_bucket_and_key,
+    get_s3_source,
+    requests_chunk_download,
+)
 from digitalhub.utils.git_utils import clone_repository
 from digitalhub.utils.logger import LOGGER
-from digitalhub.utils.s3_utils import get_bucket_and_key, get_s3_source
 from digitalhub.utils.uri_utils import map_uri_scheme
 
 

{digitalhub_runtime_python-0.8.0 → digitalhub_runtime_python-0.8.0b1}/digitalhub_runtime_python/utils/inputs.py

@@ -4,14 +4,18 @@ import inspect
 import typing
 from typing import Any, Callable
 
-from digitalhub.context.api import get_context
+from digitalhub.context.builder import get_context
+from digitalhub.entities.artifact.crud import artifact_from_dict
+from digitalhub.entities.dataitem.crud import dataitem_from_dict
+from digitalhub.entities.entity_types import EntityTypes
+from digitalhub.entities.model.crud import model_from_dict
 from digitalhub.entities.project.crud import get_project
-from digitalhub.factory.api import build_entity_from_dict
+from digitalhub.entities.utils import parse_entity_key
 from digitalhub.utils.logger import LOGGER
 
 if typing.TYPE_CHECKING:
-    from digitalhub.entities._base.entity.entity import Entity
-    from digitalhub.entities.project._base.entity import Project
+    from digitalhub.entities._base.entity.base import Entity
+    from digitalhub.entities.project.entity._base import Project
 
 
 def get_project_(project_name: str) -> Project:
@@ -53,12 +57,18 @@ def get_entity_inputs(inputs: dict) -> dict[str, Entity]:
     Returns
     -------
     dict
-        Dictionary of inputs.
+        Mlrun inputs.
     """
     try:
         inputs_objects = {}
         for k, v in inputs.items():
-            inputs_objects[k] = build_entity_from_dict(v)
+            _, entity_type, _, _, _ = parse_entity_key(v.get("key"))
+            if entity_type == EntityTypes.DATAITEM.value:
+                inputs_objects[k] = dataitem_from_dict(v)
+            elif entity_type == EntityTypes.ARTIFACT.value:
+                inputs_objects[k] = artifact_from_dict(v)
+            elif entity_type == EntityTypes.MODEL.value:
+                inputs_objects[k] = model_from_dict(v)
         return inputs_objects
     except Exception as e:
         msg = f"Error during inputs collection. Exception: {e.__class__}. Error: {e.args}"

{digitalhub_runtime_python-0.8.0 → digitalhub_runtime_python-0.8.0b1}/digitalhub_runtime_python/utils/outputs.py

@@ -1,21 +1,16 @@
 from __future__ import annotations
 
 import pickle
-import typing
 from typing import Any
 
-from digitalhub.entities.artifact._base.entity import Artifact
+from digitalhub.entities._base.state import State
 from digitalhub.entities.artifact.crud import log_artifact
-from digitalhub.entities.dataitem._base.entity import Dataitem
+from digitalhub.entities.artifact.entity._base import Artifact
 from digitalhub.entities.dataitem.crud import log_dataitem
-from digitalhub.entities.model._base.entity import Model
-from digitalhub.entities.utils.state import State
-from digitalhub.readers.api import get_supported_dataframes
+from digitalhub.entities.dataitem.entity.table import DataitemTable
+from digitalhub.readers.registry import DATAFRAME_TYPES
 from digitalhub.utils.logger import LOGGER
 
-if typing.TYPE_CHECKING:
-    from digitalhub.entities.dataitem.table.entity import DataitemTable
-
 
 def collect_outputs(results: Any, outputs: list[str], project_name: str) -> dict:
     """
@@ -45,12 +40,9 @@ def collect_outputs(results: Any, outputs: list[str], project_name: str) -> dict
         if isinstance(item, (str, int, float, bool, bytes)):
             objects[name] = item
 
-        elif f"{item.__class__.__module__}.{item.__class__.__name__}" in get_supported_dataframes():
+        elif f"{item.__class__.__module__}.{item.__class__.__name__}" in DATAFRAME_TYPES:
             objects[name] = _log_dataitem(name, project_name, item)
 
-        elif isinstance(item, (Dataitem, Artifact, Model)):
-            objects[name] = item
-
         else:
             objects[name] = _log_artifact(name, project_name, item)
 
@@ -199,7 +191,7 @@ def build_status(
 
     try:
         for key, value in parsed_execution.items():
-            if isinstance(value, (Dataitem, Artifact, Model)):
+            if isinstance(value, (DataitemTable, Artifact)):
                 outputs[key] = value.key
             else:
                 results[key] = value

{digitalhub_runtime_python-0.8.0 → digitalhub_runtime_python-0.8.0b1}/digitalhub_runtime_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: digitalhub-runtime-python
-Version: 0.8.0
+Version: 0.8.0b1
 Summary: Python runtime for DHCore
 Author-email: Fondazione Bruno Kessler <dslab@fbk.eu>, Matteo Martini <mmartini@fbk.eu>
 License:                               Apache License
@@ -229,6 +229,6 @@ Classifier: Programming Language :: Python :: 3.11
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: digitalhub[full]<0.9,>=0.8.0
+Requires-Dist: digitalhub[ml]<0.9,>=0.8.0b
 
 # SDK for DHCore

digitalhub_runtime_python-0.8.0b1/digitalhub_runtime_python.egg-info/SOURCES.txt

@@ -0,0 +1,30 @@
+LICENSE.txt
+README.md
+pyproject.toml
+digitalhub_runtime_python/__init__.py
+digitalhub_runtime_python.egg-info/PKG-INFO
+digitalhub_runtime_python.egg-info/SOURCES.txt
+digitalhub_runtime_python.egg-info/dependency_links.txt
+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/function/__init__.py
+digitalhub_runtime_python/entities/function/models.py
+digitalhub_runtime_python/entities/function/spec.py
+digitalhub_runtime_python/entities/function/status.py
+digitalhub_runtime_python/entities/run/__init__.py
+digitalhub_runtime_python/entities/run/spec.py
+digitalhub_runtime_python/entities/run/status.py
+digitalhub_runtime_python/entities/task/__init__.py
+digitalhub_runtime_python/entities/task/models.py
+digitalhub_runtime_python/entities/task/spec.py
+digitalhub_runtime_python/entities/task/status.py
+digitalhub_runtime_python/runtimes/__init__.py
+digitalhub_runtime_python/runtimes/kind_registry.py
+digitalhub_runtime_python/runtimes/runtime.py
+digitalhub_runtime_python/utils/configuration.py
+digitalhub_runtime_python/utils/env.py
+digitalhub_runtime_python/utils/inputs.py
+digitalhub_runtime_python/utils/nuclio_configuration.py
+digitalhub_runtime_python/utils/outputs.py
+digitalhub_runtime_python/utils/utils.py

digitalhub_runtime_python-0.8.0b1/digitalhub_runtime_python.egg-info/requires.txt

@@ -0,0 +1 @@
+digitalhub[ml]<0.9,>=0.8.0b

{digitalhub_runtime_python-0.8.0 → digitalhub_runtime_python-0.8.0b1}/pyproject.toml

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

digitalhub_runtime_python-0.8.0/digitalhub_runtime_python/__init__.py

@@ -1,23 +0,0 @@
-from __future__ import annotations
-
-from digitalhub_runtime_python.entities.function.python.builder import FunctionPythonBuilder
-from digitalhub_runtime_python.entities.run.python_run.builder import RunPythonRunBuilder
-from digitalhub_runtime_python.entities.task.python_build.builder import TaskPythonBuildBuilder
-from digitalhub_runtime_python.entities.task.python_job.builder import TaskPythonJobBuilder
-from digitalhub_runtime_python.entities.task.python_serve.builder import TaskPythonServeBuilder
-from digitalhub_runtime_python.utils.utils import handler
-
-entity_builders = (
-    (FunctionPythonBuilder.ENTITY_KIND, FunctionPythonBuilder),
-    (TaskPythonBuildBuilder.ENTITY_KIND, TaskPythonBuildBuilder),
-    (TaskPythonJobBuilder.ENTITY_KIND, TaskPythonJobBuilder),
-    (TaskPythonServeBuilder.ENTITY_KIND, TaskPythonServeBuilder),
-    (RunPythonRunBuilder.ENTITY_KIND, RunPythonRunBuilder),
-)
-
-try:
-    from digitalhub_runtime_python.runtimes.builder import RuntimePythonBuilder
-
-    runtime_builders = ((kind, RuntimePythonBuilder) for kind in FunctionPythonBuilder().get_all_kinds())
-except ImportError:
-    runtime_builders = tuple()

digitalhub_runtime_python-0.8.0/digitalhub_runtime_python/entities/_base/runtime_entity/builder.py

@@ -1,22 +0,0 @@
-from __future__ import annotations
-
-from digitalhub.entities._base.runtime_entity.builder import RuntimeEntityBuilder
-
-
-class RuntimeEntityBuilderPython(RuntimeEntityBuilder):
-    EXECUTABLE_KIND = "python"
-    TASKS_KINDS = [
-        {
-            "kind": "python+job",
-            "action": "job",
-        },
-        {
-            "kind": "python+build",
-            "action": "build",
-        },
-        {
-            "kind": "python+serve",
-            "action": "serve",
-        },
-    ]
-    RUN_KIND = "python+run"