cadwyn 3.4.1__py3-none-any.whl → 3.4.2__py3-none-any.whl

cadwyn/_utils.py

@@ -4,7 +4,7 @@ import inspect
 from collections.abc import Callable, Collection
 from pathlib import Path
 from types import ModuleType
-from typing import Any, TypeVar, Union
+from typing import Any, Generic, TypeVar, Union
 
 from cadwyn.exceptions import CadwynError, ModuleIsNotVersionedError
 
@@ -13,6 +13,19 @@ UnionType = type(int | str) | type(Union[int, str])
 _T = TypeVar("_T", bound=Callable)
 
 
+_P_T = TypeVar("_P_T")
+_P_R = TypeVar("_P_R")
+
+
+class classproperty(Generic[_P_T, _P_R]):  # noqa: N801
+    def __init__(self, func: Callable[[_P_T], _P_R]) -> None:
+        super().__init__()
+        self.func = func
+
+    def __get__(self, obj: Any, cls: _P_T) -> _P_R:
+        return self.func(cls)
+
+
 class PlainRepr(str):
     """String class where repr doesn't include quotes"""
 
@@ -80,7 +93,8 @@ def get_index_of_latest_schema_dir_in_module_python_path(
     # /home/myuser/package/companies/latest/__init__.py
     file = Path(file)
     _validate_that_module_is_versioned(file, version_dirs)
-    if file.name == "__init__.py":
+    is_package = file.name == "__init__.py"
+    if is_package:
         # /home/myuser/package/companies/latest/
         file = file.parent
     # /home/myuser/package/companies
@@ -94,7 +108,12 @@ def get_index_of_latest_schema_dir_in_module_python_path(
     # ['package', 'companies', 'latest', 'schemas']
     module_split_python_path = module_python_path.split(".")
 
-    return len(module_split_python_path) - len(relative_file_parts)
+    index = len(module_split_python_path) - len(relative_file_parts) - int(is_package)
+
+    # When we are in latest/__init__.py, we have this special case
+    if len(relative_file_parts) == 1 and is_package:
+        index += 1
+    return index
 
 
 def _validate_that_module_is_versioned(file: Path, version_dirs: Collection[Path]):

cadwyn/codegen/_plugins/latest_version_aliasing.py

@@ -64,8 +64,9 @@ class _ImportedModule:
         module = f"{self.path}.{self.name}"
         name = ast.alias(name="*")
         level = self.how_far_up_is_base_schema_dir_from_current_module
-        if self.is_package and level == 2:
+        if level == 2 and self.is_package:
             level -= 1
+
         return ast.ImportFrom(
             level=level,
             module=module,
@@ -93,6 +94,7 @@ def _prepare_imports_from_version_dirs(
     how_far_up_is_base_schema_dir_from_current_module = (
         len(original_module_parts) - index_of_latest_package_dir_in_pythonpath
     )
+
     is_package = original_module_parts[-1] == "__init__"
     if is_package:
         original_module_parts.pop(-1)

cadwyn/structure/versions.py

@@ -27,6 +27,7 @@ from typing_extensions import assert_never
 
 from cadwyn._compat import PYDANTIC_V2, ModelField, PydanticUndefined, model_dump
 from cadwyn._package_utils import IdentifierPythonPath, get_cls_pythonpath
+from cadwyn._utils import classproperty
 from cadwyn.exceptions import CadwynError, CadwynStructureError
 
 from .._utils import Sentinel
@@ -189,9 +190,8 @@ class VersionChangeWithSideEffects(VersionChange, _abstract=True):
                 f"Can't subclass {cls.__name__} as it was never meant to be subclassed.",
             )
 
-    @classmethod
-    @property
-    def is_applied(cls) -> bool:
+    @classproperty
+    def is_applied(cls: type["VersionChangeWithSideEffects"]) -> bool:  # pyright: ignore[reportGeneralTypeIssues]
         if (
             cls._bound_version_bundle is None
             or cls not in cls._bound_version_bundle._version_changes_to_version_mapping
@@ -294,7 +294,7 @@ class VersionBundle:
     @functools.cached_property
     def _version_changes_to_version_mapping(
         self,
-    ) -> dict[type[VersionChange], VersionDate]:
+    ) -> dict[type[VersionChange] | type[VersionChangeWithSideEffects], VersionDate]:
         return {
             version_change: version.value for version in self.versions for version_change in version.version_changes
         }

{cadwyn-3.4.1.dist-info → cadwyn-3.4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cadwyn
-Version: 3.4.1
+Version: 3.4.2
 Summary: Production-ready community-driven modern Stripe-like API versioning in FastAPI
 Home-page: https://github.com/zmievsa/cadwyn
 License: MIT

{cadwyn-3.4.1.dist-info → cadwyn-3.4.2.dist-info}/RECORD

@@ -2,7 +2,7 @@ cadwyn/__init__.py,sha256=gVLVH3SSBGH0IQYGL5tbro4s0vk--9sAym0UvoG3s1w,478
 cadwyn/__main__.py,sha256=JUNmAhwn7tG1EeXI82QmFZE-fpjfAOv2kxFNDfxWbhQ,2851
 cadwyn/_compat.py,sha256=B0K-cj9bN7ytOIehOMjN9O9s0CE3lq9WAkV97pnvll8,5410
 cadwyn/_package_utils.py,sha256=trxTYLmppv-10SKhScfyDQJh21rsQGFoLaOtHycKKR0,1443
-cadwyn/_utils.py,sha256=gEv_1Qqp7uzvdY0u_l77d6lppAsNsOCjD8FEFBKi3Js,3758
+cadwyn/_utils.py,sha256=JW3NCttM-Uj3PPW4CkYnCqROqWKOJWyHo1lcDMQillU,4274
 cadwyn/codegen/README.md,sha256=V2Kz2IOz1cTxrC-RnQ7YbWEVCIGYr3tR4IPCvepeq0M,1047
 cadwyn/codegen/__init__.py,sha256=JgddDjxMTjSfVrMXHwNu1ODgdn2QfPWpccrRKquBV6k,355
 cadwyn/codegen/_asts.py,sha256=rwg3FMC9c_20rawub98UTWzL8hhkBgJ0RdJsqnW9bVE,10161
@@ -13,7 +13,7 @@ cadwyn/codegen/_plugins/class_migrations.py,sha256=dbmXMdfUGA2X4phsNdtRQQde4SuoO
 cadwyn/codegen/_plugins/class_rebuilding.py,sha256=mJR297bqsLUfP4HW5_1GuHlpiYSQd851yHpG_ajjilg,3703
 cadwyn/codegen/_plugins/class_renaming.py,sha256=5ka2W1c18i4maNbEkEpELvGLEFbd8tthvQX3YA3Bu0A,1843
 cadwyn/codegen/_plugins/import_auto_adding.py,sha256=00zGK99cT-bq2eXKDlYBR5-Z3uHLOGU7dbhB0YFFrt0,2613
-cadwyn/codegen/_plugins/latest_version_aliasing.py,sha256=s8TgpBL9FofKyJaF4AB7UxJYkq-f9LiMVL33LJxFVp4,4010
+cadwyn/codegen/_plugins/latest_version_aliasing.py,sha256=itVCGc1x3TRwr9O_-hcQBrVBe0P_6dNgKxuSncjX2AY,4012
 cadwyn/codegen/_plugins/module_migrations.py,sha256=TeWJk4Iu4SRQ9K2iI3v3sCs1110jrltKlPdfU9mXIsQ,722
 cadwyn/exceptions.py,sha256=XOLsT4EH1uGNirmKlkgEk03PjUMtD7tgaCDadt_eBbE,695
 cadwyn/main.py,sha256=_hC2Ke1uwtnjg2WueDXlg_QnzFgJbTcAlpHgqUBTmg4,4899
@@ -26,9 +26,9 @@ cadwyn/structure/endpoints.py,sha256=VngfAydGBwekhV2tBOtNDPVgl3X1IgYxUCw--VZ5cQY
 cadwyn/structure/enums.py,sha256=iMokxA2QYJ61SzyB-Pmuq3y7KL7-e6TsnjLVUaVZQnw,954
 cadwyn/structure/modules.py,sha256=1FK-lLm-zOTXEvn-QtyBH38aDRht5PDQiZrOPCsBlM4,1268
 cadwyn/structure/schemas.py,sha256=LIKwDuzorVC9AHg4EN-UYdI133lCk_2MkBTdiyAr-EQ,8808
-cadwyn/structure/versions.py,sha256=ydE16KY9oFUlsLeLh3w6-ZDulwtya9-U0rTxtA3EaKE,28245
-cadwyn-3.4.1.dist-info/entry_points.txt,sha256=eO05hLn9GoRzzpwT9GONPmXKsonjuMNssM2D2WHWKGk,46
-cadwyn-3.4.1.dist-info/LICENSE,sha256=KeCWewiDQYpmSnzF-p_0YpoWiyDcUPaCuG8OWQs4ig4,1072
-cadwyn-3.4.1.dist-info/WHEEL,sha256=vxFmldFsRN_Hx10GDvsdv1wroKq8r5Lzvjp6GZ4OO8c,88
-cadwyn-3.4.1.dist-info/METADATA,sha256=bJR5wfSCg_UftVxkz2ZeahBW_7oCuik6bRsABe62EfE,4264
-cadwyn-3.4.1.dist-info/RECORD,,
+cadwyn/structure/versions.py,sha256=kmIJTJpihXsCnE7-7PT82nIcW3qkOtN5ewuF3bxnamc,28392
+cadwyn-3.4.2.dist-info/entry_points.txt,sha256=eO05hLn9GoRzzpwT9GONPmXKsonjuMNssM2D2WHWKGk,46
+cadwyn-3.4.2.dist-info/LICENSE,sha256=KeCWewiDQYpmSnzF-p_0YpoWiyDcUPaCuG8OWQs4ig4,1072
+cadwyn-3.4.2.dist-info/WHEEL,sha256=vxFmldFsRN_Hx10GDvsdv1wroKq8r5Lzvjp6GZ4OO8c,88
+cadwyn-3.4.2.dist-info/METADATA,sha256=s4cO22vjgaJU5gokr8L2_-osjw4ufSZhE6CYY7Vi6O8,4264
+cadwyn-3.4.2.dist-info/RECORD,,