cadwyn 5.1.3__tar.gz → 5.2.0__tar.gz

{cadwyn-5.1.3 → cadwyn-5.2.0}/CHANGELOG.md

@@ -5,6 +5,18 @@ Please follow [the Keep a Changelog standard](https://keepachangelog.com/en/1.0.
 
 ## [Unreleased]
 
+## [5.2.0]
+
+### Removed
+
+* `issubclass` dependency
+
+## [5.1.4]
+
+### Fixed
+
+* a bug where a custom HTTP exception was not being copied correctly so its unique properties are ignored
+
 ## [5.1.3]
 
 ### Fixed

{cadwyn-5.1.3 → cadwyn-5.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cadwyn
-Version: 5.1.3
+Version: 5.2.0
 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
@@ -36,7 +36,6 @@ Classifier: Typing :: Typed
 Requires-Python: >=3.9
 Requires-Dist: backports-strenum<2,>=1.3.1; python_version < '3.11'
 Requires-Dist: fastapi>=0.112.4
-Requires-Dist: issubclass>=0.1.2
 Requires-Dist: jinja2>=3.1.2
 Requires-Dist: pydantic>=2.0.0
 Requires-Dist: starlette>=0.30.0

{cadwyn-5.1.3 → cadwyn-5.2.0}/cadwyn/_render.py

@@ -5,10 +5,10 @@ from enum import Enum
 from typing import TYPE_CHECKING, Union
 
 import typer
-from issubclass import issubclass as lenient_issubclass
 from pydantic import BaseModel
 
 from cadwyn._asts import get_fancy_repr, pop_docstring_from_cls_body
+from cadwyn._utils import lenient_issubclass
 from cadwyn.exceptions import CadwynRenderError
 from cadwyn.schema_generation import (
     PydanticFieldWrapper,

{cadwyn-5.1.3 → cadwyn-5.2.0}/cadwyn/route_generation.py

@@ -17,12 +17,11 @@ import fastapi.security.base
 import fastapi.utils
 from fastapi import APIRouter
 from fastapi.routing import APIRoute
-from issubclass import issubclass as lenient_issubclass
 from pydantic import BaseModel
 from starlette.routing import BaseRoute
 from typing_extensions import TypeVar, assert_never
 
-from cadwyn._utils import DATACLASS_SLOTS, Sentinel
+from cadwyn._utils import DATACLASS_SLOTS, Sentinel, lenient_issubclass
 from cadwyn.exceptions import (
     CadwynError,
     RouteAlreadyExistsError,

{cadwyn-5.1.3 → cadwyn-5.2.0}/cadwyn/structure/schemas.py

@@ -2,7 +2,6 @@ from collections.abc import Callable
 from dataclasses import dataclass
 from typing import TYPE_CHECKING, Any, Literal, Union, cast
 
-from issubclass import issubclass as lenient_issubclass
 from pydantic import AliasChoices, AliasPath, BaseModel, Field
 from pydantic._internal._decorators import PydanticDescriptorProxy, unwrap_wrapped_function
 from pydantic.fields import FieldInfo
@@ -12,6 +11,7 @@ from cadwyn._utils import (
     Sentinel,
     fully_unwrap_decorator,
     get_name_of_function_wrapped_in_pydantic_validator,
+    lenient_issubclass,
 )
 from cadwyn.exceptions import CadwynStructureError
 

{cadwyn-5.1.3 → cadwyn-5.2.0}/cadwyn/structure/versions.py

@@ -1,5 +1,6 @@
 import email.message
 import functools
+import http
 import inspect
 import json
 from collections import defaultdict
@@ -8,7 +9,7 @@ from contextlib import AsyncExitStack
 from contextvars import ContextVar
 from datetime import date
 from enum import Enum
-from typing import TYPE_CHECKING, ClassVar, Union
+from typing import TYPE_CHECKING, ClassVar, Union, cast
 
 from fastapi import BackgroundTasks, HTTPException, params
 from fastapi import Request as FastapiRequest
@@ -616,12 +617,13 @@ class VersionBundle:
                     detail = response_info.body["detail"]
                 else:
                     detail = response_info.body
+                if detail is None:
+                    detail = http.HTTPStatus(response_info.status_code).phrase
+                raised_exception.detail = cast(str, detail)
+                raised_exception.headers = dict(response_info.headers)
+                raised_exception.status_code = response_info.status_code
 
-                raise HTTPException(
-                    status_code=response_info.status_code,
-                    detail=detail,
-                    headers=dict(response_info.headers),
-                )
+                raise raised_exception
             return response_info._response
         return response_info.body
 

{cadwyn-5.1.3 → cadwyn-5.2.0}/docs/concepts/version_changes.md

@@ -39,8 +39,7 @@ from .v2023_02_10 import RemoveTaxIDEndpoints
 
 versions = VersionBundle(
     HeadVersion(),
-    Version("2023-02-10"),
-    RemoveTaxIDEndpoints,
+    Version("2023-02-10", RemoveTaxIDEndpoints),
     Version("2022-11-16"),
 )
 ```
@@ -64,8 +63,7 @@ from .v2023_02_10 import RemoveTaxIDEndpoints
 
 versions = VersionBundle(
     HeadVersion(),
-    Version("2023-02-10"),
-    RemoveTaxIDEndpoints,
+    Version("2023-02-10", RemoveTaxIDEndpoints),
     Version("2022-11-16"),
 )
 ```

{cadwyn-5.1.3 → cadwyn-5.2.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cadwyn"
-version = "5.1.3"
+version = "5.2.0"
 description = "Production-ready community-driven modern Stripe-like API versioning in FastAPI"
 authors = [{ name = "Stanislav Zmiev", email = "zmievsa@gmail.com" }]
 license = "MIT"
@@ -55,7 +55,6 @@ dependencies = [
     "starlette >=0.30.0",
     "pydantic >=2.0.0",
     "jinja2 >=3.1.2",
-    "issubclass >=0.1.2",
     "backports-strenum >=1.3.1,<2; python_version < '3.11'",
     "typing-extensions>=4.8.0",
 ]
@@ -154,6 +153,7 @@ reportMissingSuperCall = true
 reportFunctionMemberAccess = false
 reportCircularImports = true
 reportInvalidTypeForm = false
+reportPrivateImportUsage = false
 
 [tool.pytest.ini_options]
 filterwarnings = [

{cadwyn-5.1.3 → cadwyn-5.2.0}/tests/test_data_migrations.py

@@ -3,7 +3,7 @@ import re
 from collections.abc import Callable, Coroutine
 from contextvars import ContextVar
 from io import StringIO
-from typing import Any, Literal, Union
+from typing import Any, Literal, Optional, Union
 
 import fastapi
 import pytest
@@ -11,6 +11,7 @@ from dirty_equals import IsPartialDict, IsStr
 from fastapi import APIRouter, Body, Cookie, File, Header, HTTPException, Query, Request, Response, UploadFile
 from fastapi.responses import JSONResponse
 from fastapi.routing import APIRoute
+from fastapi.testclient import TestClient
 from pydantic import BaseModel, Field, RootModel
 from starlette.responses import StreamingResponse
 
@@ -32,6 +33,7 @@ from cadwyn.structure.data import RequestInfo, ResponseInfo
 from cadwyn.structure.schemas import schema
 from cadwyn.structure.versions import Version, VersionBundle
 from tests.conftest import (
+    CreateVersionedApp,
     CreateVersionedClients,
     client,
     version_change,
@@ -1226,3 +1228,41 @@ def test__request_and_response_migrations__with_multiple_schemas_in_converters(
         resp_2001 = client_2001.post(f"/{endpoint}", json={"i": ["original_request"]})
         assert resp_2001.status_code == 200
         assert resp_2001.json() == {"i": ["original_request", endpoint]}
+
+
+def test__response_migrations__with_custom_http_exception(
+    create_versioned_app: CreateVersionedApp,
+    router: VersionedAPIRouter,
+) -> None:
+    class CustomHTTPException(HTTPException):
+        error_code: Optional[str] = None
+
+        def __init__(self, detail: str, error_code: Optional[str] = None):
+            self.error_code = error_code
+            super().__init__(status_code=400, detail=detail)
+
+    def http_exception_handler(request, exc):
+        # Check if the exception has an error_code attribute
+        error_code = exc.error_code if hasattr(exc, "error_code") else "generic_error"
+
+        return JSONResponse(
+            status_code=exc.status_code,
+            content={"code": error_code, "message": exc.detail},
+        )
+
+    # Register exception handler for Cadwyn
+
+    @router.post("/test")
+    async def endpoint():
+        raise CustomHTTPException("Cadwyn error occurred", error_code="cadwyn_error")
+
+    app = create_versioned_app(version_change())
+    app.add_exception_handler(HTTPException, http_exception_handler)
+    with TestClient(app) as client:
+        resp = client.post("/test", headers={"X-API-VERSION": "2000-01-01"})
+        assert resp.status_code == 400
+        assert resp.json() == {"code": "cadwyn_error", "message": "Cadwyn error occurred"}
+
+        resp_2001 = client.post("/test", headers={"X-API-VERSION": "2001-01-01"})
+        assert resp_2001.status_code == 400
+        assert resp_2001.json() == {"code": "cadwyn_error", "message": "Cadwyn error occurred"}

{cadwyn-5.1.3 → cadwyn-5.2.0}/uv.lock

@@ -94,12 +94,11 @@ wheels = [
 
 [[package]]
 name = "cadwyn"
-version = "5.1.3"
+version = "5.2.0"
 source = { editable = "." }
 dependencies = [
     { name = "backports-strenum", marker = "python_full_version < '3.11'" },
     { name = "fastapi" },
-    { name = "issubclass" },
     { name = "jinja2" },
     { name = "pydantic" },
     { name = "starlette" },
@@ -140,7 +139,6 @@ requires-dist = [
     { name = "backports-strenum", marker = "python_full_version < '3.11'", specifier = ">=1.3.1,<2" },
     { name = "fastapi", specifier = ">=0.112.4" },
     { name = "fastapi", extras = ["standard"], marker = "extra == 'standard'", specifier = ">=0.112.3" },
-    { name = "issubclass", specifier = ">=0.1.2" },
     { name = "jinja2", specifier = ">=3.1.2" },
     { name = "pydantic", specifier = ">=2.0.0" },
     { name = "starlette", specifier = ">=0.30.0" },
@@ -614,15 +612,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/76/74/5222a632fd8d3202ddef383b71c8b6c31a9d77989030efba5be561163d41/inline_snapshot-0.20.8-py3-none-any.whl", hash = "sha256:bded4e142b8817930e4df428b88c462308a8f01ad699852e7574a54bad7ea9f2", size = 48157 },
 ]
 
-[[package]]
-name = "issubclass"
-version = "0.1.2"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/7d/89/f9a05e3bbc7cc2a5806138e62f2f94504e491411c8d0c994296dcfd0cfaf/issubclass-0.1.2.tar.gz", hash = "sha256:740dabca95adbd25442d1dd616ed455046ab9551c38514758dc291f431fded35", size = 1850 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/b1/69/3135026fbb9d4bcdc1e76a9e4c18fc4c6161a6eea6905b76d27eeaa00940/issubclass-0.1.2-py3-none-any.whl", hash = "sha256:ea54b6b27526cf1be49a4bc15d713bef0b480e0230482626a37cf21529da3864", size = 2164 },
-]
-
 [[package]]
 name = "jinja2"
 version = "3.1.6"