persistence-kit 3.8.0__tar.gz → 3.9.1__tar.gz

{persistence_kit-3.8.0 → persistence_kit-3.9.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: persistence-kit
-Version: 3.8.0
+Version: 3.9.1
 Summary: Reusable persistence and repository toolkit
 License: MIT
 License-File: LICENSE
@@ -27,14 +27,14 @@ Provides-Extra: security-cognito
 Provides-Extra: storage-routes
 Provides-Extra: storage-s3
 Provides-Extra: testing
-Requires-Dist: asyncpg (>=0.30.0,<0.31.0)
+Requires-Dist: asyncpg (>=0.30.0,<1.0.0)
 Requires-Dist: boto3 (>=1.35.0,<2.0.0) ; extra == "storage-s3" or extra == "security-cognito" or extra == "dynamodb" or extra == "all"
 Requires-Dist: fastapi (>=0.115.0,<1.0.0) ; extra == "api" or extra == "storage-routes" or extra == "security" or extra == "security-cognito" or extra == "testing" or extra == "all"
-Requires-Dist: httpx (>=0.28.0,<0.29.0) ; extra == "restclient" or extra == "testing" or extra == "all"
+Requires-Dist: httpx (>=0.28.0,<1.0.0) ; extra == "restclient" or extra == "testing" or extra == "all"
 Requires-Dist: motor (>=3.7.1,<4.0.0)
 Requires-Dist: pydantic-settings (>=2.3.0,<3.0.0)
 Requires-Dist: pyjwt[crypto] (>=2.10.1,<3.0.0) ; extra == "security" or extra == "security-cognito" or extra == "testing" or extra == "all"
-Requires-Dist: python-multipart (>=0.0.20,<0.0.21) ; extra == "api" or extra == "storage-routes" or extra == "security" or extra == "security-cognito" or extra == "testing" or extra == "all"
+Requires-Dist: python-multipart (>=0.0.31,<1.0.0) ; extra == "api" or extra == "storage-routes" or extra == "security" or extra == "security-cognito" or extra == "testing" or extra == "all"
 Requires-Dist: sqlalchemy[asyncio] (>=2.0.43,<3.0.0)
 Requires-Dist: typing-extensions (>=4.12.0,<5.0.0)
 Project-URL: Documentation, https://github.com/andresfserrano/persistence-kit#readme

{persistence_kit-3.8.0 → persistence_kit-3.9.1}/persistence_kit/repository/dynamodb_repo/dynamodb_repo.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import asyncio
 from typing import Optional, Sequence, TypeVar, Generic, Hashable, Mapping, Any
 try:
     from typing import override
@@ -129,14 +130,18 @@ class DynamoRepository(Repository[T, TId], Generic[T, TId]):
     @override
     async def add(self, entity: T) -> None:
         item = self._mapper.to_item(entity)
-        self._table.put_item(
+        await asyncio.to_thread(
+            self._table.put_item,
             Item=item,
             ConditionExpression=Attr("id").not_exists(),
         )
 
     @override
     async def get(self, entity_id: TId) -> Optional[T]:
-        response = self._table.get_item(Key={"id": _serialize_value(entity_id)})
+        response = await asyncio.to_thread(
+            self._table.get_item,
+            Key={"id": _serialize_value(entity_id)},
+        )
         item = response.get("Item")
         return self._mapper.from_item(item) if item else None
 
@@ -149,7 +154,7 @@ class DynamoRepository(Repository[T, TId], Generic[T, TId]):
         sort_by: str | None = None,
         sort_desc: bool = False,
     ) -> Sequence[T]:
-        items = self._scan_all()
+        items = await asyncio.to_thread(self._scan_all)
         entities = [self._mapper.from_item(i) for i in items]
         if sort_by is not None:
             if not self._mapper.has_attr(sort_by):
@@ -160,18 +165,22 @@ class DynamoRepository(Repository[T, TId], Generic[T, TId]):
     @override
     async def update(self, entity: T) -> None:
         item = self._mapper.to_item(entity)
-        self._table.put_item(Item=item)
+        await asyncio.to_thread(self._table.put_item, Item=item)
 
     @override
     async def delete(self, entity_id: TId) -> None:
-        self._table.delete_item(Key={"id": _serialize_value(entity_id)})
+        await asyncio.to_thread(
+            self._table.delete_item,
+            Key={"id": _serialize_value(entity_id)},
+        )
 
     @override
     async def get_by_index(self, index: str, value: Hashable) -> Optional[T]:
         field = self._mapper.unique_fields().get(index)
         if not field:
             return None
-        response = self._table.scan(
+        response = await asyncio.to_thread(
+            self._table.scan,
             FilterExpression=Attr(field).eq(_serialize_value(value)),
             Limit=1,
         )
@@ -180,7 +189,7 @@ class DynamoRepository(Repository[T, TId], Generic[T, TId]):
 
     @override
     async def count(self) -> int:
-        return self._table.item_count
+        return await asyncio.to_thread(self._read_item_count)
 
     @override
     async def count_by_fields(
@@ -192,7 +201,7 @@ class DynamoRepository(Repository[T, TId], Generic[T, TId]):
         filter_expr = _build_filter(self._mapper, criteria)
         if filter_expr is False:
             return 0
-        items = self._scan_with_filter(filter_expr)
+        items = await asyncio.to_thread(self._scan_with_filter, filter_expr)
         return len(items)
 
     @override
@@ -210,7 +219,8 @@ class DynamoRepository(Repository[T, TId], Generic[T, TId]):
         filter_expr = _build_filter(self._mapper, criteria)
         if filter_expr is False:
             return []
-        items = self._scan_with_filter(filter_expr)
+        max_items = None if sort_by is not None or limit is None else offset + limit
+        items = await asyncio.to_thread(self._scan_with_filter, filter_expr, max_items)
         entities = [self._mapper.from_item(i) for i in items]
         if sort_by is not None:
             if not self._mapper.has_attr(sort_by):
@@ -232,9 +242,9 @@ class DynamoRepository(Repository[T, TId], Generic[T, TId]):
             filter_expr = _build_filter(self._mapper, criteria)
             if filter_expr is False:
                 return []
-            items = self._scan_with_filter(filter_expr)
+            items = await asyncio.to_thread(self._scan_with_filter, filter_expr)
         else:
-            items = self._scan_all()
+            items = await asyncio.to_thread(self._scan_all)
         seen: set = set()
         result: list[Any] = []
         for item in items:
@@ -244,6 +254,9 @@ class DynamoRepository(Repository[T, TId], Generic[T, TId]):
                 result.append(val)
         return result
 
+    def _read_item_count(self) -> int:
+        return self._table.item_count
+
     def _scan_all(self) -> list[dict]:
         items: list[dict] = []
         response = self._table.scan()
@@ -253,7 +266,11 @@ class DynamoRepository(Repository[T, TId], Generic[T, TId]):
             items.extend(response.get("Items", []))
         return items
 
-    def _scan_with_filter(self, filter_expr: ConditionBase | None) -> list[dict]:
+    def _scan_with_filter(
+        self,
+        filter_expr: ConditionBase | None,
+        max_items: Optional[int] = None,
+    ) -> list[dict]:
         items: list[dict] = []
         kwargs: dict[str, Any] = {}
         if filter_expr is not None:
@@ -261,6 +278,8 @@ class DynamoRepository(Repository[T, TId], Generic[T, TId]):
         response = self._table.scan(**kwargs)
         items.extend(response.get("Items", []))
         while "LastEvaluatedKey" in response:
+            if max_items is not None and len(items) >= max_items:
+                break
             kwargs["ExclusiveStartKey"] = response["LastEvaluatedKey"]
             response = self._table.scan(**kwargs)
             items.extend(response.get("Items", []))

{persistence_kit-3.8.0 → persistence_kit-3.9.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "persistence-kit"
-version = "3.8.0"
+version = "3.9.1"
 description = "Reusable persistence and repository toolkit"
 authors = ["Andres Felipe Serrano Barrios <andresfserrano1@gmail.com>"]
 readme = "README.md"
@@ -27,14 +27,14 @@ documentation = "https://github.com/andresfserrano/persistence-kit#readme"
 python = ">=3.11,<4.0"
 motor = "^3.7.1"
 sqlalchemy = {extras = ["asyncio"], version = "^2.0.43"}
-asyncpg = "^0.30.0"
+asyncpg = ">=0.30.0,<1.0.0"
 typing-extensions = "^4.12.0"
 pydantic-settings = "^2.3.0"
 fastapi = {version = ">=0.115.0,<1.0.0", optional = true}
 boto3 = {version = "^1.35.0", optional = true}
 pyjwt = {version = "^2.10.1", extras = ["crypto"], optional = true}
-python-multipart = {version = "^0.0.20", optional = true}
-httpx = {version = "^0.28.0", optional = true}
+python-multipart = {version = ">=0.0.31,<1.0.0", optional = true}
+httpx = {version = ">=0.28.0,<1.0.0", optional = true}
 
 [tool.poetry.extras]
 api = ["fastapi", "python-multipart"]
@@ -49,7 +49,7 @@ all = ["fastapi", "boto3", "pyjwt", "python-multipart", "httpx"]
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^8.3.0"
-pytest-asyncio = "^0.23.0"
+pytest-asyncio = ">=0.23.0,<2.0.0"
 
 [tool.pytest.ini_options]
 testpaths = ["tests"]