cadwyn 5.2.0__py3-none-any.whl → 5.2.2__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of cadwyn might be problematic. Click here for more details.
- cadwyn/_internal/__init__.py +0 -0
- cadwyn/_internal/context_vars.py +9 -0
- cadwyn/applications.py +7 -1
- cadwyn/dependencies.py +3 -3
- cadwyn/middleware.py +6 -1
- cadwyn/route_generation.py +59 -25
- cadwyn/routing.py +10 -1
- cadwyn/schema_generation.py +1 -2
- cadwyn/structure/versions.py +19 -23
- {cadwyn-5.2.0.dist-info → cadwyn-5.2.2.dist-info}/METADATA +1 -1
- {cadwyn-5.2.0.dist-info → cadwyn-5.2.2.dist-info}/RECORD +14 -12
- {cadwyn-5.2.0.dist-info → cadwyn-5.2.2.dist-info}/WHEEL +0 -0
- {cadwyn-5.2.0.dist-info → cadwyn-5.2.2.dist-info}/entry_points.txt +0 -0
- {cadwyn-5.2.0.dist-info → cadwyn-5.2.2.dist-info}/licenses/LICENSE +0 -0
|
File without changes
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
from contextvars import ContextVar
|
|
2
|
+
|
|
3
|
+
from typing_extensions import Literal
|
|
4
|
+
|
|
5
|
+
DEFAULT_API_VERSION_VAR: "ContextVar[str | None]" = ContextVar("cadwyn_default_api_version")
|
|
6
|
+
CURRENT_DEPENDENCY_SOLVER_OPTIONS = Literal["cadwyn", "fastapi"]
|
|
7
|
+
CURRENT_DEPENDENCY_SOLVER_VAR: ContextVar[CURRENT_DEPENDENCY_SOLVER_OPTIONS] = ContextVar(
|
|
8
|
+
"cadwyn_dependencies_current_dependency_solver"
|
|
9
|
+
)
|
cadwyn/applications.py
CHANGED
|
@@ -133,6 +133,12 @@ class Cadwyn(FastAPI):
|
|
|
133
133
|
stacklevel=2,
|
|
134
134
|
)
|
|
135
135
|
api_version_parameter_name = api_version_header_name
|
|
136
|
+
if api_version_default_value is not None and api_version_location == "path":
|
|
137
|
+
raise CadwynStructureError(
|
|
138
|
+
"You tried to pass an api_version_default_value while putting the API version in Path. "
|
|
139
|
+
"This is not currently supported by Cadwyn. "
|
|
140
|
+
"Please, open an issue on our github if you'd like to have it."
|
|
141
|
+
)
|
|
136
142
|
|
|
137
143
|
super().__init__(
|
|
138
144
|
debug=debug,
|
|
@@ -231,8 +237,8 @@ class Cadwyn(FastAPI):
|
|
|
231
237
|
versioning_middleware_class,
|
|
232
238
|
api_version_parameter_name=api_version_parameter_name,
|
|
233
239
|
api_version_manager=self._api_version_manager,
|
|
234
|
-
api_version_default_value=api_version_default_value,
|
|
235
240
|
api_version_var=self.versions.api_version_var,
|
|
241
|
+
api_version_default_value=api_version_default_value,
|
|
236
242
|
)
|
|
237
243
|
if self.api_version_format == "date" and (
|
|
238
244
|
sorted(self.versions.versions, key=lambda v: v.value, reverse=True) != list(self.versions.versions)
|
cadwyn/dependencies.py
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
from cadwyn.
|
|
1
|
+
from cadwyn._internal.context_vars import CURRENT_DEPENDENCY_SOLVER_OPTIONS, CURRENT_DEPENDENCY_SOLVER_VAR
|
|
2
2
|
|
|
3
3
|
|
|
4
|
-
async def current_dependency_solver() ->
|
|
5
|
-
return
|
|
4
|
+
async def current_dependency_solver() -> CURRENT_DEPENDENCY_SOLVER_OPTIONS:
|
|
5
|
+
return CURRENT_DEPENDENCY_SOLVER_VAR.get("fastapi")
|
cadwyn/middleware.py
CHANGED
|
@@ -7,10 +7,12 @@ from collections.abc import Awaitable, Callable
|
|
|
7
7
|
from contextvars import ContextVar
|
|
8
8
|
from typing import Annotated, Any, Literal, Protocol, Union
|
|
9
9
|
|
|
10
|
+
import fastapi
|
|
10
11
|
from fastapi import Request
|
|
11
12
|
from starlette.middleware.base import BaseHTTPMiddleware, DispatchFunction, RequestResponseEndpoint
|
|
12
13
|
from starlette.types import ASGIApp
|
|
13
14
|
|
|
15
|
+
from cadwyn._internal.context_vars import DEFAULT_API_VERSION_VAR
|
|
14
16
|
from cadwyn.structure.common import VersionType
|
|
15
17
|
|
|
16
18
|
|
|
@@ -69,6 +71,8 @@ def _generate_api_version_dependency(
|
|
|
69
71
|
annotation=Annotated[
|
|
70
72
|
validation_data_type, fastapi_depends_class(openapi_examples={"default": {"value": default_value}})
|
|
71
73
|
],
|
|
74
|
+
# Path-based parameters do not support a default value in FastAPI :(
|
|
75
|
+
default=default_value if fastapi_depends_class != fastapi.Path else inspect.Signature.empty,
|
|
72
76
|
),
|
|
73
77
|
],
|
|
74
78
|
)
|
|
@@ -103,10 +107,11 @@ class VersionPickingMiddleware(BaseHTTPMiddleware):
|
|
|
103
107
|
api_version = self._api_version_manager.get(request)
|
|
104
108
|
|
|
105
109
|
if api_version is None:
|
|
106
|
-
if callable(self.api_version_default_value):
|
|
110
|
+
if callable(self.api_version_default_value):
|
|
107
111
|
api_version = await self.api_version_default_value(request)
|
|
108
112
|
else:
|
|
109
113
|
api_version = self.api_version_default_value
|
|
114
|
+
DEFAULT_API_VERSION_VAR.set(api_version)
|
|
110
115
|
|
|
111
116
|
self.api_version_var.set(api_version)
|
|
112
117
|
response = await call_next(request)
|
cadwyn/route_generation.py
CHANGED
|
@@ -37,11 +37,13 @@ from cadwyn.schema_generation import (
|
|
|
37
37
|
)
|
|
38
38
|
from cadwyn.structure import Version, VersionBundle
|
|
39
39
|
from cadwyn.structure.common import Endpoint, VersionType
|
|
40
|
+
from cadwyn.structure.data import _AlterRequestByPathInstruction, _AlterResponseByPathInstruction
|
|
40
41
|
from cadwyn.structure.endpoints import (
|
|
41
42
|
EndpointDidntExistInstruction,
|
|
42
43
|
EndpointExistedInstruction,
|
|
43
44
|
EndpointHadInstruction,
|
|
44
45
|
)
|
|
46
|
+
from cadwyn.structure.versions import VersionChange
|
|
45
47
|
|
|
46
48
|
if TYPE_CHECKING:
|
|
47
49
|
from fastapi.dependencies.models import Dependant
|
|
@@ -52,6 +54,9 @@ _WR = TypeVar("_WR", bound=APIRouter, default=APIRouter)
|
|
|
52
54
|
_RouteT = TypeVar("_RouteT", bound=BaseRoute)
|
|
53
55
|
# This is a hack we do because we can't guarantee how the user will use the router.
|
|
54
56
|
_DELETED_ROUTE_TAG = "_CADWYN_DELETED_ROUTE"
|
|
57
|
+
_RoutePath = str
|
|
58
|
+
_RouteMethod = str
|
|
59
|
+
_RouteId = int
|
|
55
60
|
|
|
56
61
|
|
|
57
62
|
@dataclass(**DATACLASS_SLOTS, frozen=True, eq=True)
|
|
@@ -123,6 +128,7 @@ class _EndpointTransformer(Generic[_R, _WR]):
|
|
|
123
128
|
]
|
|
124
129
|
|
|
125
130
|
def transform(self) -> GeneratedRouters[_R, _WR]:
|
|
131
|
+
# Copy MUST keep the order and number of routes. Otherwise, a ton of code below will break.
|
|
126
132
|
router = copy_router(self.parent_router)
|
|
127
133
|
webhook_router = copy_router(self.parent_webhooks_router)
|
|
128
134
|
routers: dict[VersionType, _R] = {}
|
|
@@ -132,7 +138,7 @@ class _EndpointTransformer(Generic[_R, _WR]):
|
|
|
132
138
|
self.schema_generators[str(version.value)].annotation_transformer.migrate_router_to_version(router)
|
|
133
139
|
self.schema_generators[str(version.value)].annotation_transformer.migrate_router_to_version(webhook_router)
|
|
134
140
|
|
|
135
|
-
self.
|
|
141
|
+
self._attach_routes_to_data_converters(router, self.parent_router, version)
|
|
136
142
|
|
|
137
143
|
routers[version.value] = router
|
|
138
144
|
webhook_routers[version.value] = webhook_router
|
|
@@ -193,9 +199,11 @@ class _EndpointTransformer(Generic[_R, _WR]):
|
|
|
193
199
|
]
|
|
194
200
|
return GeneratedRouters(routers, webhook_routers)
|
|
195
201
|
|
|
196
|
-
def
|
|
197
|
-
|
|
198
|
-
|
|
202
|
+
def _attach_routes_to_data_converters(self, router: APIRouter, head_router: APIRouter, version: Version):
|
|
203
|
+
# This method is way out of its league in terms of complexity. We gotta refactor it.
|
|
204
|
+
|
|
205
|
+
path_to_route_methods_mapping, head_response_models, head_request_bodies = (
|
|
206
|
+
self._extract_all_routes_identifiers_for_route_to_converter_matching(router)
|
|
199
207
|
)
|
|
200
208
|
|
|
201
209
|
for version_change in version.changes:
|
|
@@ -204,21 +212,10 @@ class _EndpointTransformer(Generic[_R, _WR]):
|
|
|
204
212
|
*version_change.alter_request_by_path_instructions.values(),
|
|
205
213
|
]:
|
|
206
214
|
for by_path_converter in by_path_converters:
|
|
207
|
-
|
|
208
|
-
path_to_route_methods_mapping
|
|
215
|
+
self._attach_routes_by_path_converter(
|
|
216
|
+
head_router, path_to_route_methods_mapping, version_change, by_path_converter
|
|
209
217
|
)
|
|
210
218
|
|
|
211
|
-
if missing_methods:
|
|
212
|
-
raise RouteByPathConverterDoesNotApplyToAnythingError(
|
|
213
|
-
f"{by_path_converter.repr_name} "
|
|
214
|
-
f'"{version_change.__name__}.{by_path_converter.transformer.__name__}" '
|
|
215
|
-
f"failed to find routes with the following methods: {list(missing_methods)}. "
|
|
216
|
-
f"This means that you are trying to apply this converter to non-existing endpoint(s). "
|
|
217
|
-
"Please, check whether the path and methods are correct. (hint: path must include "
|
|
218
|
-
"all path variables and have a name that was used in the version that this "
|
|
219
|
-
"VersionChange resides in)"
|
|
220
|
-
)
|
|
221
|
-
|
|
222
219
|
for by_schema_converters in version_change.alter_request_by_schema_instructions.values():
|
|
223
220
|
for by_schema_converter in by_schema_converters:
|
|
224
221
|
if not by_schema_converter.check_usage: # pragma: no cover
|
|
@@ -249,14 +246,50 @@ class _EndpointTransformer(Generic[_R, _WR]):
|
|
|
249
246
|
f"{version_change.__name__}.{by_schema_converter.transformer.__name__}"
|
|
250
247
|
)
|
|
251
248
|
|
|
252
|
-
def
|
|
253
|
-
self,
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
249
|
+
def _attach_routes_by_path_converter(
|
|
250
|
+
self,
|
|
251
|
+
head_router: APIRouter,
|
|
252
|
+
path_to_route_methods_mapping: dict[_RoutePath, dict[_RouteMethod, set[_RouteId]]],
|
|
253
|
+
version_change: type[VersionChange],
|
|
254
|
+
by_path_converter: Union[_AlterResponseByPathInstruction, _AlterRequestByPathInstruction],
|
|
255
|
+
):
|
|
256
|
+
missing_methods = set()
|
|
257
|
+
for method in by_path_converter.methods:
|
|
258
|
+
if method in path_to_route_methods_mapping[by_path_converter.path]:
|
|
259
|
+
for route_index in path_to_route_methods_mapping[by_path_converter.path][method]:
|
|
260
|
+
route = head_router.routes[route_index]
|
|
261
|
+
if isinstance(by_path_converter, _AlterResponseByPathInstruction):
|
|
262
|
+
version_change._route_to_response_migration_mapping[id(route)].append(by_path_converter)
|
|
263
|
+
else:
|
|
264
|
+
version_change._route_to_request_migration_mapping[id(route)].append(by_path_converter)
|
|
265
|
+
else:
|
|
266
|
+
missing_methods.add(method)
|
|
267
|
+
|
|
268
|
+
if missing_methods:
|
|
269
|
+
raise RouteByPathConverterDoesNotApplyToAnythingError(
|
|
270
|
+
f"{by_path_converter.repr_name} "
|
|
271
|
+
f'"{version_change.__name__}.{by_path_converter.transformer.__name__}" '
|
|
272
|
+
f"failed to find routes with the following methods: {list(missing_methods)}. "
|
|
273
|
+
f"This means that you are trying to apply this converter to non-existing endpoint(s). "
|
|
274
|
+
"Please, check whether the path and methods are correct. (hint: path must include "
|
|
275
|
+
"all path variables and have a name that was used in the version that this "
|
|
276
|
+
"VersionChange resides in)"
|
|
277
|
+
)
|
|
258
278
|
|
|
259
|
-
|
|
279
|
+
def _extract_all_routes_identifiers_for_route_to_converter_matching(
|
|
280
|
+
self, router: APIRouter
|
|
281
|
+
) -> tuple[dict[_RoutePath, dict[_RouteMethod, set[_RouteId]]], set[Any], set[Any]]:
|
|
282
|
+
# int is the index of the route in the router.routes list.
|
|
283
|
+
# So we essentially keep track of which routes have which response models and request bodies.
|
|
284
|
+
# and their indices in the router.routes list. The indices will allow us to match them to the same
|
|
285
|
+
# routes in the head version. This gives us the ability to later apply changes to these routes
|
|
286
|
+
# without thinking about any renamings or response model changes.
|
|
287
|
+
|
|
288
|
+
response_models = set()
|
|
289
|
+
request_bodies = set()
|
|
290
|
+
path_to_route_methods_mapping: dict[str, dict[str, set[int]]] = defaultdict(lambda: defaultdict(set))
|
|
291
|
+
|
|
292
|
+
for index, route in enumerate(router.routes):
|
|
260
293
|
if isinstance(route, APIRoute):
|
|
261
294
|
if route.response_model is not None and lenient_issubclass(route.response_model, BaseModel):
|
|
262
295
|
response_models.add(route.response_model)
|
|
@@ -265,7 +298,8 @@ class _EndpointTransformer(Generic[_R, _WR]):
|
|
|
265
298
|
annotation = route.body_field.field_info.annotation
|
|
266
299
|
if annotation is not None and lenient_issubclass(annotation, BaseModel):
|
|
267
300
|
request_bodies.add(annotation)
|
|
268
|
-
|
|
301
|
+
for method in route.methods:
|
|
302
|
+
path_to_route_methods_mapping[route.path][method].add(index)
|
|
269
303
|
|
|
270
304
|
head_response_models = {model.__cadwyn_original_model__ for model in response_models}
|
|
271
305
|
head_request_bodies = {getattr(body, "__cadwyn_original_model__", body) for body in request_bodies}
|
cadwyn/routing.py
CHANGED
|
@@ -11,6 +11,7 @@ from starlette.responses import RedirectResponse
|
|
|
11
11
|
from starlette.routing import BaseRoute, Match
|
|
12
12
|
from starlette.types import Receive, Scope, Send
|
|
13
13
|
|
|
14
|
+
from cadwyn._internal.context_vars import DEFAULT_API_VERSION_VAR
|
|
14
15
|
from cadwyn._utils import same_definition_as_in
|
|
15
16
|
from cadwyn.middleware import APIVersionFormat
|
|
16
17
|
from cadwyn.structure.common import VersionType
|
|
@@ -70,8 +71,8 @@ class _RootCadwynAPIRouter(APIRouter):
|
|
|
70
71
|
if scope["type"] == "lifespan":
|
|
71
72
|
await self.lifespan(scope, receive, send)
|
|
72
73
|
return
|
|
73
|
-
|
|
74
74
|
version = self.api_version_var.get(None)
|
|
75
|
+
default_version_that_was_picked = DEFAULT_API_VERSION_VAR.get(None)
|
|
75
76
|
|
|
76
77
|
# if version is None, then it's an unversioned request and we need to use the unversioned routes
|
|
77
78
|
# if there will be a value, we search for the most suitable version
|
|
@@ -81,6 +82,14 @@ class _RootCadwynAPIRouter(APIRouter):
|
|
|
81
82
|
routes = self.versioned_routers[version].routes
|
|
82
83
|
else:
|
|
83
84
|
routes = await self._get_routes_from_closest_suitable_version(version)
|
|
85
|
+
if default_version_that_was_picked:
|
|
86
|
+
# We add unversioned routes to versioned routes because otherwise unversioned routes
|
|
87
|
+
# will be completely unavailable when a default version is passed. So routes such as
|
|
88
|
+
# /docs will not be accessible at all.
|
|
89
|
+
|
|
90
|
+
# We use this order because if versioned routes go first and there is a versioned route that is
|
|
91
|
+
# the same as an unversioned route -- the unversioned one becomes impossible to match.
|
|
92
|
+
routes = self.unversioned_routes + routes
|
|
84
93
|
await self.process_request(scope=scope, receive=receive, send=send, routes=routes)
|
|
85
94
|
|
|
86
95
|
@cached_property
|
cadwyn/schema_generation.py
CHANGED
|
@@ -196,8 +196,7 @@ def migrate_response_body(
|
|
|
196
196
|
response,
|
|
197
197
|
current_version=version,
|
|
198
198
|
head_response_model=latest_response_model,
|
|
199
|
-
|
|
200
|
-
method="GET",
|
|
199
|
+
head_route=None,
|
|
201
200
|
)
|
|
202
201
|
|
|
203
202
|
versioned_response_model: type[pydantic.BaseModel] = generate_versioned_models(versions)[str(version)][
|
cadwyn/structure/versions.py
CHANGED
|
@@ -24,8 +24,9 @@ from fastapi.routing import APIRoute, _prepare_response_content
|
|
|
24
24
|
from pydantic import BaseModel
|
|
25
25
|
from pydantic_core import PydanticUndefined
|
|
26
26
|
from starlette._utils import is_async_callable
|
|
27
|
-
from typing_extensions import Any,
|
|
27
|
+
from typing_extensions import Any, ParamSpec, TypeAlias, TypeVar, assert_never, deprecated, get_args
|
|
28
28
|
|
|
29
|
+
from cadwyn._internal.context_vars import CURRENT_DEPENDENCY_SOLVER_VAR
|
|
29
30
|
from cadwyn._utils import classproperty
|
|
30
31
|
from cadwyn.exceptions import (
|
|
31
32
|
CadwynError,
|
|
@@ -52,10 +53,7 @@ _CADWYN_REQUEST_PARAM_NAME = "cadwyn_request_param"
|
|
|
52
53
|
_CADWYN_RESPONSE_PARAM_NAME = "cadwyn_response_param"
|
|
53
54
|
_P = ParamSpec("_P")
|
|
54
55
|
_R = TypeVar("_R")
|
|
55
|
-
|
|
56
|
-
_CURRENT_DEPENDENCY_SOLVER_VAR: ContextVar[_CURRENT_DEPENDENCY_SOLVER_OPTIONS] = ContextVar(
|
|
57
|
-
"cadwyn_dependencies_dry_run"
|
|
58
|
-
)
|
|
56
|
+
_RouteId = int
|
|
59
57
|
|
|
60
58
|
PossibleInstructions: TypeAlias = Union[
|
|
61
59
|
AlterSchemaSubInstruction, AlterEndpointSubInstruction, AlterEnumSubInstruction, SchemaHadInstruction, staticmethod
|
|
@@ -88,6 +86,8 @@ class VersionChange:
|
|
|
88
86
|
alter_response_by_schema_instructions: ClassVar[dict[type, list[_AlterResponseBySchemaInstruction]]] = Sentinel
|
|
89
87
|
alter_response_by_path_instructions: ClassVar[dict[str, list[_AlterResponseByPathInstruction]]] = Sentinel
|
|
90
88
|
_bound_version_bundle: "Union[VersionBundle, None]"
|
|
89
|
+
_route_to_request_migration_mapping: ClassVar[dict[_RouteId, list[_AlterRequestByPathInstruction]]] = Sentinel
|
|
90
|
+
_route_to_response_migration_mapping: ClassVar[dict[_RouteId, list[_AlterResponseByPathInstruction]]] = Sentinel
|
|
91
91
|
|
|
92
92
|
def __init_subclass__(cls, _abstract: bool = False) -> None:
|
|
93
93
|
super().__init_subclass__()
|
|
@@ -99,6 +99,8 @@ class VersionChange:
|
|
|
99
99
|
cls._extract_body_instructions_into_correct_containers()
|
|
100
100
|
cls._check_no_subclassing()
|
|
101
101
|
cls._bound_version_bundle = None
|
|
102
|
+
cls._route_to_request_migration_mapping = defaultdict(list)
|
|
103
|
+
cls._route_to_response_migration_mapping = defaultdict(list)
|
|
102
104
|
|
|
103
105
|
@classmethod
|
|
104
106
|
def _extract_body_instructions_into_correct_containers(cls):
|
|
@@ -361,7 +363,6 @@ class VersionBundle:
|
|
|
361
363
|
self,
|
|
362
364
|
body_type: Union[type[BaseModel], None],
|
|
363
365
|
head_dependant: Dependant,
|
|
364
|
-
path: str,
|
|
365
366
|
request: FastapiRequest,
|
|
366
367
|
response: FastapiResponse,
|
|
367
368
|
request_info: RequestInfo,
|
|
@@ -372,22 +373,21 @@ class VersionBundle:
|
|
|
372
373
|
embed_body_fields: bool,
|
|
373
374
|
background_tasks: Union[BackgroundTasks, None],
|
|
374
375
|
) -> dict[str, Any]:
|
|
375
|
-
method = request.method
|
|
376
|
-
|
|
377
376
|
start = self.reversed_version_values.index(current_version)
|
|
377
|
+
head_route_id = id(head_route)
|
|
378
378
|
for v in self.reversed_versions[start + 1 :]:
|
|
379
379
|
for version_change in v.changes:
|
|
380
380
|
if body_type is not None and body_type in version_change.alter_request_by_schema_instructions:
|
|
381
381
|
for instruction in version_change.alter_request_by_schema_instructions[body_type]:
|
|
382
382
|
instruction(request_info)
|
|
383
|
-
if
|
|
384
|
-
for instruction in version_change.
|
|
385
|
-
|
|
386
|
-
|
|
383
|
+
if head_route_id in version_change._route_to_request_migration_mapping:
|
|
384
|
+
for instruction in version_change._route_to_request_migration_mapping[head_route_id]:
|
|
385
|
+
instruction(request_info)
|
|
386
|
+
|
|
387
387
|
request.scope["headers"] = tuple((key.encode(), value.encode()) for key, value in request_info.headers.items())
|
|
388
388
|
del request._headers
|
|
389
389
|
# This gives us the ability to tell the user whether cadwyn is running its dependencies or FastAPI
|
|
390
|
-
|
|
390
|
+
CURRENT_DEPENDENCY_SOLVER_VAR.set("cadwyn")
|
|
391
391
|
# Remember this: if len(body_params) == 1, then route.body_schema == route.dependant.body_params[0]
|
|
392
392
|
result = await solve_dependencies(
|
|
393
393
|
request=request,
|
|
@@ -409,10 +409,10 @@ class VersionBundle:
|
|
|
409
409
|
self,
|
|
410
410
|
response_info: ResponseInfo,
|
|
411
411
|
current_version: VersionType,
|
|
412
|
-
head_response_model: type[BaseModel],
|
|
413
|
-
|
|
414
|
-
method: str,
|
|
412
|
+
head_response_model: Union[type[BaseModel], None],
|
|
413
|
+
head_route: Union[APIRoute, None],
|
|
415
414
|
) -> ResponseInfo:
|
|
415
|
+
head_route_id = id(head_route)
|
|
416
416
|
end = self.version_values.index(current_version)
|
|
417
417
|
for v in self.versions[:end]:
|
|
418
418
|
for version_change in v.changes:
|
|
@@ -423,10 +423,8 @@ class VersionBundle:
|
|
|
423
423
|
version_change.alter_response_by_schema_instructions[head_response_model]
|
|
424
424
|
)
|
|
425
425
|
|
|
426
|
-
if
|
|
427
|
-
|
|
428
|
-
if method in instruction.methods: # pragma: no branch # Safe branch to skip
|
|
429
|
-
migrations_to_apply.append(instruction) # noqa: PERF401
|
|
426
|
+
if head_route_id in version_change._route_to_response_migration_mapping:
|
|
427
|
+
migrations_to_apply.extend(version_change._route_to_response_migration_mapping[head_route_id])
|
|
430
428
|
|
|
431
429
|
for migration in migrations_to_apply:
|
|
432
430
|
if response_info.status_code < 300 or migration.migrate_http_errors:
|
|
@@ -579,8 +577,7 @@ class VersionBundle:
|
|
|
579
577
|
response_info,
|
|
580
578
|
api_version,
|
|
581
579
|
head_route.response_model,
|
|
582
|
-
|
|
583
|
-
method,
|
|
580
|
+
head_route,
|
|
584
581
|
)
|
|
585
582
|
if isinstance(response_or_response_body, FastapiResponse):
|
|
586
583
|
# a webserver (uvicorn for instance) calculates the body at the endpoint level.
|
|
@@ -674,7 +671,6 @@ class VersionBundle:
|
|
|
674
671
|
new_kwargs = await self._migrate_request(
|
|
675
672
|
head_body_field,
|
|
676
673
|
head_dependant,
|
|
677
|
-
route.path,
|
|
678
674
|
request,
|
|
679
675
|
response,
|
|
680
676
|
request_info,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: cadwyn
|
|
3
|
-
Version: 5.2.
|
|
3
|
+
Version: 5.2.2
|
|
4
4
|
Summary: Production-ready community-driven modern Stripe-like API versioning in FastAPI
|
|
5
5
|
Project-URL: Source code, https://github.com/zmievsa/cadwyn
|
|
6
6
|
Project-URL: Documentation, https://docs.cadwyn.dev
|
|
@@ -4,15 +4,17 @@ cadwyn/_asts.py,sha256=QvqZmDdwH8U-Ocpj9vYR6MRrIANF8ugk9oZgAo76qLs,5223
|
|
|
4
4
|
cadwyn/_importer.py,sha256=QV6HqODCG9K2oL4Vc15fAqL2-plMvUWw_cgaj4Ln4C8,1075
|
|
5
5
|
cadwyn/_render.py,sha256=VAY2Twd_MfKaC8_X22AMIQd72_UHy87icdAbKL8hd90,5526
|
|
6
6
|
cadwyn/_utils.py,sha256=q_mTtMKTNTDzqCza67XST-jaPSfuTgnFLmOe0dlGeYY,2295
|
|
7
|
-
cadwyn/applications.py,sha256=
|
|
7
|
+
cadwyn/applications.py,sha256=xE-r96qSIWji6-mrpRhQVGTLHEvayfMDi0cRaIVPkds,20777
|
|
8
8
|
cadwyn/changelogs.py,sha256=aBTlsZ8PQpw9t4sSyezNTYDs6CMPtzIGulgAHA1ELPs,19622
|
|
9
|
-
cadwyn/dependencies.py,sha256=
|
|
9
|
+
cadwyn/dependencies.py,sha256=phUJ4Fy3UTegpOfDfHMjxsvASWo-1NQgwqphNnPdoVQ,241
|
|
10
10
|
cadwyn/exceptions.py,sha256=8D1G7ewLrMF5jq7leald1g0ulcH9zQl8ufEK3b7HHAE,1749
|
|
11
|
-
cadwyn/middleware.py,sha256=
|
|
11
|
+
cadwyn/middleware.py,sha256=jWhuISMEMo7kYLMJ8y4wzso1SNSpaW7Zkxocqi9MLEA,4617
|
|
12
12
|
cadwyn/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
13
|
-
cadwyn/route_generation.py,sha256=
|
|
14
|
-
cadwyn/routing.py,sha256=
|
|
15
|
-
cadwyn/schema_generation.py,sha256=
|
|
13
|
+
cadwyn/route_generation.py,sha256=RTZYfml03oKaNm_-SJX8N6PnafFXdsPpN0qEapHSzTw,27181
|
|
14
|
+
cadwyn/routing.py,sha256=Ii6Qbgm9lGks1IAk-kDuIu_dX3FXsA77KSfGOFmLbgc,7604
|
|
15
|
+
cadwyn/schema_generation.py,sha256=76T5MgfJHoQNfr_GdN5VVIUbGgA-KCV666r94jGSp0I,46830
|
|
16
|
+
cadwyn/_internal/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
17
|
+
cadwyn/_internal/context_vars.py,sha256=VcM8eAoSlvrIMFQhjZmjflV5o1yrPSEZZGkwOK4OSf4,378
|
|
16
18
|
cadwyn/static/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
17
19
|
cadwyn/static/docs.html,sha256=WNm5ANJVy51TcIUFOaqKf1Z8eF86CC85TTHPxACtkzw,3455
|
|
18
20
|
cadwyn/structure/__init__.py,sha256=Wgvjdq3vfl9Yhe-BkcFGAMi_Co11YOfTmJQqgF5Gzx4,655
|
|
@@ -21,9 +23,9 @@ cadwyn/structure/data.py,sha256=NWURVnP_84VI2ugp9ppo0Ofyve3pVYjymF9K82Jh-SA,7791
|
|
|
21
23
|
cadwyn/structure/endpoints.py,sha256=zUgzglNhBPnmWdJ03A8pFT4zPs_lj8nQ7c7Uo2d-ejU,6246
|
|
22
24
|
cadwyn/structure/enums.py,sha256=4FCc9aniLE3VuWAVIacrNP_FWxTIUm9JkeeHA_zZdwQ,1254
|
|
23
25
|
cadwyn/structure/schemas.py,sha256=O9yNw1OB0Qz-PvNB0FYlQm34gQsjyG2l9gg9x-RnJIY,10781
|
|
24
|
-
cadwyn/structure/versions.py,sha256=
|
|
25
|
-
cadwyn-5.2.
|
|
26
|
-
cadwyn-5.2.
|
|
27
|
-
cadwyn-5.2.
|
|
28
|
-
cadwyn-5.2.
|
|
29
|
-
cadwyn-5.2.
|
|
26
|
+
cadwyn/structure/versions.py,sha256=FNHhgqCVe9Q5TO5ZMOSJgR846mli4ubGLvNDUERyPYs,34447
|
|
27
|
+
cadwyn-5.2.2.dist-info/METADATA,sha256=MDSfUMPASu62fS_-FeTMsisY57qGkVS98CcaRQ6u5CI,4529
|
|
28
|
+
cadwyn-5.2.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
|
|
29
|
+
cadwyn-5.2.2.dist-info/entry_points.txt,sha256=mGX8wl-Xfhpr5M93SUmkykaqinUaYAvW9rtDSX54gx0,47
|
|
30
|
+
cadwyn-5.2.2.dist-info/licenses/LICENSE,sha256=KeCWewiDQYpmSnzF-p_0YpoWiyDcUPaCuG8OWQs4ig4,1072
|
|
31
|
+
cadwyn-5.2.2.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|