statikk 0.1.11__py3-none-any.whl → 0.1.13__py3-none-any.whl

statikk/engine.py

@@ -1,14 +1,14 @@
 import os
 from datetime import datetime
-from typing import Any, Dict, Type, Optional, List, Union, get_type_hints, get_origin, get_args
+from typing import Any, Dict, Type, Optional, List, Union
 
 import boto3
 from botocore.config import Config
 from pydantic.fields import FieldInfo
-from boto3.dynamodb.conditions import ComparisonCondition, Key
+from boto3.dynamodb.conditions import ComparisonCondition
 from boto3.dynamodb.types import TypeDeserializer, Decimal
 
-from statikk.typing import T
+from statikk.typing import T, inspect_optional_field
 from statikk.conditions import Condition, Equals, BeginsWith
 from statikk.expressions import UpdateExpressionBuilder
 from statikk.models import (
@@ -609,6 +609,13 @@ class Table:
 
         dynamodb_table = self._get_dynamodb_table()
 
+        if len(delete_items) > 0:
+            with dynamodb_table.batch_writer() as batch:
+                for item in delete_items:
+                    enriched_item = self._prepare_model_data(item, self.indexes)
+                    data = self._serialize_item(enriched_item)
+                    batch.delete_item(Key=data)
+
         if len(put_items) > 0:
             with dynamodb_table.batch_writer() as batch:
                 for item in put_items:
@@ -620,33 +627,6 @@ class Table:
                     data = self._serialize_item(enriched_item)
                     batch.put_item(Item=data)
 
-        if len(delete_items) > 0:
-            with dynamodb_table.batch_writer() as batch:
-                for item in delete_items:
-                    enriched_item = self._prepare_model_data(item, self.indexes)
-                    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
@@ -728,7 +708,7 @@ class Table:
                 if field_name.startswith("_"):
                     continue
 
-                is_optional, inner_type = self.inspect_optional_field(parent_model_class, field_name)
+                is_optional, inner_type = inspect_optional_field(parent_model_class, field_name)
 
                 field_type = inner_type if is_optional else field_info.annotation
 

statikk/models.py

@@ -4,7 +4,7 @@ import typing
 import logging
 from uuid import uuid4
 from typing import Optional, List, Any, Set, Type
-from statikk.typing import T
+from statikk.typing import T, inspect_optional_field
 
 from boto3.dynamodb.conditions import ComparisonCondition
 from pydantic import BaseModel, model_serializer, model_validator, Field, Extra
@@ -296,6 +296,37 @@ class DatabaseModel(BaseModel, TrackingMixin, extra=Extra.allow):
     def change_parent_to(self, new_parent: DatabaseModel) -> T:
         return self._table.reparent_subtree(self, new_parent)
 
+    def add_child_node(self, field_name: str, child_node: DatabaseModel):
+        if not child_node.is_nested():
+            raise ValueError("Child node must be nested.")
+
+        if not hasattr(self, field_name):
+            raise ValueError(f"Field {field_name} does not exist on {self.__class__.__name__}")
+
+        is_optional, inner_type = inspect_optional_field(self.__class__, field_name)
+        field_type = inner_type if is_optional else self.model_fields[field_name].annotation
+
+        if hasattr(field_type, "__origin__") and field_type.__origin__ == list:
+            if not isinstance(getattr(self, field_name), list):
+                setattr(self, field_name, [])
+            reparented = child_node.change_parent_to(self)
+            getattr(self, field_name).append(reparented)
+            return reparented
+
+        elif hasattr(field_type, "__origin__") and field_type.__origin__ == set:
+            if not isinstance(getattr(self, field_name), set):
+                setattr(self, field_name, set())
+            reparented = child_node.change_parent_to(self)
+            getattr(self, field_name).add(reparented)
+            return reparented
+
+        elif issubclass(field_type, DatabaseModel):
+            reparented = child_node.change_parent_to(self)
+            setattr(self, field_name, reparented)
+            return reparented
+
+        raise ValueError(f"Unsupported field type: {field_type}")
+
     @classmethod
     def scan(
         cls,

statikk/typing.py

@@ -1,3 +1,24 @@
-from typing import TypeVar
+from typing import TypeVar, get_origin, Union, get_args
 
 T = TypeVar("T", bound="DatabaseModel")
+
+
+def inspect_optional_field(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)

{statikk-0.1.11.dist-info → statikk-0.1.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: statikk
-Version: 0.1.11
+Version: 0.1.13
 Summary: statikk is a single table application (STA) library for DynamoDb.
 Home-page: https://github.com/terinia/statikk
 Author: Balint Biro
@@ -22,6 +22,7 @@ Requires-Dist: setuptools; extra == "testing"
 Requires-Dist: pytest; extra == "testing"
 Requires-Dist: pytest-cov; extra == "testing"
 Requires-Dist: moto[dynamodb]==4.2.14; extra == "testing"
+Dynamic: license-file
 
 .. image:: ./assets/logo.png
     :alt: Statikk

statikk-0.1.13.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=xH8vbUcup3FmZ3h3RL6-j1hxVDSQwrRASp8ILhoKXn8,32604
+statikk/expressions.py,sha256=boAeGxZj2cDsXxoiX3IIEzfX9voSMQngi4-rE_jYeuE,12233
+statikk/fields.py,sha256=LkMP5NnX7WS0HSLxI3Q-dMOrfaJ0SD7SayZxJU5Acgg,86
+statikk/models.py,sha256=fU5SwxKP1Afsy91RhYiJSD58CCF92s4YxX-fwH6p7ZI,17705
+statikk/typing.py,sha256=laOlOpWOm9_sOj4hhdZnGTUZRiq8760_B9I9B3wBhz8,750
+statikk-0.1.13.dist-info/licenses/LICENSE.txt,sha256=uSH_2Hpb2Bigy5_HhBliN2fZbBU64G3ERM5zzhKPUEE,1078
+statikk-0.1.13.dist-info/METADATA,sha256=pv7MrB9Svi22O1z--jDhW8DkEvdxNP4nErQLt7HqQpg,3183
+statikk-0.1.13.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+statikk-0.1.13.dist-info/top_level.txt,sha256=etKmBbjzIlLpSefXoiOfhWGEgvqUEALaFwCjFDBD9YI,8
+statikk-0.1.13.dist-info/RECORD,,

{statikk-0.1.11.dist-info → statikk-0.1.13.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (76.1.0)
+Generator: setuptools (77.0.3)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

statikk-0.1.11.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=FB0eNNGE9ZHz43HbI0Op-7N2cY88Ec1-w68JkdHFDpE,33346
-statikk/expressions.py,sha256=boAeGxZj2cDsXxoiX3IIEzfX9voSMQngi4-rE_jYeuE,12233
-statikk/fields.py,sha256=LkMP5NnX7WS0HSLxI3Q-dMOrfaJ0SD7SayZxJU5Acgg,86
-statikk/models.py,sha256=REipaPzo5dIq4InXbWuP48aDZdImO5fXGkALenbf7Ng,16257
-statikk/typing.py,sha256=qfpegORcdODuILK3gvuD4SdcZA1a7Myn0yvscOLPHOM,68
-statikk-0.1.11.dist-info/LICENSE.txt,sha256=uSH_2Hpb2Bigy5_HhBliN2fZbBU64G3ERM5zzhKPUEE,1078
-statikk-0.1.11.dist-info/METADATA,sha256=eDwlysQ8a42xVr-zOFJHW8s9tcHM9Tqm_fOD_eWGanw,3161
-statikk-0.1.11.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
-statikk-0.1.11.dist-info/top_level.txt,sha256=etKmBbjzIlLpSefXoiOfhWGEgvqUEALaFwCjFDBD9YI,8
-statikk-0.1.11.dist-info/RECORD,,