cadwyn 3.12.0__py3-none-any.whl → 3.12.1__py3-none-any.whl

cadwyn/__main__.py

@@ -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/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(

cadwyn/route_generation.py

@@ -95,8 +95,7 @@ class InternalRepresentationOf:
 def generate_versioned_routers(
     router: _R,
     versions: VersionBundle,
-) -> dict[VersionDate, _R]:
-    ...
+) -> dict[VersionDate, _R]: ...
 
 
 @overload
@@ -105,8 +104,7 @@ def generate_versioned_routers(
     router: _R,
     versions: VersionBundle,
     latest_schemas_package: ModuleType | None,
-) -> dict[VersionDate, _R]:
-    ...
+) -> dict[VersionDate, _R]: ...
 
 
 def generate_versioned_routers(

cadwyn/routing.py

@@ -67,15 +67,14 @@ class _RootHeaderAPIRouter(APIRouter):
         if self.min_routes_version > request_header_value:
             # then the request version is older that the oldest route we have
             _logger.info(
-                f"Request version {request_version} "
-                f"is older than the oldest "
-                f"version {self.min_routes_version.isoformat()} ",
+                "Request version is older than the oldest version. No route can match this version",
+                extra={"oldest_version": self.min_routes_version.isoformat(), "request_version": request_version},
             )
             return []
         version_chosen = self.find_closest_date_but_not_new(request_header_value)
         _logger.info(
-            f"Partial match. The endpoint with {version_chosen} "
-            f"version was selected for API call version {request_version}",
+            "Partial match. The endpoint with a lower version was selected for the API call",
+            extra={"version_chosen": version_chosen, "request_version": request_version},
         )
         return self.versioned_routers[version_chosen].routes
 

cadwyn/structure/data.py

@@ -109,13 +109,11 @@ class AlterRequestByPathInstruction(_BaseAlterRequestInstruction):
 @overload
 def convert_request_to_next_version_for(
     first_schema: type, /, *additional_schemas: type
-) -> "type[staticmethod[_P, None]]":
-    ...
+) -> "type[staticmethod[_P, None]]": ...
 
 
 @overload
-def convert_request_to_next_version_for(path: str, methods: list[str], /) -> "type[staticmethod[_P, None]]":
-    ...
+def convert_request_to_next_version_for(path: str, methods: list[str], /) -> "type[staticmethod[_P, None]]": ...
 
 
 def convert_request_to_next_version_for(
@@ -174,8 +172,7 @@ def convert_response_to_previous_version_for(
     /,
     *schemas: type,
     migrate_http_errors: bool = False,
-) -> "type[staticmethod[_P, None]]":
-    ...
+) -> "type[staticmethod[_P, None]]": ...
 
 
 @overload
@@ -185,8 +182,7 @@ def convert_response_to_previous_version_for(
     /,
     *,
     migrate_http_errors: bool = False,
-) -> "type[staticmethod[_P, None]]":
-    ...
+) -> "type[staticmethod[_P, None]]": ...
 
 
 def convert_response_to_previous_version_for(

cadwyn/structure/versions.py

@@ -20,7 +20,7 @@ from fastapi.concurrency import run_in_threadpool
 from fastapi.dependencies.models import Dependant
 from fastapi.dependencies.utils import solve_dependencies
 from fastapi.exceptions import RequestValidationError
-from fastapi.responses import FileResponse, StreamingResponse
+from fastapi.responses import FileResponse, JSONResponse, StreamingResponse
 from fastapi.routing import APIRoute, _prepare_response_content
 from pydantic import BaseModel
 from starlette._utils import is_async_callable
@@ -74,9 +74,9 @@ class VersionChange:
     alter_enum_instructions: ClassVar[list[AlterEnumSubInstruction]] = Sentinel
     alter_module_instructions: ClassVar[list[AlterModuleInstruction]] = Sentinel
     alter_endpoint_instructions: ClassVar[list[AlterEndpointSubInstruction]] = Sentinel
-    alter_request_by_schema_instructions: ClassVar[
-        dict[type[BaseModel], list[AlterRequestBySchemaInstruction]]
-    ] = Sentinel
+    alter_request_by_schema_instructions: ClassVar[dict[type[BaseModel], list[AlterRequestBySchemaInstruction]]] = (
+        Sentinel
+    )
     alter_request_by_path_instructions: ClassVar[dict[str, list[AlterRequestByPathInstruction]]] = Sentinel
     alter_response_by_schema_instructions: ClassVar[dict[type, list[AlterResponseBySchemaInstruction]]] = Sentinel
     alter_response_by_path_instructions: ClassVar[dict[str, list[AlterResponseByPathInstruction]]] = Sentinel
@@ -245,8 +245,7 @@ class VersionBundle:
         *other_versions: Version,
         api_version_var: APIVersionVarType | None = None,
         head_schemas_package: ModuleType | None = None,
-    ) -> None:
-        ...
+    ) -> None: ...
 
     @overload
     @deprecated("Pass head_version_package instead of latest_schemas_package.")
@@ -257,8 +256,7 @@ class VersionBundle:
         *other_versions: Version,
         api_version_var: APIVersionVarType | None = None,
         latest_schemas_package: ModuleType | None = None,
-    ) -> None:
-        ...
+    ) -> None: ...
 
     def __init__(
         self,
@@ -620,7 +618,10 @@ class VersionBundle:
             if isinstance(response_or_response_body, StreamingResponse | FileResponse):
                 body = None
             elif response_or_response_body.body:
-                body = json.loads(response_or_response_body.body)
+                if isinstance(response_or_response_body, JSONResponse) or raised_exception is not None:
+                    body = json.loads(response_or_response_body.body)
+                else:
+                    body = response_or_response_body.body.decode(response_or_response_body.charset)
             else:
                 body = None
                 # TODO (https://github.com/zmievsa/cadwyn/issues/51): Only do this if there are migrations
@@ -666,16 +667,25 @@ class VersionBundle:
             # that do not have it. We don't support it too.
             if response_info.body is not None and hasattr(response_info._response, "body"):
                 # TODO (https://github.com/zmievsa/cadwyn/issues/51): Only do this if there are migrations
-                response_info._response.body = json.dumps(response_info.body).encode()
+                if isinstance(response_info.body, str):
+                    response_info._response.body = response_info.body.encode(response_info._response.charset)
+                else:
+                    response_info._response.body = json.dumps(
+                        response_info.body,
+                        ensure_ascii=False,
+                        allow_nan=False,
+                        indent=None,
+                        separators=(",", ":"),
+                    ).encode("utf-8")
+                # It makes sense to re-calculate content length because the previously calculated one
+                # might slightly differ. If it differs -- uvicorn will break.
+                response_info.headers["content-length"] = str(len(response_info._response.body))
 
             if raised_exception is not None and response_info.status_code >= 400:
                 if isinstance(response_info.body, dict) and "detail" in response_info.body:
                     detail = response_info.body["detail"]
                 else:
                     detail = response_info.body
-                # It makes more sense to re-calculate content length because the previously calculated one
-                # might slightly differ.
-                del response_info.headers["content-length"]
 
                 raise HTTPException(
                     status_code=response_info.status_code,

{cadwyn-3.12.0.dist-info → cadwyn-3.12.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cadwyn
-Version: 3.12.0
+Version: 3.12.1
 Summary: Production-ready community-driven modern Stripe-like API versioning in FastAPI
 Home-page: https://github.com/zmievsa/cadwyn
 License: MIT

{cadwyn-3.12.0.dist-info → cadwyn-3.12.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
 cadwyn/__init__.py,sha256=XgF-CtZo-fPk5730sKlY2fAmPsTQRIsFbrfNFeUZyFY,495
-cadwyn/__main__.py,sha256=TMxAEvgN1MFc1TkkKmsS-jFMBAW8lVos4wUZ9stp6WU,4343
+cadwyn/__main__.py,sha256=q7oNhnJ_hNRib3o6cAo4QC0cME0prVi-6P0G14tRdkw,4339
 cadwyn/_asts.py,sha256=S-x9fVKTENZZxwWfabm0PbztcHyX2MJkI6Cwv5XgVrI,10138
 cadwyn/_compat.py,sha256=6QwtzbXn53mIhEFfEizmFjd-f894oLsM6ITxqq2rCpc,5408
 cadwyn/_package_utils.py,sha256=trxTYLmppv-10SKhScfyDQJh21rsQGFoLaOtHycKKR0,1443
@@ -8,7 +8,7 @@ cadwyn/applications.py,sha256=MAVsgYojgQO4PrUETVMAsp49k6baW4h4LtS6z12gTZs,15767
 cadwyn/codegen/README.md,sha256=hc7AE87LsEsvbh-wX1H10JEWh-8bLHoe-1CkY3h00FI,879
 cadwyn/codegen/__init__.py,sha256=JgddDjxMTjSfVrMXHwNu1ODgdn2QfPWpccrRKquBV6k,355
 cadwyn/codegen/_common.py,sha256=FTI4fqpUFGBMACVlPiDMHTWhqwW_-zQNa_4Qh7m-hCA,5877
-cadwyn/codegen/_main.py,sha256=8VdMhbQyNDyeZaxKV-2sUW_Sl5X-Lu92rHdINAHaTn0,10491
+cadwyn/codegen/_main.py,sha256=1mpXq_1AuZaAOeGjrCVMhcK7zhjmmlO82Q3ehoOOAfM,10483
 cadwyn/codegen/_plugins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cadwyn/codegen/_plugins/class_migrations.py,sha256=kHZ-RMRTARZ4l70fxHMtul_204Ute2_yQmEej7wMwwo,20119
 cadwyn/codegen/_plugins/class_rebuilding.py,sha256=zNlB_VxoEAtdC5Ydiqa7pu6Ka-pKnpPQk_dvovaK0QI,3623
@@ -19,20 +19,20 @@ cadwyn/exceptions.py,sha256=gsb1vszQ2VsnfTBM5B8AYmXwCW0yvA8pJ1GhNkGzgyE,1440
 cadwyn/main.py,sha256=kt2Vn7TIA4ZnD_xrgz57TOjUk-4zVP8SV8nuTZBEaaU,218
 cadwyn/middleware.py,sha256=8cuBri_yRkl0goe6G0MLwtL04WGbW9Infah3wy9hUVM,3372
 cadwyn/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cadwyn/route_generation.py,sha256=7nHe_IP7Uz1rXmnItJsQ2yIuqe3lRgtOr8_MP_6Vg8c,35704
-cadwyn/routing.py,sha256=s_-PxzDq0GT0pW-JtRLQrcR51tDQfd420oyWBP9S-sg,6158
+cadwyn/route_generation.py,sha256=veFSg4xlInZaJzlcO6gr3wfUCbU0_TFeU3e-9HTiqLY,35696
+cadwyn/routing.py,sha256=ObH4-ETYPQjm3bMVCNzGttEKv1LL9q2sbi9eJD4W3lY,6250
 cadwyn/static/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cadwyn/static/docs.html,sha256=WNm5ANJVy51TcIUFOaqKf1Z8eF86CC85TTHPxACtkzw,3455
 cadwyn/structure/__init__.py,sha256=HjaNd6H4m4Cia42-dCO7A7sLWuVII7oldjaCabhbs_o,697
 cadwyn/structure/common.py,sha256=6Z4nI97XPWTCinn6np73m-rLPyYNrz2fWXKJlqjsiaQ,269
-cadwyn/structure/data.py,sha256=F7jqlRohpLJrgJxkxs2gTkO77q6BJ6pCbt6wJIo3TRk,7128
+cadwyn/structure/data.py,sha256=161UO_Y669-dKdSvBx5zHT7SorppApT_VXUtideFyjs,7112
 cadwyn/structure/endpoints.py,sha256=VngfAydGBwekhV2tBOtNDPVgl3X1IgYxUCw--VZ5cQY,5627
 cadwyn/structure/enums.py,sha256=iMokxA2QYJ61SzyB-Pmuq3y7KL7-e6TsnjLVUaVZQnw,954
 cadwyn/structure/modules.py,sha256=1FK-lLm-zOTXEvn-QtyBH38aDRht5PDQiZrOPCsBlM4,1268
 cadwyn/structure/schemas.py,sha256=0ylArAkUw626VkUOJSulOwJs7CS6lrGBRECEG5HFD4Q,8897
-cadwyn/structure/versions.py,sha256=SjrVqwWFIgUQEazaIW8xXjwMhgJSdSNakbAyfHSArwA,36188
-cadwyn-3.12.0.dist-info/LICENSE,sha256=KeCWewiDQYpmSnzF-p_0YpoWiyDcUPaCuG8OWQs4ig4,1072
-cadwyn-3.12.0.dist-info/METADATA,sha256=YWd0MSdFsQe6ZedoasOrtI_8J-RKlRL8TkSylw8XuYk,4360
-cadwyn-3.12.0.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-cadwyn-3.12.0.dist-info/entry_points.txt,sha256=eO05hLn9GoRzzpwT9GONPmXKsonjuMNssM2D2WHWKGk,46
-cadwyn-3.12.0.dist-info/RECORD,,
+cadwyn/structure/versions.py,sha256=qSUOs0-jmWuOMaDMac_EBPtuaJktdChGLuUabjopQPc,36902
+cadwyn-3.12.1.dist-info/LICENSE,sha256=KeCWewiDQYpmSnzF-p_0YpoWiyDcUPaCuG8OWQs4ig4,1072
+cadwyn-3.12.1.dist-info/METADATA,sha256=V7wUTcOuVwl67QOKynW5LBZw1inrKSxwp6XFdqfuGC8,4360
+cadwyn-3.12.1.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+cadwyn-3.12.1.dist-info/entry_points.txt,sha256=eO05hLn9GoRzzpwT9GONPmXKsonjuMNssM2D2WHWKGk,46
+cadwyn-3.12.1.dist-info/RECORD,,