statikk 0.0.10__py3-none-any.whl → 0.0.12__py3-none-any.whl

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.dist-info → statikk-0.0.12.dist-info}/METADATA

@@ -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
@@ -13,14 +13,15 @@ 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'
 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.12.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=aYIVTwUxlSLnoB8DOUpX4udf0PcIoiTzgSfJ3YCtPaU,22193
+statikk/expressions.py,sha256=mF6Hmj3Kmj6KKXTymeTHSepVA7rhiSINpFgSAPeBTRY,12210
+statikk/models.py,sha256=q-wY2bQRgaH0NTnR4NGnQ22eO3rUshK-aAykt7NVFO4,6172
+statikk-0.0.12.dist-info/LICENSE.txt,sha256=uSH_2Hpb2Bigy5_HhBliN2fZbBU64G3ERM5zzhKPUEE,1078
+statikk-0.0.12.dist-info/METADATA,sha256=KEEKDEMhWuuw_uSGW16PptvjXQIyMxi96Hh9Zg8Z4yI,3339
+statikk-0.0.12.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
+statikk-0.0.12.dist-info/top_level.txt,sha256=etKmBbjzIlLpSefXoiOfhWGEgvqUEALaFwCjFDBD9YI,8
+statikk-0.0.12.dist-info/RECORD,,

{statikk-0.0.10.dist-info → statikk-0.0.12.dist-info}/WHEEL

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

statikk-0.0.10.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=7X4iAci6UBzpMkYtjS_da-iwNzf4zPbwkXvJ290IIdU,21767
-statikk/expressions.py,sha256=mF6Hmj3Kmj6KKXTymeTHSepVA7rhiSINpFgSAPeBTRY,12210
-statikk/models.py,sha256=q-wY2bQRgaH0NTnR4NGnQ22eO3rUshK-aAykt7NVFO4,6172
-statikk-0.0.10.dist-info/LICENSE.txt,sha256=uSH_2Hpb2Bigy5_HhBliN2fZbBU64G3ERM5zzhKPUEE,1078
-statikk-0.0.10.dist-info/METADATA,sha256=9miP26eX1SuDKFVoQNm7W-2j-ZCEFyLwheAQ8quO214,3293
-statikk-0.0.10.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-statikk-0.0.10.dist-info/top_level.txt,sha256=etKmBbjzIlLpSefXoiOfhWGEgvqUEALaFwCjFDBD9YI,8
-statikk-0.0.10.dist-info/RECORD,,