statikk 0.1.8__py3-none-any.whl → 0.1.9__py3-none-any.whl

statikk/engine.py

@@ -1,6 +1,6 @@
 import os
 from datetime import datetime
-from typing import Any, Dict, Type, Optional, List, Union
+from typing import Any, Dict, Type, Optional, List, Union, get_type_hints, get_origin, get_args
 
 import boto3
 from botocore.config import Config
@@ -623,6 +623,26 @@ class Table:
                     data = self._serialize_item(enriched_item)
                     batch.delete_item(Key=data)
 
+    def inspect_optional_field(self, model_class, field_name):
+        field_type = model_class.model_fields[field_name].annotation
+
+        is_optional = False
+        inner_type = field_type
+
+        if get_origin(field_type) is Union:
+            args = get_args(field_type)
+            if len(args) == 2 and args[1] is type(None):
+                is_optional = True
+                inner_type = args[0]
+
+        elif hasattr(field_type, "__origin__") and field_type.__origin__ is Union:
+            args = getattr(field_type, "__args__", [])
+            if len(args) == 2 and args[1] is type(None):
+                is_optional = True
+                inner_type = args[0]
+
+        return (is_optional, inner_type)
+
     def reconstruct_hierarchy(self, items: list[dict]) -> Optional[dict]:
         """
         Reconstructs a hierarchical dictionary structure from a flat list of dictionaries
@@ -704,7 +724,9 @@ class Table:
                 if field_name.startswith("_"):
                     continue
 
-                field_type = field_info.annotation
+                is_optional, inner_type = self.inspect_optional_field(parent_model_class, field_name)
+
+                field_type = inner_type if is_optional else field_info.annotation
 
                 if field_type == child_model_class:
                     matching_fields.append((field_name, "single"))

statikk/models.py

@@ -204,8 +204,19 @@ class DatabaseModel(BaseModel, TrackingMixin, extra=Extra.allow):
 
     @property
     def should_delete(self) -> bool:
+        if self._is_any_parent_marked_for_deletion():
+            return True
+
         return self._should_delete or self.is_parent_changed()
 
+    def _is_any_parent_marked_for_deletion(self) -> bool:
+        current = self._parent
+        while current is not None:
+            if current._should_delete:
+                return True
+            current = current._parent
+        return False
+
     @classmethod
     def query(
         cls: Type[T],

{statikk-0.1.8.dist-info → statikk-0.1.9.dist-info}/METADATA

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

statikk-0.1.9.dist-info/RECORD

@@ -0,0 +1,12 @@
+statikk/__init__.py,sha256=pH5i4Fj1tbXLqLtTVIdoojiplZssQn0nnud8-HXodRE,577
+statikk/conditions.py,sha256=63FYMR-UUaE-ZJEb_8CU721CQTwhajq39-BbokmKeMA,2166
+statikk/engine.py,sha256=0jF5pUZJtr_lBZMEZXd7PGDerr26CLZUh91gy15Leac,33252
+statikk/expressions.py,sha256=boAeGxZj2cDsXxoiX3IIEzfX9voSMQngi4-rE_jYeuE,12233
+statikk/fields.py,sha256=LkMP5NnX7WS0HSLxI3Q-dMOrfaJ0SD7SayZxJU5Acgg,86
+statikk/models.py,sha256=gzy_MV3LVsVlorqHencXyS7HCVV2QQ698aWK5bQIdFk,16115
+statikk/typing.py,sha256=qfpegORcdODuILK3gvuD4SdcZA1a7Myn0yvscOLPHOM,68
+statikk-0.1.9.dist-info/LICENSE.txt,sha256=uSH_2Hpb2Bigy5_HhBliN2fZbBU64G3ERM5zzhKPUEE,1078
+statikk-0.1.9.dist-info/METADATA,sha256=ZvTT-xMgID_v5WgHYz13E_JLHtqflVz9naDu9Qh-9rA,3160
+statikk-0.1.9.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+statikk-0.1.9.dist-info/top_level.txt,sha256=etKmBbjzIlLpSefXoiOfhWGEgvqUEALaFwCjFDBD9YI,8
+statikk-0.1.9.dist-info/RECORD,,

statikk-0.1.8.dist-info/RECORD

@@ -1,12 +0,0 @@
-statikk/__init__.py,sha256=pH5i4Fj1tbXLqLtTVIdoojiplZssQn0nnud8-HXodRE,577
-statikk/conditions.py,sha256=63FYMR-UUaE-ZJEb_8CU721CQTwhajq39-BbokmKeMA,2166
-statikk/engine.py,sha256=x3TB4iMXSpLudwv0dRBGFapttbc8etg36SA_tSq0tGY,32362
-statikk/expressions.py,sha256=boAeGxZj2cDsXxoiX3IIEzfX9voSMQngi4-rE_jYeuE,12233
-statikk/fields.py,sha256=LkMP5NnX7WS0HSLxI3Q-dMOrfaJ0SD7SayZxJU5Acgg,86
-statikk/models.py,sha256=X2MRFn3TAmKdxUQ9KDO9oNoekct4F3QBdcB1COtCpDU,15785
-statikk/typing.py,sha256=qfpegORcdODuILK3gvuD4SdcZA1a7Myn0yvscOLPHOM,68
-statikk-0.1.8.dist-info/LICENSE.txt,sha256=uSH_2Hpb2Bigy5_HhBliN2fZbBU64G3ERM5zzhKPUEE,1078
-statikk-0.1.8.dist-info/METADATA,sha256=9TYBs4MKqRMN2TJN6iRyl3g8nWSIG_zBlVnAAUtfClc,3160
-statikk-0.1.8.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-statikk-0.1.8.dist-info/top_level.txt,sha256=etKmBbjzIlLpSefXoiOfhWGEgvqUEALaFwCjFDBD9YI,8
-statikk-0.1.8.dist-info/RECORD,,