cadwyn 5.3.2__tar.gz → 5.4.1__tar.gz

{cadwyn-5.3.2 → cadwyn-5.4.1}/.pre-commit-config.yaml

@@ -1,12 +1,13 @@
 default_language_version:
-  python: python3.10
+  python: python3
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v5.0.0
     hooks:
       - id: check-added-large-files
       - id: check-yaml
-        args: ["--unsafe"]
+        args:
+          - '--unsafe'
       - id: check-toml
       - id: end-of-file-fixer
       - id: trailing-whitespace
@@ -18,27 +19,34 @@ repos:
       - id: python-check-blanket-noqa
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.8.1
+    rev: v0.11.10
     hooks:
       - id: ruff
-        args: [--fix, --exit-non-zero-on-fix]
+        args:
+          - '--fix'
+          - '--exit-non-zero-on-fix'
       - id: ruff-format
 
   - repo: https://github.com/adamchainz/blacken-docs
-    rev: "1.19.1" # replace with latest tag on GitHub
+    rev: 1.19.1 # replace with latest tag on GitHub
     hooks:
       - id: blacken-docs
         additional_dependencies:
           - black==22.12.0
-        args: ["--line-length=80", "--target-version=py310", "--skip-errors"]
+        args:
+          - '--line-length=80'
+          - '--target-version=py310'
+          - '--skip-errors'
 
   - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: v0.43.0
+    rev: v0.44.0
     hooks:
       - id: markdownlint
-        args: ["--disable", "MD013"]
+        args:
+          - '--disable'
+          - MD013
 
   - repo: https://github.com/astral-sh/uv-pre-commit
-    rev: 0.6.5
+    rev: 0.7.5
     hooks:
       - id: uv-lock

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

@@ -5,6 +5,26 @@ Please follow [the Keep a Changelog standard](https://keepachangelog.com/en/1.0.
 
 ## [Unreleased]
 
+## [5.4.1]
+
+### Fixed
+
+* Fixed import error in python 3.9 when using typing_extensions==3.14.0
+
+## [5.4.0]
+
+### Added
+
+- `typing_inspection` dependency from pydantic team for complex isinstance checks that must be the same between `typing` and `typing_extensions`
+- Support for `pydantic>=2.12.0` FieldInfo refactoring from https://github.com/pydantic/pydantic/pull/11898
+
+
+## [5.3.3]
+
+### Fixed
+
+* Fixed pypi badge link in README
+
 ## [5.3.2]
 
 ### Fixed

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cadwyn
-Version: 5.3.2
+Version: 5.4.1
 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
@@ -37,9 +37,10 @@ Requires-Python: >=3.9
 Requires-Dist: backports-strenum<2,>=1.3.1; python_version < '3.11'
 Requires-Dist: fastapi>=0.112.4
 Requires-Dist: jinja2>=3.1.2
-Requires-Dist: pydantic>=2.0.0
+Requires-Dist: pydantic>=2.11.0
 Requires-Dist: starlette>=0.30.0
 Requires-Dist: typing-extensions>=4.8.0
+Requires-Dist: typing-inspection>=0.4.0
 Provides-Extra: standard
 Requires-Dist: fastapi[standard]>=0.112.3; extra == 'standard'
 Requires-Dist: typer>=0.7.0; extra == 'standard'
@@ -59,7 +60,7 @@ Production-ready community-driven modern [Stripe-like](https://stripe.com/blog/a
     <img src="https://img.shields.io/codecov/c/github/zmievsa/cadwyn?color=%2334D058&logo=codecov" alt="Coverage">
 </a>
 <a href="https://pypi.org/project/cadwyn/" target="_blank">
-    <img alt="PyPI" src="https://img.shields.io/pypi/v/cadwyn?color=%2334D058&logo=pypi&label=PyPI package" alt="Package version">
+    <img alt="PyPI" src="https://img.shields.io/pypi/v/cadwyn?color=%2334D058&logo=pypi&label=PyPI" alt="Package version">
 </a>
 <a href="https://pypi.org/project/cadwyn/" target="_blank">
     <img src="https://img.shields.io/pypi/pyversions/cadwyn?color=%2334D058&logo=python" alt="Supported Python versions">
@@ -71,12 +72,12 @@ Production-ready community-driven modern [Stripe-like](https://stripe.com/blog/a
 
 ## Who is this for?
 
-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.
+Cadwyn allows you to maintain the implementation just for your newest API version and get all the older versions generated automatically. You keep API backward compatibility 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:
+This [approach](https://docs.cadwyn.dev/theory/how_we_got_here/#ii-migration-based-response-building) may be useful if you want to:
 
 1. Support many API versions for a long time
-2. Effortlessly backport features and bugfixes to older API versions
+2. Have features and bugfixes automatically backported to older API versions
 
 Whether you are a newbie in API versioning, a pro looking for a sophisticated tool, an experimenter looking to build a similar framework, or even someone who just wants to learn about all approaches to API versioning -- Cadwyn has the functionality, theory, and documentation to cover all the mentioned use cases.
 
@@ -86,6 +87,4 @@ The [documentation](https://docs.cadwyn.dev) has everything you need to succeed.
 
 ## Sponsors
 
-These are our gorgeous sponsors. They are using Cadwyn and are sponsoring it through various means. Contact [me](https://github.com/zmievsa) if you would like to become one too!
-
-[![Monite](https://docs.cadwyn.dev/img/sponsor_logos/monite.png)](https://docs.monite.com/)
+These are our gorgeous sponsors. They are using Cadwyn and are sponsoring it through various means. Contact [me](https://github.com/zmievsa) if you would like to become one, too!

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

@@ -12,7 +12,7 @@ Production-ready community-driven modern [Stripe-like](https://stripe.com/blog/a
     <img src="https://img.shields.io/codecov/c/github/zmievsa/cadwyn?color=%2334D058&logo=codecov" alt="Coverage">
 </a>
 <a href="https://pypi.org/project/cadwyn/" target="_blank">
-    <img alt="PyPI" src="https://img.shields.io/pypi/v/cadwyn?color=%2334D058&logo=pypi&label=PyPI package" alt="Package version">
+    <img alt="PyPI" src="https://img.shields.io/pypi/v/cadwyn?color=%2334D058&logo=pypi&label=PyPI" alt="Package version">
 </a>
 <a href="https://pypi.org/project/cadwyn/" target="_blank">
     <img src="https://img.shields.io/pypi/pyversions/cadwyn?color=%2334D058&logo=python" alt="Supported Python versions">
@@ -24,12 +24,12 @@ Production-ready community-driven modern [Stripe-like](https://stripe.com/blog/a
 
 ## Who is this for?
 
-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.
+Cadwyn allows you to maintain the implementation just for your newest API version and get all the older versions generated automatically. You keep API backward compatibility 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:
+This [approach](https://docs.cadwyn.dev/theory/how_we_got_here/#ii-migration-based-response-building) may be useful if you want to:
 
 1. Support many API versions for a long time
-2. Effortlessly backport features and bugfixes to older API versions
+2. Have features and bugfixes automatically backported to older API versions
 
 Whether you are a newbie in API versioning, a pro looking for a sophisticated tool, an experimenter looking to build a similar framework, or even someone who just wants to learn about all approaches to API versioning -- Cadwyn has the functionality, theory, and documentation to cover all the mentioned use cases.
 
@@ -39,6 +39,4 @@ The [documentation](https://docs.cadwyn.dev) has everything you need to succeed.
 
 ## Sponsors
 
-These are our gorgeous sponsors. They are using Cadwyn and are sponsoring it through various means. Contact [me](https://github.com/zmievsa) if you would like to become one too!
-
-[![Monite](https://docs.cadwyn.dev/img/sponsor_logos/monite.png)](https://docs.monite.com/)
+These are our gorgeous sponsors. They are using Cadwyn and are sponsoring it through various means. Contact [me](https://github.com/zmievsa) if you would like to become one, too!

{cadwyn-5.3.2 → cadwyn-5.4.1}/cadwyn/__main__.py

@@ -36,7 +36,7 @@ def version_callback(value: bool):
 def output_code(code: str, raw: bool):
     if raw:
         typer.echo(code)
-    else:
+    else:  # pragma: no cover
         _CONSOLE.print(Syntax(code, "python", line_numbers=True))
 
 

{cadwyn-5.3.2 → cadwyn-5.4.1}/cadwyn/_asts.py

@@ -22,7 +22,7 @@ NoneType = type(None)
 
 
 # A parent type of typing._GenericAlias
-_BaseGenericAlias = cast(type, type(List[int])).mro()[1]  # noqa: UP006
+_BaseGenericAlias = cast("type", type(List[int])).mro()[1]  # noqa: UP006
 
 # type(list[int]) and type(List[int]) are different which is why we have to do this.
 # Please note that this problem is much wider than just lists which is why we use typing._BaseGenericAlias

{cadwyn-5.3.2 → cadwyn-5.4.1}/cadwyn/applications.py

@@ -400,7 +400,7 @@ class Cadwyn(FastAPI):
                 init_oauth=self.swagger_ui_init_oauth,
                 swagger_ui_parameters=self.swagger_ui_parameters,
             )
-        return self._render_docs_dashboard(req, cast(str, self.docs_url))
+        return self._render_docs_dashboard(req, cast("str", self.docs_url))
 
     async def redoc_dashboard(self, req: Request) -> Response:
         version = req.query_params.get("version")
@@ -410,7 +410,7 @@ class Cadwyn(FastAPI):
             openapi_url = root_path + f"{self.openapi_url}?version={version}"
             return get_redoc_html(openapi_url=openapi_url, title=f"{self.title} - ReDoc")
 
-        return self._render_docs_dashboard(req, docs_url=cast(str, self.redoc_url))
+        return self._render_docs_dashboard(req, docs_url=cast("str", self.redoc_url))
 
     def _extract_root_path(self, req: Request):
         return req.scope.get("root_path", "").rstrip("/")

{cadwyn-5.3.2 → cadwyn-5.4.1}/cadwyn/changelogs.py

@@ -93,7 +93,7 @@ def _generate_changelog(versions: VersionBundle, router: _RootCadwynAPIRouter) -
                     generator_from_newer_version,
                     generator_from_older_version,
                     schemas_from_older_version,
-                    cast(list[APIRoute], routes_from_newer_version),
+                    cast("list[APIRoute]", routes_from_newer_version),
                 )
                 if changelog_entry is not None:  # pragma: no branch # This should never happen
                     version_change_changelog.instructions.append(CadwynVersionChangeInstruction(changelog_entry))
@@ -321,18 +321,18 @@ def _convert_version_change_instruction_to_changelog_entry(  # noqa: C901
     if isinstance(instruction, EndpointDidntExistInstruction):
         return CadwynEndpointWasAddedChangelogEntry(
             path=instruction.endpoint_path,
-            methods=cast(Any, instruction.endpoint_methods),
+            methods=cast("Any", instruction.endpoint_methods),
         )
     elif isinstance(instruction, EndpointExistedInstruction):
         return CadwynEndpointWasRemovedChangelogEntry(
             path=instruction.endpoint_path,
-            methods=cast(Any, instruction.endpoint_methods),
+            methods=cast("Any", instruction.endpoint_methods),
         )
     elif isinstance(instruction, EndpointHadInstruction):
         if instruction.attributes.include_in_schema is not Sentinel:
             return CadwynEndpointWasRemovedChangelogEntry(
                 path=instruction.endpoint_path,
-                methods=cast(Any, instruction.endpoint_methods),
+                methods=cast("Any", instruction.endpoint_methods),
             )
 
         renaming_map = {"operation_id": "operationId"}
@@ -379,7 +379,7 @@ def _convert_version_change_instruction_to_changelog_entry(  # noqa: C901
             attribute_changes.append(CadwynEndpointAttributeChange(name="responses", new_value=changed_responses))
         return CadwynEndpointHadChangelogEntry(
             path=instruction.endpoint_path,
-            methods=cast(Any, instruction.endpoint_methods),
+            methods=cast("Any", instruction.endpoint_methods),
             changes=attribute_changes,
         )
 

{cadwyn-5.3.2 → cadwyn-5.4.1}/cadwyn/route_generation.py

@@ -78,7 +78,7 @@ def generate_versioned_routers(
     webhooks: Union[_WR, None] = None,
 ) -> GeneratedRouters[_R, _WR]:
     if webhooks is None:
-        webhooks = cast(_WR, APIRouter())
+        webhooks = cast("_WR", APIRouter())
     return _EndpointTransformer(router, versions, webhooks).transform()
 
 
@@ -167,7 +167,7 @@ class _EndpointTransformer(Generic[_R, _WR]):
 
                 # We know they are APIRoutes because of the check at the very beginning of the top loop.
                 # I.e. Because head_route is an APIRoute, both routes are  APIRoutes too
-                older_route = cast(APIRoute, older_route)
+                older_route = cast("APIRoute", older_route)
                 # Wait.. Why do we need this code again?
                 if older_route.body_field is not None and _route_has_a_simple_body_schema(older_route):
                     if hasattr(older_route.body_field.type_, "__cadwyn_original_model__"):

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

@@ -11,14 +11,20 @@ from collections.abc import Callable, Sequence
 from datetime import date
 from enum import Enum
 from functools import cache
-from typing import TYPE_CHECKING, Annotated, Generic, Union, cast
+from typing import (
+    TYPE_CHECKING,
+    Annotated,
+    Generic,
+    Union,
+    _BaseGenericAlias,  # pyright: ignore[reportAttributeAccessIssue]
+    cast,
+)
 
 import fastapi.params
 import fastapi.security.base
 import fastapi.utils
 import pydantic
 import pydantic._internal._decorators
-import typing_extensions
 from fastapi import Response
 from fastapi.dependencies.utils import is_async_gen_callable, is_coroutine_callable, is_gen_callable
 from fastapi.routing import APIRoute
@@ -32,12 +38,12 @@ from pydantic._internal._decorators import (
     RootValidatorDecoratorInfo,
     ValidatorDecoratorInfo,
 )
+from pydantic._internal._known_annotated_metadata import collect_known_metadata
 from pydantic._internal._typing_extra import try_eval_type as pydantic_try_eval_type
 from pydantic.fields import ComputedFieldInfo, FieldInfo
 from typing_extensions import (
     Any,
     Doc,
-    NewType,
     Self,
     TypeAlias,
     TypeAliasType,
@@ -80,11 +86,6 @@ if TYPE_CHECKING:
     from cadwyn.structure.versions import HeadVersion, Version, VersionBundle
 
 
-if sys.version_info >= (3, 10):
-    from typing import _BaseGenericAlias  # pyright: ignore[reportAttributeAccessIssue]
-else:
-    from typing_extensions import _BaseGenericAlias  # pyright: ignore[reportAttributeAccessIssue]
-
 _Call = TypeVar("_Call", bound=Callable[..., Any])
 
 _FieldName: TypeAlias = str
@@ -153,16 +154,12 @@ class PydanticFieldWrapper:
         )
 
 
-def _extract_passed_field_attributes(field_info: FieldInfo):
-    attributes = {
-        attr_name: field_info._attributes_set[attr_name]
-        for attr_name in _all_field_arg_names
-        if attr_name in field_info._attributes_set
+def _extract_passed_field_attributes(field_info: FieldInfo) -> dict[str, object]:
+    return {
+        k: v
+        for k, v in (field_info._attributes_set | collect_known_metadata(field_info.metadata)[0]).items()
+        if k in _all_field_arg_names and not (k == "frozen" and v is None)
     }
-    # PydanticV2 always adds frozen to _attributes_set but we don't want it if it wasn't explicitly set
-    if attributes.get("frozen", ...) is None:
-        attributes.pop("frozen")
-    return attributes
 
 
 @dataclasses.dataclass(**DATACLASS_SLOTS)
@@ -265,7 +262,7 @@ def _wrap_pydantic_model(model: type[_T_PYDANTIC_MODEL]) -> "_PydanticModelWrapp
     # For example, when "from __future__ import annotations" is used in the file with the schema
     if model is not BaseModel:
         model.model_rebuild(raise_errors=False)
-    model = cast(type[_T_PYDANTIC_MODEL], model)
+    model = cast("type[_T_PYDANTIC_MODEL]", model)
 
     decorators = _get_model_decorators(model)
     validators = {}
@@ -345,7 +342,7 @@ def _wrap_pydantic_model(model: type[_T_PYDANTIC_MODEL]) -> "_PydanticModelWrapp
 def _get_field_and_validator_names_from_model(cls: type) -> tuple[set[_FieldName], set[str]]:
     fields = cls.model_fields
     source = inspect.getsource(cls)
-    cls_ast = cast(ast.ClassDef, ast.parse(textwrap.dedent(source)).body[0])
+    cls_ast = cast("ast.ClassDef", ast.parse(textwrap.dedent(source)).body[0])
     validator_names = (
         _get_validator_info_or_none(node)
         for node in cls_ast.body
@@ -468,7 +465,7 @@ class _PydanticModelWrapper(Generic[_T_PYDANTIC_MODEL]):
         fields = {name: field.generate_field_copy(generator) for name, field in self.fields.items()}
         model_copy = type(self.cls)(
             self.name,
-            tuple(generator[cast(type[BaseModel], base)] for base in self.cls.__bases__),
+            tuple(generator[cast("type[BaseModel]", base)] for base in self.cls.__bases__),
             self.other_attributes
             | per_field_validators
             | root_validators
@@ -514,7 +511,7 @@ class _CallableWrapper:
         return hash(self._original_callable)
 
     def __eq__(self, value: object) -> bool:
-        return self._original_callable == value  # pyright: ignore[reportUnnecessaryComparison]
+        return self._original_callable == value
 
 
 class _AsyncCallableWrapper(_CallableWrapper):
@@ -587,9 +584,11 @@ class _AnnotationTransformer:
         self._remake_endpoint_dependencies(route)
 
     def _change_version_of_a_non_container_annotation(self, annotation: Any) -> Any:
-        if isinstance(annotation, (_BaseGenericAlias, types.GenericAlias)):
+        from typing_inspection.typing_objects import is_any, is_newtype, is_typealiastype
+
+        if isinstance(annotation, (types.GenericAlias, _BaseGenericAlias)):
             return get_origin(annotation)[tuple(self.change_version_of_annotation(arg) for arg in get_args(annotation))]
-        elif isinstance(annotation, TypeAliasType):
+        elif is_typealiastype(annotation):
             if (
                 annotation.__module__ is not None and (annotation.__module__.startswith("pydantic."))
             ) or annotation.__name__ in _PYDANTIC_ALL_EXPORTED_NAMES:
@@ -616,7 +615,7 @@ class _AnnotationTransformer:
             return getitem(
                 tuple(self.change_version_of_annotation(a) for a in get_args(annotation)),
             )
-        elif annotation is typing.Any or annotation is typing_extensions.Any or isinstance(annotation, NewType):
+        elif is_any(annotation) or is_newtype(annotation):
             return annotation
         elif isinstance(annotation, type):
             return self._change_version_of_type(annotation)
@@ -776,7 +775,7 @@ class SchemaGenerator:
         wrapper = self._get_wrapper_for_model(model)
         model_copy = wrapper.generate_model_copy(self)
         self.concrete_models[model] = model_copy
-        return cast(type[_T_ANY_MODEL], model_copy)
+        return cast("type[_T_ANY_MODEL]", model_copy)
 
     @overload
     def _get_wrapper_for_model(self, model: type[BaseModel]) -> "_PydanticModelWrapper[BaseModel]": ...
@@ -865,7 +864,7 @@ def _apply_alter_schema_instructions(
         elif isinstance(alter_schema_instruction, ValidatorExistedInstruction):
             validator_name = get_name_of_function_wrapped_in_pydantic_validator(alter_schema_instruction.validator)
             raw_validator = cast(
-                pydantic._internal._decorators.PydanticDescriptorProxy, alter_schema_instruction.validator
+                "pydantic._internal._decorators.PydanticDescriptorProxy", alter_schema_instruction.validator
             )
             schema_info.validators[validator_name] = _wrap_validator(
                 raw_validator.wrapped,
@@ -1041,15 +1040,19 @@ def _delete_field_attributes(
     annotation: Any,
 ) -> None:
     for attr_name in alter_schema_instruction.attributes:
+        deleted = False
+
         if attr_name in field.passed_field_attributes:
             field.delete_attribute(name=attr_name)
-        elif get_origin(annotation) == Annotated and any(  # pragma: no branch
+            deleted = True
+        if get_origin(annotation) == Annotated and any(  # pragma: no branch
             hasattr(sub_ann, attr_name) for sub_ann in get_args(annotation)
         ):
             for sub_ann in get_args(annotation):
                 if hasattr(sub_ann, attr_name):
                     object.__setattr__(sub_ann, attr_name, None)
-        else:
+                    deleted = True
+        if not deleted:
             raise InvalidGenerationInstructionError(
                 f'You tried to delete the attribute "{attr_name}" of field "{alter_schema_instruction.name}" '
                 f'from "{model.name}" in "{version_change_name}" '
@@ -1100,7 +1103,7 @@ class _EnumWrapper(Generic[_T_ENUM]):
         for attr_name, attr in initialization_namespace.items():
             enum_dict[attr_name] = attr
         enum_dict["__doc__"] = self.cls.__doc__
-        model_copy = cast(type[_T_ENUM], type(self.name, self.cls.__bases__, enum_dict))
+        model_copy = cast("type[_T_ENUM]", type(self.name, self.cls.__bases__, enum_dict))
         model_copy.__cadwyn_original_model__ = self.cls  # pyright: ignore[reportAttributeAccessIssue]
         return model_copy
 

{cadwyn-5.3.2 → cadwyn-5.4.1}/cadwyn/structure/data.py

@@ -140,7 +140,7 @@ def convert_request_to_next_version_for(
         if isinstance(schema_or_path, str):
             return _AlterRequestByPathInstruction(
                 path=schema_or_path,
-                methods=set(cast(list, methods_or_second_schema)),
+                methods=set(cast("list", methods_or_second_schema)),
                 transformer=transformer,
             )
         else:
@@ -214,7 +214,7 @@ def convert_response_to_previous_version_for(
             # The validation above checks that methods is not None
             return _AlterResponseByPathInstruction(
                 path=schema_or_path,
-                methods=set(cast(list, methods_or_second_schema)),
+                methods=set(cast("list", methods_or_second_schema)),
                 transformer=transformer,
                 migrate_http_errors=migrate_http_errors,
             )

{cadwyn-5.3.2 → cadwyn-5.4.1}/cadwyn/structure/schemas.py

@@ -246,7 +246,7 @@ class AlterFieldInstructionFactory:
         info: Union[FieldInfo, Any, None] = None,
     ) -> FieldExistedAsInstruction:
         if info is None:
-            info = cast(FieldInfo, Field())
+            info = cast("FieldInfo", Field())
         info.annotation = type
         return FieldExistedAsInstruction(is_hidden_from_changelog=False, schema=self.schema, name=self.name, field=info)
 
@@ -317,7 +317,7 @@ class AlterSchemaInstructionFactory:
     def validator(
         self, func: "Union[Callable[..., Any], classmethod[Any, Any, Any], PydanticDescriptorProxy]", /
     ) -> AlterValidatorInstructionFactory:
-        func = cast(Union[Callable[..., Any], PydanticDescriptorProxy], unwrap_wrapped_function(func))
+        func = cast("Union[Callable[..., Any], PydanticDescriptorProxy]", unwrap_wrapped_function(func))
 
         if not isinstance(func, PydanticDescriptorProxy):
             if hasattr(func, "__self__"):

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

@@ -620,7 +620,7 @@ class VersionBundle:
                     detail = response_info.body
                 if detail is None:
                     detail = http.HTTPStatus(response_info.status_code).phrase
-                raised_exception.detail = cast(str, detail)
+                raised_exception.detail = cast("str", detail)
                 raised_exception.headers = dict(response_info.headers)
                 raised_exception.status_code = response_info.status_code
 

{cadwyn-5.3.2 → cadwyn-5.4.1}/docs/concepts/version_changes.md

@@ -408,6 +408,31 @@ print(BulkCreateUsersRequestBody is BulkCreateUsersResponseBody)  # False
 
 or to specify migrations using [endpoint path](#path-based-migration-specification) instead of a schema.
 
+## Dependency re-execution warning
+
+Notice that whenever a request comes to Cadwyn, we first validate it against the request's version of the schema, then we migrate it to the latest version, and then validate again to prevent migrations from creating invalid requests.
+
+This means that if you have a dependency that is executed during the request validation, **it will be executed twice**. For example, if you have a dependency that checks whether a user exists in the database, it will be executed twice. This is not a problem if the dependency is idempotent but it is a problem if it is not.
+
+To solve this problem, you can use the `cadwyn.current_dependency_solver` dependency which tell you whether your dependency is getting called before or after the request is migrated. If you want to run it once we migrated the request to the latest version, you should only run it when `current_dependency_solver` is `"cadwyn"`. If you want your dependency to run at the very beginning of handling the request, you should only run it when `current_dependency_solver` is `"fastapi"`.
+
+```python
+from cadwyn import current_dependency_solver
+
+
+def my_dependency(
+    dependency_solver: Annotated[
+        Literal["fastapi", "cadwyn"], Depends(current_dependency_solver)
+    ]
+):
+    if dependency_solver == "fastapi":  # Before migration
+        ...
+    else:  # After migration
+        ...
+```
+
+but the majority of your dependencies will not need this as most dependencies should not have side effects or network calls within them.
+
 ## Version changes with side effects
 
 Sometimes you will use API versioning to handle a breaking change in your **business logic**, not in the schemas themselves. In such cases, it is tempting to add a version check and just follow the new business logic such as:

{cadwyn-5.3.2 → cadwyn-5.4.1}/docs/how_to/change_openapi_schemas/remove_field.md

@@ -83,7 +83,8 @@ Let's say that we had a nullable `middle_name` field but we decided that it does
             schema(BaseUser)
             .field("middle_name")
             .existed_as(
-                type=str | None, description="User's Middle Name", default=None
+                type=str | None,
+                info=Field(description="User's Middle Name", default=None),
             ),
         )
     ```

cadwyn-5.4.1/docs/img/logos/cadwyn_icon_transparent.svg

@@ -0,0 +1 @@
+<svg clip-rule="evenodd" fill-rule="evenodd" height="104.996mm" image-rendering="optimizeQuality" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" viewBox="0 0 2410.37 2560.05" width="108.373mm" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientUnits="objectBoundingBox" x1="50%" x2="50%" y1="100%" y2="0%"><stop offset="0" stop-color="#5a1ee2"/><stop offset="1" stop-color="#9f52ee"/></linearGradient><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="1279.45" x2="1826.35" y1="1276.73" y2="1018.32"><stop offset="0" stop-color="#8740ea"/><stop offset="1" stop-color="#e791ff"/></linearGradient><path d="m0 0h2410.38v2560.05h-2410.38z" fill="none"/><g fill-rule="nonzero"><path d="m1246.08 741.76c-188.54 0-359.22 76.41-482.76 199.96-123.54 123.54-199.96 294.22-199.96 482.76s76.41 359.23 199.96 482.77c123.54 123.54 294.22 199.96 482.76 199.96s359.23-76.41 482.77-199.96c19.07-19.07 37.03-39.27 53.75-60.49 9.08-11.53 25.65-13.82 37.52-5.19l88.47 64.28c6.22 4.52 9.92 10.68 11 18.29s-.78 14.56-5.51 20.62c-21.48 27.55-44.64 53.74-69.31 78.41-153.22 153.22-364.9 247.99-598.68 247.99-233.79 0-445.46-94.77-598.68-247.99s-247.99-364.9-247.99-598.68c0-233.79 94.77-445.46 247.99-598.68s364.89-247.99 598.68-247.99c233.02 0 444.07 94.16 597.18 246.5l-141.94 91.37c-120.79-108.14-280.33-173.91-455.23-173.91z" fill="url(#a)"/><path d="m609.17 397.48 169.83 432.05-50.81 19.85-169.83-432.05z" fill="#974ced"/><path d="m1241.57 1320.13 556.05-431.46 66.61 86.25-556.05 431.47z" fill="url(#b)"/><path d="m463.33 1349.37 993.64 598.21-56.35 93.51-993.64-598.21z" fill="url(#a)"/><path d="m1407.66 1977.15c97.66-120.17 197.41-214.12 299.23-281.82 102.94-68.46 208.08-110.16 315.38-125.11l7.48 54.01c-99.04 13.8-196.64 52.66-292.75 116.58-97.25 64.66-192.95 154.92-287.06 270.72l-42.27-34.38z" fill="#884bd4"/></g><path d="m583.76 288.89c65.46 0 118.52 53.06 118.52 118.52s-53.06 118.52-118.52 118.52-118.52-53.06-118.52-118.52 53.06-118.52 118.52-118.52z" fill="#974ced"/><path d="m1830.93 669.87c144.66 0 261.92 117.27 261.92 261.92 0 144.66-117.27 261.92-261.92 261.92-144.66 0-261.92-117.27-261.92-261.92 0-144.66 117.27-261.92 261.92-261.92z" fill="#e791ff"/><path d="m1428.79 1846.58c81.61 0 147.76 66.16 147.76 147.76 0 81.61-66.16 147.76-147.76 147.76-81.61 0-147.76-66.16-147.76-147.76 0-81.61 66.16-147.76 147.76-147.76z" fill="#e791ff"/><path d="m2026.01 1484.86c62.06 0 112.36 50.31 112.36 112.36 0 62.06-50.31 112.36-112.36 112.36-62.06 0-112.36-50.31-112.36-112.36 0-62.06 50.31-112.36 112.36-112.36z" fill="#e791ff"/><path d="m435.16 1232.96c90.11 0 163.16 73.05 163.16 163.16s-73.05 163.16-163.16 163.16-163.16-73.05-163.16-163.16 73.05-163.16 163.16-163.16z" fill="#e791ff"/><path d="m1274.87 1267.83c52.7 0 95.43 42.73 95.43 95.43s-42.73 95.43-95.43 95.43-95.43-42.73-95.43-95.43 42.73-95.43 95.43-95.43z" fill="#8740ea"/></svg>

cadwyn-5.4.1/docs/img/logos/cadwyn_transparent.svg

@@ -0,0 +1 @@
+<svg clip-rule="evenodd" fill-rule="evenodd" height="104.996mm" image-rendering="optimizeQuality" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" viewBox="0 0 14313.61 3866.19" width="108.373mm" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientUnits="objectBoundingBox" x1="50%" x2="50%" y1="100%" y2="0%"><stop offset="0" stop-color="#5a1ee2"/><stop offset="1" stop-color="#9f52ee"/></linearGradient><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="1903.41" x2="2936.67" y1="1866.35" y2="1378.14"><stop offset="0" stop-color="#8740ea"/><stop offset="1" stop-color="#e791ff"/></linearGradient><g fill-rule="nonzero"><path d="m1840.35 855.62c-356.21 0-678.69 144.37-912.09 377.78-233.41 233.41-377.78 555.88-377.78 912.09s144.37 678.7 377.78 912.11 555.88 377.78 912.09 377.78 678.7-144.37 912.11-377.78c36.04-36.04 69.97-74.2 101.55-114.28 17.16-21.78 48.47-26.11 70.9-9.81l167.14 121.44c11.75 8.54 18.75 20.18 20.77 34.56 2.03 14.38-1.48 27.51-10.41 38.96-40.59 52.05-84.34 101.53-130.95 148.14-289.49 289.49-689.41 468.54-1131.11 468.54-441.71 0-841.61-179.05-1131.1-468.54s-468.54-689.41-468.54-1131.11c0-441.71 179.05-841.61 468.54-1131.1s689.39-468.54 1131.1-468.54c440.25 0 839 177.9 1128.26 465.72l-268.17 172.62c-228.21-204.31-529.64-328.58-860.09-328.58z" fill="url(#a)"/><path d="m637.02 205.17 320.87 816.28-95.99 37.5-320.86-816.28z" fill="#974ced"/><path d="m1831.83 1948.35 1050.57-815.18 125.85 162.96-1050.57 815.18z" fill="url(#b)"/><path d="m361.5 2003.59 1877.3 1130.22-106.48 176.67-1877.3-1130.22z" fill="url(#a)"/><path d="m2145.63 3189.67c184.51-227.04 372.98-404.54 565.34-532.45 194.49-129.34 393.12-208.13 595.86-236.38l14.13 102.04c-187.12 26.07-371.51 99.5-553.11 220.25-183.73 122.16-364.54 292.69-542.36 511.49z" fill="#884bd4"/></g><path d="m589.03 0c123.67 0 223.92 100.25 223.92 223.92s-100.25 223.92-223.92 223.92-223.92-100.25-223.92-223.92 100.25-223.92 223.92-223.92z" fill="#974ced"/><g fill="#e791ff"><path d="m2945.33 719.79c273.31 0 494.86 221.55 494.86 494.86s-221.55 494.86-494.86 494.86-494.86-221.55-494.86-494.86 221.55-494.86 494.86-494.86z"/><path d="m2185.56 2942.97c154.18 0 279.17 124.99 279.17 279.17s-124.99 279.17-279.17 279.17-279.17-124.99-279.17-279.17 124.99-279.17 279.17-279.17z"/><path d="m3313.89 2259.57c117.25 0 212.29 95.05 212.29 212.29 0 117.25-95.05 212.29-212.29 212.29-117.25 0-212.29-95.05-212.29-212.29 0-117.25 95.05-212.29 212.29-212.29z"/><path d="m308.26 1783.66c170.25 0 308.26 138.01 308.26 308.26s-138.01 308.26-308.26 308.26-308.26-138.01-308.26-308.26 138.01-308.26 308.26-308.26z"/></g><path d="m1894.75 1849.54c99.57 0 180.29 80.72 180.29 180.29s-80.72 180.29-180.29 180.29-180.29-80.72-180.29-180.29 80.72-180.29 180.29-180.29z" fill="#8740ea"/><path d="m4640.58 3233.75c173.84 0 329.7-59.95 443.61-155.86v125.89h341.69v-1519.65h-341.69v125.89c-113.9-95.91-269.76-155.86-443.61-155.86-452.6 0-785.31 344.7-785.31 791.3 0 443.61 332.71 788.3 785.31 788.3zm0-338.7c-263.77 0-443.61-191.83-443.61-449.6 0-260.77 179.84-452.6 443.61-452.6s443.61 191.83 443.61 452.6c0 257.78-179.84 449.6-443.61 449.6zm1182.6-452.6c0 446.6 332.71 791.3 785.31 791.3 173.84 0 329.7-59.95 443.61-155.86v125.89h341.69v-2098.14h-341.69v704.38c-113.9-95.91-269.76-155.86-443.61-155.86-452.6 0-785.31 344.7-785.31 788.3zm338.7 0c0-260.77 179.84-449.6 446.61-449.6 266.76 0 443.61 188.83 443.61 449.6s-179.84 452.6-443.61 452.6-446.61-191.83-446.61-452.6zm2903.08 155.86 287.74 605.46h257.78l725.35-1519.65h-374.66l-482.57 1001.11-284.75-608.46h-260.76l-284.75 608.46-479.58-1001.11h-377.67l728.35 1519.65h254.78zm3382.65-914.19h-377.67l-479.57 1013.1-479.58-1013.1h-377.67l668.41 1405.75-368.67 776.31h374.66l1040.08-2182.06zm735.99 761.32c0-275.75 143.88-452.6 395.65-452.6 251.78 0 392.65 177.05 392.65 452.6v758.33h341.7v-758.33c0-461.59-290.75-791.3-734.35-791.3-164.86 0-296.73 53.95-395.65 134.88v-104.91h-338.7v1519.65h338.7v-758.33z" fill="#fff" fill-rule="nonzero"/></svg>

cadwyn-5.4.1/docs/img/logos/cadwyn_with_background.svg

@@ -0,0 +1 @@
+<svg clip-rule="evenodd" fill-rule="evenodd" height="104.996mm" image-rendering="optimizeQuality" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" viewBox="0 0 13833 4217.33" width="108.373mm" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientUnits="objectBoundingBox" x1="50%" x2="50%" y1="100%" y2="0%"><stop offset="0" stop-color="#5a1ee2"/><stop offset="1" stop-color="#9f52ee"/></linearGradient><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="2346.93" x2="3249.83" y1="2002.05" y2="1575.43"><stop offset="0" stop-color="#8740ea"/><stop offset="1" stop-color="#e791ff"/></linearGradient><path d="m0-.01h13833.01v4217.33h-13833.01z" fill="#060320"/><g fill-rule="nonzero"><path d="m2291.83 1118.85c-311.27 0-593.06 126.16-797.01 330.11-203.96 203.96-330.11 485.75-330.11 797.01 0 311.27 126.16 593.06 330.11 797.02 203.96 203.96 485.75 330.11 797.01 330.11 311.27 0 593.06-126.16 797.02-330.11 31.49-31.49 61.14-64.84 88.74-99.86 15-19.03 42.35-22.82 61.95-8.57l146.05 106.12c10.27 7.46 16.39 17.63 18.15 30.2 1.78 12.57-1.29 24.04-9.09 34.04-35.47 45.48-73.7 88.72-114.43 129.45-252.96 252.96-602.43 409.42-988.4 409.42s-735.43-156.46-988.39-409.42-409.42-602.43-409.42-988.4 156.46-735.43 409.42-988.39 602.41-409.42 988.39-409.42c384.7 0 733.14 155.45 985.91 406.96l-234.34 150.84c-199.42-178.53-462.81-287.12-751.57-287.12z" fill="url(#a)"/><path d="m1240.33 550.46 280.38 713.29-83.87 32.77-280.39-713.29z" fill="#974ced"/><path d="m2284.39 2073.71 918.01-712.33 109.97 142.39-918.01 712.33z" fill="url(#b)"/><path d="m999.57 2121.97 1640.44 987.62-93.04 154.38-1640.45-987.62z" fill="url(#a)"/><path d="m2558.6 3158.4c161.23-198.39 325.92-353.5 494.01-465.27 169.95-113.02 343.52-181.87 520.68-206.56l12.34 89.16c-163.51 22.78-324.64 86.94-483.32 192.46-160.55 106.75-318.55 255.76-473.93 446.95l-69.78-56.75z" fill="#884bd4"/></g><path d="m1198.39 371.18c108.07 0 195.67 87.6 195.67 195.67s-87.6 195.67-195.67 195.67-195.67-87.6-195.67-195.67 87.6-195.67 195.67-195.67z" fill="#974ced"/><g fill="#e791ff"><path d="m3257.39 1000.15c238.82 0 432.42 193.6 432.42 432.42s-193.6 432.42-432.42 432.42-432.42-193.6-432.42-432.42 193.6-432.42 432.42-432.42z"/><path d="m2593.49 2942.83c134.73 0 243.95 109.22 243.95 243.95s-109.22 243.95-243.95 243.95-243.95-109.22-243.95-243.95 109.22-243.95 243.95-243.95z"/><path d="m3579.46 2345.65c102.45 0 185.51 83.05 185.51 185.51 0 102.45-83.05 185.51-185.51 185.51-102.45 0-185.51-83.05-185.51-185.51 0-102.45 83.05-185.51 185.51-185.51z"/><path d="m953.04 1929.79c148.77 0 269.36 120.6 269.36 269.36 0 148.77-120.6 269.36-269.36 269.36-148.77 0-269.36-120.6-269.36-269.36 0-148.77 120.6-269.36 269.36-269.36z"/></g><path d="m2339.37 1987.36c87.01 0 157.55 70.54 157.55 157.55s-70.54 157.55-157.55 157.55-157.55-70.54-157.55-157.55 70.54-157.55 157.55-157.55z" fill="#8740ea"/><path d="m4738.75 3196.92c151.91 0 288.11-52.39 387.63-136.2v110.01h298.58v-1327.91h-298.58v110.01c-99.53-83.81-235.73-136.2-387.63-136.2-395.49 0-686.22 301.21-686.22 691.46 0 387.63 290.73 688.84 686.22 688.84zm0-295.96c-230.49 0-387.63-167.62-387.63-392.88 0-227.87 157.15-395.49 387.63-395.49 230.49 0 387.63 167.62 387.63 395.49 0 225.25-157.15 392.88-387.63 392.88zm1033.39-395.49c0 390.25 290.73 691.46 686.22 691.46 151.91 0 288.11-52.39 387.63-136.2v110.01h298.58v-1833.41h-298.58v615.5c-99.53-83.81-235.73-136.2-387.63-136.2-395.49 0-686.22 301.21-686.22 688.84zm295.96 0c0-227.87 157.15-392.88 390.26-392.88 233.1 0 387.63 165.01 387.63 392.88s-157.15 395.49-387.63 395.49c-230.49 0-390.26-167.62-390.26-395.49zm2536.8 136.2 251.44 529.07h225.25l633.83-1327.91h-327.39l-421.69 874.8-248.82-531.69h-227.86l-248.82 531.69-419.07-874.8h-330.02l636.45 1327.91h222.64l254.05-529.07zm2955.86-798.85h-330.02l-419.06 885.28-419.07-885.28h-330.02l584.08 1228.38-322.16 678.37h327.39l908.85-1906.75zm643.13 665.26c0-240.96 125.72-395.49 345.73-395.49s343.11 154.71 343.11 395.49v662.65h298.59v-662.65c0-403.35-254.06-691.46-641.7-691.46-144.06 0-259.3 47.14-345.73 117.86v-91.67h-295.96v1327.91h295.96v-662.65z" fill="#fff" fill-rule="nonzero"/></svg>

{cadwyn-5.3.2 → cadwyn-5.4.1}/docs/index.md

@@ -36,9 +36,3 @@ Whether you are a newbie in API versioning, a pro looking for a sophisticated to
 ## Get started
 
 It is recommended to read the [quickstart tutorial](https://docs.cadwyn.dev/quickstart/setup/) first to get your feet wet with Cadwyn's approach
-
-## Sponsors
-
-These are our gorgeous sponsors. They are using Cadwyn and are sponsoring it through various means. Contact [me](https://github.com/zmievsa) if you would like to become one too!
-
-[![Monite](./img/sponsor_logos/monite.png)](https://docs.monite.com/)

cadwyn-5.4.1/docs/stylesheets/extra.css

@@ -0,0 +1,12 @@
+.md-header__button.md-logo {
+  margin-top: 0
+  margin-bottom: 0;
+  padding-top: 0;
+  padding-bottom: 0;
+}
+
+.md-header__button.md-logo img,
+.md-header__button.md-logo svg {
+  height: 2.4rem;
+  width: 2.4rem;
+}

{cadwyn-5.3.2 → cadwyn-5.4.1}/mkdocs.yml

@@ -11,6 +11,9 @@ plugins:
       hooks:
         on_pre_build: "docs.plugin:on_pre_build"
 
+extra_css:
+  - stylesheets/extra.css
+
 markdown_extensions:
   toc:
     permalink: true
@@ -41,8 +44,12 @@ markdown_extensions:
   md_in_html: null
   mdx_include:
   markdown_include_variants:
+
 theme:
   name: "material"
+  logo: img/logos/cadwyn_icon_transparent.svg
+  favicon: img/logos/cadwyn_icon_transparent.svg
+
   features:
     - content.code.annotate
     - content.code.copy