statikk 0.1.2__tar.gz → 0.1.4__tar.gz

{statikk-0.1.2 → statikk-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: statikk
-Version: 0.1.2
+Version: 0.1.4
 Summary: statikk is a single table application (STA) library for DynamoDb.
 Home-page: https://github.com/terinia/statikk
 Author: Balint Biro

{statikk-0.1.2 → statikk-0.1.4}/src/statikk/models.py

@@ -56,11 +56,13 @@ class IndexFieldConfig(BaseModel):
 class TrackingMixin:
     _original_hash: int = Field(exclude=True)
 
-    @classmethod
-    def should_track(cls) -> bool:
-        return True
+    @property
+    def should_track(self) -> bool:
+        if self._parent is not None:
+            return self._parent.should_track
+        return False
 
-    def __init__(self):
+    def init_tracking(self):
         self._original_hash = self._recursive_hash()
 
     def _recursive_hash(self) -> int:
@@ -72,6 +74,9 @@ class TrackingMixin:
         Returns:
             A hash value representing the model's non-model fields.
         """
+        if not self.should_track:
+            return 0
+
         values = []
         for field_name in self.model_fields:
             if not hasattr(self, field_name):
@@ -131,7 +136,7 @@ class TrackingMixin:
 
     @property
     def was_modified(self) -> bool:
-        if self.should_track():
+        if self.should_track:
             return self._recursive_hash() != self._original_hash
 
         return True
@@ -173,7 +178,7 @@ class DatabaseModel(BaseModel, TrackingMixin, extra=Extra.allow):
         range_key: Optional[Condition] = None,
         filter_condition: Optional[ComparisonCondition] = None,
         index_name: Optional[str] = None,
-    ) -> T:
+    ) -> list[T]:
         return cls._table.query_index(
             hash_key=hash_key,
             model_class=cls,
@@ -253,10 +258,10 @@ class DatabaseModel(BaseModel, TrackingMixin, extra=Extra.allow):
 
     @model_validator(mode="after")
     def initialize_tracking(self):
-        self._original_hash = self._recursive_hash()
         self._model_types_in_hierarchy[self.type()] = type(self)
         if not self.is_nested():
             self._set_parent_references(self)
+        self.init_tracking()
 
         return self
 
@@ -351,6 +356,7 @@ class DatabaseModel(BaseModel, TrackingMixin, extra=Extra.allow):
         field._parent = parent
         root._model_types_in_hierarchy[field.type()] = type(field)
         field._set_parent_references(root)
+        field.init_tracking()
 
     def _set_parent_references(self, root: DatabaseModel):
         for field_name, field_value in self:

{statikk-0.1.2 → statikk-0.1.4}/src/statikk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: statikk
-Version: 0.1.2
+Version: 0.1.4
 Summary: statikk is a single table application (STA) library for DynamoDb.
 Home-page: https://github.com/terinia/statikk
 Author: Balint Biro

{statikk-0.1.2 → statikk-0.1.4}/tests/test_models.py

@@ -28,6 +28,10 @@ class MyDatabaseModel(DatabaseModel):
     foo: str
     nested: MyNestedDatabaseModel
 
+    @property
+    def should_track(self) -> bool:
+        return True
+
 
 class MyDatabaseModelWithList(DatabaseModel):
     foo: str
@@ -98,10 +102,6 @@ def test_tracking_disabled():
         foo: str = "foo"
         bar: str = "bar"
 
-        @classmethod
-        def should_track(cls) -> bool:
-            return False
-
     my_database_model = MyDatabaseModel(foo="foo", bar="bar")
     assert my_database_model.was_modified is True  # untracked models should always be marked as modified
     my_database_model.foo = "bar"