digitalhub-runtime-python 0.6.1__tar.gz → 0.7.0__tar.gz

{digitalhub_runtime_python-0.6.1 → digitalhub_runtime_python-0.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: digitalhub-runtime-python
-Version: 0.6.1
+Version: 0.7.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.0b
+Requires-Dist: digitalhub[ml]<0.8,>=0.7.0b
 
 # SDK for DHCore

{digitalhub_runtime_python-0.6.1 → digitalhub_runtime_python-0.7.0}/digitalhub_runtime_python/__init__.py

@@ -17,28 +17,28 @@ root_ent = f"{root}.entities"
 
 
 # Function
-entity_type = EntityTypes.FUNCTIONS.value
+entity_type = EntityTypes.FUNCTION.value
 func_kind = "python"
-prefix = entity_type.removesuffix("s").capitalize()
+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.TASKS.value
+entity_type = EntityTypes.TASK.value
 for i in ["job", "build", "serve"]:
     task_kind = f"{func_kind}+{i}"
-    prefix = entity_type.removesuffix("s").capitalize()
+    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.RUNS.value
+entity_type = EntityTypes.RUN.value
 run_kind = f"{func_kind}+run"
-prefix = entity_type.removesuffix("s").capitalize()
+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.6.1/digitalhub_runtime_python/entities/functions → digitalhub_runtime_python-0.7.0/digitalhub_runtime_python/entities/function}/models.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from pathlib import Path
 
-from digitalhub_core.entities.functions.models import SourceCodeParams, SourceCodeStruct
+from digitalhub_core.entities.function.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

{digitalhub_runtime_python-0.6.1/digitalhub_runtime_python/entities/functions → digitalhub_runtime_python-0.7.0/digitalhub_runtime_python/entities/function}/spec.py

@@ -2,8 +2,8 @@ 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
+from digitalhub_core.entities.function.spec import FunctionParams, FunctionSpec
+from digitalhub_runtime_python.entities.function.models import SourceCodeParamsPython, SourceCodeStructPython
 
 
 class FunctionSpecPython(FunctionSpec):

{digitalhub_runtime_python-0.6.1/digitalhub_runtime_python/entities/functions → digitalhub_runtime_python-0.7.0/digitalhub_runtime_python/entities/function}/status.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from digitalhub_core.entities.functions.status import FunctionStatus
+from digitalhub_core.entities.function.status import FunctionStatus
 
 
 class FunctionStatusPython(FunctionStatus):

{digitalhub_runtime_python-0.6.1/digitalhub_runtime_python/entities/runs → digitalhub_runtime_python-0.7.0/digitalhub_runtime_python/entities/run}/spec.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from digitalhub_ml.entities.runs.spec import RunParamsMl, RunSpecMl
+from digitalhub_ml.entities.run.spec import RunParamsMl, RunSpecMl
 
 
 class RunSpecPython(RunSpecMl):
@@ -28,6 +28,7 @@ class RunSpecPython(RunSpecMl):
         self.tolerations = kwargs.get("tolerations")
         self.env = kwargs.get("env")
         self.secrets = kwargs.get("secrets")
+        self.profile = kwargs.get("profile")
         self.backoff_limit = kwargs.get("backoff_limit")
         self.schedule = kwargs.get("schedule")
         self.replicas = kwargs.get("replicas")
@@ -56,11 +57,12 @@ class RunParamsPython(RunParamsMl):
     function: str = None
     node_selector: list[dict] = None
     volumes: list[dict] = None
-    resources: list[dict] = None
+    resources: dict = None
     affinity: dict = None
     tolerations: list[dict] = None
     env: list[dict] = None
     secrets: list[str] = None
+    profile: str = None
 
     # Task job
     backoff_limit: int = None

digitalhub_runtime_python-0.7.0/digitalhub_runtime_python/entities/run/status.py

@@ -0,0 +1,39 @@
+from __future__ import annotations
+
+import requests
+from digitalhub_core.utils.exceptions import EntityError
+from digitalhub_ml.entities.run.status import RunStatusMl
+
+
+class RunStatusPython(RunStatusMl):
+    """
+    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.6.1/digitalhub_runtime_python/entities/tasks → digitalhub_runtime_python-0.7.0/digitalhub_runtime_python/entities/task}/spec.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from typing import Literal
 
-from digitalhub_core.entities.tasks.spec import TaskParamsK8s, TaskSpecK8s
+from digitalhub_core.entities.task.spec import TaskParamsK8s, TaskSpecK8s
 
 
 class TaskSpecJob(TaskSpecK8s):

{digitalhub_runtime_python-0.6.1/digitalhub_runtime_python/entities/tasks → digitalhub_runtime_python-0.7.0/digitalhub_runtime_python/entities/task}/status.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from digitalhub_core.entities.tasks.status import TaskStatus
+from digitalhub_core.entities.task.status import TaskStatus
 
 
 class TaskStatusJob(TaskStatus):

{digitalhub_runtime_python-0.6.1 → digitalhub_runtime_python-0.7.0}/digitalhub_runtime_python/runtimes/runtime.py

@@ -22,11 +22,8 @@ class RuntimePython(Runtime):
     def __init__(self, kind_registry: KindRegistry, project: str) -> None:
         super().__init__(kind_registry, project)
         ctx = get_context(self.project)
-        self.root = ctx.runtime_dir
-        self.tmp_dir = ctx.tmp_dir
-
-        self.root.mkdir(parents=True, exist_ok=True)
-        self.tmp_dir.mkdir(parents=True, exist_ok=True)
+        self.runtime_dir = ctx.root / "runtime_python"
+        self.runtime_dir.mkdir(parents=True, exist_ok=True)
 
     def build(self, function: dict, task: dict, run: dict) -> dict:
         """
@@ -129,9 +126,9 @@ class RuntimePython(Runtime):
             LOGGER.exception(msg)
             raise RuntimeError(msg)
 
-    ####################
+    ##############################
     # Configuration
-    ####################
+    ##############################
 
     def _configure_execution(self, spec: dict) -> tuple[Callable, bool]:
         """
@@ -148,7 +145,7 @@ class RuntimePython(Runtime):
             Function to execute.
         """
         fnc = get_function_from_source(
-            self.root,
+            self.runtime_dir,
             spec.get("source", {}),
         )
         return fnc, hasattr(fnc, "__wrapped__")

{digitalhub_runtime_python-0.6.1 → digitalhub_runtime_python-0.7.0}/digitalhub_runtime_python/utils/inputs.py

@@ -5,17 +5,17 @@ import typing
 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.entities.artifact.crud import artifact_from_dict
 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_data.entities.dataitem.crud import dataitem_from_dict
 from digitalhub_ml.entities.entity_types import EntityTypes
-from digitalhub_ml.entities.models.crud import model_from_dict
-from digitalhub_ml.entities.projects.crud import get_project
+from digitalhub_ml.entities.model.crud import model_from_dict
+from digitalhub_ml.entities.project.crud import get_project
 
 if typing.TYPE_CHECKING:
-    from digitalhub_core.entities._base.entity import Entity
-    from digitalhub_core.entities.projects.entity import Project
+    from digitalhub_core.entities._base.entity.base import Entity
+    from digitalhub_core.entities.project.entity._base import Project
 
 
 def get_project_(project_name: str) -> Project:
@@ -63,11 +63,11 @@ def get_entity_inputs(inputs: dict) -> dict[str, Entity]:
         inputs_objects = {}
         for k, v in inputs.items():
             _, entity_type, _, _, _ = parse_entity_key(v.get("key"))
-            if entity_type == EntityTypes.DATAITEMS.value:
+            if entity_type == EntityTypes.DATAITEM.value:
                 inputs_objects[k] = dataitem_from_dict(v)
-            elif entity_type == EntityTypes.ARTIFACTS.value:
+            elif entity_type == EntityTypes.ARTIFACT.value:
                 inputs_objects[k] = artifact_from_dict(v)
-            elif entity_type == EntityTypes.MODELS.value:
+            elif entity_type == EntityTypes.MODEL.value:
                 inputs_objects[k] = model_from_dict(v)
         return inputs_objects
     except Exception as e:

{digitalhub_runtime_python-0.6.1 → digitalhub_runtime_python-0.7.0}/digitalhub_runtime_python/utils/outputs.py

@@ -3,17 +3,13 @@ from __future__ import annotations
 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.entities._base.state import State
+from digitalhub_core.entities.artifact.crud import log_artifact
+from digitalhub_core.entities.artifact.entity._base import Artifact
 from digitalhub_core.utils.logger import LOGGER
-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.entities.dataitem.crud import log_dataitem
+from digitalhub_data.entities.dataitem.entity.table import DataitemTable
 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:
@@ -45,10 +41,10 @@ def collect_outputs(results: Any, outputs: list[str], project_name: str) -> dict
             objects[name] = item
 
         elif f"{item.__class__.__module__}.{item.__class__.__name__}" in DATAFRAME_TYPES:
-            objects[name] = build_and_load_dataitem(name, project_name, item)
+            objects[name] = _log_dataitem(name, project_name, item)
 
         else:
-            objects[name] = build_and_load_artifact(name, project_name, item)
+            objects[name] = _log_artifact(name, project_name, item)
 
     return objects
 
@@ -102,9 +98,9 @@ def listify_results(results: Any) -> list:
     return results
 
 
-def build_and_load_dataitem(name: str, project_name: str, data: Any) -> DataitemTable:
+def _log_dataitem(name: str, project_name: str, data: Any) -> DataitemTable:
     """
-    Build and load dataitem.
+    Log dataitem.
 
     Parameters
     ----------
@@ -113,7 +109,7 @@ def build_and_load_dataitem(name: str, project_name: str, data: Any) -> Dataitem
     project_name : str
         Project name.
     data : Any
-        Data.
+        Dataframe.
 
     Returns
     -------
@@ -121,33 +117,21 @@ def build_and_load_dataitem(name: str, project_name: str, data: Any) -> Dataitem
         Dataitem key.
     """
     try:
-        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
+        return log_dataitem(
+            project=project_name,
+            name=name,
+            kind="table",
+            data=data,
+        )
     except Exception as e:
-        msg = f"Some error occurred while building and loading dataitem. Exception: {e.__class__}. Error: {e.args}"
+        msg = f"Some error occurred while logging dataitem. Exception: {e.__class__}. Error: {e.args}"
         LOGGER.exception(msg)
         raise RuntimeError(msg)
 
 
-def build_and_load_artifact(name: str, project_name: str, data: Any) -> Artifact:
+def _log_artifact(name: str, project_name: str, data: Any) -> Artifact:
     """
-    Build and load artifact.
+    Log artifact.
 
     Parameters
     ----------
@@ -164,25 +148,19 @@ def build_and_load_artifact(name: str, project_name: str, data: Any) -> Artifact
         Artifact key.
     """
     try:
-        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
+        pickle_file = f"{name}.pickle"
         with open(pickle_file, "wb") as f:
             f.write(pickle.dumps(data))
-
-        art = new_artifact(**kwargs)
-        art.upload(source=pickle_file)
-        return art
+        return log_artifact(
+            project=project_name,
+            name=name,
+            kind="artifact",
+            source=pickle_file,
+        )
 
     except Exception as e:
-        msg = f"Some error occurred while building and loading artifact. Exception: {e.__class__}. Error: {e.args}"
+        msg = f"Some error occurred while logging artifact. Exception: {e.__class__}. Error: {e.args}"
         LOGGER.exception(msg)
         raise RuntimeError(msg)
 
@@ -212,12 +190,11 @@ def build_status(
         mapped_outputs = {}
 
     try:
-        for key, _ in mapped_outputs.items():
-            if key in parsed_execution:
-                if isinstance(parsed_execution[key], (DataitemTable, Artifact)):
-                    outputs[key] = parsed_execution[key].key
-                else:
-                    results[key] = parsed_execution[key]
+        for key, value in parsed_execution.items():
+            if isinstance(value, (DataitemTable, Artifact)):
+                outputs[key] = value.key
+            else:
+                results[key] = value
         return {
             "state": State.COMPLETED.value,
             "outputs": outputs,

{digitalhub_runtime_python-0.6.1 → digitalhub_runtime_python-0.7.0}/digitalhub_runtime_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: digitalhub-runtime-python
-Version: 0.6.1
+Version: 0.7.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.0b
+Requires-Dist: digitalhub[ml]<0.8,>=0.7.0b
 
 # SDK for DHCore

{digitalhub_runtime_python-0.6.1 → digitalhub_runtime_python-0.7.0}/digitalhub_runtime_python.egg-info/SOURCES.txt

@@ -8,17 +8,17 @@ 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/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
-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/models.py
-digitalhub_runtime_python/entities/tasks/spec.py
-digitalhub_runtime_python/entities/tasks/status.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-0.7.0/digitalhub_runtime_python.egg-info/requires.txt

@@ -0,0 +1 @@
+digitalhub[ml]<0.8,>=0.7.0b

{digitalhub_runtime_python-0.6.1 → digitalhub_runtime_python-0.7.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "digitalhub-runtime-python"
-version = "0.6.1"
+version = "0.7.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.6.0b",
+"digitalhub[ml]>=0.7.0b, <0.8",
 ]
 
 [project.urls]
@@ -32,14 +32,14 @@ max-line-length = 120
 [tool.ruff]
 line-length = 120
 
-[tool.ruff.extend-per-file-ignores]
+[tool.ruff.lint.extend-per-file-ignores]
 "__init__.py" = ["F401"]
 
-[tool.ruff.pydocstyle]
+[tool.ruff.lint.pydocstyle]
 convention = "numpy"
 
 [tool.bumpver]
-current_version = "0.6.1"
+current_version = "0.7.0"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = false

digitalhub_runtime_python-0.6.1/digitalhub_runtime_python/entities/runs/status.py

@@ -1,9 +0,0 @@
-from __future__ import annotations
-
-from digitalhub_ml.entities.runs.status import RunStatusMl
-
-
-class RunStatusPython(RunStatusMl):
-    """
-    Run Python status.
-    """

digitalhub_runtime_python-0.6.1/digitalhub_runtime_python.egg-info/requires.txt

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