cadwyn 5.3.0__tar.gz → 5.3.2__tar.gz

{cadwyn-5.3.0 → cadwyn-5.3.2}/CHANGELOG.md

@@ -5,6 +5,18 @@ Please follow [the Keep a Changelog standard](https://keepachangelog.com/en/1.0.
 
 ## [Unreleased]
 
+## [5.3.2]
+
+### Fixed
+
+* Add support for `pydantic_settings.BaseSettings` in dependencies
+
+## [5.3.1]
+
+### Fixed
+
+* Fix invalid content-length header with custom exception handlers (#273)
+
 ## [5.3.0]
 
 ### Added

{cadwyn-5.3.0 → cadwyn-5.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cadwyn
-Version: 5.3.0
+Version: 5.3.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
@@ -71,7 +71,7 @@ Production-ready community-driven modern [Stripe-like](https://stripe.com/blog/a
 
 ## Who is this for?
 
-Cadwyn allows you to support a single version of your code while auto-generating the schemas and routes for older versions. You keep API versioning encapsulated in small and independent "version change" modules while your business logic stays simple and knows nothing about versioning.
+Cadwyn allows you to maintain the implementation just for your newest API version and get all the older versions generated automatically. You keep API versioning encapsulated in small and independent "version change" modules while your business logic stays simple and knows nothing about versioning.
 
 Its [approach](https://docs.cadwyn.dev/theory/how_we_got_here/#ii-migration-based-response-building) will be useful if you want to:
 

{cadwyn-5.3.0 → cadwyn-5.3.2}/README.md

@@ -24,7 +24,7 @@ Production-ready community-driven modern [Stripe-like](https://stripe.com/blog/a
 
 ## Who is this for?
 
-Cadwyn allows you to support a single version of your code while auto-generating the schemas and routes for older versions. You keep API versioning encapsulated in small and independent "version change" modules while your business logic stays simple and knows nothing about versioning.
+Cadwyn allows you to maintain the implementation just for your newest API version and get all the older versions generated automatically. You keep API versioning encapsulated in small and independent "version change" modules while your business logic stays simple and knows nothing about versioning.
 
 Its [approach](https://docs.cadwyn.dev/theory/how_we_got_here/#ii-migration-based-response-building) will be useful if you want to:
 

{cadwyn-5.3.0 → cadwyn-5.3.2}/cadwyn/schema_generation.py

@@ -102,6 +102,14 @@ PYDANTIC_DECORATOR_TYPE_TO_DECORATOR_MAP = {
     ComputedFieldInfo: pydantic.computed_field,
 }
 _PYDANTIC_ALL_EXPORTED_NAMES = set(pydantic.__all__)
+_DEFAULT_PYDANTIC_CLASSES = (BaseModel, RootModel)
+
+try:
+    from pydantic_settings import BaseSettings
+
+    _DEFAULT_PYDANTIC_CLASSES = (*_DEFAULT_PYDANTIC_CLASSES, BaseSettings)
+except ImportError:  # pragma: no cover
+    pass
 
 
 VALIDATOR_CONFIG_KEY = "__validators__"
@@ -757,7 +765,7 @@ class SchemaGenerator:
         if (
             not isinstance(model, type)
             or not lenient_issubclass(model, (BaseModel, Enum))
-            or model in (BaseModel, RootModel)
+            or model in _DEFAULT_PYDANTIC_CLASSES
         ):
             return model
         model = _unwrap_model(model)

{cadwyn-5.3.0 → cadwyn-5.3.2}/cadwyn/structure/versions.py

@@ -528,6 +528,8 @@ class VersionBundle:
                 status_code=raised_exception.status_code,
                 headers=raised_exception.headers,
             )
+            if (raised_exception.headers or {}).get("content-length") is None:  # pragma: no branch
+                del response_or_response_body.headers["content-length"]
         api_version = self.api_version_var.get()
         if api_version is None:
             return response_or_response_body
@@ -579,6 +581,7 @@ class VersionBundle:
             head_route.response_model,
             head_route,
         )
+
         if isinstance(response_or_response_body, FastapiResponse):
             # a webserver (uvicorn for instance) calculates the body at the endpoint level.
             # if an endpoint returns no "body", its content-length will be set to 0
@@ -605,9 +608,10 @@ class VersionBundle:
                         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 response_info.headers.get("content-length") is not None:
+                    # 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:

{cadwyn-5.3.0 → cadwyn-5.3.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cadwyn"
-version = "5.3.0"
+version = "5.3.2"
 description = "Production-ready community-driven modern Stripe-like API versioning in FastAPI"
 authors = [{ name = "Stanislav Zmiev", email = "zmievsa@gmail.com" }]
 license = "MIT"
@@ -88,6 +88,7 @@ dev-dependencies = [
     "pdbpp>=0.10.3",
     "markdown-include-variants>=0.0.4",
     "inline-snapshot>=0.20.7",
+    "pydantic-settings>=2.8.1",
 ]
 
 [project.urls]

{cadwyn-5.3.0 → cadwyn-5.3.2}/tests/test_router_generation.py

@@ -14,7 +14,8 @@ from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer
 from fastapi.security.http import HTTPBasic
 from fastapi.testclient import TestClient
 from inline_snapshot import snapshot
-from pydantic import BaseModel, JsonValue
+from pydantic import BaseModel, Field, JsonValue
+from pydantic_settings import BaseSettings
 from pytest_fixture_classes import fixture_class
 from starlette.responses import FileResponse
 from typing_extensions import Any, NewType, TypeAlias, TypeAliasType, get_args
@@ -1355,6 +1356,32 @@ def test__router_generation__with_generator_dependencies(
     )
 
 
+def test__router_generation__with_pydantic_settings_dependency(
+    create_versioned_app: CreateVersionedApp,
+    router: VersionedAPIRouter,
+) -> None:
+    class Settings(BaseSettings):
+        foo: str = Field(default="bar")
+
+    async def settings() -> Settings:
+        return Settings()
+
+    @router.get("/test")
+    def read_root(settings: Annotated[Settings, Depends(settings)]):
+        assert settings
+        return {"foo": settings.foo}
+
+    app = create_versioned_app(version_change())
+    with TestClient(app) as client:
+        resp = client.get("/test", headers={"x-api-version": "2000-01-01"})
+        assert resp.status_code == 200
+        assert resp.json() == {"foo": "bar"}
+
+        resp = client.get("/test", headers={"x-api-version": "2001-01-01"})
+        assert resp.status_code == 200
+        assert resp.json() == {"foo": "bar"}
+
+
 ######################
 # External lib testing
 ######################

{cadwyn-5.3.0 → cadwyn-5.3.2}/uv.lock

@@ -94,7 +94,7 @@ wheels = [
 
 [[package]]
 name = "cadwyn"
-version = "5.3.0"
+version = "5.3.2"
 source = { editable = "." }
 dependencies = [
     { name = "backports-strenum", marker = "python_full_version < '3.11'" },
@@ -124,6 +124,7 @@ dev = [
     { name = "mkdocs-material" },
     { name = "mkdocs-simple-hooks" },
     { name = "pdbpp" },
+    { name = "pydantic-settings" },
     { name = "pyright" },
     { name = "pytest" },
     { name = "pytest-cov" },
@@ -160,6 +161,7 @@ dev = [
     { name = "mkdocs-material", specifier = ">=9.3.1" },
     { name = "mkdocs-simple-hooks", specifier = ">=0.1.5" },
     { name = "pdbpp", specifier = ">=0.10.3" },
+    { name = "pydantic-settings", specifier = ">=2.8.1" },
     { name = "pyright", specifier = ">=1.1.390" },
     { name = "pytest", specifier = "==8.3.4" },
     { name = "pytest-cov", specifier = ">=4.0.0" },
@@ -1041,6 +1043,19 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/a1/0c/c5c5cd3689c32ed1fe8c5d234b079c12c281c051759770c05b8bed6412b5/pydantic_core-2.27.2-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:7d0c8399fcc1848491f00e0314bd59fb34a9c008761bcb422a057670c3f65e35", size = 2004961 },
 ]
 
+[[package]]
+name = "pydantic-settings"
+version = "2.8.1"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "pydantic" },
+    { name = "python-dotenv" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/88/82/c79424d7d8c29b994fb01d277da57b0a9b09cc03c3ff875f9bd8a86b2145/pydantic_settings-2.8.1.tar.gz", hash = "sha256:d5c663dfbe9db9d5e1c646b2e161da12f0d734d422ee56f567d0ea2cee4e8585", size = 83550 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/0b/53/a64f03044927dc47aafe029c42a5b7aabc38dfb813475e0e1bf71c4a59d0/pydantic_settings-2.8.1-py3-none-any.whl", hash = "sha256:81942d5ac3d905f7f3ee1a70df5dfb62d5569c12f51a5a647defc1c3d9ee2e9c", size = 30839 },
+]
+
 [[package]]
 name = "pygments"
 version = "2.19.1"