statikk 0.1.21__py3-none-any.whl → 0.1.22__py3-none-any.whl

statikk/engine.py

@@ -261,10 +261,7 @@ class Table:
                 batch.delete_by_key(delete_params)
 
             for item in items:
-                if item.should_delete:
-                    batch.delete(item)
-                else:
-                    batch.put(item)
+                batch.put(item)
 
         model._db_snapshot_keys = new_keys
 

statikk/models.py

@@ -171,7 +171,6 @@ class DatabaseModel(BaseModel, TrackingMixin):
     _parent: Optional[DatabaseModel] = None
     _parent_field_name: Optional[str] = None
     _model_types_in_hierarchy: dict[str, Type[DatabaseModel]] = {}
-    _should_delete: bool = False
     _db_snapshot_keys = set()
 
     class Config:
@@ -207,20 +206,6 @@ class DatabaseModel(BaseModel, TrackingMixin):
     def is_simple_object(self) -> bool:
         return len(self._model_types_in_hierarchy) == 1
 
-    @property
-    def should_delete(self) -> bool:
-        if self._is_any_parent_marked_for_deletion():
-            return True
-        return self._should_delete
-
-    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
-
     def build_model_indexes(self) -> T:
         for node in self.dfs_traverse_hierarchy():
             self._table.build_model_indexes(node)
@@ -294,12 +279,30 @@ class DatabaseModel(BaseModel, TrackingMixin):
             return self._parent.should_write_to_database()
         return True
 
-    def mark_for_delete(self):
-        self._should_delete = True
-
     def _change_parent_to(self, new_parent: DatabaseModel, field_name: str) -> T:
         return self._table.reparent_subtree(self, new_parent, field_name)
 
+    def remove_child_node(self, child_node: DatabaseModel):
+        """
+        Remove a child node from this model, optionally specifying which field to search.
+
+        Args:
+            child_node: The database model instance to remove
+            field_name: Optional field name to limit the search scope
+        """
+        field_name = child_node._parent_field_name
+        field_info = self.model_fields[field_name]
+        field_value = getattr(self, field_name)
+        is_optional, inner_type = inspect_optional_field(self.__class__, field_name)
+        field_type = inner_type if is_optional else field_info.annotation
+
+        if hasattr(field_type, "__origin__") and field_type.__origin__ == list:
+            if isinstance(field_value, list):
+                field_value.remove(next(filter(lambda item: item.id == child_node.id, field_value), None))
+
+        elif isinstance(field_value, DatabaseModel) and field_value.id == child_node.id:
+            setattr(self, field_name, None)
+
     def _remove_from_parent(self, parent: DatabaseModel, field_name: str):
         is_optional, inner_type = inspect_optional_field(parent.__class__, field_name)
         field_type = inner_type if is_optional else parent.model_fields[field_name].annotation
@@ -307,12 +310,7 @@ class DatabaseModel(BaseModel, TrackingMixin):
         if hasattr(field_type, "__origin__") and field_type.__origin__ == list:
             if not isinstance(field, list):
                 setattr(parent, field_name, [])
-            field.remove(next(filter(lambda item: item.id == self.id, getattr(parent, field_name)), None))
-
-        elif hasattr(field_type, "__origin__") and field_type.__origin__ == set:
-            if not isinstance(field, set):
-                setattr(parent, field_name, set())
-            field.remove(next(filter(lambda item: item.id == self.id, getattr(parent, field_name)), None))
+            field.remove(next(filter(lambda item: item.id == self.id, field), None))
 
         elif issubclass(field_type, DatabaseModel):
             current_value = getattr(parent, field_name)

{statikk-0.1.21.dist-info → statikk-0.1.22.dist-info}/METADATA

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

{statikk-0.1.21.dist-info → statikk-0.1.22.dist-info}/RECORD

@@ -1,12 +1,12 @@
 statikk/__init__.py,sha256=pH5i4Fj1tbXLqLtTVIdoojiplZssQn0nnud8-HXodRE,577
 statikk/conditions.py,sha256=63FYMR-UUaE-ZJEb_8CU721CQTwhajq39-BbokmKeMA,2166
-statikk/engine.py,sha256=7SstnrKK5eiGYR31rlOTUkgsUmBsADWbE7uMpoJ3ipA,32249
+statikk/engine.py,sha256=oYSxiD6lw0aoK6StoqJvdb6lWwTJEra4H3UfnnE7yK8,32145
 statikk/expressions.py,sha256=boAeGxZj2cDsXxoiX3IIEzfX9voSMQngi4-rE_jYeuE,12233
 statikk/fields.py,sha256=uLGD3xEnz2nqQY6EwG8Dd7pnRMMVP4PU2Z2I-uGNaTA,150
-statikk/models.py,sha256=1qnj2VmJivo4vJtI2UnlK85d9imuh_IiIp3UC1K7Y3I,17207
+statikk/models.py,sha256=IaB6USTvrzEQa3LewgFQ4772eaWkWFF_fyzIVQLzp8U,17385
 statikk/typing.py,sha256=laOlOpWOm9_sOj4hhdZnGTUZRiq8760_B9I9B3wBhz8,750
-statikk-0.1.21.dist-info/licenses/LICENSE.txt,sha256=uSH_2Hpb2Bigy5_HhBliN2fZbBU64G3ERM5zzhKPUEE,1078
-statikk-0.1.21.dist-info/METADATA,sha256=mJs51n5Koa2cgorpZ9wV96FqJQV-E8TVCUkIkdE_esQ,3183
-statikk-0.1.21.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-statikk-0.1.21.dist-info/top_level.txt,sha256=etKmBbjzIlLpSefXoiOfhWGEgvqUEALaFwCjFDBD9YI,8
-statikk-0.1.21.dist-info/RECORD,,
+statikk-0.1.22.dist-info/licenses/LICENSE.txt,sha256=uSH_2Hpb2Bigy5_HhBliN2fZbBU64G3ERM5zzhKPUEE,1078
+statikk-0.1.22.dist-info/METADATA,sha256=3jIg6WKVrVjPnNx6Vb6tpU03EMavyeYrGHxuzp8MlnM,3183
+statikk-0.1.22.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+statikk-0.1.22.dist-info/top_level.txt,sha256=etKmBbjzIlLpSefXoiOfhWGEgvqUEALaFwCjFDBD9YI,8
+statikk-0.1.22.dist-info/RECORD,,