Fix the pre-commit formatting hook

Author: zmievsa

cadwyn/_asts.py

@@ -22,7 +22,7 @@
 
 
 # A parent type of typing._GenericAlias
-_BaseGenericAlias = cast(type, type(List[int])).mro()[1]  # noqa: UP006
+_BaseGenericAlias = cast("type", type(List[int])).mro()[1]  # noqa: UP006
 
 # type(list[int]) and type(List[int]) are different which is why we have to do this.
 # Please note that this problem is much wider than just lists which is why we use typing._BaseGenericAlias

cadwyn/applications.py

@@ -400,7 +400,7 @@ async def swagger_dashboard(self, req: Request) -> Response:
                 init_oauth=self.swagger_ui_init_oauth,
                 swagger_ui_parameters=self.swagger_ui_parameters,
             )
-        return self._render_docs_dashboard(req, cast(str, self.docs_url))
+        return self._render_docs_dashboard(req, cast("str", self.docs_url))
 
     async def redoc_dashboard(self, req: Request) -> Response:
         version = req.query_params.get("version")
@@ -410,7 +410,7 @@ async def redoc_dashboard(self, req: Request) -> Response:
             openapi_url = root_path + f"{self.openapi_url}?version={version}"
             return get_redoc_html(openapi_url=openapi_url, title=f"{self.title} - ReDoc")
 
-        return self._render_docs_dashboard(req, docs_url=cast(str, self.redoc_url))
+        return self._render_docs_dashboard(req, docs_url=cast("str", self.redoc_url))
 
     def _extract_root_path(self, req: Request):
         return req.scope.get("root_path", "").rstrip("/")

cadwyn/changelogs.py

@@ -93,7 +93,7 @@ def _generate_changelog(versions: VersionBundle, router: _RootCadwynAPIRouter) -
                     generator_from_newer_version,
                     generator_from_older_version,
                     schemas_from_older_version,
-                    cast(list[APIRoute], routes_from_newer_version),
+                    cast("list[APIRoute]", routes_from_newer_version),
                 )
                 if changelog_entry is not None:  # pragma: no branch # This should never happen
                     version_change_changelog.instructions.append(CadwynVersionChangeInstruction(changelog_entry))
@@ -321,18 +321,18 @@ def _convert_version_change_instruction_to_changelog_entry(  # noqa: C901
     if isinstance(instruction, EndpointDidntExistInstruction):
         return CadwynEndpointWasAddedChangelogEntry(
             path=instruction.endpoint_path,
-            methods=cast(Any, instruction.endpoint_methods),
+            methods=cast("Any", instruction.endpoint_methods),
         )
     elif isinstance(instruction, EndpointExistedInstruction):
         return CadwynEndpointWasRemovedChangelogEntry(
             path=instruction.endpoint_path,
-            methods=cast(Any, instruction.endpoint_methods),
+            methods=cast("Any", instruction.endpoint_methods),
         )
     elif isinstance(instruction, EndpointHadInstruction):
         if instruction.attributes.include_in_schema is not Sentinel:
             return CadwynEndpointWasRemovedChangelogEntry(
                 path=instruction.endpoint_path,
-                methods=cast(Any, instruction.endpoint_methods),
+                methods=cast("Any", instruction.endpoint_methods),
             )
 
         renaming_map = {"operation_id": "operationId"}
@@ -379,7 +379,7 @@ def _convert_version_change_instruction_to_changelog_entry(  # noqa: C901
             attribute_changes.append(CadwynEndpointAttributeChange(name="responses", new_value=changed_responses))
         return CadwynEndpointHadChangelogEntry(
             path=instruction.endpoint_path,
-            methods=cast(Any, instruction.endpoint_methods),
+            methods=cast("Any", instruction.endpoint_methods),
             changes=attribute_changes,
         )
 

cadwyn/route_generation.py

@@ -78,7 +78,7 @@ def generate_versioned_routers(
     webhooks: Union[_WR, None] = None,
 ) -> GeneratedRouters[_R, _WR]:
     if webhooks is None:
-        webhooks = cast(_WR, APIRouter())
+        webhooks = cast("_WR", APIRouter())
     return _EndpointTransformer(router, versions, webhooks).transform()
 
 
@@ -167,7 +167,7 @@ def transform(self) -> GeneratedRouters[_R, _WR]:
 
                 # We know they are APIRoutes because of the check at the very beginning of the top loop.
                 # I.e. Because head_route is an APIRoute, both routes are  APIRoutes too
-                older_route = cast(APIRoute, older_route)
+                older_route = cast("APIRoute", older_route)
                 # Wait.. Why do we need this code again?
                 if older_route.body_field is not None and _route_has_a_simple_body_schema(older_route):
                     if hasattr(older_route.body_field.type_, "__cadwyn_original_model__"):

cadwyn/schema_generation.py

@@ -263,7 +263,7 @@ def _wrap_pydantic_model(model: type[_T_PYDANTIC_MODEL]) -> "_PydanticModelWrapp
     # For example, when "from __future__ import annotations" is used in the file with the schema
     if model is not BaseModel:
         model.model_rebuild(raise_errors=False)
-    model = cast(type[_T_PYDANTIC_MODEL], model)
+    model = cast("type[_T_PYDANTIC_MODEL]", model)
 
     decorators = _get_model_decorators(model)
     validators = {}
@@ -343,7 +343,7 @@ def _rebuild_annotated(name: str):
 def _get_field_and_validator_names_from_model(cls: type) -> tuple[set[_FieldName], set[str]]:
     fields = cls.model_fields
     source = inspect.getsource(cls)
-    cls_ast = cast(ast.ClassDef, ast.parse(textwrap.dedent(source)).body[0])
+    cls_ast = cast("ast.ClassDef", ast.parse(textwrap.dedent(source)).body[0])
     validator_names = (
         _get_validator_info_or_none(node)
         for node in cls_ast.body
@@ -466,7 +466,7 @@ def generate_model_copy(self, generator: "SchemaGenerator") -> type[_T_PYDANTIC_
         fields = {name: field.generate_field_copy(generator) for name, field in self.fields.items()}
         model_copy = type(self.cls)(
             self.name,
-            tuple(generator[cast(type[BaseModel], base)] for base in self.cls.__bases__),
+            tuple(generator[cast("type[BaseModel]", base)] for base in self.cls.__bases__),
             self.other_attributes
             | per_field_validators
             | root_validators
@@ -776,7 +776,7 @@ def __getitem__(self, model: type[_T_ANY_MODEL], /) -> type[_T_ANY_MODEL]:
         wrapper = self._get_wrapper_for_model(model)
         model_copy = wrapper.generate_model_copy(self)
         self.concrete_models[model] = model_copy
-        return cast(type[_T_ANY_MODEL], model_copy)
+        return cast("type[_T_ANY_MODEL]", model_copy)
 
     @overload
     def _get_wrapper_for_model(self, model: type[BaseModel]) -> "_PydanticModelWrapper[BaseModel]": ...
@@ -865,7 +865,7 @@ def _apply_alter_schema_instructions(
         elif isinstance(alter_schema_instruction, ValidatorExistedInstruction):
             validator_name = get_name_of_function_wrapped_in_pydantic_validator(alter_schema_instruction.validator)
             raw_validator = cast(
-                pydantic._internal._decorators.PydanticDescriptorProxy, alter_schema_instruction.validator
+                "pydantic._internal._decorators.PydanticDescriptorProxy", alter_schema_instruction.validator
             )
             schema_info.validators[validator_name] = _wrap_validator(
                 raw_validator.wrapped,
@@ -1100,7 +1100,7 @@ def generate_model_copy(self, generator: "SchemaGenerator") -> type[_T_ENUM]:
         for attr_name, attr in initialization_namespace.items():
             enum_dict[attr_name] = attr
         enum_dict["__doc__"] = self.cls.__doc__
-        model_copy = cast(type[_T_ENUM], type(self.name, self.cls.__bases__, enum_dict))
+        model_copy = cast("type[_T_ENUM]", type(self.name, self.cls.__bases__, enum_dict))
         model_copy.__cadwyn_original_model__ = self.cls  # pyright: ignore[reportAttributeAccessIssue]
         return model_copy
 

cadwyn/structure/data.py

@@ -140,7 +140,7 @@ def decorator(transformer: Callable[[RequestInfo], None]) -> Any:
         if isinstance(schema_or_path, str):
             return _AlterRequestByPathInstruction(
                 path=schema_or_path,
-                methods=set(cast(list, methods_or_second_schema)),
+                methods=set(cast("list", methods_or_second_schema)),
                 transformer=transformer,
             )
         else:
@@ -214,7 +214,7 @@ def decorator(transformer: Callable[[ResponseInfo], None]) -> Any:
             # The validation above checks that methods is not None
             return _AlterResponseByPathInstruction(
                 path=schema_or_path,
-                methods=set(cast(list, methods_or_second_schema)),
+                methods=set(cast("list", methods_or_second_schema)),
                 transformer=transformer,
                 migrate_http_errors=migrate_http_errors,
             )

cadwyn/structure/schemas.py

@@ -246,7 +246,7 @@ def existed_as(
         info: Union[FieldInfo, Any, None] = None,
     ) -> FieldExistedAsInstruction:
         if info is None:
-            info = cast(FieldInfo, Field())
+            info = cast("FieldInfo", Field())
         info.annotation = type
         return FieldExistedAsInstruction(is_hidden_from_changelog=False, schema=self.schema, name=self.name, field=info)
 
@@ -317,7 +317,7 @@ def field(self, name: str, /) -> AlterFieldInstructionFactory:
     def validator(
         self, func: "Union[Callable[..., Any], classmethod[Any, Any, Any], PydanticDescriptorProxy]", /
     ) -> AlterValidatorInstructionFactory:
-        func = cast(Union[Callable[..., Any], PydanticDescriptorProxy], unwrap_wrapped_function(func))
+        func = cast("Union[Callable[..., Any], PydanticDescriptorProxy]", unwrap_wrapped_function(func))
 
         if not isinstance(func, PydanticDescriptorProxy):
             if hasattr(func, "__self__"):

cadwyn/structure/versions.py

@@ -620,7 +620,7 @@ async def _convert_endpoint_response_to_version(  # noqa: C901
                     detail = response_info.body
                 if detail is None:
                     detail = http.HTTPStatus(response_info.status_code).phrase
-                raised_exception.detail = cast(str, detail)
+                raised_exception.detail = cast("str", detail)
                 raised_exception.headers = dict(response_info.headers)
                 raised_exception.status_code = response_info.status_code
 

tests/test_applications.py

@@ -1,9 +1,8 @@
 import re
-from typing import Annotated, cast
+from typing import TYPE_CHECKING, Annotated, cast
 
 import pytest
 from fastapi import APIRouter, BackgroundTasks, Depends, FastAPI
-from fastapi.routing import APIRoute
 from fastapi.testclient import TestClient
 from pydantic import BaseModel
 
@@ -21,6 +20,9 @@
     v2022_01_02_router,
 )
 
+if TYPE_CHECKING:
+    from fastapi.routing import APIRoute
+
 
 def test__header_routing__invalid_version_format__error():
     main_app = Cadwyn(versions=VersionBundle(Version("2022-11-16")))
@@ -37,15 +39,15 @@ def test__header_routing__invalid_version_format__error():
 
 
 def test__header_routing_fastapi_init__openapi_passing_nulls__should_not_add_openapi_routes():
-    assert [cast(APIRoute, r).path for r in Cadwyn(versions=VersionBundle(Version("2022-11-16"))).routes] == [
+    assert [cast("APIRoute", r).path for r in Cadwyn(versions=VersionBundle(Version("2022-11-16"))).routes] == [
         "/docs/oauth2-redirect",
         "/changelog",
         "/openapi.json",
         "/docs",
         "/redoc",
     ]
     assert [
-        cast(APIRoute, r).path
+        cast("APIRoute", r).path
         for r in Cadwyn(versions=VersionBundle(Version("2022-11-16")), docs_url=None, redoc_url=None).routes
     ] == [
         "/changelog",
@@ -56,7 +58,7 @@ def test__header_routing_fastapi_init__openapi_passing_nulls__should_not_add_ope
 
 def test__header_routing_fastapi_init__passing_null_to_oauth2__should_not_add_oauth2_redirect_route():
     app = Cadwyn(versions=VersionBundle(Version("2022-11-16")), swagger_ui_oauth2_redirect_url=None)
-    assert [cast(APIRoute, r).path for r in app.routes] == [
+    assert [cast("APIRoute", r).path for r in app.routes] == [
         "/changelog",
         "/openapi.json",
         "/docs",
@@ -165,7 +167,7 @@ def test__header_routing_fastapi_add_header_versioned_routers__apirouter_is_empt
         )
     assert len(app.router.versioned_routers) == 1
     assert len(app.router.versioned_routers["2022-11-16"].routes) == 1
-    route = cast(APIRoute, app.router.versioned_routers["2022-11-16"].routes[0])
+    route = cast("APIRoute", app.router.versioned_routers["2022-11-16"].routes[0])
     assert route.path == "/openapi.json"
 
 
@@ -385,9 +387,9 @@ def post_subscription(body: Subscription):  # pragma: no cover
         assert "post-subscription" in openapi_dict["webhooks"], "'post-subscription' webhook is missing"
         assert "post" in openapi_dict["webhooks"]["post-subscription"], "POST method for 'post-subscription' is missing"
         assert "Subscription" in openapi_dict["components"]["schemas"], "'Subscription' component is missing"
-        assert (
-            "monthly_fee" in openapi_dict["components"]["schemas"]["Subscription"]["properties"]
-        ), "monthly_fee field is missing"
+        assert "monthly_fee" in openapi_dict["components"]["schemas"]["Subscription"]["properties"], (
+            "monthly_fee field is missing"
+        )
 
         resp = client.get("/openapi.json?version=2022-11-16")
         openapi_dict = resp.json()
@@ -397,9 +399,9 @@ def post_subscription(body: Subscription):  # pragma: no cover
         assert "post-subscription" in openapi_dict["webhooks"], "'post-subscription' webhook is present"
         assert "post" in openapi_dict["webhooks"]["post-subscription"], "POST method for 'post-subscription' is missing"
         assert "Subscription" in openapi_dict["components"]["schemas"], "'Subscription' component is missing"
-        assert (
-            "monthly_fee" not in openapi_dict["components"]["schemas"]["Subscription"]["properties"]
-        ), "monthly_fee field is present yet it must be deleted"
+        assert "monthly_fee" not in openapi_dict["components"]["schemas"]["Subscription"]["properties"], (
+            "monthly_fee field is present yet it must be deleted"
+        )
 
 
 def test__api_version_header_name_is_deprecated_and_translates_to_api_version_parameter_name():

tests/test_router_generation.py

@@ -99,8 +99,8 @@ def __call__(
     ) -> tuple[list[APIRoute], list[APIRoute]]:
         app = self.create_versioned_app(*version_changes, router=router)
         return (
-            cast(list[APIRoute], app.router.versioned_routers.get("2000-01-01", APIRouter()).routes),
-            cast(list[APIRoute], app.router.versioned_routers.get("2001-01-01", APIRouter()).routes),
+            cast("list[APIRoute]", app.router.versioned_routers.get("2000-01-01", APIRouter()).routes),
+            cast("list[APIRoute]", app.router.versioned_routers.get("2001-01-01", APIRouter()).routes),
         )
 
 
@@ -730,8 +730,8 @@ async def test():
     app = create_versioned_app(version_change(schema(SchemaWithOneIntField).field("foo").had(type=list[str])))
     schemas = generate_versioned_models(app.versions)
 
-    routes_2000 = cast(list[APIRoute], app.router.versioned_routers["2000-01-01"].routes)
-    routes_2001 = cast(list[APIRoute], app.router.versioned_routers["2001-01-01"].routes)
+    routes_2000 = cast("list[APIRoute]", app.router.versioned_routers["2000-01-01"].routes)
+    routes_2001 = cast("list[APIRoute]", app.router.versioned_routers["2001-01-01"].routes)
 
     assert len(routes_2000) == len(routes_2001) == 2
 
@@ -769,8 +769,8 @@ async def test(body: dict[str, list[SchemaWithOnePydanticField]]):
     app = create_versioned_app(version_change(schema(SchemaWithOneIntField).field("foo").had(type=list[str])))
     schemas = generate_versioned_models(app.versions)
 
-    routes_2000 = cast(list[APIRoute], app.router.versioned_routers["2000-01-01"].routes)
-    routes_2001 = cast(list[APIRoute], app.router.versioned_routers["2001-01-01"].routes)
+    routes_2000 = cast("list[APIRoute]", app.router.versioned_routers["2000-01-01"].routes)
+    routes_2001 = cast("list[APIRoute]", app.router.versioned_routers["2001-01-01"].routes)
     assert len(routes_2000) == len(routes_2001) == 2
 
     body_param_2000 = routes_2000[1].dependant.body_params[0]
@@ -802,8 +802,8 @@ async def test(body: ChildSchema):
 
     app = create_versioned_app(version_change(schema(ParentSchema).field("foo").didnt_exist))
 
-    routes_2000 = cast(list[APIRoute], app.router.versioned_routers["2000-01-01"].routes)
-    routes_2001 = cast(list[APIRoute], app.router.versioned_routers["2001-01-01"].routes)
+    routes_2000 = cast("list[APIRoute]", app.router.versioned_routers["2000-01-01"].routes)
+    routes_2001 = cast("list[APIRoute]", app.router.versioned_routers["2001-01-01"].routes)
     assert len(routes_2000) == len(routes_2001) == 2
 
     body_param_2000 = routes_2000[1].dependant.body_params[0]
@@ -833,8 +833,8 @@ async def test3(body: UnversionedSchema3):
     app = create_versioned_app(version_change(schema(SchemaWithOneIntField).field("foo").had(type=list[str])))
     schemas = generate_versioned_models(app.versions)
 
-    routes_2000 = cast(list[APIRoute], app.router.versioned_routers["2000-01-01"].routes)
-    routes_2001 = cast(list[APIRoute], app.router.versioned_routers["2001-01-01"].routes)
+    routes_2000 = cast("list[APIRoute]", app.router.versioned_routers["2000-01-01"].routes)
+    routes_2001 = cast("list[APIRoute]", app.router.versioned_routers["2001-01-01"].routes)
 
     assert len(routes_2000) == len(routes_2001) == 4
     assert routes_2000[1].dependant.body_params[0].type_ is schemas["2000-01-01"][UnversionedSchema1]
@@ -1221,7 +1221,7 @@ async def test():
 
     client_2000, *_ = create_versioned_clients().values()
 
-    dependant = cast(APIRoute, client_2000.app.router.versioned_routers["2000-01-01"].routes[-1]).dependant
+    dependant = cast("APIRoute", client_2000.app.router.versioned_routers["2000-01-01"].routes[-1]).dependant
     assert dependant.dependencies[1].dependencies[0].security_requirements[0].security_scheme is auth_header_scheme
     response = client_2000.get("/test")
     assert response.status_code == expected_status_code