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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: digitalhub-runtime-python
-Version: 0.5.0b11
+Version: 0.6.0
 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.6.0b
 
 # SDK for DHCore

{digitalhub_runtime_python-0.5.0b11 → digitalhub_runtime_python-0.6.0}/digitalhub_runtime_python/__init__.py

@@ -27,7 +27,7 @@ registry.register(func_kind, func_info)
 
 # Tasks
 entity_type = EntityTypes.TASKS.value
-for i in ["job", "build"]:
+for i in ["job", "build", "serve"]:
     task_kind = f"{func_kind}+{i}"
     prefix = entity_type.removesuffix("s").capitalize()
     suffix = i.capitalize()

digitalhub_runtime_python-0.6.0/digitalhub_runtime_python/entities/functions/models.py

@@ -0,0 +1,101 @@
+from __future__ import annotations
+
+from pathlib import Path
+
+from digitalhub_core.entities.functions.models import SourceCodeParams, SourceCodeStruct
+from digitalhub_core.utils.exceptions import EntityError
+from digitalhub_core.utils.generic_utils import encode_source, encode_string
+from digitalhub_core.utils.uri_utils import map_uri_scheme
+
+
+class SourceCodeStructPython(SourceCodeStruct):
+    """
+    Source code struct for python.
+    """
+
+    def __init__(
+        self,
+        source: str | None = None,
+        handler: str | None = None,
+        code: str | None = None,
+        base64: str | None = None,
+        lang: str | None = None,
+        init_function: str | None = None,
+    ) -> None:
+        super().__init__(
+            source=source,
+            handler=handler,
+            code=code,
+            base64=base64,
+            lang=lang,
+        )
+        self.init_function = init_function
+
+    @staticmethod
+    def source_check(source: dict) -> dict:
+        """
+        Check source. Overrides SourceCodeStruct.source_check.
+
+        Parameters
+        ----------
+        source : dict
+            Source.
+
+        Returns
+        -------
+        dict
+            Checked source.
+        """
+        # Source check
+        source_path = source.get("source")
+        code = source.get("code")
+        base64 = source.get("base64")
+        handler = source.get("handler")
+        source["lang"] = "python"
+
+        if handler is None:
+            raise EntityError("Handler must be provided.")
+
+        if source_path is None and code is None and base64 is None:
+            raise EntityError("Source must be provided.")
+
+        if base64 is not None:
+            return source
+
+        if code is not None:
+            source["base64"] = encode_string(code)
+            return source
+
+        if source_path is not None:
+            if map_uri_scheme(source_path) == "local":
+                if not (Path(source_path).suffix == ".py" and Path(source_path).is_file()):
+                    raise EntityError("Source is not a valid python file.")
+                source["base64"] = encode_source(source_path)
+            else:
+                if handler is None:
+                    raise EntityError("Handler must be provided if source is not local.")
+
+        return source
+
+    def to_dict(self) -> dict:
+        """
+        Convert to dictionary.
+
+        Returns
+        -------
+        dict
+            Dictionary representation of the object.
+        """
+        dict_ = super().to_dict()
+        if self.init_function is not None:
+            dict_["init_function"] = self.init_function
+        return dict_
+
+
+class SourceCodeParamsPython(SourceCodeParams):
+    """
+    Source code params for python.
+    """
+
+    init_function: str = None
+    """Handler for init function."""

digitalhub_runtime_python-0.6.0/digitalhub_runtime_python/entities/functions/spec.py

@@ -0,0 +1,108 @@
+from __future__ import annotations
+
+from typing import Literal
+
+from digitalhub_core.entities.functions.spec import FunctionParams, FunctionSpec
+from digitalhub_runtime_python.entities.functions.models import SourceCodeParamsPython, SourceCodeStructPython
+
+
+class FunctionSpecPython(FunctionSpec):
+    """
+    Specification for a Function job.
+    """
+
+    def __init__(
+        self,
+        source: dict | None = None,
+        code_src: str | None = None,
+        handler: str | None = None,
+        code: str | None = None,
+        base64: str | None = None,
+        init_function: str | None = None,
+        lang: str | None = None,
+        image: str | None = None,
+        base_image: str | None = None,
+        python_version: str | None = None,
+        requirements: list | None = None,
+    ) -> None:
+        super().__init__()
+
+        self.image = image
+        self.base_image = base_image
+        self.python_version = python_version
+        self.requirements = requirements
+
+        # Give source precedence
+        if source is not None:
+            source_dict = source
+        else:
+            source_dict = {
+                "source": code_src,
+                "handler": handler,
+                "code": code,
+                "base64": base64,
+                "lang": lang,
+                "init_function": init_function,
+            }
+
+        source_checked = self.source_check(source_dict)
+        self.source = SourceCodeStructPython(**source_checked)
+
+    @staticmethod
+    def source_check(source: dict) -> dict:
+        """
+        Check source.
+
+        Parameters
+        ----------
+        source : dict
+            Source.
+
+        Returns
+        -------
+        dict
+            Checked source.
+        """
+        return SourceCodeStructPython.source_check(source)
+
+    def show_source_code(self) -> str:
+        """
+        Show source code.
+
+        Returns
+        -------
+        str
+            Source code.
+        """
+        return self.source.show_source_code()
+
+    def to_dict(self) -> dict:
+        """
+        Override to_dict to exclude code from source.
+
+        Returns
+        -------
+        dict
+            Dictionary representation of the object.
+        """
+        dict_ = super().to_dict()
+        dict_["source"] = self.source.to_dict()
+        return dict_
+
+
+class FunctionParamsPython(FunctionParams, SourceCodeParamsPython):
+    """
+    Function python parameters model.
+    """
+
+    python_version: Literal["PYTHON3_9", "PYTHON3_10", "PYTHON3_11"]
+    "Python version"
+
+    image: str = None
+    "Image where the function will be executed"
+
+    base_image: str = None
+    "Base image used to build the image where the function will be executed"
+
+    requirements: list = None
+    "Requirements list to be installed in the image where the function will be executed"

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

@@ -0,0 +1,78 @@
+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:
+        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.6.0/digitalhub_runtime_python/entities/tasks/models.py

@@ -0,0 +1,12 @@
+from __future__ import annotations
+
+from pydantic import BaseModel
+
+
+class CorePort(BaseModel):
+    """
+    Port mapper model.
+    """
+
+    port: int
+    target_port: int

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

@@ -1,10 +1,8 @@
-"""
-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):
@@ -15,13 +13,9 @@ class TaskSpecJob(TaskSpecK8s):
         function: str,
         **kwargs,
     ) -> None:
-        """
-        Constructor.
-        """
         super().__init__(function, **kwargs)
 
         self.backoff_limit = kwargs.get("backoff_limit")
-        self.schedule = kwargs.get("schedule")
 
 
 class TaskParamsJob(TaskParamsK8s):
@@ -29,6 +23,9 @@ class TaskParamsJob(TaskParamsK8s):
     TaskParamsJob model.
     """
 
+    backoff_limit: int = None
+    """Backoff limit."""
+
 
 class TaskSpecBuild(TaskSpecK8s):
     """Task Build specification."""
@@ -36,18 +33,11 @@ class TaskSpecBuild(TaskSpecK8s):
     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
 
 
@@ -56,12 +46,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 +53,23 @@ 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:
+        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.0}/digitalhub_runtime_python/entities/tasks/status.py

@@ -13,3 +13,9 @@ class TaskStatusBuild(TaskStatus):
     """
     Task Build status.
     """
+
+
+class TaskStatusServe(TaskStatus):
+    """
+    Task Serve status.
+    """

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

@@ -1,6 +1,3 @@
-"""
-Runtime class for running Python functions.
-"""
 from __future__ import annotations
 
 import typing
@@ -23,9 +20,6 @@ class RuntimePython(Runtime):
     """
 
     def __init__(self, kind_registry: KindRegistry, project: str) -> None:
-        """
-        Constructor.
-        """
         super().__init__(kind_registry, project)
         ctx = get_context(self.project)
         self.root = ctx.runtime_dir
@@ -70,6 +64,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 +108,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.0}/digitalhub_runtime_python/utils/configuration.py

@@ -43,6 +43,35 @@ def get_function_from_source(path: Path, source_spec: dict) -> Callable:
         raise RuntimeError(msg) from e
 
 
+def get_init_function(path: Path, source_spec: dict) -> Callable:
+    """
+    Get function from source.
+
+    Parameters
+    ----------
+    path : Path
+        Path where to save the function source.
+    source_spec : dict
+        Funcrion source spec.
+
+    Returns
+    -------
+    Callable
+        Function.
+    """
+    try:
+        if "init_function" not in source_spec:
+            return
+        function_code = save_function_source(path, source_spec)
+        handler_path, _ = parse_handler(source_spec["handler"])
+        function_path = (function_code / handler_path).with_suffix(".py")
+        return import_function(function_path, source_spec["init_function"])
+    except Exception as e:
+        msg = f"Some error occurred while getting init function. Exception: {e.__class__}. Error: {e.args}"
+        LOGGER.exception(msg)
+        raise RuntimeError(msg) from e
+
+
 def parse_handler(handler: str) -> tuple:
     """
     Parse handler.

digitalhub_runtime_python-0.6.0/digitalhub_runtime_python/utils/env.py

@@ -0,0 +1,3 @@
+import os
+
+S3_BUCKET = os.getenv("S3_BUCKET_NAME")

{digitalhub_runtime_python-0.5.0b11 → digitalhub_runtime_python-0.6.0}/digitalhub_runtime_python/utils/inputs.py

@@ -6,7 +6,7 @@ from typing import Any, Callable
 
 from digitalhub_core.context.builder import get_context
 from digitalhub_core.entities.artifacts.crud import artifact_from_dict
-from digitalhub_core.utils.generic_utils import parse_entity_key
+from digitalhub_core.entities.utils import parse_entity_key
 from digitalhub_core.utils.logger import LOGGER
 from digitalhub_data.entities.dataitems.crud import dataitem_from_dict
 from digitalhub_ml.entities.entity_types import EntityTypes
@@ -115,31 +115,28 @@ def compose_inputs(
         fnc_args = {**parameters, **entity_inputs}
 
         fnc_parameters = inspect.signature(func).parameters
-        LOGGER.info(f"Function parameters: {'project' in fnc_parameters}")
 
         _has_project = "project" in fnc_parameters
         _has_context = "context" in fnc_parameters
         _has_event = "event" in fnc_parameters
 
+        # Project is reserved keyword argument
+        # both in local and remote executions
         if _has_project:
-            if _has_context:
+            if _has_context and not local_execution:
                 fnc_args["project"] = context.project
             elif isinstance(project, str):
                 fnc_args["project"] = get_project_(project)
             else:
                 fnc_args["project"] = project
 
-        if _has_context:
-            if context is not None and not local_execution:
+        # Context and event are reserved keyword arguments
+        # only in remote executions
+        if not local_execution:
+            if _has_context:
                 fnc_args["context"] = context
-            else:
-                raise RuntimeError("Context is not available on local execution.")
-
-        if _has_event:
-            if event is not None and not local_execution:
+            if _has_event:
                 fnc_args["event"] = event
-            else:
-                raise RuntimeError("Event is not available on local execution.")
 
         return fnc_args
 

digitalhub_runtime_python-0.6.0/digitalhub_runtime_python/utils/nuclio_configuration.py

@@ -0,0 +1,98 @@
+from __future__ import annotations
+
+from pathlib import Path
+from typing import Callable, Union
+
+from digitalhub_core.utils.uri_utils import map_uri_scheme
+from digitalhub_runtime_python.utils.configuration import import_function
+
+
+def parse_handler(handler: str) -> tuple[Path, str]:
+    """
+    Parse handler.
+
+    Parameters
+    ----------
+    handler : str
+        Function handler
+
+    Returns
+    -------
+    tuple[Path, str]
+        Function handler.
+    """
+    parsed = handler.split(":")
+    if len(parsed) == 1:
+        return None, parsed[0]
+    return Path(*parsed[0].split(".")), parsed[1]
+
+
+def get_function_source(source_spec: dict) -> Path:
+    """
+    Get function source.
+
+    Parameters
+    ----------
+    source : dict
+        Function source.
+
+    Returns
+    -------
+    Path
+        Path to function source.
+    """
+    path = Path("/shared")
+
+    # Get relevant information
+    base64 = source_spec.get("base64")
+    source = source_spec.get("source", "main.py")
+    handler = source_spec.get("handler")
+
+    handler_path, _ = parse_handler(handler)
+
+    # Get scheme in source
+    scheme = map_uri_scheme(source)
+
+    # Check base64. If it is set, it means
+    # that the source comes from a local file
+    if base64 is not None:
+        if scheme == "local":
+            if handler_path is not None:
+                return path / handler_path / Path(source)
+            return path / Path(source)
+        raise RuntimeError("Source is not a local file.")
+
+    if handler_path is not None:
+        return path / handler_path.with_suffix(".py")
+    raise RuntimeError("Must provide handler path in handler in form <root>.<dir>.<module>:<function_name>.")
+
+
+def import_function_and_init(source: dict) -> tuple[Callable, Union[Callable, None]]:
+    """
+    Import function from source.
+
+    Parameters
+    ----------
+    source : dict
+        Function source.
+
+    Returns
+    -------
+    tuple
+        Function and init function.
+    """
+
+    # Get function source
+    function_path = get_function_source(source)
+    _, handler_name = parse_handler(source.get("handler"))
+
+    # Import function
+    fnc = import_function(function_path, handler_name)
+
+    # Get init function
+    init_handler = source.get("init_function")
+    init_fnc = None
+    if init_handler is not None:
+        init_fnc = import_function(function_path, init_handler)
+
+    return fnc, init_fnc

{digitalhub_runtime_python-0.5.0b11 → digitalhub_runtime_python-0.6.0}/digitalhub_runtime_python/utils/outputs.py

@@ -4,12 +4,16 @@ import pickle
 from typing import Any
 
 from digitalhub_core.entities._base.status import State
+from digitalhub_core.entities._builders.uuid import build_uuid
 from digitalhub_core.entities.artifacts.crud import new_artifact
 from digitalhub_core.entities.artifacts.entity import Artifact
 from digitalhub_core.utils.logger import LOGGER
-from digitalhub_data.entities.dataitems.crud import new_dataitem
+from digitalhub_data.entities.dataitems.crud import create_dataitem
 from digitalhub_data.entities.dataitems.entity.table import DataitemTable
+from digitalhub_data.readers.builder import get_reader_by_object
 from digitalhub_data.readers.registry import DATAFRAME_TYPES
+from digitalhub_ml.entities.entity_types import EntityTypes
+from digitalhub_runtime_python.utils.env import S3_BUCKET
 
 
 def collect_outputs(results: Any, outputs: list[str], project_name: str) -> dict:
@@ -117,8 +121,22 @@ def build_and_load_dataitem(name: str, project_name: str, data: Any) -> Dataitem
         Dataitem key.
     """
     try:
-        path = f"s3://datalake/{project_name}/dataitems/table/{name}.parquet"
-        di: DataitemTable = new_dataitem(project=project_name, name=name, kind="table", path=path)
+        kwargs = {}
+        kwargs["project"] = project_name
+        kwargs["name"] = name
+        kwargs["kind"] = "table"
+        new_id = build_uuid()
+        kwargs["uuid"] = new_id
+        kwargs["path"] = f"s3://{S3_BUCKET}/{project_name}/{EntityTypes.DATAITEMS.value}/{new_id}/data.parquet"
+
+        di: DataitemTable = create_dataitem(**kwargs)
+
+        reader = get_reader_by_object(data)
+        di.spec.schema = reader.get_schema(data)
+        di.status.preview = reader.get_preview(data)
+
+        di.save()
+
         di.write_df(df=data)
         return di
     except Exception as e:
@@ -146,14 +164,21 @@ def build_and_load_artifact(name: str, project_name: str, data: Any) -> Artifact
         Artifact key.
     """
     try:
-        path = f"s3://datalake/{project_name}/artifacts/artifact/{name}.pickle"
+        kwargs = {}
+        kwargs["project"] = project_name
+        kwargs["name"] = name
+        kwargs["kind"] = "artifact"
+        new_id = build_uuid()
+        kwargs["uuid"] = new_id
+        pickle_file = f"{name}.pickle"
+        kwargs["path"] = f"s3://{S3_BUCKET}/{project_name}/{EntityTypes.ARTIFACTS.value}/{new_id}/{pickle_file}"
 
         # Dump item to pickle
-        with open(f"{name}.pickle", "wb") as f:
+        with open(pickle_file, "wb") as f:
             f.write(pickle.dumps(data))
 
-        art = new_artifact(project=project_name, name=name, kind="artifact", path=path)
-        art.upload(source=f"{name}.pickle")
+        art = new_artifact(**kwargs)
+        art.upload(source=pickle_file)
         return art
 
     except Exception as e:

{digitalhub_runtime_python-0.5.0b11 → digitalhub_runtime_python-0.6.0}/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.0
 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.6.0b
 
 # SDK for DHCore

{digitalhub_runtime_python-0.5.0b11 → digitalhub_runtime_python-0.6.0}/digitalhub_runtime_python.egg-info/SOURCES.txt

@@ -9,6 +9,7 @@ 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/models.py
 digitalhub_runtime_python/entities/functions/spec.py
 digitalhub_runtime_python/entities/functions/status.py
 digitalhub_runtime_python/entities/runs/__init__.py
@@ -22,6 +23,8 @@ 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.6.0/digitalhub_runtime_python.egg-info/requires.txt

@@ -0,0 +1 @@
+digitalhub[ml]>=0.6.0b

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "digitalhub-runtime-python"
-version = "0.5.0b11"
+version = "0.6.0"
 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",
 ]
 
 [project.urls]
@@ -39,7 +39,7 @@ line-length = 120
 convention = "numpy"
 
 [tool.bumpver]
-current_version = "0.5.0b11"
+current_version = "0.6.0"
 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/functions/spec.py

@@ -1,139 +0,0 @@
-"""
-Function Conatiner specification module.
-"""
-from __future__ import annotations
-
-from pathlib import Path
-
-from digitalhub_core.entities.functions.spec import FunctionParams, FunctionSpec, SourceCodeStruct
-from digitalhub_core.utils.exceptions import EntityError
-from digitalhub_core.utils.generic_utils import decode_string, encode_source, encode_string
-from digitalhub_core.utils.uri_utils import map_uri_scheme
-
-
-class FunctionSpecPython(FunctionSpec):
-    """
-    Specification for a Function job.
-    """
-
-    def __init__(
-        self,
-        source: dict,
-        image: str | None = None,
-        base_image: str | None = None,
-        requirements: list | None = None,
-    ) -> None:
-        """
-        Constructor.
-        """
-        super().__init__()
-
-        self.image = image
-        self.base_image = base_image
-        self.requirements = requirements
-
-        source = self._source_check(source)
-        self.source = SourceCodeStruct(**source)
-
-    @staticmethod
-    def _source_check(source: dict) -> dict:
-        """
-        Check source.
-
-        Parameters
-        ----------
-        source : dict
-            Source.
-
-        Returns
-        -------
-        dict
-            Checked source.
-        """
-        if source is None:
-            raise EntityError("Source must be provided.")
-
-        # Source check
-        source_path = source.get("source")
-        code = source.get("code")
-        base64 = source.get("base64")
-        handler = source.get("handler")
-        source["lang"] = "python"
-
-        if handler is None:
-            raise EntityError("Handler must be provided.")
-
-        if source_path is None and code is None and base64 is None:
-            raise EntityError("Source must be provided.")
-
-        if base64 is not None:
-            return source
-
-        if code is not None:
-            source["base64"] = encode_string(code)
-            return source
-
-        if source_path is not None:
-            if map_uri_scheme(source_path) == "local":
-                if not (Path(source_path).suffix == ".py" and Path(source_path).is_file()):
-                    raise EntityError("Source is not a valid python file.")
-                source["base64"] = encode_source(source_path)
-            else:
-                if handler is None:
-                    raise EntityError("Handler must be provided if source is not local.")
-
-        return source
-
-    def show_source_code(self) -> str:
-        """
-        Show source code.
-
-        Returns
-        -------
-        str
-            Source code.
-        """
-        if self.source.code is not None:
-            return str(self.source.code)
-        if self.source.base64 is not None:
-            try:
-                return decode_string(self.source.base64)
-            except Exception:
-                raise EntityError("Something got wrong during source code decoding.")
-        if (self.source.source is not None) and (map_uri_scheme(self.source.source) == "local"):
-            try:
-                return Path(self.source.source).read_text()
-            except Exception:
-                raise EntityError("Cannot access source code.")
-        return ""
-
-    def to_dict(self) -> dict:
-        """
-        Override to_dict to exclude code from source.
-
-        Returns
-        -------
-        dict
-            Dictionary representation of the object.
-        """
-        dict_ = super().to_dict()
-        dict_["source"] = self.source.to_dict()
-        return dict_
-
-
-class FunctionParamsPython(FunctionParams):
-    """
-    Function python parameters model.
-    """
-
-    source: dict
-    "Source code"
-
-    image: str = None
-    "Image"
-
-    base_image: str = None
-    "Base image"
-
-    requirements: list = None
-    "Requirements list, as used by the runtime"

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/entities/tasks/models.py

@@ -1,31 +0,0 @@
-from __future__ import annotations
-
-from pydantic import BaseModel
-
-
-class CorePort(BaseModel):
-    """
-    Port mapper model.
-    """
-
-    port: int
-    target_port: int
-
-
-class ContextRef(BaseModel):
-    """
-    ContextRef model.
-    """
-
-    destination: str = None
-    protocol: str = None
-    source: str = None
-
-
-class ContextSource(BaseModel):
-    """
-    ContextSource model.
-    """
-
-    base64: str = None
-    name: 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