cadwyn 4.4.0__tar.gz → 4.4.2__tar.gz

{cadwyn-4.4.0 → cadwyn-4.4.2}/.github/workflows/ci.yaml

@@ -27,6 +27,8 @@ jobs:
             python-version: "3.11"
           - os: ubuntu-latest
             python-version: "3.12"
+          - os: ubuntu-latest
+            python-version: "3.13"
           - os: windows-latest
             python-version: "3.10"
           - os: macos-latest

{cadwyn-4.4.0 → cadwyn-4.4.2}/.github/workflows/daily_tests.yaml

@@ -10,12 +10,21 @@ jobs:
   update-dependencies-and-test:
     name: Update dependencies and run tests
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: true
+      matrix:
+        python-version: ["3.10", "3.11", "3.12", "3.13"]
 
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/setup-python-uv
+        with:
+          python-version: ${{ matrix.python-version }}
       - run: uv sync --refresh --all-extras --dev --upgrade
       - run: pytest .
+      - uses: jakebailey/pyright-action@v1
+        with:
+          pylance-version: latest-release
 
   notify-on-failure:
     name: Notify on failure

{cadwyn-4.4.0 → cadwyn-4.4.2}/CHANGELOG.md

@@ -5,6 +5,18 @@ Please follow [the Keep a Changelog standard](https://keepachangelog.com/en/1.0.
 
 ## [Unreleased]
 
+## [4.4.2]
+
+### Fixed
+
+* Non-function (object instances) dependencies not supporting dependency overrides in testing
+
+## [4.4.1]
+
+### Added
+
+* Python 3.13 to CI
+
 ## [4.4.0]
 
 ### Added

{cadwyn-4.4.0 → cadwyn-4.4.2}/Makefile

@@ -11,4 +11,4 @@ test:
 	rm -r coverage; \
 	uv run coverage run --source=. -m pytest .; \
 	uv run coverage combine; \
-	uv run coverage report --fail-under=100;
+	uv run coverage report --fail-under=100 --show-missing;

{cadwyn-4.4.0 → cadwyn-4.4.2}/PKG-INFO

@@ -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 → cadwyn-4.4.2}/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-4.4.0 → cadwyn-4.4.2}/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-4.4.0 → cadwyn-4.4.2}/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 → cadwyn-4.4.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cadwyn"
-version = "4.4.0"
+version = "4.4.2"
 description = "Production-ready community-driven modern Stripe-like API versioning in FastAPI"
 authors = [{ name = "Stanislav Zmiev", email = "zmievsa@gmail.com" }]
 license = "MIT"
@@ -20,6 +20,7 @@ keywords = [
     "python310",
     "python311",
     "python312",
+    "python313",
 ]
 classifiers = [
     "Intended Audience :: Information Technology",
@@ -30,6 +31,7 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Topic :: Internet",
     "Topic :: Software Development :: Libraries :: Application Frameworks",
     "Topic :: Software Development :: Libraries :: Python Modules",
@@ -56,24 +58,16 @@ dependencies = [
     "typing-extensions>=4.8.0",
 ]
 
+
 [project.optional-dependencies]
 standard = ["fastapi[standard]>=0.112.3", "typer>=0.7.0"]
 
-[project.urls]
-"Source code" = "https://github.com/zmievsa/cadwyn"
-Documentation = "https://docs.cadwyn.dev"
-
-
-[project.scripts]
-cadwyn = "cadwyn.__main__:app"
-
 [tool.uv]
 dev-dependencies = [
     "pdbpp ~=0.10.3",
     "python-multipart >=0.0.6",
     "better-devtools ~=0.13.3",
     "pytest-sugar ~=1.0.0",
-
     # tests
     "svcs ~=24.1.0",
     "httpx >=0.26.0",
@@ -82,7 +76,6 @@ dev-dependencies = [
     "pytest-cov >=4.0.0",
     "dirty-equals >=0.6.0",
     "uvicorn ~=0.23.0",
-
     # docs
     "mkdocs >=1.5.2",
     "mkdocs-material >=9.3.1",
@@ -91,6 +84,15 @@ dev-dependencies = [
     "mike >=2.1.2, <3",
 ]
 
+[project.urls]
+"Source code" = "https://github.com/zmievsa/cadwyn"
+Documentation = "https://docs.cadwyn.dev"
+
+
+[project.scripts]
+cadwyn = "cadwyn.__main__:app"
+
+
 [tool.coverage.run]
 data_file = "coverage/coverage"
 parallel = true

{cadwyn-4.4.0 → cadwyn-4.4.2}/tests/conftest.py

@@ -142,7 +142,7 @@ def version_change(
     **body_items: Any,
 ):
     return type(VersionChange)(
-        "MyVersionChange",
+        "MyVersionChange",  # pyright: ignore[reportCallIssue]
         (VersionChange,),
         {
             "description": "",

cadwyn-4.4.2/tests/test_auth_dependencies.py

@@ -0,0 +1,67 @@
+from typing import NoReturn
+
+import pytest
+from fastapi import APIRouter, HTTPException, Security
+from fastapi.testclient import TestClient
+
+from cadwyn.applications import Cadwyn
+from cadwyn.structure.versions import Version, VersionBundle
+
+
+class ScarySecurity:
+    """It's IMPORTANT that we use an instance of a class instead of a function because it can be properly copied.
+
+    It's an edge case.
+    """
+
+    async def __call__(self) -> NoReturn:
+        raise HTTPException(status_code=401, detail="Unauthorized")
+
+
+scary_security = ScarySecurity()
+
+
+@pytest.fixture
+def cadwyn_app():
+    router = APIRouter()
+
+    @router.get("/hello")
+    async def world(user=Security(scary_security)):
+        return {"hello": "world", "user": user}
+
+    app = Cadwyn(versions=VersionBundle(Version("2023-11-16")))
+    app.include_router(router)
+    app.generate_and_include_versioned_routers(router)
+
+    return app
+
+
+@pytest.fixture
+def user_client(cadwyn_app: Cadwyn):
+    with TestClient(app=cadwyn_app, base_url="http://test") as ac:
+        yield ac
+
+
+@pytest.fixture
+def _override_auth_dependency(cadwyn_app: Cadwyn) -> None:
+    cadwyn_app.dependency_overrides[scary_security] = lambda: {"id": 123}
+
+
+def test__no_dependency_overrides_with_unversioned_routes(user_client: TestClient):
+    response = user_client.get("/hello")
+    assert response.status_code == 401, response.json()
+
+
+def test__no_dependency_overrides_with_versioned_routes(user_client: TestClient):
+    response = user_client.get("/hello", headers={"x-api-version": "2023-11-16"})
+    assert response.status_code == 401, response.json()
+
+
+def test__dependency_overrides_with_unversioned_routes(user_client: TestClient, _override_auth_dependency: None):
+    response = user_client.get("/hello")
+    assert response.status_code == 200, response.json()
+
+
+def test__dependency_overrides_with_versioned_routes(user_client: TestClient, _override_auth_dependency: None):
+    response = user_client.get("/hello", headers={"x-api-version": "2023-11-16"})
+    assert response.status_code == 200, response.json()

{cadwyn-4.4.0 → cadwyn-4.4.2}/tests/test_render.py

@@ -19,11 +19,16 @@ def test__render_model__with_weird_types():
     )
     # TODO: sobolevn has created a tool for doing such nocovers in a better manner.
     # hopefully someday we will switch to it.
-    if sys.version_info >= (3, 11):  # pragma: no cover # We cover this in CI
+    if sys.version_info >= (3, 11):
         rendered_lambda = "lambda: 83"
-    else:  # pragma: no cover # We cover this in CI
+    else:
         rendered_lambda = "lambda : 83"
 
+    if sys.version_info >= (3, 13):
+        rend_ann = "typing.Annotated"
+    else:
+        rend_ann = "Annotated"
+
     # TODO: As you see, we do not rename bases correctly in render. We gotta fix it some day...
     assert code(result) == code(
         f'''
@@ -32,11 +37,11 @@ class ModelWithWeirdFields(A):
     foo: dict = Field(default={{'a': 'b'}})
     bar: list[int] = Field(default_factory=my_default_factory)
     baz: typing.Literal[MyEnum.foo] = Field()
-    saz: Annotated[str, StringConstraints(to_upper=True)] = Field()
-    laz: Annotated[int, None, Interval(gt=12, ge=None, lt=None, le=None), None] = Field()
+    saz: {rend_ann}[str, StringConstraints(to_upper=True)] = Field()
+    laz: {rend_ann}[int, None, Interval(gt=12, ge=None, lt=None, le=None), None] = Field()
     taz: typing.Union[int, str, None] = Field(default_factory={rendered_lambda})
     naz: list[int] = Field(default=[1, 2, 3])
-    gaz: Annotated[bytes, Strict(strict=True), Len(min_length=0, max_length=None)] = Field(min_length=3, title='Hewwo')
+    gaz: {rend_ann}[bytes, Strict(strict=True), Len(min_length=0, max_length=None)] = Field(min_length=3, title='Hewwo')
 '''
     )
 

{cadwyn-4.4.0 → cadwyn-4.4.2}/tests/test_schema_generation/test_schema_validator.py

@@ -1,7 +1,13 @@
 import re
 
 import pytest
-from pydantic import BaseModel, field_validator, model_validator, root_validator, validator
+from pydantic import (
+    BaseModel,
+    field_validator,
+    model_validator,
+    root_validator,  # pyright: ignore[reportDeprecated]
+    validator,  # pyright: ignore[reportDeprecated]
+)
 
 from cadwyn.exceptions import InvalidGenerationInstructionError
 from cadwyn.structure import schema
@@ -58,12 +64,12 @@ def test__schema_validator_existed__with_deprecated_validators(
 ):
     with pytest.warns(DeprecationWarning):
 
-        @root_validator(pre=True)
+        @root_validator(pre=True)  # pyright: ignore[reportDeprecated]
         def hewwo(cls, values):
             values["foo"] += "_root"
             return values
 
-        @validator("foo")
+        @validator("foo")  # pyright: ignore[reportDeprecated]
         def dawkness(cls, value):
             return value + "_field"
 
@@ -178,7 +184,7 @@ def test__schema_field_didnt_exist__with_validator_that_covers_multiple_fields__
 
         with pytest.warns(DeprecationWarning):
 
-            @validator("bar")
+            @validator("bar")  # pyright: ignore[reportDeprecated]
             def validate_bar(cls, value):
                 raise NotImplementedError
 
@@ -191,7 +197,7 @@ def test__schema_field_didnt_exist__with_validator_that_covers_multiple_fields__
     class ExpectedSchema(BaseModel):
         bar: str
 
-        @validator("bar")
+        @validator("bar")  # pyright: ignore[reportDeprecated]
         def validate_bar(cls, value):
             raise NotImplementedError