fractal-task-tools 0.0.10__tar.gz → 0.0.12__tar.gz

{fractal_task_tools-0.0.10/src/fractal_task_tools.egg-info → fractal_task_tools-0.0.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fractal-task-tools
-Version: 0.0.10
+Version: 0.0.12
 Summary: Shared tools for Fractal tasks
 Author-email: Tommaso Comparin <tommaso.comparin@exact-lab.it>
 License: BSD-3-Clause
@@ -10,8 +10,9 @@ Project-URL: changelog, https://github.com/fractal-analytics-platform/fractal-ta
 Requires-Python: <3.13,>=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pydantic<=2.8.2,>=2.0.0
+Requires-Dist: pydantic<=2.11.2,>=2.0.0
 Requires-Dist: docstring-parser<=0.16,>=0.15
+Requires-Dist: packaging
 Provides-Extra: dev
 Requires-Dist: bumpver==2024.1130; extra == "dev"
 Requires-Dist: devtools==0.12.2; extra == "dev"

{fractal_task_tools-0.0.10 → fractal_task_tools-0.0.12}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fractal-task-tools"
-version = "0.0.10"
+version = "0.0.12"
 description = "Shared tools for Fractal tasks"
 authors = [
     {name="Tommaso Comparin", email="tommaso.comparin@exact-lab.it"},
@@ -9,8 +9,9 @@ readme = "README.md"
 license = {text ="BSD-3-Clause"}
 requires-python = ">=3.10,<3.13"
 dependencies = [
-    "pydantic >=2.0.0,<=2.8.2",
+    "pydantic >=2.0.0,<=2.11.2",
     "docstring-parser >=0.15,<=0.16",
+    "packaging",
 ]
 [project.optional-dependencies]
 dev = [
@@ -43,7 +44,7 @@ build-backend = "setuptools.build_meta"
 fractal-manifest = "fractal_task_tools._cli:main"
 
 [tool.bumpver]
-current_version = "0.0.10"
+current_version = "0.0.12"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message = "bump version {old_version} -> {new_version}"
 commit = true

{fractal_task_tools-0.0.10 → fractal_task_tools-0.0.12}/src/fractal_task_tools/__init__.py

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

{fractal_task_tools-0.0.10 → fractal_task_tools-0.0.12}/src/fractal_task_tools/_args_schemas.py

@@ -6,10 +6,8 @@ from typing import Any
 from typing import Callable
 from typing import Optional
 
+import pydantic
 from docstring_parser import parse as docparse
-from pydantic._internal import _generate_schema
-from pydantic._internal import _typing_extra
-from pydantic._internal._config import ConfigWrapper
 
 from ._descriptions import _get_class_attrs_descriptions
 from ._descriptions import _get_function_args_descriptions
@@ -64,16 +62,43 @@ def _remove_attributes_from_descriptions(old_schema: _Schema) -> _Schema:
 
 
 def _create_schema_for_function(function: Callable) -> _Schema:
-    namespace = _typing_extra.add_module_globals(function, None)
-    gen_core_schema = _generate_schema.GenerateSchema(
-        ConfigWrapper(None), namespace
-    )
-    core_schema = gen_core_schema.generate_schema(function)
-    clean_core_schema = gen_core_schema.clean_schema(core_schema)
+    from packaging.version import parse
+
+    if parse(pydantic.__version__) >= parse("2.11.0"):
+
+        from pydantic.experimental.arguments_schema import (
+            generate_arguments_schema,
+        )  # noqa
+
+        core_schema = generate_arguments_schema(
+            function,
+            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
+
+        gen_core_schema = _generate_schema.GenerateSchema(
+            ConfigWrapper(None),
+            None,
+        )
+        core_schema = gen_core_schema.generate_schema(function)
+        core_schema = gen_core_schema.clean_schema(core_schema)
+    else:
+        from pydantic._internal._typing_extra import add_module_globals  # noqa
+        from pydantic._internal import _generate_schema  # noqa
+        from pydantic._internal._config import ConfigWrapper  # noqa
+
+        namespace = add_module_globals(function, None)
+        gen_core_schema = _generate_schema.GenerateSchema(
+            ConfigWrapper(None), namespace
+        )
+        core_schema = gen_core_schema.generate_schema(function)
+        core_schema = gen_core_schema.clean_schema(core_schema)
+
     gen_json_schema = CustomGenerateJsonSchema()
-    json_schema = gen_json_schema.generate(
-        clean_core_schema, mode="validation"
-    )
+    json_schema = gen_json_schema.generate(core_schema, mode="validation")
     return json_schema
 
 

{fractal_task_tools-0.0.10 → fractal_task_tools-0.0.12}/src/fractal_task_tools/_cli.py

@@ -47,6 +47,19 @@ for subparser in (create_manifest_parser, check_manifest_parser):
         default="dev.task_list",
         required=False,
     )
+
+    subparser.add_argument(
+        "--fractal-server-2-13",
+        action="store_true",
+        help=(
+            "If set, produce a manifest which is compatible with "
+            "fractal-server<2.14 (that is, exclude tasks' `type`s from "
+            "manifest and forbid converter types."
+        ),
+        default=False,
+        required=False,
+    )
+
 check_manifest_parser.add_argument(
     "--ignore-keys-order",
     type=bool,
@@ -78,6 +91,7 @@ def main():
         manifest = create_manifest(
             raw_package_name=args.package,
             task_list_path=args.task_list_path,
+            fractal_server_2_13=args.fractal_server_2_13,
         )
         write_manifest_to_file(
             raw_package_name=args.package,
@@ -88,6 +102,7 @@ def main():
         manifest = create_manifest(
             raw_package_name=args.package,
             task_list_path=args.task_list_path,
+            fractal_server_2_13=args.fractal_server_2_13,
         )
         check_manifest(
             raw_package_name=args.package,

{fractal_task_tools-0.0.10 → fractal_task_tools-0.0.12}/src/fractal_task_tools/_create_manifest.py

@@ -21,6 +21,7 @@ def create_manifest(
     *,
     raw_package_name: str,
     task_list_path: str,
+    fractal_server_2_13: bool = False,
 ) -> dict[str, Any]:
     """
     Create the package manifest based on a `task_list.py` module
@@ -32,6 +33,10 @@ def create_manifest(
         task_list_path:
             Relative path to the `task_list.py` module, with respect to the
             package root (example `dev.task_list`).
+        fractal_server_2_13:
+            If set, produce a manifest which is compatible with
+            fractal-server<2.14 (that is, exclude tasks' `type`s from manifest
+            and forbid converter types."
 
     Returns:
         Task-package manifest.
@@ -98,7 +103,16 @@ def create_manifest(
             },
             exclude_unset=True,
         )
-        task_dict["type"] = task_obj.type
+        if fractal_server_2_13 and task_obj.type in [
+            "converter_compound",
+            "converter_non_parallel",
+        ]:
+            raise ValueError(
+                f"Invalid task type {task_obj.type} "
+                f"(with {fractal_server_2_13=})."
+            )
+        if not fractal_server_2_13:
+            task_dict["type"] = task_obj.type
 
         # Copy some properties from `task_obj` to `task_dict`
         if task_obj.executable_non_parallel is not None:

{fractal_task_tools-0.0.10 → fractal_task_tools-0.0.12/src/fractal_task_tools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fractal-task-tools
-Version: 0.0.10
+Version: 0.0.12
 Summary: Shared tools for Fractal tasks
 Author-email: Tommaso Comparin <tommaso.comparin@exact-lab.it>
 License: BSD-3-Clause
@@ -10,8 +10,9 @@ Project-URL: changelog, https://github.com/fractal-analytics-platform/fractal-ta
 Requires-Python: <3.13,>=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pydantic<=2.8.2,>=2.0.0
+Requires-Dist: pydantic<=2.11.2,>=2.0.0
 Requires-Dist: docstring-parser<=0.16,>=0.15
+Requires-Dist: packaging
 Provides-Extra: dev
 Requires-Dist: bumpver==2024.1130; extra == "dev"
 Requires-Dist: devtools==0.12.2; extra == "dev"

{fractal_task_tools-0.0.10 → fractal_task_tools-0.0.12}/src/fractal_task_tools.egg-info/requires.txt

@@ -1,5 +1,6 @@
-pydantic<=2.8.2,>=2.0.0
+pydantic<=2.11.2,>=2.0.0
 docstring-parser<=0.16,>=0.15
+packaging
 
 [dev]
 bumpver==2024.1130

{fractal_task_tools-0.0.10 → fractal_task_tools-0.0.12}/tests/test_create_manifest.py

@@ -24,11 +24,32 @@ def test_create_manifest(tmp_path: Path, caplog):
 
     import fake_tasks
 
+    # FAILURE: create legacy manifest with converter tasks
+    with pytest.raises(ValueError, match="Invalid task type"):
+        create_manifest(
+            raw_package_name="fake-tasks",
+            task_list_path="task_list_with_converter",
+            fractal_server_2_13=True,
+        )
+
+    # SUCCESS: create legacy manifest
     manifest = create_manifest(
         raw_package_name="fake-tasks",
         task_list_path="task_list",
+        fractal_server_2_13=True,
     )
+    for task in manifest["task_list"]:
+        assert "type" not in task.keys()
+
+    # SUCCESS: create non-legacy manifest
+    manifest = create_manifest(
+        raw_package_name="fake-tasks",
+        task_list_path="task_list",
+    )
+    for task in manifest["task_list"]:
+        assert "type" in task.keys()
     debug(manifest)
+
     write_manifest_to_file(
         raw_package_name="fake-tasks",
         manifest=manifest,