cadwyn 3.12.0__tar.gz → 3.15.10__tar.gz

{cadwyn-3.12.0 → cadwyn-3.15.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cadwyn
-Version: 3.12.0
+Version: 3.15.10
 Summary: Production-ready community-driven modern Stripe-like API versioning in FastAPI
 Home-page: https://github.com/zmievsa/cadwyn
 License: MIT
@@ -33,7 +33,8 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Typing :: Typed
 Provides-Extra: cli
 Requires-Dist: better-ast-comments (>=1.2.1,<1.3.0)
-Requires-Dist: fastapi (>=0.110.0)
+Requires-Dist: fastapi (>=0.115.2)
+Requires-Dist: issubclass (>=0.1.2,<0.2.0)
 Requires-Dist: jinja2 (>=3.1.2)
 Requires-Dist: pydantic (>=1.0.0)
 Requires-Dist: starlette (>=0.36.3)
@@ -53,8 +54,8 @@ Production-ready community-driven modern [Stripe-like](https://stripe.com/blog/a
 <a href="https://github.com/zmievsa/cadwyn/actions/workflows/ci.yaml?branch=main&event=push" target="_blank">
     <img src="https://github.com/zmievsa/cadwyn/actions/workflows/ci.yaml/badge.svg?branch=main&event=push" alt="Test">
 </a>
-<a href="https://codecov.io/gh/ovsyanka83/cadwyn" target="_blank">
-    <img src="https://img.shields.io/codecov/c/github/ovsyanka83/cadwyn?color=%2334D058&logo=codecov" alt="Coverage">
+<a href="https://codecov.io/gh/zmievsa/cadwyn" target="_blank">
+    <img src="https://img.shields.io/codecov/c/github/zmievsa/cadwyn?color=%2334D058&logo=codecov" alt="Coverage">
 </a>
 <a href="https://pypi.org/project/cadwyn/" target="_blank">
     <img alt="PyPI" src="https://img.shields.io/pypi/v/cadwyn?color=%2334D058&logo=pypi&label=PyPI package" alt="Package version">

{cadwyn-3.12.0 → cadwyn-3.15.10}/README.md

@@ -8,8 +8,8 @@ Production-ready community-driven modern [Stripe-like](https://stripe.com/blog/a
 <a href="https://github.com/zmievsa/cadwyn/actions/workflows/ci.yaml?branch=main&event=push" target="_blank">
     <img src="https://github.com/zmievsa/cadwyn/actions/workflows/ci.yaml/badge.svg?branch=main&event=push" alt="Test">
 </a>
-<a href="https://codecov.io/gh/ovsyanka83/cadwyn" target="_blank">
-    <img src="https://img.shields.io/codecov/c/github/ovsyanka83/cadwyn?color=%2334D058&logo=codecov" alt="Coverage">
+<a href="https://codecov.io/gh/zmievsa/cadwyn" target="_blank">
+    <img src="https://img.shields.io/codecov/c/github/zmievsa/cadwyn?color=%2334D058&logo=codecov" alt="Coverage">
 </a>
 <a href="https://pypi.org/project/cadwyn/" target="_blank">
     <img alt="PyPI" src="https://img.shields.io/pypi/v/cadwyn?color=%2334D058&logo=pypi&label=PyPI package" alt="Package version">

{cadwyn-3.12.0 → cadwyn-3.15.10}/cadwyn/__init__.py

@@ -2,8 +2,12 @@ import importlib.metadata
 
 from .applications import Cadwyn
 from .codegen import generate_code_for_versioned_packages
-from .route_generation import InternalRepresentationOf, VersionedAPIRouter, generate_versioned_routers
-from .structure import VersionBundle
+from .route_generation import (
+    InternalRepresentationOf,  # pyright: ignore[reportDeprecated]
+    VersionedAPIRouter,
+    generate_versioned_routers,
+)
+from .structure import HeadVersion, Version, VersionBundle
 
 __version__ = importlib.metadata.version("cadwyn")
 __all__ = [
@@ -11,6 +15,8 @@ __all__ = [
     "VersionedAPIRouter",
     "generate_code_for_versioned_packages",
     "VersionBundle",
+    "HeadVersion",
+    "Version",
     "generate_versioned_routers",
     "InternalRepresentationOf",
 ]

{cadwyn-3.12.0 → cadwyn-3.15.10}/cadwyn/__main__.py

@@ -60,7 +60,7 @@ def deprecated_generate_versioned_packages(
     possibly_version_bundle = getattr(version_bundle_module, version_bundle_variable_name)
     version_bundle = _get_version_bundle(possibly_version_bundle)
 
-    return generate_code_for_versioned_packages(
+    return generate_code_for_versioned_packages(  # pyright: ignore[reportDeprecated]
         template_package,
         version_bundle,
         ignore_coverage_for_latest_aliases=ignore_coverage_for_latest_aliases,
@@ -115,8 +115,7 @@ def _get_version_bundle(possibly_version_bundle: Any) -> VersionBundle:
 @app.callback()
 def main(
     version: bool = typer.Option(None, "-V", "--version", callback=version_callback, is_eager=True),
-):
-    ...
+): ...
 
 
 if __name__ == "__main__":

{cadwyn-3.12.0 → cadwyn-3.15.10}/cadwyn/_asts.py

@@ -10,6 +10,7 @@ from typing import (  # noqa: UP035
     TYPE_CHECKING,
     Any,
     List,
+    cast,
     get_args,
     get_origin,
 )
@@ -32,7 +33,7 @@ _RE_CAMEL_TO_SNAKE = re.compile(r"(?<!^)(?=[A-Z])")
 
 
 # A parent type of typing._GenericAlias
-_BaseGenericAlias = 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
@@ -100,7 +101,7 @@ def transform_generic_alias(value: GenericAliasUnion) -> Any:
     return f"{get_fancy_repr(get_origin(value))}[{', '.join(get_fancy_repr(a) for a in get_args(value))}]"
 
 
-def transform_none(_: NoneType) -> Any:
+def transform_none(_: Any) -> Any:
     return "None"
 
 
@@ -134,7 +135,7 @@ def transform_auto(_: auto) -> Any:
     return PlainRepr("auto()")
 
 
-def transform_union(value: UnionType) -> Any:  # pyright: ignore[reportInvalidTypeForm]
+def transform_union(value: UnionType) -> Any:
     return "typing.Union[" + (", ".join(get_fancy_repr(a) for a in get_args(value))) + "]"
 
 
@@ -155,7 +156,6 @@ def transform_other(value: Any) -> Any:
 def _get_lambda_source_from_default_factory(source: str) -> str:
     found_lambdas: list[ast.Lambda] = []
 
-    ast.parse(source)
     for node in ast.walk(ast.parse(source)):
         if isinstance(node, ast.keyword) and node.arg == "default_factory" and isinstance(node.value, ast.Lambda):
             found_lambdas.append(node.value)
@@ -231,7 +231,7 @@ def delete_keyword_from_call(attr_name: str, call: ast.Call):
 def get_ast_keyword_from_argument_name_and_value(name: str, value: Any):
     if not isinstance(value, ast.AST):
         value = ast.parse(get_fancy_repr(value), mode="eval").body
-    return ast.keyword(arg=name, value=value)
+    return ast.keyword(arg=name, value=value)  # pyright: ignore[reportArgumentType, reportCallIssue]
 
 
 def pop_docstring_from_cls_body(cls_body: list[ast.stmt]) -> list[ast.stmt]:

{cadwyn-3.12.0 → cadwyn-3.15.10}/cadwyn/_compat.py

@@ -61,7 +61,7 @@ class PydanticFieldWrapper:
 
     annotation: Any
 
-    init_model_field: dataclasses.InitVar[ModelField]  # pyright: ignore[reportInvalidTypeForm]
+    init_model_field: dataclasses.InitVar[ModelField]
     field_info: FieldInfo = dataclasses.field(init=False)
 
     annotation_ast: ast.expr | None = None
@@ -69,7 +69,7 @@ class PydanticFieldWrapper:
     # the value_ast is "None" and "Field(default=None)" respectively
     value_ast: ast.expr | None = None
 
-    def __post_init__(self, init_model_field: ModelField):  # pyright: ignore[reportInvalidTypeForm]
+    def __post_init__(self, init_model_field: ModelField):
         if isinstance(init_model_field, FieldInfo):
             self.field_info = init_model_field
         else:
@@ -111,6 +111,13 @@ class PydanticFieldWrapper:
             return attributes | extras
 
 
+def get_annotation_from_model_field(model: ModelField) -> Any:
+    if PYDANTIC_V2:
+        return model.field_info.annotation
+    else:
+        return model.annotation
+
+
 def model_fields(model: type[BaseModel]) -> dict[str, FieldInfo]:
     if PYDANTIC_V2:
         return model.model_fields

{cadwyn-3.12.0 → cadwyn-3.15.10}/cadwyn/applications.py

@@ -1,3 +1,5 @@
+import dataclasses
+import datetime
 from collections.abc import Callable, Coroutine, Sequence
 from datetime import date
 from logging import getLogger
@@ -7,9 +9,14 @@ from typing import Any, cast
 
 from fastapi import APIRouter, FastAPI, HTTPException, routing
 from fastapi.datastructures import Default
-from fastapi.openapi.docs import get_redoc_html, get_swagger_ui_html
+from fastapi.openapi.docs import (
+    get_redoc_html,
+    get_swagger_ui_html,
+    get_swagger_ui_oauth2_redirect_html,
+)
 from fastapi.openapi.utils import get_openapi
 from fastapi.params import Depends
+from fastapi.responses import HTMLResponse
 from fastapi.templating import Jinja2Templates
 from fastapi.utils import generate_unique_id
 from starlette.middleware import Middleware
@@ -19,7 +26,6 @@ from starlette.routing import BaseRoute, Route
 from starlette.types import Lifespan
 from typing_extensions import Self, deprecated
 
-from cadwyn._utils import same_definition_as_in
 from cadwyn.middleware import HeaderVersioningMiddleware, _get_api_version_dependency
 from cadwyn.route_generation import generate_versioned_routers
 from cadwyn.routing import _RootHeaderAPIRouter
@@ -29,6 +35,11 @@ CURR_DIR = Path(__file__).resolve()
 logger = getLogger(__name__)
 
 
+@dataclasses.dataclass(slots=True)
+class FakeDependencyOverridesProvider:
+    dependency_overrides: dict[Callable[..., Any], Callable[..., Any]]
+
+
 class Cadwyn(FastAPI):
     _templates = Jinja2Templates(directory=CURR_DIR.parent / "static")
 
@@ -54,8 +65,13 @@ class Cadwyn(FastAPI):
         swagger_ui_oauth2_redirect_url: str | None = "/docs/oauth2-redirect",
         swagger_ui_init_oauth: dict[str, Any] | None = None,
         middleware: Sequence[Middleware] | None = None,
-        exception_handlers: dict[int | type[Exception], Callable[[Request, Any], Coroutine[Any, Any, Response]]]
-        | None = None,
+        exception_handlers: (
+            dict[
+                int | type[Exception],
+                Callable[[Request, Any], Coroutine[Any, Any, Response]],
+            ]
+            | None
+        ) = None,
         on_startup: Sequence[Callable[[], Any]] | None = None,
         on_shutdown: Sequence[Callable[[], Any]] | None = None,
         lifespan: Lifespan[Self] | None = None,
@@ -71,7 +87,9 @@ class Cadwyn(FastAPI):
         deprecated: bool | None = None,
         include_in_schema: bool = True,
         swagger_ui_parameters: dict[str, Any] | None = None,
-        generate_unique_id_function: Callable[[routing.APIRoute], str] = Default(generate_unique_id),  # noqa: B008
+        generate_unique_id_function: Callable[[routing.APIRoute], str] = Default(  # noqa: B008
+            generate_unique_id
+        ),
         separate_input_output_schemas: bool = True,
         **extra: Any,
     ) -> None:
@@ -80,6 +98,7 @@ class Cadwyn(FastAPI):
         latest_schemas_package = extra.pop("latest_schemas_package", None) or self.versions.head_schemas_package
         self.versions.head_schemas_package = latest_schemas_package
         self._latest_schemas_package = cast(ModuleType, latest_schemas_package)
+        self._dependency_overrides_provider = FakeDependencyOverridesProvider({})
 
         super().__init__(
             debug=debug,
@@ -143,11 +162,10 @@ class Cadwyn(FastAPI):
         self.redoc_url = redoc_url
         self.openapi_url = openapi_url
         self.redoc_url = redoc_url
-        self.swaggers = {}
 
         unversioned_router = APIRouter(**self._kwargs_to_router)
         self._add_openapi_endpoints(unversioned_router)
-        self.add_unversioned_routers(unversioned_router)
+        self.include_router(unversioned_router)
         self.add_middleware(
             HeaderVersioningMiddleware,
             api_version_header_name=self.router.api_version_header_name,
@@ -155,6 +173,20 @@ class Cadwyn(FastAPI):
             default_response_class=default_response_class,
         )
 
+    @property
+    def dependency_overrides(self) -> dict[Callable[..., Any], Callable[..., Any]]:
+        # This is only necessary because we cannot send self to versioned router generator
+        # because it takes a deepcopy of the router and self.versions.head_schemas_package is a module
+        # which cannot be copied.
+        return self._dependency_overrides_provider.dependency_overrides
+
+    @dependency_overrides.setter
+    def dependency_overrides(  # pyright: ignore[reportIncompatibleVariableOverride]
+        self,
+        value: dict[Callable[..., Any], Callable[..., Any]],
+    ) -> None:
+        self._dependency_overrides_provider.dependency_overrides = value
+
     @property  # pragma: no cover
     @deprecated("It is going to be deleted in the future. Use VersionBundle.head_schemas_package instead")
     def latest_schemas_package(self):
@@ -178,6 +210,18 @@ class Cadwyn(FastAPI):
                     endpoint=self.swagger_dashboard,
                     include_in_schema=False,
                 )
+                if self.swagger_ui_oauth2_redirect_url:
+
+                    async def swagger_ui_redirect(req: Request) -> HTMLResponse:
+                        return (
+                            get_swagger_ui_oauth2_redirect_html()  # pragma: no cover # unimportant right now but # TODO
+                        )
+
+                    self.add_route(
+                        self.swagger_ui_oauth2_redirect_url,
+                        swagger_ui_redirect,
+                        include_in_schema=False,
+                    )
             if self.redoc_url is not None:
                 unversioned_router.add_route(
                     path=self.redoc_url,
@@ -186,7 +230,7 @@ class Cadwyn(FastAPI):
                 )
 
     def generate_and_include_versioned_routers(self, *routers: APIRouter) -> None:
-        root_router = APIRouter()
+        root_router = APIRouter(dependency_overrides_provider=self._dependency_overrides_provider)
         for router in routers:
             root_router.include_router(router)
         router_versions = generate_versioned_routers(
@@ -196,77 +240,85 @@ class Cadwyn(FastAPI):
         for version, router in router_versions.items():
             self.add_header_versioned_routers(router, header_value=version.isoformat())
 
-    def enrich_swagger(self):
-        """
-        This method goes through all header-based apps and collect a dict[openapi_version, openapi_json]
-
-        For each route a `X-API-VERSION` header with value is added
-
-        """
-        unversioned_routes_openapi = get_openapi(
-            title=self.title,
-            version=self.version,
-            openapi_version=self.openapi_version,
-            description=self.description,
-            terms_of_service=self.terms_of_service,
-            contact=self.contact,
-            license_info=self.license_info,
-            routes=self.router.routes,
-            tags=self.openapi_tags,
-            servers=self.servers,
+    async def openapi_jsons(self, req: Request) -> JSONResponse:
+        raw_version = req.query_params.get("version") or req.headers.get(self.router.api_version_header_name)
+        not_found_error = HTTPException(
+            status_code=404,
+            detail=f"OpenApi file of with version `{raw_version}` not found",
         )
-        if unversioned_routes_openapi["paths"]:
-            self.swaggers["unversioned"] = unversioned_routes_openapi
-
-        for header_value, router in self.router.versioned_routers.items():
-            header_value_str = header_value.isoformat()
-            openapi = get_openapi(
+        try:
+            version = datetime.date.fromisoformat(raw_version)  # pyright: ignore[reportArgumentType]
+        # TypeError when raw_version is None
+        # ValueError when raw_version is of the non-iso format
+        except (ValueError, TypeError):
+            version = raw_version
+
+        if version in self.router.versioned_routers:
+            routes = self.router.versioned_routers[version].routes
+            formatted_version = version.isoformat()
+        elif version == "unversioned" and self._there_are_public_unversioned_routes():
+            routes = self.router.unversioned_routes
+            formatted_version = "unversioned"
+        else:
+            raise not_found_error
+
+        return JSONResponse(
+            get_openapi(
                 title=self.title,
-                version=self.version,
+                version=formatted_version,
                 openapi_version=self.openapi_version,
                 description=self.description,
                 terms_of_service=self.terms_of_service,
                 contact=self.contact,
                 license_info=self.license_info,
-                routes=router.routes,
+                routes=routes,
                 tags=self.openapi_tags,
                 servers=self.servers,
             )
-            # in current implementation we expect header_value to be a date
-            self.swaggers[header_value_str] = openapi
-
-    async def openapi_jsons(self, req: Request) -> JSONResponse:
-        version = req.query_params.get("version") or req.headers.get(self.router.api_version_header_name)
-        openapi_of_a_version = self.swaggers.get(version)
-        if not openapi_of_a_version:
-            raise HTTPException(
-                status_code=404,
-                detail=f"OpenApi file of with version `{version}` not found",
-            )
+        )
 
-        return JSONResponse(openapi_of_a_version)
+    def _there_are_public_unversioned_routes(self):
+        return any(isinstance(route, Route) and route.include_in_schema for route in self.router.unversioned_routes)
 
     async def swagger_dashboard(self, req: Request) -> Response:
-        return self._render_docs_dashboard_or_concrete_verssion(get_swagger_ui_html, req, cast(str, self.docs_url))
+        version = req.query_params.get("version")
 
-    async def redoc_dashboard(self, req: Request) -> Response:
-        return self._render_docs_dashboard_or_concrete_verssion(get_redoc_html, req, cast(str, self.redoc_url))
+        if version:
+            root_path = self._extract_root_path(req)
+            openapi_url = root_path + f"{self.openapi_url}?version={version}"
+            oauth2_redirect_url = self.swagger_ui_oauth2_redirect_url
+            if oauth2_redirect_url:
+                oauth2_redirect_url = root_path + oauth2_redirect_url
+            return get_swagger_ui_html(
+                openapi_url=openapi_url,
+                title=f"{self.title} - Swagger UI",
+                oauth2_redirect_url=oauth2_redirect_url,
+                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))
 
-    def _render_docs_dashboard_or_concrete_verssion(self, render_docs: Callable[..., Any], req: Request, docs_url: str):
-        base_url = str(req.base_url).rstrip("/")
+    async def redoc_dashboard(self, req: Request) -> Response:
         version = req.query_params.get("version")
 
         if version:
-            return render_docs(
-                openapi_url=f"{self.openapi_url}?version={version}",
-                title="Swagger UI",
-            )
+            root_path = self._extract_root_path(req)
+            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))
+
+    def _extract_root_path(self, req: Request):
+        return req.scope.get("root_path", "").rstrip("/")
+
+    def _render_docs_dashboard(self, req: Request, docs_url: str):
+        base_url = str(req.base_url).rstrip("/")
+        table = {version: f"{base_url}{docs_url}?version={version}" for version in self.router.sorted_versions}
+        if self._there_are_public_unversioned_routes():
+            table |= {"unversioned": f"{base_url}{docs_url}?version=unversioned"}
         return self._templates.TemplateResponse(
             "docs.html",
-            {
-                "request": req,
-                "table": {version: f"{base_url}{docs_url}?version={version}" for version in sorted(self.swaggers)},
-            },
+            {"request": req, "table": table},
         )
 
     def add_header_versioned_routers(
@@ -281,109 +333,41 @@ class Cadwyn(FastAPI):
         except ValueError as e:
             raise ValueError("header_value should be in ISO 8601 format") from e
 
+        added_routes: list[BaseRoute] = []
         if header_value_as_dt not in self.router.versioned_routers:  # pragma: no branch
             self.router.versioned_routers[header_value_as_dt] = APIRouter(**self._kwargs_to_router)
-            if self.openapi_url is not None:  # pragma: no branch
-                self.router.versioned_routers[header_value_as_dt].add_route(
-                    path=self.openapi_url,
-                    endpoint=self.openapi_jsons,
-                    include_in_schema=False,
-                )
 
-        added_routes: list[BaseRoute] = []
+        versioned_router = self.router.versioned_routers[header_value_as_dt]
+        if self.openapi_url is not None:  # pragma: no branch
+            versioned_router.add_route(
+                path=self.openapi_url,
+                endpoint=self.openapi_jsons,
+                include_in_schema=False,
+            )
+            added_routes.append(versioned_router.routes[-1])
+
+        added_route_count = 0
         for router in (first_router, *other_routers):
             self.router.versioned_routers[header_value_as_dt].include_router(
                 router,
                 dependencies=[Depends(_get_api_version_dependency(self.router.api_version_header_name, header_value))],
             )
+            added_route_count += len(router.routes)
 
-        self.enrich_swagger()
-        return added_routes
+        added_routes.extend(versioned_router.routes[-added_route_count:])
+        self.router.routes.extend(added_routes)
 
-    @same_definition_as_in(FastAPI.include_router)
-    def include_router(self, *args: Any, **kwargs: Any):
-        route = super().include_router(*args, **kwargs)
-        self.enrich_swagger()
-        return route
-
-    @same_definition_as_in(FastAPI.post)
-    def post(self, *args: Any, **kwargs: Any):
-        route = super().post(*args, **kwargs)
-        self.enrich_swagger()
-        return route
-
-    @same_definition_as_in(FastAPI.get)
-    def get(self, *args: Any, **kwargs: Any):
-        route = super().get(*args, **kwargs)
-        self.enrich_swagger()
-        return route
-
-    @same_definition_as_in(FastAPI.patch)
-    def patch(self, *args: Any, **kwargs: Any):
-        route = super().patch(*args, **kwargs)
-        self.enrich_swagger()
-        return route
-
-    @same_definition_as_in(FastAPI.delete)
-    def delete(self, *args: Any, **kwargs: Any):
-        route = super().delete(*args, **kwargs)
-        self.enrich_swagger()
-        return route
-
-    @same_definition_as_in(FastAPI.put)
-    def put(self, *args: Any, **kwargs: Any):
-        route = super().put(*args, **kwargs)
-        self.enrich_swagger()
-        return route
-
-    @same_definition_as_in(FastAPI.trace)
-    def trace(self, *args: Any, **kwargs: Any):  # pragma: no cover
-        route = super().trace(*args, **kwargs)
-        self.enrich_swagger()
-        return route
-
-    @same_definition_as_in(FastAPI.options)
-    def options(self, *args: Any, **kwargs: Any):
-        route = super().options(*args, **kwargs)
-        self.enrich_swagger()
-        return route
-
-    @same_definition_as_in(FastAPI.head)
-    def head(self, *args: Any, **kwargs: Any):
-        route = super().head(*args, **kwargs)
-        self.enrich_swagger()
-        return route
-
-    @same_definition_as_in(FastAPI.add_api_route)
-    def add_api_route(self, *args: Any, **kwargs: Any):
-        route = super().add_api_route(*args, **kwargs)
-        self.enrich_swagger()
-        return route
-
-    @same_definition_as_in(FastAPI.api_route)
-    def api_route(self, *args: Any, **kwargs: Any):
-        route = super().api_route(*args, **kwargs)
-        self.enrich_swagger()
-        return route
-
-    @same_definition_as_in(FastAPI.add_api_websocket_route)
-    def add_api_websocket_route(self, *args: Any, **kwargs: Any):  # pragma: no cover
-        route = super().add_api_websocket_route(*args, **kwargs)
-        self.enrich_swagger()
-        return route
-
-    @same_definition_as_in(FastAPI.websocket)
-    def websocket(self, *args: Any, **kwargs: Any):  # pragma: no cover
-        route = super().websocket(*args, **kwargs)
-        self.enrich_swagger()
-        return route
+        return added_routes
 
+    @deprecated("Use builtin FastAPI methods such as include_router instead")
     def add_unversioned_routers(self, *routers: APIRouter):
         for router in routers:
-            self.router.include_router(router)
-        self.enrich_swagger()
+            self.include_router(router)
 
-    @deprecated("Use add add_unversioned_routers instead")
+    @deprecated("Use builtin FastAPI methods such as add_api_route instead")
     def add_unversioned_routes(self, *routes: Route):
         router = APIRouter(routes=list(routes))
         self.include_router(router)
+
+    @deprecated("It no longer does anything")
+    def enrich_swagger(self): ...

{cadwyn-3.12.0 → cadwyn-3.15.10}/cadwyn/codegen/_common.py

@@ -1,6 +1,7 @@
 import ast
 import dataclasses
 import inspect
+import textwrap
 from dataclasses import dataclass
 from enum import Enum
 from functools import cache
@@ -89,7 +90,7 @@ def get_fields_and_validators_from_model(
             {},
         )
     else:
-        cls_ast = cast(ast.ClassDef, ast.parse(source).body[0])
+        cls_ast = cast(ast.ClassDef, ast.parse(textwrap.dedent(source)).body[0])
         validators: dict[str, _ValidatorWrapper] = {}
 
         validators_and_nones = (

{cadwyn-3.12.0 → cadwyn-3.15.10}/cadwyn/codegen/_main.py

@@ -53,8 +53,7 @@ def generate_code_for_versioned_packages(
     codegen_plugins: Sequence[CodegenPlugin] = DEFAULT_CODEGEN_PLUGINS,
     migration_plugins: Sequence[MigrationPlugin] = DEFAULT_CODEGEN_MIGRATION_PLUGINS,
     extra_context: dict[str, Any] | None = None,
-):
-    ...
+): ...
 
 
 @overload
@@ -70,8 +69,7 @@ def generate_code_for_versioned_packages(
     codegen_plugins: Sequence[CodegenPlugin] = DEFAULT_CODEGEN_PLUGINS,
     migration_plugins: Sequence[MigrationPlugin] = DEFAULT_CODEGEN_MIGRATION_PLUGINS,
     extra_context: dict[str, Any] | None = None,
-):
-    ...
+): ...
 
 
 def generate_code_for_versioned_packages(
@@ -168,7 +166,7 @@ def _generate_directory_for_version(
         version_dir,
     ):
         file_source = read_python_module(template_module)
-        parsed_file = ast.parse(file_source)
+        parsed_file = ast_comments.parse(file_source)
         context = _build_context(global_context, template_dir, version_dir, template_module, parallel_file, parsed_file)
 
         parsed_file = _apply_module_level_plugins(plugins, parsed_file, context)
@@ -178,9 +176,9 @@ def _generate_directory_for_version(
 
 def _apply_module_level_plugins(
     plugins: Collection[CodegenPlugin],
-    parsed_file: ast.Module,
+    parsed_file: ast_comments.Module,
     context: CodegenContext,
-) -> ast.Module:
+) -> ast_comments.Module:
     node_type = type(parsed_file)
     for plugin in plugins:
         if issubclass(node_type, plugin.node_type):
@@ -190,9 +188,9 @@ def _apply_module_level_plugins(
 
 def _apply_per_node_plugins(
     plugins: Collection[CodegenPlugin],
-    parsed_file: ast.Module,
+    parsed_file: ast_comments.Module,
     context: CodegenContext,
-) -> ast.Module:
+) -> ast_comments.Module:
     new_body = []
 
     for node in parsed_file.body:
@@ -202,7 +200,7 @@ def _apply_per_node_plugins(
                 node = plugin(node, context)  # noqa: PLW2901
         new_body.append(node)
 
-    return ast.Module(body=new_body, type_ignores=[])
+    return ast_comments.Module(body=new_body, type_ignores=[])
 
 
 def _build_context(
@@ -211,7 +209,7 @@ def _build_context(
     version_dir: Path,
     template_module: ModuleType,
     parallel_file: Path,
-    parsed_file: ast.Module,
+    parsed_file: ast_comments.Module,
 ):
     if template_module.__name__.endswith(".__init__"):
         module_python_path = template_module.__name__.removesuffix(".__init__")

{cadwyn-3.12.0 → cadwyn-3.15.10}/cadwyn/codegen/_plugins/class_rebuilding.py

@@ -80,9 +80,9 @@ def _modify_schema_cls(
     cls_node.name = model_info.name
 
     field_definitions = [
-        ast.AnnAssign(
+        ast.AnnAssign(  # pyright: ignore[reportCallIssue]
             target=ast.Name(name, ctx=ast.Store()),
-            annotation=copy.deepcopy(field.annotation_ast),
+            annotation=copy.deepcopy(field.annotation_ast),  # pyright: ignore[reportArgumentType]
             # We do this because next plugins **might** use a transformer which will edit the ast within the field
             # and break rendering
             value=copy.deepcopy(field.value_ast),