fractal-task-tools 0.0.11__py3-none-any.whl → 0.0.13__py3-none-any.whl

fractal_task_tools/__init__.py

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

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.11.dist-info → fractal_task_tools-0.0.13.dist-info}/METADATA

@@ -1,17 +1,18 @@
 Metadata-Version: 2.4
 Name: fractal-task-tools
-Version: 0.0.11
+Version: 0.0.13
 Summary: Shared tools for Fractal tasks
 Author-email: Tommaso Comparin <tommaso.comparin@exact-lab.it>
 License: BSD-3-Clause
 Project-URL: homepage, https://github.com/fractal-analytics-platform/fractal-task-tools
 Project-URL: repository, https://github.com/fractal-analytics-platform/fractal-task-tools
 Project-URL: changelog, https://github.com/fractal-analytics-platform/fractal-task-tools/blob/main/CHANGELOG.md
-Requires-Python: <3.13,>=3.10
+Requires-Python: <3.14,>=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pydantic<=2.8.2,>=2.0.0
+Requires-Dist: pydantic<=2.11.7,>=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.11.dist-info → fractal_task_tools-0.0.13.dist-info}/RECORD

@@ -1,5 +1,5 @@
-fractal_task_tools/__init__.py,sha256=PcOgryhg28_2__bAMe68Hp1V7Iuaqnh-qpDVFRJOIYw,80
-fractal_task_tools/_args_schemas.py,sha256=Ka5IAAEdC7xg03ZHMl5jFbv4Sk8JR1QKbxFl7soevlQ,7829
+fractal_task_tools/__init__.py,sha256=d38l6QAX81NKMZH36oT3OjrbTySBP8TNLhTnGMWpeWc,80
+fractal_task_tools/_args_schemas.py,sha256=8n4OH3judg4FsOSsl-pTa9uN2VOysSrYnkj9IOFFCCk,8681
 fractal_task_tools/_cli.py,sha256=ARy3PWjAr92hBk0ZHnFIEAqTskipBIaLRW6COTJ4X-k,2936
 fractal_task_tools/_cli_tools.py,sha256=6G7zXvL6o5t7n4HvVAqP6an0o7qx5fEau5KjtoDXFuc,2622
 fractal_task_tools/_create_manifest.py,sha256=aPolxXH5Ug1xh_g5acuEF_GdMCYWApZnrb_N8gA3sqg,5796
@@ -13,9 +13,9 @@ fractal_task_tools/_task_docs.py,sha256=aEXozSKf3a7weOwJMHyTVJTvHlCKgDr1qoU-AAO3
 fractal_task_tools/_titles.py,sha256=GLWn-06fgQD6qzOM75H59EV0MMCXc8jVpHqGanYzNbw,3000
 fractal_task_tools/task_models.py,sha256=4qBDUAoqIgdfAV-7CKkVO5--Y_2Y6CflNVMIiwJxn9g,4177
 fractal_task_tools/task_wrapper.py,sha256=dhphKgxDm4EUxZnsrAy20hJPD6bGdqx7tNg9N_QzlCo,1878
-fractal_task_tools-0.0.11.dist-info/licenses/LICENSE,sha256=1SGAsQ3Jm_nIU7c2TgtTZe_IOKjm9BDsrcf2r98xrdk,1584
-fractal_task_tools-0.0.11.dist-info/METADATA,sha256=8_5ecJ8jId-B81i_4Yf3uovR9nZl56wDxxuUe6BuGGg,4716
-fractal_task_tools-0.0.11.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-fractal_task_tools-0.0.11.dist-info/entry_points.txt,sha256=zE4qv7QhuiqN6DaPkmJV18X1xyYoUi0HIJ-uAg2M6TU,66
-fractal_task_tools-0.0.11.dist-info/top_level.txt,sha256=2VBpiMDIBMJGOEPiHHX3njYEZGLhr4L0nu8vfkcNVzw,19
-fractal_task_tools-0.0.11.dist-info/RECORD,,
+fractal_task_tools-0.0.13.dist-info/licenses/LICENSE,sha256=1SGAsQ3Jm_nIU7c2TgtTZe_IOKjm9BDsrcf2r98xrdk,1584
+fractal_task_tools-0.0.13.dist-info/METADATA,sha256=2MhXVd46Ilf_yX6pkWPN2otoUBfK5rMud_3svrzoVuc,4742
+fractal_task_tools-0.0.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fractal_task_tools-0.0.13.dist-info/entry_points.txt,sha256=zE4qv7QhuiqN6DaPkmJV18X1xyYoUi0HIJ-uAg2M6TU,66
+fractal_task_tools-0.0.13.dist-info/top_level.txt,sha256=2VBpiMDIBMJGOEPiHHX3njYEZGLhr4L0nu8vfkcNVzw,19
+fractal_task_tools-0.0.13.dist-info/RECORD,,

{fractal_task_tools-0.0.11.dist-info → fractal_task_tools-0.0.13.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any