cadwyn 3.4.2__py3-none-any.whl → 3.4.4__py3-none-any.whl

cadwyn/codegen/_plugins/latest_version_aliasing.py

@@ -64,8 +64,6 @@ class _ImportedModule:
         module = f"{self.path}.{self.name}"
         name = ast.alias(name="*")
         level = self.how_far_up_is_base_schema_dir_from_current_module
-        if level == 2 and self.is_package:
-            level -= 1
 
         return ast.ImportFrom(
             level=level,

cadwyn/exceptions.py

@@ -25,6 +25,10 @@ class RouterGenerationError(CadwynError):
     pass
 
 
+class RouterPathParamsModifiedError(RouterGenerationError):
+    pass
+
+
 class RouteAlreadyExistsError(RouterGenerationError):
     def __init__(self, *routes: APIRoute):
         self.routes = routes

cadwyn/routing.py

@@ -1,5 +1,6 @@
 import functools
 import inspect
+import re
 import sys
 import typing
 import warnings
@@ -45,7 +46,13 @@ from typing_extensions import Self, assert_never
 from cadwyn._compat import model_fields, rebuild_fastapi_body_param
 from cadwyn._package_utils import get_package_path_from_module, get_version_dir_path
 from cadwyn._utils import Sentinel, UnionType, get_another_version_of_module
-from cadwyn.exceptions import CadwynError, ModuleIsNotVersionedError, RouteAlreadyExistsError, RouterGenerationError
+from cadwyn.exceptions import (
+    CadwynError,
+    ModuleIsNotVersionedError,
+    RouteAlreadyExistsError,
+    RouterGenerationError,
+    RouterPathParamsModifiedError,
+)
 from cadwyn.structure import Version, VersionBundle
 from cadwyn.structure.common import Endpoint, VersionDate
 from cadwyn.structure.endpoints import (
@@ -624,6 +631,19 @@ def _apply_endpoint_had_instruction(
                     " It means that your version change has no effect on the attribute"
                     " and can be removed.",
                 )
+            if attr_name == "path":
+                original_path_params = {p.alias for p in original_route.dependant.path_params}
+                new_path_params = set(re.findall("{(.*?)}", attr))
+                if new_path_params != original_path_params:
+                    raise RouterPathParamsModifiedError(
+                        f'When altering the path of "{original_route.path}" in "{version_change.__name__}",'
+                        " you have tried to change its path params "
+                        f'from "{list(original_route.methods)}" to "{list(new_path_params)}". It is not allowed to '
+                        "change the path params of a route because the endpoint was created to handle the old path "
+                        "params. In fact, there is no need to change them because the change of path params is "
+                        "not a breaking change. If you really need to change the path params, you should create a "
+                        "new route with the new path params and delete the old one.",
+                    )
             setattr(original_route, attr_name, attr)
 
 

cadwyn/structure/versions.py

@@ -303,13 +303,13 @@ class VersionBundle:
         self,
         body_type: type[BaseModel] | None,
         latest_dependant_with_internal_schema: Dependant,
+        path: str,
         request: FastapiRequest,
         response: FastapiResponse,
         request_info: RequestInfo,
         current_version: VersionDate,
         latest_route: APIRoute,
     ) -> dict[str, Any]:
-        path = request.scope["path"]
         method = request.method
         for v in reversed(self.versions):
             if v.value <= current_version:
@@ -363,7 +363,6 @@ class VersionBundle:
         Returns:
             Modified data
         """
-
         for v in self.versions:
             if v.value <= current_version:
                 break
@@ -396,7 +395,6 @@ class VersionBundle:
             async def decorator(*args: Any, **kwargs: Any) -> _R:
                 request: FastapiRequest = kwargs[request_param_name]
                 response: FastapiResponse = kwargs[response_param_name]
-                path = request.scope["path"]
                 method = request.method
                 kwargs = await self._convert_endpoint_kwargs_to_version(
                     template_module_body_field_for_request_migrations,
@@ -413,7 +411,7 @@ class VersionBundle:
                 return await self._convert_endpoint_response_to_version(
                     endpoint,
                     latest_route,
-                    path,
+                    route,
                     method,
                     response_param_name,
                     kwargs,
@@ -433,7 +431,7 @@ class VersionBundle:
         self,
         func_to_get_response_from: Endpoint,
         latest_route: APIRoute,
-        path: str,
+        route: APIRoute,
         method: str,
         response_param_name: str,
         kwargs: dict[str, Any],
@@ -480,7 +478,7 @@ class VersionBundle:
             response_info,
             api_version,
             latest_route,
-            path,
+            route.path,
             method,
         )
         if isinstance(response_or_response_body, FastapiResponse):
@@ -545,6 +543,7 @@ class VersionBundle:
         new_kwargs = await self._migrate_request(
             template_module_body_field_for_request_migrations,
             latest_dependant_with_internal_schema,
+            route.path,
             request,
             response,
             request_info,

{cadwyn-3.4.2.dist-info → cadwyn-3.4.4.dist-info}/METADATA

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

{cadwyn-3.4.2.dist-info → cadwyn-3.4.4.dist-info}/RECORD

@@ -13,12 +13,12 @@ cadwyn/codegen/_plugins/class_migrations.py,sha256=dbmXMdfUGA2X4phsNdtRQQde4SuoO
 cadwyn/codegen/_plugins/class_rebuilding.py,sha256=mJR297bqsLUfP4HW5_1GuHlpiYSQd851yHpG_ajjilg,3703
 cadwyn/codegen/_plugins/class_renaming.py,sha256=5ka2W1c18i4maNbEkEpELvGLEFbd8tthvQX3YA3Bu0A,1843
 cadwyn/codegen/_plugins/import_auto_adding.py,sha256=00zGK99cT-bq2eXKDlYBR5-Z3uHLOGU7dbhB0YFFrt0,2613
-cadwyn/codegen/_plugins/latest_version_aliasing.py,sha256=itVCGc1x3TRwr9O_-hcQBrVBe0P_6dNgKxuSncjX2AY,4012
+cadwyn/codegen/_plugins/latest_version_aliasing.py,sha256=9MPW-FMOcjBZ7L05T0sxwSDCfFZHAn6xZV_E1KImbUA,3946
 cadwyn/codegen/_plugins/module_migrations.py,sha256=TeWJk4Iu4SRQ9K2iI3v3sCs1110jrltKlPdfU9mXIsQ,722
-cadwyn/exceptions.py,sha256=XOLsT4EH1uGNirmKlkgEk03PjUMtD7tgaCDadt_eBbE,695
+cadwyn/exceptions.py,sha256=0nvauw2r5VOaTg9tQ9TZgLdQd3xiqqi6YD7e3-vOcVs,766
 cadwyn/main.py,sha256=_hC2Ke1uwtnjg2WueDXlg_QnzFgJbTcAlpHgqUBTmg4,4899
 cadwyn/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cadwyn/routing.py,sha256=3H8GKT10wAYroAOCtGCNBMuA63SGAQSESze3EhBLwo0,34433
+cadwyn/routing.py,sha256=85xqLfRuLtYwyoFl97ITHPNBSnoN7wP9a_mjyEDAJDc,35563
 cadwyn/structure/__init__.py,sha256=BjFPlQYCw8ds_4zxdCi2LimarUGqSzyTNmOdT-FkGms,661
 cadwyn/structure/common.py,sha256=6Z4nI97XPWTCinn6np73m-rLPyYNrz2fWXKJlqjsiaQ,269
 cadwyn/structure/data.py,sha256=cCaclB67mKlgRiydPFijyfLdng4qyqnY_hP8ApS5pT4,5781
@@ -26,9 +26,9 @@ cadwyn/structure/endpoints.py,sha256=VngfAydGBwekhV2tBOtNDPVgl3X1IgYxUCw--VZ5cQY
 cadwyn/structure/enums.py,sha256=iMokxA2QYJ61SzyB-Pmuq3y7KL7-e6TsnjLVUaVZQnw,954
 cadwyn/structure/modules.py,sha256=1FK-lLm-zOTXEvn-QtyBH38aDRht5PDQiZrOPCsBlM4,1268
 cadwyn/structure/schemas.py,sha256=LIKwDuzorVC9AHg4EN-UYdI133lCk_2MkBTdiyAr-EQ,8808
-cadwyn/structure/versions.py,sha256=kmIJTJpihXsCnE7-7PT82nIcW3qkOtN5ewuF3bxnamc,28392
-cadwyn-3.4.2.dist-info/entry_points.txt,sha256=eO05hLn9GoRzzpwT9GONPmXKsonjuMNssM2D2WHWKGk,46
-cadwyn-3.4.2.dist-info/LICENSE,sha256=KeCWewiDQYpmSnzF-p_0YpoWiyDcUPaCuG8OWQs4ig4,1072
-cadwyn-3.4.2.dist-info/WHEEL,sha256=vxFmldFsRN_Hx10GDvsdv1wroKq8r5Lzvjp6GZ4OO8c,88
-cadwyn-3.4.2.dist-info/METADATA,sha256=s4cO22vjgaJU5gokr8L2_-osjw4ufSZhE6CYY7Vi6O8,4264
-cadwyn-3.4.2.dist-info/RECORD,,
+cadwyn/structure/versions.py,sha256=YSAPrGOIesWtVI-CW5gEMbzNops5idMKeeksBGcJaMY,28365
+cadwyn-3.4.4.dist-info/entry_points.txt,sha256=eO05hLn9GoRzzpwT9GONPmXKsonjuMNssM2D2WHWKGk,46
+cadwyn-3.4.4.dist-info/LICENSE,sha256=KeCWewiDQYpmSnzF-p_0YpoWiyDcUPaCuG8OWQs4ig4,1072
+cadwyn-3.4.4.dist-info/WHEEL,sha256=vxFmldFsRN_Hx10GDvsdv1wroKq8r5Lzvjp6GZ4OO8c,88
+cadwyn-3.4.4.dist-info/METADATA,sha256=cW1suk85sWnkSQYswqck6ho5NxtbwGmUAIgOin1MPWc,4264
+cadwyn-3.4.4.dist-info/RECORD,,