digitalhub-runtime-python 0.9.0b1__tar.gz → 0.9.1__tar.gz

{digitalhub_runtime_python-0.9.0b1 → digitalhub_runtime_python-0.9.1}/LICENSE.txt

@@ -186,7 +186,7 @@ APPENDIX: How to apply the Apache License to your work.
    same "printed page" as the copyright notice for easier
    identification within third-party archives.
 
-Copyright [yyyy] [name of copyright owner]
+Copyright 2024 DSLab, Fondazione Bruno Kessler
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

{digitalhub_runtime_python-0.9.0b1 → digitalhub_runtime_python-0.9.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: digitalhub-runtime-python
-Version: 0.9.0b1
+Version: 0.9.1
 Summary: Python runtime for DHCore
 Author-email: Fondazione Bruno Kessler <dslab@fbk.eu>, Matteo Martini <mmartini@fbk.eu>
 License:                               Apache License
@@ -191,7 +191,7 @@ License:                               Apache License
            same "printed page" as the copyright notice for easier
            identification within third-party archives.
         
-        Copyright [yyyy] [name of copyright owner]
+        Copyright 2024 DSLab, Fondazione Bruno Kessler
         
         Licensed under the Apache License, Version 2.0 (the "License");
         you may not use this file except in compliance with the License.

{digitalhub_runtime_python-0.9.0b1 → digitalhub_runtime_python-0.9.1}/digitalhub_runtime_python/runtimes/runtime.py

@@ -7,7 +7,7 @@ from digitalhub.runtimes._base import Runtime
 from digitalhub.utils.logger import LOGGER
 
 from digitalhub_runtime_python.entities._commons.enums import EntityKinds
-from digitalhub_runtime_python.utils.configuration import get_function_from_source
+from digitalhub_runtime_python.utils.configuration import import_function_from_source
 from digitalhub_runtime_python.utils.inputs import compose_inputs
 from digitalhub_runtime_python.utils.outputs import build_status, parse_outputs
 
@@ -125,7 +125,7 @@ class RuntimePython(Runtime):
         Callable
             Function to execute.
         """
-        fnc = get_function_from_source(
+        fnc = import_function_from_source(
             self.runtime_dir,
             spec.get("source", {}),
         )

{digitalhub_runtime_python-0.9.0b1 → digitalhub_runtime_python-0.9.1}/digitalhub_runtime_python/utils/configuration.py

@@ -12,10 +12,17 @@ from digitalhub.utils.generic_utils import (
 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 has_git_scheme, has_local_scheme, has_remote_scheme, has_s3_scheme
+from digitalhub.utils.uri_utils import (
+    get_filename_from_uri,
+    has_git_scheme,
+    has_local_scheme,
+    has_remote_scheme,
+    has_s3_scheme,
+    has_zip_scheme,
+)
 
 
-def get_function_from_source(path: Path, source_spec: dict) -> Callable:
+def import_function_from_source(path: Path, source_spec: dict) -> Callable:
     """
     Get function from source.
 
@@ -42,61 +49,6 @@ def get_function_from_source(path: Path, source_spec: dict) -> Callable:
         raise RuntimeError(msg) from e
 
 
-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)
-
-    # Check base64. If it is set, it means
-    # that the source comes from a local file
-    if base64 is not None:
-        if has_local_scheme(source):
-            return path / handler_path / Path(source)
-        raise RuntimeError("Source is not a local file.")
-
-    if handler_path != Path(""):
-        return path / handler_path.with_suffix(".py")
-    raise RuntimeError("Must provide handler path in handler in form <root>.<dir>.<module>:<function_name>.")
-
-
-def parse_handler(handler: str) -> tuple[Path, str]:
-    """
-    Parse handler.
-
-    Parameters
-    ----------
-    handler : str
-        Function handler.
-
-    Returns
-    -------
-    tuple[Path, str]
-        Handler path and function name.
-    """
-    parsed = handler.split(":")
-    if len(parsed) == 1:
-        return Path(""), parsed[0]
-    return Path(*parsed[0].split(".")), parsed[1]
-
-
 def save_function_source(path: Path, source_spec: dict) -> Path:
     """
     Save function source.
@@ -126,22 +78,32 @@ def save_function_source(path: Path, source_spec: dict) -> Path:
         base64_path.write_text(decode_base64_string(base64))
         return base64_path
 
+    if source is None:
+        raise RuntimeError("Function source not found in spec.")
+
     # Git repo
     if has_git_scheme(source):
         clone_repository(path, source)
 
     # Http(s) or s3 presigned urls
     elif has_remote_scheme(source):
-        filename = path / "archive.zip"
-        requests_chunk_download(source, filename)
-        extract_archive(path, filename)
+        filename = path / get_filename_from_uri(source)
+        if has_zip_scheme(source):
+            requests_chunk_download(source.removeprefix("zip+"), filename)
+            extract_archive(path, filename)
+            filename.unlink()
+        else:
+            requests_chunk_download(source, filename)
 
     # S3 path
     elif has_s3_scheme(source):
-        filename = path / "archive.zip"
+        if not has_zip_scheme(source):
+            raise RuntimeError("S3 source must be a zip file with scheme zip+s3://.")
+        filename = path / get_filename_from_uri(source)
         bucket, key = get_bucket_and_key(source)
         get_s3_source(bucket, key, filename)
         extract_archive(path, filename)
+        filename.unlink()
 
     # Unsupported scheme
     else:
@@ -150,14 +112,20 @@ def save_function_source(path: Path, source_spec: dict) -> Path:
     return path
 
 
-def import_function_and_init(source: dict) -> tuple[Callable, Union[Callable, None]]:
+def import_function_and_init_from_source(
+    path: Path, source_spec: dict, default_py: str
+) -> tuple[Callable, Union[Callable, None]]:
     """
-    Import function from source.
+    Import function and init from source.
 
     Parameters
     ----------
-    source : dict
+    path : Path
+        Path where the function source is or must be saved.
+    source_spec : dict
         Function source.
+    default_py : str
+        Default python file.
 
     Returns
     -------
@@ -166,16 +134,73 @@ def import_function_and_init(source: dict) -> tuple[Callable, Union[Callable, No
     """
 
     # Get function source
-    function_path = get_function_source(source)
-    _, handler_name = parse_handler(source.get("handler"))
+    function_path = get_function_source(path, source_spec, default_py)
+    _, handler_name = parse_handler(source_spec.get("handler"))
 
     # Import function
     fnc = import_function(function_path, handler_name)
 
     # Get init function
     init_fnc: Callable | None = None
-    init_handler: str | None = source.get("init_function")
+    init_handler: str | None = source_spec.get("init_function")
     if init_handler is not None:
         init_fnc = import_function(function_path, init_handler)
 
     return fnc, init_fnc
+
+
+def get_function_source(path: Path, source_spec: dict, default_py: str) -> Path:
+    """
+    Get function source.
+
+    Parameters
+    ----------
+    path : Path
+        Path where the function source is or must be saved.
+    source_spec : dict
+        Function source.
+    default_py : str
+        Default python file.
+
+    Returns
+    -------
+    Path
+        Path to function source.
+    """
+    # Get relevant information
+    base64 = source_spec.get("base64")
+    source = source_spec.get("source", default_py)
+    handler = source_spec.get("handler")
+
+    handler_path, _ = parse_handler(handler)
+
+    # Check base64. If it is set, it means
+    # that the source comes from a local file
+    if base64 is not None:
+        if has_local_scheme(source):
+            return path / handler_path / Path(source)
+        raise RuntimeError("Source is not a local file.")
+
+    if handler_path != Path(""):
+        return path / handler_path.with_suffix(".py")
+    raise RuntimeError("Must provide handler path in handler in form <root>.<dir>.<module>:<function_name>.")
+
+
+def parse_handler(handler: str) -> tuple[Path, str]:
+    """
+    Parse handler.
+
+    Parameters
+    ----------
+    handler : str
+        Function handler.
+
+    Returns
+    -------
+    tuple[Path, str]
+        Handler path and function name.
+    """
+    parsed = handler.split(":")
+    if len(parsed) == 1:
+        return Path(""), parsed[0]
+    return Path(*parsed[0].split(".")), parsed[1]

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: digitalhub-runtime-python
-Version: 0.9.0b1
+Version: 0.9.1
 Summary: Python runtime for DHCore
 Author-email: Fondazione Bruno Kessler <dslab@fbk.eu>, Matteo Martini <mmartini@fbk.eu>
 License:                               Apache License
@@ -191,7 +191,7 @@ License:                               Apache License
            same "printed page" as the copyright notice for easier
            identification within third-party archives.
         
-        Copyright [yyyy] [name of copyright owner]
+        Copyright 2024 DSLab, Fondazione Bruno Kessler
         
         Licensed under the Apache License, Version 2.0 (the "License");
         you may not use this file except in compliance with the License.

{digitalhub_runtime_python-0.9.0b1 → digitalhub_runtime_python-0.9.1}/pyproject.toml

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