fractal-task-tools 0.0.13__tar.gz → 0.0.14__tar.gz

{fractal_task_tools-0.0.13/src/fractal_task_tools.egg-info → fractal_task_tools-0.0.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fractal-task-tools
-Version: 0.0.13
+Version: 0.0.14
 Summary: Shared tools for Fractal tasks
 Author-email: Tommaso Comparin <tommaso.comparin@exact-lab.it>
 License: BSD-3-Clause
@@ -18,6 +18,8 @@ Requires-Dist: bumpver==2024.1130; extra == "dev"
 Requires-Dist: devtools==0.12.2; extra == "dev"
 Requires-Dist: pytest<9.0.0,>=8.3.0; extra == "dev"
 Requires-Dist: coverage<7.7.0,>=7.6.0; extra == "dev"
+Requires-Dist: jsonschema>=4; extra == "dev"
+Requires-Dist: requests<2.33.0,>2.32.0; extra == "dev"
 Provides-Extra: docs
 Requires-Dist: mkdocs<1.7.0,>=1.6.0; extra == "docs"
 Requires-Dist: mkdocs-material<9.7.0,>=9.6.0; extra == "docs"

{fractal_task_tools-0.0.13 → fractal_task_tools-0.0.14}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fractal-task-tools"
-version = "0.0.13"
+version = "0.0.14"
 description = "Shared tools for Fractal tasks"
 authors = [
     {name="Tommaso Comparin", email="tommaso.comparin@exact-lab.it"},
@@ -19,6 +19,8 @@ dev = [
     "devtools ==0.12.2",
     "pytest >=8.3.0, <9.0.0",
     "coverage >=7.6.0,<7.7.0",
+    "jsonschema >=4",
+    "requests >2.32.0,<2.33.0",
 ]
 docs = [
     "mkdocs >=1.6.0,<1.7.0",
@@ -44,7 +46,7 @@ build-backend = "setuptools.build_meta"
 fractal-manifest = "fractal_task_tools._cli:main"
 
 [tool.bumpver]
-current_version = "0.0.13"
+current_version = "0.0.14"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message = "bump version {old_version} -> {new_version}"
 commit = true

{fractal_task_tools-0.0.13 → fractal_task_tools-0.0.14}/src/fractal_task_tools/__init__.py

@@ -2,4 +2,4 @@ import logging
 
 logging.basicConfig(level=logging.INFO)
 
-__VERSION__ = "0.0.13"
+__VERSION__ = "0.0.14"

{fractal_task_tools-0.0.13 → fractal_task_tools-0.0.14}/src/fractal_task_tools/_args_schemas.py

@@ -65,7 +65,6 @@ def _create_schema_for_function(function: Callable) -> _Schema:
     from packaging.version import parse
 
     if parse(pydantic.__version__) >= parse("2.11.0"):
-
         from pydantic.experimental.arguments_schema import (
             generate_arguments_schema,
         )  # noqa
@@ -75,7 +74,6 @@ def _create_schema_for_function(function: Callable) -> _Schema:
             schema_type="arguments",
         )
     elif parse(pydantic.__version__) >= parse("2.9.0"):
-
         from pydantic._internal._config import ConfigWrapper  # noqa
         from pydantic._internal import _generate_schema  # noqa
 

{fractal_task_tools-0.0.13 → fractal_task_tools-0.0.14}/src/fractal_task_tools/_create_manifest.py

@@ -86,6 +86,12 @@ def create_manifest(
     # Load DOCS_LINK
     try:
         DOCS_LINK = getattr(task_list_module, "DOCS_LINK")
+        # Transform empty string into None
+        if DOCS_LINK == "":
+            DOCS_LINK = None
+            logging.warning(
+                "`DOCS_LINK=" "` transformed into `DOCS_LINK=None`."
+            )
     except AttributeError:
         DOCS_LINK = None
         logging.warning("No `DOCS_LINK` found in task_list module.")

{fractal_task_tools-0.0.13 → fractal_task_tools-0.0.14}/src/fractal_task_tools/_signature_constraints.py

@@ -70,7 +70,6 @@ def _validate_function_signature(function: callable):
     """
     sig = signature(function)
     for param in sig.parameters.values():
-
         # CASE 1: Check that name is not forbidden
         if param.name in FORBIDDEN_PARAM_NAMES:
             raise ValueError(

{fractal_task_tools-0.0.13 → fractal_task_tools-0.0.14/src/fractal_task_tools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fractal-task-tools
-Version: 0.0.13
+Version: 0.0.14
 Summary: Shared tools for Fractal tasks
 Author-email: Tommaso Comparin <tommaso.comparin@exact-lab.it>
 License: BSD-3-Clause
@@ -18,6 +18,8 @@ Requires-Dist: bumpver==2024.1130; extra == "dev"
 Requires-Dist: devtools==0.12.2; extra == "dev"
 Requires-Dist: pytest<9.0.0,>=8.3.0; extra == "dev"
 Requires-Dist: coverage<7.7.0,>=7.6.0; extra == "dev"
+Requires-Dist: jsonschema>=4; extra == "dev"
+Requires-Dist: requests<2.33.0,>2.32.0; extra == "dev"
 Provides-Extra: docs
 Requires-Dist: mkdocs<1.7.0,>=1.6.0; extra == "docs"
 Requires-Dist: mkdocs-material<9.7.0,>=9.6.0; extra == "docs"

{fractal_task_tools-0.0.13 → fractal_task_tools-0.0.14}/src/fractal_task_tools.egg-info/SOURCES.txt

@@ -26,7 +26,7 @@ tests/test_cli.py
 tests/test_create_manifest.py
 tests/test_create_schema_for_single_task.py
 tests/test_deepdiff.py
-tests/test_extract_function.py
+tests/test_handle_functions.py
 tests/test_normalize_package_name.py
 tests/test_task_models.py
 tests/test_task_wrapper.py

{fractal_task_tools-0.0.13 → fractal_task_tools-0.0.14}/src/fractal_task_tools.egg-info/requires.txt

@@ -7,6 +7,8 @@ bumpver==2024.1130
 devtools==0.12.2
 pytest<9.0.0,>=8.3.0
 coverage<7.7.0,>=7.6.0
+jsonschema>=4
+requests<2.33.0,>2.32.0
 
 [docs]
 mkdocs<1.7.0,>=1.6.0

{fractal_task_tools-0.0.13 → fractal_task_tools-0.0.14}/tests/test_create_manifest.py

@@ -41,6 +41,14 @@ def test_create_manifest(tmp_path: Path, caplog):
     for task in manifest["task_list"]:
         assert "type" not in task.keys()
 
+    # SUCCESS: create manifest with `DOCS_LINK=""` transformed into `None`
+    manifest = create_manifest(
+        raw_package_name="fake-tasks",
+        task_list_path="task_list_with_empty_docs_link",
+    )
+    for task in manifest["task_list"]:
+        assert "docs_link" not in task.keys()
+
     # SUCCESS: create non-legacy manifest
     manifest = create_manifest(
         raw_package_name="fake-tasks",

fractal_task_tools-0.0.13/tests/test_extract_function.py → fractal_task_tools-0.0.14/tests/test_handle_functions.py

@@ -1,5 +1,48 @@
+import typing
+
 import pytest
 from fractal_task_tools._signature_constraints import _extract_function
+from fractal_task_tools._signature_constraints import (
+    _validate_function_signature,
+)
+
+
+def test_validate_function_signature():
+    def fun1(args: list[str]):
+        pass
+
+    with pytest.raises(
+        ValueError,
+        match="argument with name args",
+    ):
+        _validate_function_signature(function=fun1)
+
+    def fun2(x: typing.Union[int, str]):
+        pass
+
+    with pytest.raises(
+        ValueError,
+        match="typing.Union is not supported",
+    ):
+        _validate_function_signature(function=fun2)
+
+    def fun3(x: int | str):
+        pass
+
+    with pytest.raises(
+        ValueError,
+        match='Use of "|',
+    ):
+        _validate_function_signature(function=fun3)
+
+    def fun4(x: typing.Optional[int] = 1):
+        pass
+
+    with pytest.raises(
+        ValueError,
+        match="Optional parameter has non-None default value",
+    ):
+        _validate_function_signature(function=fun4)
 
 
 def test_extract_function():

{fractal_task_tools-0.0.13 → fractal_task_tools-0.0.14}/tests/test_task_wrapper.py

@@ -29,7 +29,6 @@ def fake_task_invalid_output(zarr_url: str, parameter: float):
 
 
 def test_run_fractal_task(tmp_path, monkeypatch, caplog):
-
     ARGS_PATH = tmp_path / "args.json"
     METADIFF_PATH = tmp_path / "metadiff.json"