cadwyn 4.4.0__py3-none-any.whl → 4.4.2__py3-none-any.whl

cadwyn/route_generation.py

@@ -1,7 +1,7 @@
 import re
 from collections import defaultdict
 from collections.abc import Callable, Sequence
-from copy import deepcopy
+from copy import copy, deepcopy
 from dataclasses import dataclass
 from typing import (
     TYPE_CHECKING,
@@ -49,6 +49,7 @@ if TYPE_CHECKING:
 _Call = TypeVar("_Call", bound=Callable[..., Any])
 _R = TypeVar("_R", bound=APIRouter)
 _WR = TypeVar("_WR", bound=APIRouter, default=APIRouter)
+_RouteT = TypeVar("_RouteT", bound=BaseRoute)
 # This is a hack we do because we can't guarantee how the user will use the router.
 _DELETED_ROUTE_TAG = "_CADWYN_DELETED_ROUTE"
 
@@ -90,6 +91,25 @@ class VersionedAPIRouter(fastapi.routing.APIRouter):
         return endpoint
 
 
+def copy_router(router: _R) -> _R:
+    router = copy(router)
+    router.routes = [copy_route(r) for r in router.routes]
+    return router
+
+
+def copy_route(route: _RouteT) -> _RouteT:
+    if not isinstance(route, APIRoute):
+        return copy(route)
+
+    # This is slightly wasteful in terms of resources but it makes it easy for us
+    # to make sure that new versions of FastAPI are going to be supported even if
+    # APIRoute gets new attributes.
+    new_route = deepcopy(route)
+    new_route.dependant = copy(route.dependant)
+    new_route.dependencies = copy(route.dependencies)
+    return new_route
+
+
 class _EndpointTransformer(Generic[_R, _WR]):
     def __init__(self, parent_router: _R, versions: VersionBundle, webhooks: _WR) -> None:
         super().__init__()
@@ -103,8 +123,8 @@ class _EndpointTransformer(Generic[_R, _WR]):
         ]
 
     def transform(self) -> GeneratedRouters[_R, _WR]:
-        router = deepcopy(self.parent_router)
-        webhook_router = deepcopy(self.parent_webhooks_router)
+        router = copy_router(self.parent_router)
+        webhook_router = copy_router(self.parent_webhooks_router)
         routers: dict[VersionDate, _R] = {}
         webhook_routers: dict[VersionDate, _WR] = {}
 
@@ -117,8 +137,8 @@ class _EndpointTransformer(Generic[_R, _WR]):
             routers[version.value] = router
             webhook_routers[version.value] = webhook_router
             # Applying changes for the next version
-            router = deepcopy(router)
-            webhook_router = deepcopy(webhook_router)
+            router = copy_router(router)
+            webhook_router = copy_router(webhook_router)
             self._apply_endpoint_changes_to_router(router.routes + webhook_router.routes, version)
 
         if self.routes_that_never_existed:
@@ -134,7 +154,7 @@ class _EndpointTransformer(Generic[_R, _WR]):
             if not isinstance(head_route, APIRoute):
                 continue
             _add_request_and_response_params(head_route)
-            copy_of_dependant = deepcopy(head_route.dependant)
+            copy_of_dependant = copy(head_route.dependant)
 
             for older_router in list(routers.values()):
                 older_route = older_router.routes[route_index]

cadwyn/schema_generation.py

@@ -367,6 +367,10 @@ class _PydanticModelWrapper(Generic[_T_PYDANTIC_MODEL]):
         return model_copy
 
 
+def is_regular_function(call: Callable):
+    return isinstance(call, types.FunctionType | types.MethodType)
+
+
 class _CallableWrapper:
     """__eq__ and __hash__ are needed to make sure that dependency overrides work correctly.
     They are based on putting dependencies (functions) as keys for the dictionary so if we want to be able to
@@ -376,6 +380,8 @@ class _CallableWrapper:
     def __init__(self, original_callable: Callable) -> None:
         super().__init__()
         self._original_callable = original_callable
+        if not is_regular_function(original_callable):
+            original_callable = original_callable.__call__
         functools.update_wrapper(self, original_callable)
 
     @property
@@ -458,6 +464,12 @@ class _AnnotationTransformer:
     def _change_version_of_a_non_container_annotation(self, annotation: Any) -> Any:
         if isinstance(annotation, _BaseGenericAlias | types.GenericAlias):
             return get_origin(annotation)[tuple(self.change_version_of_annotation(arg) for arg in get_args(annotation))]
+        elif isinstance(annotation, fastapi.params.Security):
+            return fastapi.params.Security(
+                self.change_version_of_annotation(annotation.dependency),
+                scopes=annotation.scopes,
+                use_cache=annotation.use_cache,
+            )
         elif isinstance(annotation, fastapi.params.Depends):
             return fastapi.params.Depends(
                 self.change_version_of_annotation(annotation.dependency),
@@ -475,7 +487,7 @@ class _AnnotationTransformer:
         elif callable(annotation):
             if type(annotation).__module__.startswith(
                 ("fastapi.", "pydantic.", "pydantic_core.", "starlette.")
-            ) or isinstance(annotation, fastapi.params.Security | fastapi.security.base.SecurityBase):
+            ) or isinstance(annotation, fastapi.security.base.SecurityBase):
                 return annotation
 
             def modifier(annotation: Any):
@@ -568,8 +580,12 @@ class _AnnotationTransformer:
     def _copy_function_through_class_based_wrapper(cls, call: Any):
         """Separate from copy_endpoint because endpoints MUST be functions in FastAPI, they cannot be cls instances"""
         call = cls._unwrap_callable(call)
-
-        if inspect.iscoroutinefunction(call):
+        if not is_regular_function(call):
+            # This means that the callable is actually an instance of a regular class
+            actual_call = call.__call__
+        else:
+            actual_call = call
+        if inspect.iscoroutinefunction(actual_call):
             return _AsyncCallableWrapper(call)
         else:
             return _CallableWrapper(call)
@@ -578,9 +594,6 @@ class _AnnotationTransformer:
     def _unwrap_callable(call: Any) -> Any:
         while hasattr(call, "_original_callable"):
             call = call._original_callable
-        if not isinstance(call, types.FunctionType | types.MethodType):
-            # This means that the callable is actually an instance of a regular class
-            call = call.__call__
 
         return call
 
@@ -607,7 +620,7 @@ class SchemaGenerator:
 
     def __getitem__(self, model: type[_T_ANY_MODEL], /) -> type[_T_ANY_MODEL]:
         if not isinstance(model, type) or not issubclass(model, BaseModel | Enum) or model in (BaseModel, RootModel):
-            return model  # pyright: ignore[reportReturnType]
+            return model
         model = _unwrap_model(model)
 
         if model in self.concrete_models:

cadwyn/structure/versions.py

@@ -156,6 +156,8 @@ class VersionChange:
                 "instructions_to_migrate_to_previous_version",
                 "__module__",
                 "__doc__",
+                "__firstlineno__",
+                "__static_attributes__",
             }:
                 raise CadwynStructureError(
                     f"Found: '{attr_name}' attribute of type '{type(attr_value)}' in '{cls.__name__}'."

{cadwyn-4.4.0.dist-info → cadwyn-4.4.2.dist-info}/METADATA

@@ -1,13 +1,13 @@
 Metadata-Version: 2.3
 Name: cadwyn
-Version: 4.4.0
+Version: 4.4.2
 Summary: Production-ready community-driven modern Stripe-like API versioning in FastAPI
 Project-URL: Source code, https://github.com/zmievsa/cadwyn
 Project-URL: Documentation, https://docs.cadwyn.dev
 Author-email: Stanislav Zmiev <zmievsa@gmail.com>
 License-Expression: MIT
 License-File: LICENSE
-Keywords: api,api-versioning,code-generation,fastapi,hints,json-schema,pydantic,python,python310,python311,python312,stripe,versioning
+Keywords: api,api-versioning,code-generation,fastapi,hints,json-schema,pydantic,python,python310,python311,python312,python313,stripe,versioning
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Web Environment
 Classifier: Framework :: AsyncIO
@@ -23,6 +23,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Internet
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Internet :: WWW/HTTP :: HTTP Servers

{cadwyn-4.4.0.dist-info → cadwyn-4.4.2.dist-info}/RECORD

@@ -9,9 +9,9 @@ cadwyn/changelogs.py,sha256=SdrdAKQ01mpzs-EN_zg-D0TY7wxsibjRjLMhGcI4q80,20066
 cadwyn/exceptions.py,sha256=VlJKRmEGfFTDtHbOWc8kXK4yMi2N172K684Y2UIV8rI,1832
 cadwyn/middleware.py,sha256=kUZK2dmoricMbv6knPCIHpXEInX2670XIwAj0v_XQxk,3408
 cadwyn/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cadwyn/route_generation.py,sha256=870pZK-Gs_pUuRRj9jcJm3AOc-Ua2jtNRoJcwUutLA4,24028
+cadwyn/route_generation.py,sha256=2qUTPHsG6u6yXUA5pLa3ubfZOc9FrISDMELmAFhDSUY,24696
 cadwyn/routing.py,sha256=9AHSojmuLgUAQlLMIqXz-ViZ9n-fljgOsn7oxha7PjM,7341
-cadwyn/schema_generation.py,sha256=1eJ--nyG8onUROWegCmQQWJ4iJEu1MrTt-8bnLIQyeQ,39992
+cadwyn/schema_generation.py,sha256=JuWuBPZTEC_K8BEd67jaXFqD-Y4r40njJLQFNBrU77Y,40465
 cadwyn/static/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cadwyn/static/docs.html,sha256=WNm5ANJVy51TcIUFOaqKf1Z8eF86CC85TTHPxACtkzw,3455
 cadwyn/structure/__init__.py,sha256=vej7TdTMSOg8U8Wk7GTNdA4rc6loA9083FWaTg4jAaY,655
@@ -20,9 +20,9 @@ cadwyn/structure/data.py,sha256=1ALPhBBCE_t4GrxM0Fa3hQ-jkORJgeWNySnZ42bsi0g,7382
 cadwyn/structure/endpoints.py,sha256=9FFnbqPM9v0CP6J6tGhMNKVvWqA9u3ZjI2Fannr2Rl0,5933
 cadwyn/structure/enums.py,sha256=bZL-iUOUFi9ZYlMZJw-tAix2yrgCp3gH3N2gwO44LUU,1043
 cadwyn/structure/schemas.py,sha256=D0BD1D3v9MRdVWchU9JM2zHd0dvB0UgXHDGFCe5aQZc,8209
-cadwyn/structure/versions.py,sha256=2qe7xFYNdzdWmCZhkf4_zJ7lF0XdtyM1wq6xQ9omb_c,33655
-cadwyn-4.4.0.dist-info/METADATA,sha256=YcNWXemwnjoR8H2ODF7yFTWRBOjbPaxar1vKXe9UmOs,4443
-cadwyn-4.4.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-cadwyn-4.4.0.dist-info/entry_points.txt,sha256=mGX8wl-Xfhpr5M93SUmkykaqinUaYAvW9rtDSX54gx0,47
-cadwyn-4.4.0.dist-info/licenses/LICENSE,sha256=KeCWewiDQYpmSnzF-p_0YpoWiyDcUPaCuG8OWQs4ig4,1072
-cadwyn-4.4.0.dist-info/RECORD,,
+cadwyn/structure/versions.py,sha256=7vbKSj0XwYNDbDXRAhB4iHT1K1YCRAcvXsQrC6rZn7w,33731
+cadwyn-4.4.2.dist-info/METADATA,sha256=jXeXnBO2beIecKbyGh1RGv_Fq1TQpgc46_dXHIGLjcs,4504
+cadwyn-4.4.2.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+cadwyn-4.4.2.dist-info/entry_points.txt,sha256=mGX8wl-Xfhpr5M93SUmkykaqinUaYAvW9rtDSX54gx0,47
+cadwyn-4.4.2.dist-info/licenses/LICENSE,sha256=KeCWewiDQYpmSnzF-p_0YpoWiyDcUPaCuG8OWQs4ig4,1072
+cadwyn-4.4.2.dist-info/RECORD,,