cadwyn 3.15.7__py3-none-any.whl → 3.15.9__py3-none-any.whl

cadwyn/_asts.py

@@ -101,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"
 
 
@@ -156,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)
@@ -232,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/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/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),

cadwyn/middleware.py

@@ -64,11 +64,11 @@ class HeaderVersioningMiddleware(BaseHTTPMiddleware):
                     request=request,
                     dependant=self.version_header_validation_dependant,
                     async_exit_stack=async_exit_stack,
+                    embed_body_fields=False,
                 )
-                values, errors, *_ = solved_result
-                if errors:
-                    return self.default_response_class(status_code=422, content=_normalize_errors(errors))
-                api_version = cast(date, values[self.api_version_header_name.replace("-", "_")])
+                if solved_result.errors:
+                    return self.default_response_class(status_code=422, content=_normalize_errors(solved_result.errors))
+                api_version = cast(date, solved_result.values[self.api_version_header_name.replace("-", "_")])
                 self.api_version_var.set(api_version)
 
         response = await call_next(request)

cadwyn/route_generation.py

@@ -445,7 +445,7 @@ def _extract_internal_request_schemas_from_router(
 
     def _extract_internal_request_schemas_from_annotations(annotations: dict[str, Any]):
         for key, annotation in annotations.items():
-            if isinstance(annotation, type(Annotated[int, int])):
+            if isinstance(annotation, type(Annotated[int, int])):  # pyright: ignore[reportArgumentType]
                 args = get_args(annotation)
                 if isinstance(args[1], type) and issubclass(  # pragma: no branch
                     args[1],
@@ -525,7 +525,7 @@ class _AnnotationTransformer:
     ):
         if route.response_model is not None and not ignore_response_model:
             route.response_model = self._change_version_of_annotations(route.response_model, version_dir)
-            route.response_field = fastapi.utils.create_response_field(
+            route.response_field = fastapi.utils.create_model_field(
                 name="Response_" + route.unique_id,
                 type_=route.response_model,
                 mode="serialization",

cadwyn/structure/modules.py

@@ -1,5 +1,6 @@
 import ast
 import dataclasses
+import textwrap
 from dataclasses import InitVar, dataclass
 from types import ModuleType
 
@@ -13,7 +14,7 @@ class AlterModuleInstruction:
     import_: ast.Import | ast.ImportFrom = dataclasses.field(init=False)
 
     def __post_init__(self, raw_import: str):
-        parsed_body = ast.parse(raw_import).body
+        parsed_body = ast.parse(textwrap.dedent(raw_import)).body
         if len(parsed_body) > 1:
             raise CadwynStructureError(
                 f"You have specified more than just a single import. This is prohibited. "

cadwyn/structure/versions.py

@@ -449,6 +449,8 @@ class VersionBundle:
         current_version: VersionDate,
         head_route: APIRoute,
         exit_stack: AsyncExitStack,
+        *,
+        embed_body_fields: bool,
     ) -> dict[str, Any]:
         method = request.method
         for v in reversed(self.versions):
@@ -465,19 +467,20 @@ class VersionBundle:
         request.scope["headers"] = tuple((key.encode(), value.encode()) for key, value in request_info.headers.items())
         del request._headers
         # Remember this: if len(body_params) == 1, then route.body_schema == route.dependant.body_params[0]
-        dependencies, errors, _, _, _ = await solve_dependencies(
+        result = await solve_dependencies(
             request=request,
             response=response,
             dependant=head_dependant,
             body=request_info.body,
             dependency_overrides_provider=head_route.dependency_overrides_provider,
             async_exit_stack=exit_stack,
+            embed_body_fields=embed_body_fields,
         )
-        if errors:
+        if result.errors:
             raise CadwynHeadRequestValidationError(
-                _normalize_errors(errors), body=request_info.body, version=current_version
+                _normalize_errors(result.errors), body=request_info.body, version=current_version
             )
-        return dependencies
+        return result.values
 
     def _migrate_response(
         self,
@@ -671,7 +674,10 @@ 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
-                if isinstance(response_info.body, str):
+                if (
+                    isinstance(response_info.body, str)
+                    and response_info._response.headers.get("content-type") != "application/json"
+                ):
                     response_info._response.body = response_info.body.encode(response_info._response.charset)
                 else:
                     response_info._response.body = json.dumps(
@@ -752,6 +758,7 @@ class VersionBundle:
             api_version,
             head_route,
             exit_stack=exit_stack,
+            embed_body_fields=route._embed_body_fields,
         )
         # Because we re-added it into our kwargs when we did solve_dependencies
         if _CADWYN_REQUEST_PARAM_NAME in new_kwargs:

{cadwyn-3.15.7.dist-info → cadwyn-3.15.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cadwyn
-Version: 3.15.7
+Version: 3.15.9
 Summary: Production-ready community-driven modern Stripe-like API versioning in FastAPI
 Home-page: https://github.com/zmievsa/cadwyn
 License: MIT
@@ -33,7 +33,7 @@ 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)

{cadwyn-3.15.7.dist-info → cadwyn-3.15.9.dist-info}/RECORD

@@ -1,25 +1,25 @@
 cadwyn/__init__.py,sha256=Wh_CtNgodacy8plxyDXCDb52CDftbql4jGXQ2pldX4s,605
 cadwyn/__main__.py,sha256=cc-5iYItjxRnB09uxuxlEbjrLm1AEhXI2KrI5iakEOw,4376
-cadwyn/_asts.py,sha256=OF1qQKPqTbgYhH1tYF-MB8CCU0r6YITZpMFegzmk0Ic,10118
+cadwyn/_asts.py,sha256=0OcYNZPFm65CFb-oZMwbx191Bai0asqDA4y_IKzh6_w,10147
 cadwyn/_compat.py,sha256=yAPmfGl2vVEYXlNHHPMoa2JkEJCVPjbP_Uz0WOIVOp4,5494
 cadwyn/_package_utils.py,sha256=trxTYLmppv-10SKhScfyDQJh21rsQGFoLaOtHycKKR0,1443
 cadwyn/_utils.py,sha256=BFsfZBpdoL5RMAaT1V1cXJVpTZCmwksQ-Le2MTHivGI,4841
 cadwyn/applications.py,sha256=MkZ_vMs6YfnfuWPUzBjNBmrxtDa97etsV0zcnlv-iS0,15749
 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/_common.py,sha256=fnz9Q-C7oZ3JKypPC_Xi6_CssF803XAUHL661IYY1hM,5910
 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
+cadwyn/codegen/_plugins/class_rebuilding.py,sha256=_gjQsx_kU36tf8HT3mKhSv7V9RXfawFdbKTtYLP2IMk,3698
 cadwyn/codegen/_plugins/class_renaming.py,sha256=oc9Ms6YnpJKaq1iOehcBfA_OFUFL-CAAZJiaQPlkKHs,1773
 cadwyn/codegen/_plugins/import_auto_adding.py,sha256=krAVzsmsW-CbKP-W9oCkQsL7aPfhHzRq4STgai6Tm5s,2543
 cadwyn/codegen/_plugins/module_migrations.py,sha256=TeWJk4Iu4SRQ9K2iI3v3sCs1110jrltKlPdfU9mXIsQ,722
 cadwyn/exceptions.py,sha256=aJKx1qgzZqShL4MX3COjS780qzNJcdZFeGzYYa5gbzw,1726
 cadwyn/main.py,sha256=kt2Vn7TIA4ZnD_xrgz57TOjUk-4zVP8SV8nuTZBEaaU,218
-cadwyn/middleware.py,sha256=8cuBri_yRkl0goe6G0MLwtL04WGbW9Infah3wy9hUVM,3372
+cadwyn/middleware.py,sha256=kUZK2dmoricMbv6knPCIHpXEInX2670XIwAj0v_XQxk,3408
 cadwyn/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cadwyn/route_generation.py,sha256=14_CP_oJBhiO1dNgtYwYkuZnL7o7wyL-EenSvMx39ig,41571
+cadwyn/route_generation.py,sha256=80LmEodZ5SgscnhVL4A3ck0t8RJK5d5Acnefyo4CfIc,41607
 cadwyn/routing.py,sha256=o6IMjxTxARPa5BxFfsXqOP3bVw9Ya6OBAEbUwH9lMVM,7445
 cadwyn/static/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cadwyn/static/docs.html,sha256=WNm5ANJVy51TcIUFOaqKf1Z8eF86CC85TTHPxACtkzw,3455
@@ -28,11 +28,11 @@ cadwyn/structure/common.py,sha256=6Z4nI97XPWTCinn6np73m-rLPyYNrz2fWXKJlqjsiaQ,26
 cadwyn/structure/data.py,sha256=1ALPhBBCE_t4GrxM0Fa3hQ-jkORJgeWNySnZ42bsi0g,7382
 cadwyn/structure/endpoints.py,sha256=JhTgVrqLjm5LkE9thjvU1UuWcSCmDgW2bMdqznsZb2Y,5777
 cadwyn/structure/enums.py,sha256=iMokxA2QYJ61SzyB-Pmuq3y7KL7-e6TsnjLVUaVZQnw,954
-cadwyn/structure/modules.py,sha256=1FK-lLm-zOTXEvn-QtyBH38aDRht5PDQiZrOPCsBlM4,1268
+cadwyn/structure/modules.py,sha256=v3hA_KiqKwwo-ur0Z84WvqD0rTTe4fBTkMUK8SxUj7s,1301
 cadwyn/structure/schemas.py,sha256=0ylArAkUw626VkUOJSulOwJs7CS6lrGBRECEG5HFD4Q,8897
-cadwyn/structure/versions.py,sha256=_NthvvuN7l01J-E2zCZmYtpJZjiVO-wqSDvMSFXhzno,37400
-cadwyn-3.15.7.dist-info/LICENSE,sha256=KeCWewiDQYpmSnzF-p_0YpoWiyDcUPaCuG8OWQs4ig4,1072
-cadwyn-3.15.7.dist-info/METADATA,sha256=IplLmVX2LHqfcRse_swuTQ9cf-9MMbbhcKs-10rNhok,4397
-cadwyn-3.15.7.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-cadwyn-3.15.7.dist-info/entry_points.txt,sha256=eO05hLn9GoRzzpwT9GONPmXKsonjuMNssM2D2WHWKGk,46
-cadwyn-3.15.7.dist-info/RECORD,,
+cadwyn/structure/versions.py,sha256=Vlp-H1K36NRztHRkNhagmNKgQbIP6bc0gAgm7egHCTs,37679
+cadwyn-3.15.9.dist-info/LICENSE,sha256=KeCWewiDQYpmSnzF-p_0YpoWiyDcUPaCuG8OWQs4ig4,1072
+cadwyn-3.15.9.dist-info/METADATA,sha256=LF_7ygrwYAOOqt8any8RynxqWL0I1hVI5seBiqjy7Rg,4397
+cadwyn-3.15.9.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+cadwyn-3.15.9.dist-info/entry_points.txt,sha256=eO05hLn9GoRzzpwT9GONPmXKsonjuMNssM2D2WHWKGk,46
+cadwyn-3.15.9.dist-info/RECORD,,