fastapi-rtk 2.3.1__tar.gz → 2.3.2__tar.gz

{fastapi_rtk-2.3.1 → fastapi_rtk-2.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-rtk
-Version: 2.3.1
+Version: 2.3.2
 Summary: A package that provides a set of tools to build a FastAPI application with a Class-Based CRUD API.
 Project-URL: Homepage, https://codeberg.org/datatactics/fastapi-rtk
 Project-URL: Issues, https://codeberg.org/datatactics/fastapi-rtk/issues

fastapi_rtk-2.3.2/fastapi_rtk/_version.py

@@ -0,0 +1 @@
+__version__ = "2.3.2"

{fastapi_rtk-2.3.1 → fastapi_rtk-2.3.2}/fastapi_rtk/backends/generic/model.py

@@ -1,4 +1,5 @@
 import typing
+import warnings
 
 from ...bases.model import BasicModel
 from ...utils import T, lazy
@@ -52,11 +53,17 @@ class GenericModel(BasicModel):
     """
     A mapper that contains the primary key, properties, and columns of the model.
     """
+    __abstract__ = False
+    """
+    Set to True in a class body to skip `__init_subclass__` setup for that
+    class only (an abstract intermediate that should not be validated as a
+    concrete model). The flag does not inherit: a concrete subclass that does
+    not set it is reset to False and set up normally.
+    """
     __ignore_init__ = False
     """
-    If set to True, the `__init_subclass__` method will not run for this class.
-
-    Useful for subclasses that should work as a model.
+    Deprecated alias for `__abstract__`. Still honoured but emits a
+    DeprecationWarning; prefer `__abstract__` in new code.
     """
     __table__: "Table | None" = None
     """
@@ -64,8 +71,17 @@ class GenericModel(BasicModel):
     """
 
     def __init_subclass__(cls) -> None:
-        if getattr(cls, "__ignore_init__", False):
-            # If the child class defines '__ignore_init__', skip the parent's logic
+        own = cls.__dict__
+        if own.get("__abstract__") or own.get("__ignore_init__"):
+            # Abstract intermediate: skip setup for the declaring class only
+            # (own-dict, not inherited); concrete subclasses are reset below
+            # so the marker does not cascade.
+            if own.get("__ignore_init__"):
+                warnings.warn(
+                    "__ignore_init__ is deprecated; set __abstract__ = True instead.",
+                    DeprecationWarning,
+                    stacklevel=2,
+                )
             return
 
         # Take all the columns from the base classes, this allow the use of multiple inheritance
@@ -92,6 +108,11 @@ class GenericModel(BasicModel):
         if not cls.__mapper__.pk:
             raise PKMissingException(cls.__name__, "Primary key is missing")
 
+        # The abstract markers apply only to the declaring class; reset them
+        # on this concrete subclass so an inherited True does not cascade.
+        cls.__abstract__ = False
+        cls.__ignore_init__ = False
+
     def __init__(self, *, __check_on_init__=True, **kwargs):
         """
         Initialize the model with the given keyword arguments.

{fastapi_rtk-2.3.1 → fastapi_rtk-2.3.2}/tests/unit/backends/generic/test_model.py

@@ -30,12 +30,40 @@ class TestSubclassPKValidation:
                 a = GenericColumn(int, primary_key=True, auto_increment=True)
                 b = GenericColumn(str, primary_key=True)
 
-    def test_ignore_init_skips_validation(self):
+    def test_abstract_skips_validation(self):
         class M(GenericModel):
-            __ignore_init__ = True
+            __abstract__ = True
 
         # No exception even though no PK
 
+    def test_abstract_does_not_inherit_to_subclasses(self):
+        class Base(GenericModel):
+            __abstract__ = True  # abstract intermediate, skipped
+
+        assert Base.__abstract__ is True
+
+        # a concrete subclass is validated normally (the marker did not
+        # inherit) and is reset to False
+        class Concrete(Base):
+            id = GenericColumn(int, primary_key=True)
+
+        assert Concrete.__abstract__ is False
+
+        # a concrete subclass without a pk is still enforced, proving no
+        # skip leaked from the abstract base
+        with pytest.raises(PKMissingException):
+
+            class NoPk(Base):
+                x = GenericColumn(int)
+
+    def test_ignore_init_deprecated_alias_still_skips(self):
+        with pytest.warns(DeprecationWarning):
+
+            class M(GenericModel):
+                __ignore_init__ = True
+
+        # still skipped (no PK error) but emits a DeprecationWarning
+
 
 class TestModelInit:
     def _model(self):

fastapi_rtk-2.3.1/fastapi_rtk/_version.py

@@ -1 +0,0 @@
-__version__ = "2.3.1"