Skip to content

Commit 593bc11

Browse files
committed
Stop supporting Pydantic-V1 JSON-Schema generation (ref #802)
1 parent b17c779 commit 593bc11

File tree

4 files changed

+314
-654
lines changed

4 files changed

+314
-654
lines changed

fractal_tasks_core/dev/create_manifest.py

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import logging
1717
from importlib import import_module
1818
from pathlib import Path
19-
from typing import Literal
2019
from typing import Optional
2120

2221
from fractal_tasks_core.dev.lib_args_schemas import (
@@ -28,26 +27,13 @@
2827
logging.basicConfig(level=logging.INFO)
2928

3029

31-
def check_args_schema_version(args_schema_version: Optional[str]) -> str:
32-
if args_schema_version is None:
33-
import pydantic
34-
35-
if pydantic.__version__.startswith("1"):
36-
args_schema_version = "pydantic_v1"
37-
elif pydantic.__version__.startswith("2"):
38-
args_schema_version = "pydantic_v2"
39-
else:
40-
raise ValueError(f"Unsupported {pydantic.__version__=}")
41-
elif args_schema_version not in ["pydantic_v1", "pydantic_v2"]:
42-
raise ValueError(f"Unsupported {args_schema_version=}")
43-
return args_schema_version
30+
ARGS_SCHEMA_VERSION = "pydantic_v2"
4431

4532

4633
def create_manifest(
4734
package: str = "fractal_tasks_core",
4835
manifest_version: str = "2",
4936
has_args_schemas: bool = True,
50-
args_schema_version: Literal["pydantic_v1", "pydantic_v2", None] = None,
5137
docs_link: Optional[str] = None,
5238
custom_pydantic_models: Optional[list[tuple[str, str, str]]] = None,
5339
):
@@ -85,17 +71,14 @@ def create_manifest(
8571

8672
logging.info("Start generating a new manifest")
8773

88-
args_schema_version = check_args_schema_version(args_schema_version)
89-
logging.warning(f"{args_schema_version=}")
90-
9174
# Prepare an empty manifest
9275
manifest = dict(
9376
manifest_version=manifest_version,
9477
task_list=[],
9578
has_args_schemas=has_args_schemas,
9679
)
9780
if has_args_schemas:
98-
manifest["args_schema_version"] = args_schema_version
81+
manifest["args_schema_version"] = ARGS_SCHEMA_VERSION
9982

10083
# Prepare a default value of docs_link
10184
if package == "fractal_tasks_core" and docs_link is None:
@@ -138,7 +121,6 @@ def create_manifest(
138121
executable,
139122
package=package,
140123
custom_pydantic_models=custom_pydantic_models,
141-
args_schema_version=args_schema_version,
142124
)
143125
logging.info(f"[{executable}] END (new schema)")
144126
task_dict[f"args_schema_{kind}"] = schema

0 commit comments

Comments
 (0)