Fix the rest of the issues from fastapi==0.119.0

Author: zmievsa

cadwyn/changelogs.py

@@ -2,9 +2,13 @@
 import sys
 from enum import auto
 from logging import getLogger
-from typing import TYPE_CHECKING, Any, Literal, TypeVar, Union, cast, get_args
+from typing import Any, Literal, TypeVar, Union, cast, get_args
 
-from fastapi.openapi.constants import REF_TEMPLATE
+from fastapi._compat import (
+    get_compat_model_name_map,
+    get_definitions,
+)
+from fastapi._compat.v2 import ModelField
 from fastapi.openapi.utils import (
     get_fields_from_routes,
     get_openapi,
@@ -35,9 +39,6 @@
     ValidatorExistedInstruction,
 )
 
-if TYPE_CHECKING:
-    from fastapi._compat import ModelField
-
 if sys.version_info >= (3, 11):  # pragma: no cover
     from enum import StrEnum
 else:  # pragma: no cover
@@ -89,7 +90,7 @@ def _generate_changelog(versions: VersionBundle, router: _RootCadwynAPIRouter) -
                     version_change,
                     generator_from_newer_version,
                     generator_from_older_version,
-                    schemas_from_older_version,
+                    schemas_from_older_version,  # pyright: ignore[reportArgumentType]
                     cast("list[APIRoute]", routes_from_newer_version),
                 )
                 if changelog_entry is not None:  # pragma: no branch # This should never happen
@@ -153,21 +154,22 @@ def _get_all_pydantic_models_from_generic(annotation: Any) -> list[type[BaseMode
 
 
 def _get_openapi_representation_of_a_field(model: type[BaseModel], field_name: str) -> dict:
-    from fastapi._compat import (
-        GenerateJsonSchema,
-        ModelField,
-        get_compat_model_name_map,
-        get_definitions,
-    )
-
     class CadwynDummyModelForRepresentation(BaseModel):
         my_field: model
 
-    model_name_map = get_compat_model_name_map([CadwynDummyModelForRepresentation.model_fields["my_field"]])
-    schema_generator = GenerateJsonSchema(ref_template=REF_TEMPLATE)
+    model_name_map = get_compat_model_name_map(
+        [
+            CadwynDummyModelForRepresentation.model_fields["my_field"],  # pyright: ignore[reportArgumentType]
+        ]
+    )
+
     _, definitions = get_definitions(
-        fields=[ModelField(CadwynDummyModelForRepresentation.model_fields["my_field"], "my_field")],
-        schema_generator=schema_generator,
+        fields=[
+            ModelField(
+                CadwynDummyModelForRepresentation.model_fields["my_field"],
+                "my_field",
+            ),  # pyright: ignore[reportArgumentType]
+        ],
         model_name_map=model_name_map,
         separate_input_output_schemas=False,
     )

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cadwyn"
-version = "5.4.5"
+version = "5.5.0"
 description = "Production-ready community-driven modern Stripe-like API versioning in FastAPI"
 authors = [{ name = "Stanislav Zmiev", email = "[email protected]" }]
 license = "MIT"
@@ -51,7 +51,7 @@ classifiers = [
     "Topic :: Internet :: WWW/HTTP",
 ]
 dependencies = [
-    "fastapi >=0.112.4",
+    "fastapi >=0.119.0",
     "starlette >=0.30.0",
     "pydantic >=2.11.0",
     "jinja2 >=3.1.2",
@@ -62,7 +62,7 @@ dependencies = [
 
 
 [project.optional-dependencies]
-standard = ["fastapi[standard]>=0.112.3", "typer>=0.7.0"]
+standard = ["fastapi[standard]>=0.119.0", "typer>=0.7.0"]
 
 [tool.uv]
 dev-dependencies = [

tests/test_render.py

@@ -10,8 +10,6 @@
 from tests.test_cli import code
 
 
-# TODO: Return this test once https://github.com/pydantic/pydantic/pull/11898 is merged
-@pytest.mark.xfail
 def test__render_model__with_weird_types():
     result = render_model_by_path(
         "tests._resources.render.complex.classes:ModelWithWeirdFields",

tests/test_schema_generation/test_schema_field.py

@@ -68,16 +68,17 @@ class ExpectedSchema(BaseModel):
 
 
 def test__field_existed_as__extras_are_added(create_runtime_schemas: CreateRuntimeSchemas):
-    schemas = create_runtime_schemas(
-        version_change(
-            schema(EmptySchema)
-            .field("foo")
-            .existed_as(
-                type=int,
-                info=Field(deflolbtt="hewwo"),  # pyright: ignore[reportCallIssue]
-            ),
+    with pytest.warns(DeprecationWarning):
+        schemas = create_runtime_schemas(
+            version_change(
+                schema(EmptySchema)
+                .field("foo")
+                .existed_as(
+                    type=int,
+                    info=Field(deflolbtt="hewwo"),  # pyright: ignore[reportCallIssue]
+                ),
+            )
         )
-    )
 
     class ExpectedSchema(BaseModel):
         foo: int = Field(json_schema_extra={"deflolbtt": "hewwo"})
@@ -266,7 +267,7 @@ class SchemaWithOneDecimalField(BaseModel):
 
 @pytest.mark.parametrize(
     ("attr", "attr_value"),
-    [("exclude", [16, 17, 18])],
+    [("exclude", True)],
 )
 def test__schema_field_had__list_of_int_field(attr: str, attr_value: Any, create_runtime_schemas: CreateRuntimeSchemas):
     class SchemaWithOneListOfIntField(BaseModel):