statikk 0.0.9__py3-none-any.whl → 0.0.11__py3-none-any.whl

statikk/engine.py

@@ -6,7 +6,7 @@ import boto3
 from botocore.config import Config
 from pydantic.fields import FieldInfo
 from boto3.dynamodb.conditions import ComparisonCondition, Key
-from boto3.dynamodb.types import TypeDeserializer
+from boto3.dynamodb.types import TypeDeserializer, Decimal
 
 from statikk.conditions import Condition, Equals, BeginsWith
 from statikk.expressions import UpdateExpressionBuilder
@@ -19,6 +19,10 @@ from statikk.models import (
     KeySchema,
 )
 
+from aws_xray_sdk.core import xray_recorder
+from aws_xray_sdk.core import patch_all
+
+patch_all()
 
 class InvalidIndexNameError(Exception):
     pass
@@ -54,19 +58,30 @@ class Table:
                 model.set_table_ref(self)
                 if "type" not in model.model_fields:
                     model.model_fields["type"] = FieldInfo(annotation=str, default=model.model_type(), required=False)
+        self._client = None
+        self._dynamodb_table = None
 
     def _dynamodb_client(self):
-        return boto3.client(
+        if self._client:
+            return self._client
+
+        self._client = boto3.client(
             "dynamodb",
             config=Config(region_name=os.environ.get("AWS_DEFAULT_REGION", "eu-west-1")),
         )
 
+        return self._client
+
     def _get_dynamodb_table(self):
+        if self._dynamodb_table:
+            return self._dynamodb_table
+
         dynamodb = boto3.resource(
             "dynamodb",
             config=Config(region_name=os.environ.get("AWS_DEFAULT_REGION", "eu-west-1")),
         )
-        return dynamodb.Table(self.name)
+        self._dynamodb_table = dynamodb.Table(self.name)
+        return self._dynamodb_table
 
     def _to_dynamodb_type(self, type: Any):
         if type is str:
@@ -157,7 +172,13 @@ class Table:
         key = {self.key_schema.hash_key: id}
         self._get_dynamodb_table().delete_item(Key=key)
 
-    def get_item(self, id: str, model_class: Type[DatabaseModel], sort_key: Optional[Any] = None):
+    def get_item(
+        self,
+        id: str,
+        model_class: Type[DatabaseModel],
+        sort_key: Optional[Any] = None,
+        consistent_read: bool = False,
+    ):
         """
         Returns an item from the database by id, using the partition key of the table.
         :param id: The id of the item to retrieve.
@@ -167,11 +188,10 @@ class Table:
         key = {self.key_schema.hash_key: id}
         if sort_key:
             key[self.key_schema.sort_key] = self._serialize_value(sort_key)
-        raw_data = self._get_dynamodb_table().get_item(Key=key)
+        raw_data = self._get_dynamodb_table().get_item(Key=key, ConsistentRead=consistent_read)
         if "Item" not in raw_data:
             raise ItemNotFoundError(f"{model_class} with id '{id}' not found.")
         data = raw_data["Item"]
-        del data["type"]
         for key, value in data.items():
             data[key] = self._deserialize_value(value, model_class.model_fields[key])
         return model_class(**data)
@@ -207,7 +227,6 @@ class Table:
         """
         data = self._serialize_item(model)
         self._get_dynamodb_table().put_item(Item=data)
-        del data["type"]
         for key, value in data.items():
             data[key] = self._deserialize_value(value, model.model_fields[key])
         return type(model)(**data)
@@ -231,6 +250,7 @@ class Table:
         def _find_changed_indexes():
             changed_index_values = set()
             for prefixed_attribute, value in expression_attribute_values.items():
+                expression_attribute_values[prefixed_attribute] = self._serialize_value(value)
                 attribute = prefixed_attribute.replace(":", "")
                 if model.model_fields[attribute].annotation is IndexSecondaryKeyField:
                     idx_field = getattr(model, attribute)
@@ -313,13 +333,14 @@ class Table:
 
         while last_evaluated_key:
             items = self._get_dynamodb_table().query(**query_params)
-            yield from [model_class(**item) for item in items["Items"]]
+            yield from [self._deserialize_item(item, model_class=model_class) for item in items["Items"]]
             last_evaluated_key = items.get("LastEvaluatedKey", False)
 
     def scan(
         self,
         model_class: Type[DatabaseModel],
         filter_condition: Optional[ComparisonCondition] = None,
+        consistent_read: bool = False,
     ):
         """
         Scans the database for items matching the provided filter condition. The method returns a list of items matching
@@ -328,7 +349,9 @@ class Table:
         :param model_class: The model class to use to deserialize the items.
         :param filter_condition: An optional filter condition to use for the query. See boto3.dynamodb.conditions.ComparisonCondition for more information.
         """
-        query_params = {}
+        query_params = {
+            "ConsistentRead": consistent_read,
+        }
         if filter_condition:
             query_params["FilterExpression"] = filter_condition
         last_evaluated_key = True
@@ -394,17 +417,29 @@ class Table:
         data = self._prepare_model_data(item, self.indexes)
         for key, value in data.items():
             data[key] = self._serialize_value(value)
-        data["type"] = item.model_type()
         return data
 
+    def _deserialize_item(self, item: Dict[str, Any], model_class: Type[DatabaseModel]):
+        for key, value in item.items():
+            item[key] = self._deserialize_value(value, model_class.model_fields[key])
+        return model_class(**item)
+
     def _deserialize_value(self, value: Any, annotation: Any):
         if annotation is datetime or "datetime" in str(annotation):
             return datetime.fromtimestamp(int(value))
+        if annotation is float:
+            return float(value)
         return value
 
     def _serialize_value(self, value: Any):
         if isinstance(value, datetime):
             return int(value.timestamp())
+        if isinstance(value, float):
+            return Decimal(value)
+        if isinstance(value, list):
+            return [self._serialize_value(item) for item in value]
+        if isinstance(value, dict):
+            return {key: self._serialize_value(item) for key, item in value.items() if item is not None}
         return value
 
     def _set_index_fields(self, model: DatabaseModel | Type[DatabaseModel], idx: GSI):
@@ -422,6 +457,8 @@ class Table:
             if field_info.annotation is IndexSecondaryKeyField and idx.name in getattr(model, field_name).index_names
         ]
 
+        if len(sort_key_fields_unordered) == idx.sort_key is not None:
+            raise IncorrectSortKeyError(f"Model {model.__class__} does not have a sort key defined.")
         if sort_key_fields_unordered[0][1] is not None:
             sort_key_fields_unordered.sort(key=lambda x: x[1])
 

statikk/models.py

@@ -111,15 +111,19 @@ class DatabaseModel(BaseModel):
         )
 
     @classmethod
-    def get(cls, id: str, sort_key: Optional[str] = None):
-        return cls._table.get_item(id=id, model_class=cls, sort_key=sort_key)
+    def get(cls, id: str, sort_key: Optional[str] = None, consistent_read: bool = False):
+        return cls._table.get_item(id=id, model_class=cls, sort_key=sort_key, consistent_read=consistent_read)
 
     @classmethod
     def batch_get(cls, ids: List[str], batch_size: int = 100):
         return cls._table.batch_get_items(ids=ids, model_class=cls, batch_size=batch_size)
 
     @classmethod
-    def scan(cls, filter_condition: Optional[ComparisonCondition] = None):
+    def scan(
+        cls,
+        filter_condition: Optional[ComparisonCondition] = None,
+        consistent_read: bool = False,
+    ):
         return cls._table.scan(model_class=cls, filter_condition=filter_condition)
 
     @staticmethod

{statikk-0.0.9.dist-info → statikk-0.0.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: statikk
-Version: 0.0.9
+Version: 0.0.11
 Summary: statikk is a single table application (STA) library for DynamoDb.
 Home-page: https://github.com/terinia/statikk
 Author: Balint Biro
@@ -13,8 +13,9 @@ Classifier: Programming Language :: Python
 Requires-Python: >=3.8
 Description-Content-Type: text/x-rst; charset=UTF-8
 License-File: LICENSE.txt
-Requires-Dist: pydantic ==2.3.0
+Requires-Dist: pydantic ==2.7.4
 Requires-Dist: boto3 ==1.28.43
+Requires-Dist: aws-xray-sdk ==2.14.0
 Requires-Dist: importlib-metadata ; python_version < "3.8"
 Provides-Extra: testing
 Requires-Dist: setuptools ; extra == 'testing'

statikk-0.0.11.dist-info/RECORD

@@ -0,0 +1,10 @@
+statikk/__init__.py,sha256=pH5i4Fj1tbXLqLtTVIdoojiplZssQn0nnud8-HXodRE,577
+statikk/conditions.py,sha256=66kJ-2YWqlV-dzEkiAe6c985dMQ-lpaoZ8aaoWhSs_M,2220
+statikk/engine.py,sha256=wjorLdbirezwymmqyEgSdAVrJCizQZW6RSn00eXsvvY,22149
+statikk/expressions.py,sha256=mF6Hmj3Kmj6KKXTymeTHSepVA7rhiSINpFgSAPeBTRY,12210
+statikk/models.py,sha256=q-wY2bQRgaH0NTnR4NGnQ22eO3rUshK-aAykt7NVFO4,6172
+statikk-0.0.11.dist-info/LICENSE.txt,sha256=uSH_2Hpb2Bigy5_HhBliN2fZbBU64G3ERM5zzhKPUEE,1078
+statikk-0.0.11.dist-info/METADATA,sha256=wzxKaL43IN7GtHmpfU-7cHuuTW-Jr2PGO7SOh1fV014,3330
+statikk-0.0.11.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+statikk-0.0.11.dist-info/top_level.txt,sha256=etKmBbjzIlLpSefXoiOfhWGEgvqUEALaFwCjFDBD9YI,8
+statikk-0.0.11.dist-info/RECORD,,

{statikk-0.0.9.dist-info → statikk-0.0.11.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.2)
+Generator: bdist_wheel (0.43.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

statikk-0.0.9.dist-info/RECORD

@@ -1,10 +0,0 @@
-statikk/__init__.py,sha256=pH5i4Fj1tbXLqLtTVIdoojiplZssQn0nnud8-HXodRE,577
-statikk/conditions.py,sha256=66kJ-2YWqlV-dzEkiAe6c985dMQ-lpaoZ8aaoWhSs_M,2220
-statikk/engine.py,sha256=ArbYY4RU1kuRajpxF92lDPWpHYQ4kTMCFlianVePaYI,20712
-statikk/expressions.py,sha256=mF6Hmj3Kmj6KKXTymeTHSepVA7rhiSINpFgSAPeBTRY,12210
-statikk/models.py,sha256=XBJv-SJYMQ64kPsVat9VXFvK8_egaA2Z9SjuDSVn7AQ,6046
-statikk-0.0.9.dist-info/LICENSE.txt,sha256=uSH_2Hpb2Bigy5_HhBliN2fZbBU64G3ERM5zzhKPUEE,1078
-statikk-0.0.9.dist-info/METADATA,sha256=1XaS5o7SHNX7ALpLQ6999HNvwWDhYRE4wxunSzqTNVY,3292
-statikk-0.0.9.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-statikk-0.0.9.dist-info/top_level.txt,sha256=etKmBbjzIlLpSefXoiOfhWGEgvqUEALaFwCjFDBD9YI,8
-statikk-0.0.9.dist-info/RECORD,,