digitalhub-runtime-python 0.6.0b1__tar.gz → 0.6.0b3__tar.gz

{digitalhub_runtime_python-0.6.0b1 → digitalhub_runtime_python-0.6.0b3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: digitalhub-runtime-python
-Version: 0.6.0b1
+Version: 0.6.0b3
 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.6.0b1 → digitalhub_runtime_python-0.6.0b3}/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.0b1 → digitalhub_runtime_python-0.6.0b3}/digitalhub_runtime_python/entities/functions/spec.py

@@ -4,6 +4,7 @@ Function Conatiner specification module.
 from __future__ import annotations
 
 from pathlib import Path
+from typing import Literal
 
 from digitalhub_core.entities.functions.spec import FunctionParams, FunctionSpec, SourceCodeStruct
 from digitalhub_core.utils.exceptions import EntityError
@@ -131,14 +132,14 @@ class FunctionParamsPython(FunctionParams):
     source: dict
     "Source code"
 
+    python_version: Literal["PYTHON3_9", "PYTHON3_10"]
+    "Python version"
+
     image: str = None
     "Image"
 
     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.0b3/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.6.0b1 → digitalhub_runtime_python-0.6.0b3}/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.6.0b3/digitalhub_runtime_python/utils/env.py

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

{digitalhub_runtime_python-0.6.0b1 → digitalhub_runtime_python-0.6.0b3}/digitalhub_runtime_python/utils/inputs.py

@@ -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.0b1 → digitalhub_runtime_python-0.6.0b3}/digitalhub_runtime_python/utils/outputs.py

@@ -6,10 +6,14 @@ from typing import Any
 from digitalhub_core.entities._base.status import State
 from digitalhub_core.entities.artifacts.crud import new_artifact
 from digitalhub_core.entities.artifacts.entity import Artifact
+from digitalhub_core.utils.generic_utils import build_uuid
 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.6.0b1 → digitalhub_runtime_python-0.6.0b3}/digitalhub_runtime_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: digitalhub-runtime-python
-Version: 0.6.0b1
+Version: 0.6.0b3
 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.6.0b1 → digitalhub_runtime_python-0.6.0b3}/digitalhub_runtime_python.egg-info/SOURCES.txt

@@ -22,6 +22,7 @@ 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/outputs.py
 digitalhub_runtime_python/utils/utils.py

{digitalhub_runtime_python-0.6.0b1 → digitalhub_runtime_python-0.6.0b3}/pyproject.toml

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

digitalhub_runtime_python-0.6.0b1/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