cadwyn 3.6.1__tar.gz → 3.6.3__tar.gz

{cadwyn-3.6.1 → cadwyn-3.6.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cadwyn
-Version: 3.6.1
+Version: 3.6.3
 Summary: Production-ready community-driven modern Stripe-like API versioning in FastAPI
 Home-page: https://github.com/zmievsa/cadwyn
 License: MIT
@@ -49,8 +49,8 @@ Production-ready community-driven modern [Stripe-like](https://stripe.com/blog/a
 ---
 
 <p align="center">
-<a href="https://github.com/zmievsa/cadwyn/actions?query=workflow%3ATests+event%3Apush+branch%3Amain" target="_blank">
-    <img src="https://github.com/zmievsa/cadwyn/actions/workflows/test.yaml/badge.svg?branch=main&event=push" alt="Test">
+<a href="https://github.com/zmievsa/cadwyn/actions/workflows/ci.yaml?branch=main&event=push" target="_blank">
+    <img src="https://github.com/zmievsa/cadwyn/actions/workflows/ci.yaml/badge.svg?branch=main&event=push" alt="Test">
 </a>
 <a href="https://codecov.io/gh/ovsyanka83/cadwyn" target="_blank">
     <img src="https://img.shields.io/codecov/c/github/ovsyanka83/cadwyn?color=%2334D058" alt="Coverage">

{cadwyn-3.6.1 → cadwyn-3.6.3}/README.md

@@ -5,8 +5,8 @@ Production-ready community-driven modern [Stripe-like](https://stripe.com/blog/a
 ---
 
 <p align="center">
-<a href="https://github.com/zmievsa/cadwyn/actions?query=workflow%3ATests+event%3Apush+branch%3Amain" target="_blank">
-    <img src="https://github.com/zmievsa/cadwyn/actions/workflows/test.yaml/badge.svg?branch=main&event=push" alt="Test">
+<a href="https://github.com/zmievsa/cadwyn/actions/workflows/ci.yaml?branch=main&event=push" target="_blank">
+    <img src="https://github.com/zmievsa/cadwyn/actions/workflows/ci.yaml/badge.svg?branch=main&event=push" alt="Test">
 </a>
 <a href="https://codecov.io/gh/ovsyanka83/cadwyn" target="_blank">
     <img src="https://img.shields.io/codecov/c/github/ovsyanka83/cadwyn?color=%2334D058" alt="Coverage">

{cadwyn-3.6.1 → cadwyn-3.6.3}/cadwyn/applications.py

@@ -1,6 +1,6 @@
 from collections.abc import Callable, Coroutine, Sequence
 from types import ModuleType
-from typing import TYPE_CHECKING, Any, cast
+from typing import Any, cast
 
 from fastapi import APIRouter, routing
 from fastapi.datastructures import Default
@@ -14,7 +14,6 @@ from starlette.types import Lifespan
 from typing_extensions import Self
 from verselect import HeaderRoutingFastAPI
 
-from cadwyn.exceptions import CadwynError
 from cadwyn.routing import generate_versioned_routers
 from cadwyn.structure import VersionBundle
 
@@ -62,11 +61,11 @@ class Cadwyn(HeaderRoutingFastAPI):
         separate_input_output_schemas: bool = True,
         **extra: Any,
     ) -> None:
+        self.versions = versions
         # TODO: Remove argument entirely in any major version.
         latest_schemas_package = extra.pop("latest_schemas_package", None) or self.versions.latest_schemas_package
-        self.latest_schemas_package = cast(ModuleType, latest_schemas_package)
         self.versions.latest_schemas_package = latest_schemas_package
-        self.versions = versions
+        self.latest_schemas_package = cast(ModuleType, latest_schemas_package)
 
         super().__init__(
             api_version_header_name=api_version_header_name,

{cadwyn-3.6.1 → cadwyn-3.6.3}/cadwyn/codegen/_common.py

@@ -30,8 +30,12 @@ class PydanticModelWrapper:
     name: str
     fields: dict[_FieldName, PydanticFieldWrapper]
     validators: dict[_FieldName, _ValidatorWrapper]
+    annotations: dict[str, Any] = dataclasses.field(init=False, repr=False)
     _parents: list[Self] | None = dataclasses.field(init=False, default=None)
 
+    def __post_init__(self):
+        self.annotations = self.cls.__annotations__.copy()
+
     def _get_parents(self, schemas: "dict[IdentifierPythonPath, Self]"):
         if self._parents is not None:
             return self._parents
@@ -61,9 +65,9 @@ class PydanticModelWrapper:
         annotations = {}
 
         for parent in reversed(self._get_parents(schemas)):
-            annotations |= parent.cls.__annotations__
+            annotations |= parent.annotations
 
-        return annotations | self.cls.__annotations__
+        return annotations | self.annotations
 
 
 @cache
@@ -76,7 +80,7 @@ def get_fields_and_validators_from_model(
     fields = model_fields(cls)
     try:
         source = inspect.getsource(cls)
-    except OSError:
+    except OSError:  # pragma: no cover # It is covered by tests but not on every platform
         return (
             {
                 field_name: PydanticFieldWrapper(annotation=field.annotation, init_model_field=field)

{cadwyn-3.6.1 → cadwyn-3.6.3}/cadwyn/codegen/_main.py

@@ -81,6 +81,8 @@ def generate_code_for_versioned_packages(
         codegen_plugins=codegen_plugins,
         migration_plugins=migration_plugins,
     )
+    # This should not affect real use cases at all but is rather useful for testing
+    importlib.invalidate_caches()
 
 
 def _generate_versioned_directories(

{cadwyn-3.6.1 → cadwyn-3.6.3}/cadwyn/codegen/_plugins/class_migrations.py

@@ -156,7 +156,7 @@ def _add_field_to_model(
         for attr_name, attr_value in passed_field_attributes.items():
             add_keyword_to_call(attr_name, attr_value, field_call_ast)
         field.value_ast = field_call_ast
-    model.cls.__annotations__[alter_schema_instruction.name] = alter_schema_instruction.type
+    model.annotations[alter_schema_instruction.name] = alter_schema_instruction.type
 
 
 def _change_field_in_model(
@@ -175,7 +175,7 @@ def _change_field_in_model(
 
     field = defined_fields[alter_schema_instruction.name]
     model.fields[alter_schema_instruction.name] = field
-    model.cls.__annotations__[alter_schema_instruction.name] = defined_annotations[alter_schema_instruction.name]
+    model.annotations[alter_schema_instruction.name] = defined_annotations[alter_schema_instruction.name]
 
     annotation_ast, field_call_ast, contype_is_definitely_used = _get_constraint_asts_and_field_call_ast(
         schemas, model, alter_schema_instruction.name, field
@@ -247,7 +247,7 @@ def _change_field(  # noqa: C901
                 f'but it already has type "{field.annotation}"',
             )
         field.annotation = alter_schema_instruction.type
-        model.cls.__annotations__[alter_schema_instruction.name] = alter_schema_instruction.type
+        model.annotations[alter_schema_instruction.name] = alter_schema_instruction.type
         fancy_type_repr = get_fancy_repr(alter_schema_instruction.type)
         field.annotation_ast = ast.parse(fancy_type_repr, mode="eval").body
 
@@ -259,7 +259,7 @@ def _change_field(  # noqa: C901
                 "but it already has that name.",
             )
         model.fields[alter_schema_instruction.new_name] = model.fields.pop(alter_schema_instruction.name)
-        model.cls.__annotations__[alter_schema_instruction.new_name] = model.cls.__annotations__.pop(
+        model.annotations[alter_schema_instruction.new_name] = model.annotations.pop(
             alter_schema_instruction.name,
             defined_annotations[alter_schema_instruction.name],
         )

{cadwyn-3.6.1 → cadwyn-3.6.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cadwyn"
-version = "3.6.1"
+version = "3.6.3"
 description = "Production-ready community-driven modern Stripe-like API versioning in FastAPI"
 authors = ["Stanislav Zmiev <zmievsa@gmail.com>"]
 license = "MIT"
@@ -69,15 +69,14 @@ pytest-cov = ">=4.0.0"
 uvicorn = "*"
 devtools = "*"
 pdbpp = "^0.10.3"
-pytest-asyncio = "^0.21.0"
 httpx = "*"
-pytest-fixture-classes = "^1.0.3"
-pre-commit = "^3.4.0"
-dirty-equals = "^0.6.0"
-mkdocs = "^1.5.2"
-mkdocs-material = "^9.3.1"
-python-multipart = "^0.0.6"
-mkdocs-simple-hooks = "^0.1.5"
+pytest-fixture-classes = ">=1.0.3"
+pre-commit = ">=3.4.0"
+dirty-equals = ">=0.6.0"
+mkdocs = ">=1.5.2"
+mkdocs-material = ">=9.3.1"
+python-multipart = ">=0.0.6"
+mkdocs-simple-hooks = ">=0.1.5"
 
 [tool.poetry.scripts]
 cadwyn = "cadwyn.__main__:app"