pydantic-forms 2.2.0__tar.gz → 2.3.0__tar.gz

{pydantic_forms-2.2.0 → pydantic_forms-2.3.0}/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.2.0
+current_version = 2.3.0
 commit = False
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)((\-rc)(?P<build>\d+))?

{pydantic_forms-2.2.0 → pydantic_forms-2.3.0}/.github/workflows/run-linting-tests.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
+        python-version: ['3.10', '3.11', '3.12', '3.13', '3.14']
       fail-fast: false
 
     steps:
@@ -29,12 +29,9 @@ jobs:
           python -m pip install --upgrade pip
           pip install flit
           flit install --deps develop --extras fastapi
-      - name: Check formatting
-        run: |
-          python -V | grep 10 || black --check .
-      - name: Lint with ruff
-        run: |
-          ruff check .
-      - name: Check with mypy
-        run: |
-          mypy pydantic_forms
+      - name: Run pre-commit hooks
+        uses: pre-commit/action@v3.0.1
+# Use pre-commit mypy for now
+#      - name: Check with mypy
+#        run: |
+#          mypy pydantic_forms

{pydantic_forms-2.2.0 → pydantic_forms-2.3.0}/.github/workflows/run-unit-tests.yml

@@ -9,35 +9,33 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
+        python-version: ['3.10', '3.11', '3.12', '3.13', '3.14']
         pydantic-version: ['lockfile']
         fastapi-version: ['lockfile']
         # Test specific older releases to avoid an extremely large test matrix
         include:
-          # Older pydantic releases with the oldest + latest supported python version
+          # Older pydantic releases with the oldest + second-latest supported python version.
+          # (using python 3.14 requires pydantic 2.12 which is currently the latest)
+          - python-version: '3.13'
+            pydantic-version: '2.11.10'
+            fastapi-version: 'lockfile'
           - python-version: '3.13'
             pydantic-version: '2.10.6'
             fastapi-version: 'lockfile'
-          - python-version: '3.9'
+          - python-version: '3.10'
             pydantic-version: '2.10.6'
             fastapi-version: 'lockfile'
           - python-version: '3.13'
             pydantic-version: '2.9.2'
             fastapi-version: 'lockfile'
-          - python-version: '3.9'
+          - python-version: '3.10'
             pydantic-version: '2.9.2'
             fastapi-version: 'lockfile'
-          - python-version: '3.13'
-            pydantic-version: '2.8.2'
-            fastapi-version: 'lockfile'
-          - python-version: '3.9'
-            pydantic-version: '2.8.2'
-            fastapi-version: 'lockfile'
           # Older fastapi releases with the oldest + latest supported python version
-          - python-version: '3.13'
+          - python-version: '3.14'
             pydantic-version: 'lockfile'
             fastapi-version: '0.103.2'
-          - python-version: '3.9'
+          - python-version: '3.10'
             pydantic-version: 'lockfile'
             fastapi-version: '0.103.2'
       fail-fast: false

{pydantic_forms-2.2.0 → pydantic_forms-2.3.0}/.pre-commit-config.yaml

@@ -1,22 +1,21 @@
 repos:
   - repo: https://github.com/psf/black
-    rev: 25.1.0
+    rev: 25.11.0
     hooks:
       - id: black
-        language_version: python3.9
   - repo: https://github.com/asottile/blacken-docs
-    rev: 1.19.1
+    rev: 1.20.0
     hooks:
       - id: blacken-docs
         additional_dependencies: [black==24.2.0]
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.9.10
+    rev: v0.14.5
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix, --show-fixes]
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
@@ -28,10 +27,9 @@ repos:
       - id: requirements-txt-fixer
       - id: detect-private-key
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.15.0
+    rev: v1.18.2
     hooks:
       - id: mypy
-        language_version: python3.9
         additional_dependencies:
           - pydantic
           - types-toml
@@ -50,6 +48,6 @@ repos:
       - id: python-check-mock-methods
       - id: rst-backticks
   - repo: https://github.com/shellcheck-py/shellcheck-py
-    rev: v0.10.0.1
+    rev: v0.11.0.1
     hooks:
       - id: shellcheck

{pydantic_forms-2.2.0 → pydantic_forms-2.3.0}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: pydantic-forms
-Version: 2.2.0
+Version: 2.3.0
 Summary: Pydantic-forms engine.
 Home-page: https://github.com/workfloworchestrator/pydantic-forms
 Author: SURF
 Author-email: automation-beheer@surf.nl
-Requires-Python: >=3.9,<=3.14
+Requires-Python: >=3.10,<3.15
 Description-Content-Type: text/markdown
 Classifier: Intended Audience :: Information Technology
 Classifier: Intended Audience :: System Administrators
@@ -28,16 +28,16 @@ Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Telecommunications Industry
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Internet :: WWW/HTTP :: HTTP Servers
 Classifier: Topic :: Internet :: WWW/HTTP
 License-File: LICENSE
 Requires-Dist: more-itertools
-Requires-Dist: pydantic[email]>=2.7.4
+Requires-Dist: pydantic[email]>=2.9.0
 Requires-Dist: pydantic-i18n==0.4.5
 Requires-Dist: toml ; extra == "dev"
 Requires-Dist: bumpversion ; extra == "dev"
@@ -56,7 +56,7 @@ Requires-Dist: apache-license-check ; extra == "test"
 Requires-Dist: black ; extra == "test"
 Requires-Dist: structlog ; extra == "test"
 Requires-Dist: jsonref ; extra == "test"
-Requires-Dist: mypy==1.6.1 ; extra == "test"
+Requires-Dist: mypy==1.18.2 ; extra == "test"
 Requires-Dist: pytest ; extra == "test"
 Requires-Dist: pytest-cov ; extra == "test"
 Requires-Dist: pytest-asyncio ; extra == "test"

{pydantic_forms-2.2.0 → pydantic_forms-2.3.0}/pydantic_forms/__init__.py

@@ -13,4 +13,4 @@
 
 """Pydantic-forms engine."""
 
-__version__ = "2.2.0"
+__version__ = "2.3.0"

{pydantic_forms-2.2.0 → pydantic_forms-2.3.0}/pydantic_forms/core/asynchronous.py

@@ -84,7 +84,7 @@ async def post_form(
         except ValidationError as e:
             # Todo: add extra_translation to tr
             tr = PydanticI18n(translations)
-            raise FormValidationError(generated_form.__name__, e, tr, locale) from e  # type: ignore
+            raise FormValidationError(generated_form.__name__, e, tr, locale) from e
 
         # Update state with validated_data
         current_state.update(form_validated_data.model_dump())

pydantic_forms-2.3.0/pydantic_forms/core/shared.py

@@ -0,0 +1,113 @@
+# Copyright 2019-2023 SURF.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+from inspect import isasyncgenfunction, isgeneratorfunction
+from typing import Any, Callable
+
+import structlog
+from pydantic import BaseModel, ConfigDict, PydanticUndefinedAnnotation, version
+
+logger = structlog.get_logger(__name__)
+
+
+PYDANTIC_VERSION = version.version_short()
+
+
+class DisplayOnlyFieldType:
+    pass
+
+
+class FormPage(BaseModel):
+    model_config = ConfigDict(
+        arbitrary_types_allowed=True,
+        title="unknown",
+        extra="forbid",
+        validate_default=True,
+    )
+
+    def __init__(self, **data: Any):
+        frozen_fields = {k: v for k, v in self.__class__.model_fields.items() if v.frozen}
+
+        def get_value(k: str, v: Any) -> Any:
+            if k in frozen_fields:
+                return frozen_fields[k].default
+            return v
+
+        mutable_data = {k: get_value(k, v) for k, v in data.items()}
+        super().__init__(**mutable_data)
+
+    if PYDANTIC_VERSION in ("2.9", "2.10", "2.11"):
+
+        @classmethod
+        def __pydantic_init_subclass__(cls, /, **kwargs: Any) -> None:
+            # The default and requiredness of a field is not a property of a field
+            # In the case of DisplayOnlyFieldTypes, we do kind of want that.
+            # Using this method we set the right properties after the form is created
+            needs_rebuild = False
+
+            for field in cls.model_fields.values():
+                if field.frozen:
+                    field.validate_default = False
+                    needs_rebuild = True
+
+            if needs_rebuild:
+                try:
+                    # Fix for #39:
+                    # Core schema used during validation is constructed before __pydantic_init_subclass__ which means
+                    # that the field.validate_default change above doesn't take effect.
+                    # As a workaround, we explicitly rebuild the model to reconstruct the core schema.
+                    #
+                    # Downside is that unresolved forward-refs trigger an exception; for now we catch/log/ignore it.
+                    # From pydantic 2.12 a new hook __pydantic_on_complete__ can be used to perform the rebuild instead.
+                    # https://github.com/pydantic/pydantic/pull/11762
+                    cls.model_rebuild(force=True)
+                except PydanticUndefinedAnnotation as exc:
+                    logger.warning(
+                        "Failed to rebuild model due to undefined annotation, frozen fields may not work as expected",
+                        undefined_annotation=exc.name,
+                        model=cls.__name__,
+                    )
+
+    else:  # pydantic >= 2.12
+
+        @classmethod
+        def __pydantic_on_complete__(cls) -> None:
+            # The default and requiredness of a field is not a property of a field
+            # In the case of DisplayOnlyFieldTypes, we do kind of want that.
+            # Using this method we set the right properties after the form is created
+            needs_rebuild = False
+
+            for field in cls.model_fields.values():
+                if field.frozen:
+                    field.validate_default = False
+                    needs_rebuild = True
+
+            if needs_rebuild:
+                cls.model_rebuild(force=True)
+
+
+FORMS: dict[str, Callable] = {}
+
+
+def register_form(key: str, form: Callable) -> None:
+    logger.info("Current Forms", forms=FORMS, new_key=key)
+    if key in FORMS and form is not FORMS[key]:
+        raise Exception(f"Trying to re-register form {key} with a different function")
+
+    if not isasyncgenfunction(form) and not isgeneratorfunction(form):
+        raise Exception(f"Trying to register form {key} function {form} which is not an (async) generator function")
+
+    FORMS[key] = form
+
+
+def list_forms() -> list[str]:
+    return list(FORMS.keys())

{pydantic_forms-2.2.0 → pydantic_forms-2.3.0}/pydantic_forms/core/sync.py

@@ -79,7 +79,7 @@ def post_form(
             except ValidationError as e:
                 # Todo: add extra_translation to tr
                 tr = PydanticI18n(translations)
-                raise FormValidationError(generated_form.__name__, e, tr, locale) from e  # type: ignore
+                raise FormValidationError(generated_form.__name__, e, tr, locale) from e
 
             # Update state with validated_data
             current_state.update(form_validated_data.model_dump())

{pydantic_forms-2.2.0 → pydantic_forms-2.3.0}/pydantic_forms/types.py

@@ -1,16 +1,11 @@
 from enum import Enum
+from types import UnionType
 from typing import Any, AsyncGenerator, Callable, Generator, Type, TypeVar, Union
 
+from pydantic.main import BaseModel
 from typing_extensions import TypedDict
 
-try:
-    # python3.10 introduces types.UnionType for the new union and optional type defs.
-    from types import UnionType  # type: ignore  # 3.9 compatibility
-
-    union_types = [Union, UnionType]
-except ImportError:
-    union_types = [Union]
-from pydantic.main import BaseModel
+union_types = [Union, UnionType]
 
 UUIDstr = str
 State = dict[str, Any]

{pydantic_forms-2.2.0 → pydantic_forms-2.3.0}/pydantic_forms/validators/components/read_only.py

@@ -93,7 +93,7 @@ def read_only_list(default: list[Any] | None = None) -> Any:
 
     return Annotated[
         list[default_item_type],
-        Field(default, json_schema_extra=json_schema),  # type: ignore[arg-type]
+        Field(default, json_schema_extra=json_schema),
         AfterValidator(validate_list),
         PlainSerializer(serialize_list, when_used="json"),
     ]
@@ -131,7 +131,7 @@ def read_only_field(default: Any, merge_type: Any | None = None) -> Any:
 
     read_only_type = Annotated[
         Literal[default],  # type: ignore[valid-type]
-        Field(default, json_schema_extra=json_schema),  # type: ignore[arg-type]
+        Field(default, json_schema_extra=json_schema),
         BeforeValidator(validate),
         PlainSerializer(serialize_json, when_used="json"),
     ]

{pydantic_forms-2.2.0 → pydantic_forms-2.3.0}/pyproject.toml

@@ -30,21 +30,21 @@ classifiers = [
     "Intended Audience :: Telecommunications Industry",
     "License :: OSI Approved :: Apache Software License",
     "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Topic :: Internet :: WWW/HTTP :: HTTP Servers",
     "Topic :: Internet :: WWW/HTTP",
 ]
 requires = [
     "more-itertools",
-    "pydantic[email]>=2.7.4",
+    "pydantic[email]>=2.9.0",
     "pydantic-i18n==0.4.5"
 ]
 description-file = "README.md"
-requires-python = ">=3.9,<=3.14"
+requires-python = ">=3.10,<3.15"
 
 [tool.flit.metadata.urls]
 Documentation = "https://github.com/workfloworchestrator/pydantic-forms/blob/main/README.md"
@@ -55,7 +55,7 @@ test = [
     "black",
     "structlog",
     "jsonref",
-    "mypy==1.6.1",
+    "mypy==1.18.2",
     "pytest",
     "pytest-cov",
     "pytest-asyncio",
@@ -96,7 +96,7 @@ fastapi = [
 
 [tool.black]
 line-length = 120
-target-version = ["py39"]
+target-version = ["py310"]
 exclude = '''
 (
   /(
@@ -126,9 +126,10 @@ exclude = [
     "venv",
     ".venv",
     "docs",
-    "tests"
 ]
 lint.ignore = [
+    "B904",
+    "B905",
     "C417",
     "D100",
     "D101",
@@ -140,18 +141,22 @@ lint.ignore = [
     "D107",
     "D202",
     "E501",
-    "N806",
-    "B905",
-    "N805",
-    "B904",
-    "N803",
     "N801",
-    "N815",
     "N802",
+    "N803",
+    "N805",
+    "N806",
+    "N815",
+    "S101", # use of assert
 ]
 line-length = 120
 lint.select = ["B", "C", "D", "E", "F", "I", "N", "RET", "S", "T", "W"]
-target-version = "py39"
+target-version = "py310"
+
+[tool.ruff.lint.per-file-ignores]
+"tests/*" = [
+    "D205",  # blank line required
+]
 
 [tool.lint.flake8-tidy-imports]
 ban-relative-imports = "all"

{pydantic_forms-2.2.0 → pydantic_forms-2.3.0}/setup.cfg

@@ -36,8 +36,7 @@ disallow_untyped_decorators = True
 no_implicit_optional = True
 strict_optional = True
 namespace_packages = true
-; TODO re-enable unused ignores when we stop supporting 3.9 https://github.com/python/mypy/issues/8823
-warn_unused_ignores = False
+warn_unused_ignores = True
 warn_redundant_casts = True
 ; Disable due to flaky results in mypy itself
 ;warn_return_any = True

{pydantic_forms-2.2.0 → pydantic_forms-2.3.0}/tests/unit_tests/helpers.py

@@ -7,7 +7,7 @@ def assert_equal_ignore_key(expected, actual, ignore_keys):
     def deep_remove_keys(d, keys_to_ignore):
         if isinstance(d, dict):
             return {k: deep_remove_keys(v, keys_to_ignore) for k, v in d.items() if k not in keys_to_ignore}
-        elif isinstance(d, list):
+        if isinstance(d, list):
             return [deep_remove_keys(i, keys_to_ignore) for i in d]
         return d
 

{pydantic_forms-2.2.0 → pydantic_forms-2.3.0}/tests/unit_tests/test_accept.py

@@ -1,5 +1,3 @@
-from unittest.mock import ANY
-
 from pydantic_core import ValidationError
 from pytest import raises
 

{pydantic_forms-2.2.0 → pydantic_forms-2.3.0}/tests/unit_tests/test_choice_list.py

@@ -4,8 +4,6 @@ from pydantic_core import ValidationError
 from pydantic_forms.core import FormPage
 from pydantic_forms.validators import Choice, choice_list
 
-from tests.unit_tests.helpers import PYDANTIC_VERSION
-
 
 def test_choice_list():
     class LegChoice(Choice):
@@ -152,15 +150,11 @@ def test_choice_list_constraint_at_least_one_item(Form):
 
     errors = exc_info.value.errors(include_url=False, include_context=False)
 
-    if PYDANTIC_VERSION == "2.8":
-        message = "List should have at least 1 item after validation, not 0"
-    else:
-        message = "Value should have at least 1 item after validation, not 0"
     expected = [
         {
             "input": [],
             "loc": ("choice",),
-            "msg": message,
+            "msg": "Value should have at least 1 item after validation, not 0",
             "type": "too_short",
         }
     ]

{pydantic_forms-2.2.0 → pydantic_forms-2.3.0}/tests/unit_tests/test_constrained_list.py

@@ -3,9 +3,6 @@ from pytest import raises
 
 from pydantic_forms.core import FormPage
 from pydantic_forms.validators import unique_conlist
-from pydantic.version import version_short as pydantic_version_short
-
-from tests.unit_tests.helpers import PYDANTIC_VERSION
 
 
 def test_constrained_list_good():
@@ -77,15 +74,11 @@ def test_constrained_list_too_short():
 
     errors = exc_info.value.errors(include_url=False, include_context=False)
 
-    if PYDANTIC_VERSION == "2.8":
-        message = "List should have at least 1 item after validation, not 0"
-    else:
-        message = "Value should have at least 1 item after validation, not 0"
     expected = [
         {
             "input": [],
             "loc": ("v",),
-            "msg": message,
+            "msg": "Value should have at least 1 item after validation, not 0",
             "type": "too_short",
         }
     ]
@@ -117,15 +110,12 @@ def test_constrained_list_inherit_constraints():
         UniqueConListModel(v=[])
 
     errors = exc_info.value.errors(include_url=False, include_context=False)
-    if PYDANTIC_VERSION == "2.8":
-        message = "List should have at least 1 item after validation, not 0"
-    else:
-        message = "Value should have at least 1 item after validation, not 0"
+
     assert errors == [
         {
             "input": [],
             "loc": ("v",),
-            "msg": message,
+            "msg": "Value should have at least 1 item after validation, not 0",
             "type": "too_short",
             # "ctx": {"limit_value": 1},
         }

{pydantic_forms-2.2.0 → pydantic_forms-2.3.0}/tests/unit_tests/test_display_subscription.py

@@ -2,7 +2,6 @@ from uuid import uuid4
 
 from pydantic_forms.core import FormPage
 from pydantic_forms.validators import DisplaySubscription, Label, migration_summary
-from tests.unit_tests.helpers import PYDANTIC_VERSION
 
 
 def test_display_subscription():
@@ -36,11 +35,6 @@ def test_display_only_schema():
         label: Label
         summary: Summary
 
-    if PYDANTIC_VERSION == "2.8":
-        summary_ref = {"allOf": [{"$ref": "#/$defs/MigrationSummaryValue"}]}
-    else:
-        summary_ref = {"$ref": "#/$defs/MigrationSummaryValue"}
-
     expected = {
         "$defs": {"MigrationSummaryValue": {"properties": {}, "title": "MigrationSummaryValue", "type": "object"}},
         "additionalProperties": False,
@@ -59,7 +53,7 @@ def test_display_only_schema():
                 "type": "string",
             },
             "summary": {
-                **summary_ref,
+                "$ref": "#/$defs/MigrationSummaryValue",
                 "default": None,
                 "format": "summary",
                 "type": "string",

{pydantic_forms-2.2.0 → pydantic_forms-2.3.0}/tests/unit_tests/test_list_of_two.py

@@ -3,7 +3,6 @@ from pydantic import ValidationError
 
 from pydantic_forms.core import FormPage
 from pydantic_forms.validators import ListOfTwo
-from tests.unit_tests.helpers import PYDANTIC_VERSION
 
 
 @pytest.fixture(name="Form")
@@ -23,15 +22,12 @@ def test_list_of_two_min_items(Form):
         assert Form(two=[1])
 
     errors = error_info.value.errors(include_url=False, include_context=False)
-    if PYDANTIC_VERSION == "2.8":
-        message = "List should have at least 2 items after validation, not 1"
-    else:
-        message = "Value should have at least 2 items after validation, not 1"
+
     expected = [
         {
             "input": [1],
             "loc": ("two",),
-            "msg": message,
+            "msg": "Value should have at least 2 items after validation, not 1",
             "type": "too_short",
         }
     ]
@@ -43,15 +39,12 @@ def test_list_of_two_max_items(Form):
         assert Form(two=[1, 2, 3])
 
     errors = error_info.value.errors(include_url=False, include_context=False)
-    if PYDANTIC_VERSION == "2.8":
-        message = "List should have at most 2 items after validation, not 3"
-    else:
-        message = "Value should have at most 2 items after validation, not 3"
+
     expected = [
         {
             "input": [1, 2, 3],
             "loc": ("two",),
-            "msg": message,
+            "msg": "Value should have at most 2 items after validation, not 3",
             "type": "too_long",
         },
     ]

{pydantic_forms-2.2.0 → pydantic_forms-2.3.0}/tests/unit_tests/test_migration_summary.py

@@ -2,7 +2,6 @@ from uuid import uuid4
 
 from pydantic_forms.core import FormPage
 from pydantic_forms.validators import DisplaySubscription, Label, migration_summary
-from tests.unit_tests.helpers import PYDANTIC_VERSION
 
 
 def test_display_default():
@@ -34,17 +33,12 @@ def test_migration_summary_schema():
     class Form(FormPage):
         ms: Summary
 
-    if PYDANTIC_VERSION == "2.8":
-        ms_ref = {"allOf": [{"$ref": "#/$defs/MigrationSummaryValue"}]}
-    else:
-        ms_ref = {"$ref": "#/$defs/MigrationSummaryValue"}
-
     expected = {
         "$defs": {"MigrationSummaryValue": {"properties": {}, "title": "MigrationSummaryValue", "type": "object"}},
         "additionalProperties": False,
         "properties": {
             "ms": {
-                **ms_ref,
+                "$ref": "#/$defs/MigrationSummaryValue",
                 "default": None,
                 "format": "summary",
                 "type": "string",

{pydantic_forms-2.2.0 → pydantic_forms-2.3.0}/tests/unit_tests/test_read_only_field.py

@@ -1,16 +1,14 @@
 import json
 from uuid import UUID
 
-from pydantic.config import JsonDict
 import pytest
 from pydantic import BaseModel, ValidationError
-
-from pydantic.version import version_short as pydantic_version_short
+from pydantic.config import JsonDict
 
 from pydantic_forms.core import FormPage
 from pydantic_forms.types import strEnum
-from pydantic_forms.validators import read_only_field, read_only_list, LongText, OrganisationId
 from pydantic_forms.utils.schema import merge_json_schema
+from pydantic_forms.validators import LongText, OrganisationId, read_only_field, read_only_list
 from tests.unit_tests.helpers import PYDANTIC_VERSION
 
 
@@ -36,7 +34,7 @@ def test_read_only_field_schema(read_only_value, schema_value, schema_type, othe
     class Form(FormPage):
         read_only: read_only_field(read_only_value)
 
-    if PYDANTIC_VERSION in ("2.8", "2.9"):
+    if PYDANTIC_VERSION in ("2.9",):
         # Field that was removed in 2.10 https://github.com/pydantic/pydantic/pull/10692
         enum_value = str(read_only_value) if isinstance(read_only_value, UUID) else read_only_value
         enum = {"enum": [enum_value]}

{pydantic_forms-2.2.0 → pydantic_forms-2.3.0}/tests/unit_tests/test_shared.py

@@ -1,7 +1,5 @@
-from typing import Annotated
-
 import pytest
-from pydantic import Field, BaseModel
+from pydantic import Field
 from pydantic_core import ValidationError
 
 from pydantic_forms.core import FormPage

{pydantic_forms-2.2.0 → pydantic_forms-2.3.0}/tests/unit_tests/test_utils_from_serializable.py

@@ -1,4 +1,3 @@
-import pytest
 from datetime import datetime
 
 from pydantic_forms.utils.json import from_serializable

{pydantic_forms-2.2.0 → pydantic_forms-2.3.0}/tests/unit_tests/test_utils_to_serializable.py

@@ -1,12 +1,13 @@
 # Test UUID serialization
-from dataclasses import dataclass, asdict
+from dataclasses import asdict, dataclass
 from datetime import datetime
-from ipaddress import IPv4Network, IPv6Network, IPv4Address, IPv6Address
+from ipaddress import IPv4Address, IPv4Network, IPv6Address, IPv6Network
 from uuid import UUID
 
-from pydantic_forms.utils.json import to_serializable
 import pytest
 
+from pydantic_forms.utils.json import to_serializable
+
 
 def test_to_serializable_uuid():
     test_uuid = UUID("12345678123456781234567812345678")

pydantic_forms-2.2.0/pydantic_forms/core/shared.py

@@ -1,91 +0,0 @@
-# Copyright 2019-2023 SURF.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-from inspect import isasyncgenfunction, isgeneratorfunction
-from typing import Any, Callable
-
-import structlog
-from pydantic import BaseModel, ConfigDict, PydanticUndefinedAnnotation
-
-logger = structlog.get_logger(__name__)
-
-
-class DisplayOnlyFieldType:
-    pass
-
-
-class FormPage(BaseModel):
-    model_config = ConfigDict(
-        arbitrary_types_allowed=True,
-        title="unknown",
-        extra="forbid",
-        validate_default=True,
-    )
-
-    def __init__(self, **data: Any):
-        frozen_fields = {k: v for k, v in self.__class__.model_fields.items() if v.frozen}
-
-        def get_value(k: str, v: Any) -> Any:
-            if k in frozen_fields:
-                return frozen_fields[k].default
-            return v
-
-        mutable_data = {k: get_value(k, v) for k, v in data.items()}
-        super().__init__(**mutable_data)
-
-    @classmethod
-    def __pydantic_init_subclass__(cls, /, **kwargs: Any) -> None:
-        # The default and requiredness of a field is not a property of a field
-        # In the case of DisplayOnlyFieldTypes, we do kind of want that.
-        # Using this method we set the right properties after the form is created
-        needs_rebuild = False
-
-        for field in cls.model_fields.values():
-            if field.frozen:
-                field.validate_default = False
-                needs_rebuild = True
-
-        if needs_rebuild:
-            try:
-                # Fix for #39:
-                # Core schema used during validation is constructed before __pydantic_init_subclass__ which means
-                # that the field.validate_default change above doesn't take effect.
-                # As a workaround, we explicitly rebuild the model to reconstruct the core schema.
-                #
-                # Downside is that unresolved forward-refs trigger an exception; for now we catch/log/ignore it.
-                # From pydantic 2.12 a new hook __pydantic_on_complete__ can be used to perform the rebuild instead.
-                # https://github.com/pydantic/pydantic/pull/11762
-                cls.model_rebuild(force=True)
-            except PydanticUndefinedAnnotation as exc:
-                logger.warning(
-                    "Failed to rebuild model due to undefined annotation, frozen fields may not work as expected",
-                    undefined_annotation=exc.name,
-                    model=cls.__name__,
-                )
-
-
-FORMS: dict[str, Callable] = {}
-
-
-def register_form(key: str, form: Callable) -> None:
-    logger.info("Current Forms", forms=FORMS, new_key=key)
-    if key in FORMS and form is not FORMS[key]:
-        raise Exception(f"Trying to re-register form {key} with a different function")
-
-    if not isasyncgenfunction(form) and not isgeneratorfunction(form):
-        raise Exception(f"Trying to register form {key} function {form} which is not an (async) generator function")
-
-    FORMS[key] = form
-
-
-def list_forms() -> list[str]:
-    return list(FORMS.keys())