statikk 0.0.10__tar.gz → 0.0.12__tar.gz

{statikk-0.0.10 → statikk-0.0.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: statikk
-Version: 0.0.10
+Version: 0.0.12
 Summary: statikk is a single table application (STA) library for DynamoDb.
 Home-page: https://github.com/terinia/statikk
 Author: Balint Biro
@@ -14,13 +14,14 @@ Requires-Python: >=3.8
 Description-Content-Type: text/x-rst; charset=UTF-8
 License-File: LICENSE.txt
 Requires-Dist: importlib-metadata; python_version < "3.8"
-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
 Provides-Extra: testing
 Requires-Dist: setuptools; extra == "testing"
 Requires-Dist: pytest; extra == "testing"
 Requires-Dist: pytest-cov; extra == "testing"
-Requires-Dist: moto[dynamodb]; extra == "testing"
+Requires-Dist: moto[dynamodb]==4.2.14; extra == "testing"
 
 .. image:: ./assets/logo.png
     :alt: Statikk

{statikk-0.0.10 → statikk-0.0.12}/setup.cfg

@@ -24,8 +24,9 @@ package_dir =
 python_requires = >=3.8
 install_requires = 
 	importlib-metadata; python_version<"3.8"
-	pydantic==2.3.0
+	pydantic==2.7.4
 	boto3==1.28.43
+	aws-xray-sdk==2.14.0
 
 [options.packages.find]
 where = src
@@ -37,7 +38,7 @@ testing =
 	setuptools
 	pytest
 	pytest-cov
-	moto[dynamodb]
+	moto[dynamodb]==4.2.14
 
 [options.entry_points]
 

{statikk-0.0.10 → statikk-0.0.12}/src/statikk/engine.py

@@ -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:
@@ -149,14 +164,6 @@ class Table:
         """Deletes the DynamoDB table."""
         self._dynamodb_client().delete_table(TableName=self.name)
 
-    def delete_item(self, id: str):
-        """
-        Deletes an item from the database by id, using the partition key of the table.
-        :param id: The id of the item to delete.
-        """
-        key = {self.key_schema.hash_key: id}
-        self._get_dynamodb_table().delete_item(Key=key)
-
     def get_item(
         self,
         id: str,
@@ -181,6 +188,14 @@ class Table:
             data[key] = self._deserialize_value(value, model_class.model_fields[key])
         return model_class(**data)
 
+    def delete_item(self, id: str):
+        """
+        Deletes an item from the database by id, using the partition key of the table.
+        :param id: The id of the item to delete.
+        """
+        key = {self.key_schema.hash_key: id}
+        self._get_dynamodb_table().delete_item(Key=key)
+
     def put_item(self, model: DatabaseModel) -> DatabaseModel:
         """
         Puts an item into the database.
@@ -374,7 +389,7 @@ class Table:
                 else:
                     results.extend(
                         [
-                            model_class(**self._convert_dynamodb_to_python(item))
+                            self._deserialize_item(self._convert_dynamodb_to_python(item), model_class)
                             for item in response["Responses"][self.name]
                         ]
                     )
@@ -410,7 +425,7 @@ class Table:
         return model_class(**item)
 
     def _deserialize_value(self, value: Any, annotation: Any):
-        if annotation is datetime or "datetime" in str(annotation):
+        if annotation is datetime or "datetime" in str(annotation) and value is not None:
             return datetime.fromtimestamp(int(value))
         if annotation is float:
             return float(value)

{statikk-0.0.10 → statikk-0.0.12}/src/statikk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: statikk
-Version: 0.0.10
+Version: 0.0.12
 Summary: statikk is a single table application (STA) library for DynamoDb.
 Home-page: https://github.com/terinia/statikk
 Author: Balint Biro
@@ -14,13 +14,14 @@ Requires-Python: >=3.8
 Description-Content-Type: text/x-rst; charset=UTF-8
 License-File: LICENSE.txt
 Requires-Dist: importlib-metadata; python_version < "3.8"
-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
 Provides-Extra: testing
 Requires-Dist: setuptools; extra == "testing"
 Requires-Dist: pytest; extra == "testing"
 Requires-Dist: pytest-cov; extra == "testing"
-Requires-Dist: moto[dynamodb]; extra == "testing"
+Requires-Dist: moto[dynamodb]==4.2.14; extra == "testing"
 
 .. image:: ./assets/logo.png
     :alt: Statikk

{statikk-0.0.10 → statikk-0.0.12}/src/statikk.egg-info/requires.txt

@@ -1,5 +1,6 @@
-pydantic==2.3.0
+pydantic==2.7.4
 boto3==1.28.43
+aws-xray-sdk==2.14.0
 
 [:python_version < "3.8"]
 importlib-metadata
@@ -8,4 +9,4 @@ importlib-metadata
 setuptools
 pytest
 pytest-cov
-moto[dynamodb]
+moto[dynamodb]==4.2.14

{statikk-0.0.10 → statikk-0.0.12}/tests/test_engine.py

@@ -1,6 +1,6 @@
 from _decimal import Decimal
 from datetime import datetime, timezone
-from typing import List
+from typing import List, Optional
 from pydantic import BaseModel
 import pytest
 from boto3.dynamodb.conditions import Attr
@@ -30,7 +30,7 @@ class MyAwesomeModel(DatabaseModel):
     values: set = {1, 2, 3, 4}
     cost: int = 4
     probability: float = 0.5
-
+    created_at: Optional[datetime] = None
 
 class SimpleModel(DatabaseModel):
     player_id: IndexPrimaryKeyField
@@ -92,6 +92,7 @@ def test_create_my_awesome_model():
         "cost": 4,
         "type": "MyAwesomeModel",
         "probability": 0.5,
+        "created_at": None
     }
     model_2 = MyAwesomeModel(id="foo-2", player_id="123", tier="EPIC", name="FooFoo")
     table.put_item(model_2)
@@ -106,6 +107,7 @@ def test_create_my_awesome_model():
         "cost": 4,
         "type": "MyAwesomeModel",
         "probability": 0.5,
+        "created_at": None
     }
     mock_dynamodb().stop()
 
@@ -344,7 +346,7 @@ def test_batch_get_items():
         models=[MyAwesomeModel],
     )
     _create_dynamodb_table(table)
-    model = MyAwesomeModel(id="foo", player_id="123", tier="LEGENDARY")
+    model = MyAwesomeModel(id="foo", player_id="123", tier="LEGENDARY", created_at=datetime(2024, 7, 9))
     model_2 = MyAwesomeModel(id="foo-2", player_id="123", tier="LEGENDARY")
     table.put_item(model)
     table.put_item(model_2)
@@ -353,9 +355,11 @@ def test_batch_get_items():
     assert models[0].id == model.id
     assert models[0].model_type == model.model_type
     assert models[0].tier == model.tier
+    assert models[0].created_at == datetime(2024, 7, 9)
     assert models[1].id == model_2.id
     assert models[1].model_type == model_2.model_type
     assert models[1].tier == model_2.tier
+    assert models[1].created_at is None
     mock_dynamodb().stop()