single page per page call

Author: slorello89

aredis_om/model/model.py

@@ -422,6 +422,7 @@ def __init__(
         page_size: int = DEFAULT_PAGE_SIZE,
         sort_fields: Optional[List[str]] = None,
         nocontent: bool = False,
+        single_page: bool = False,
     ):
         if not has_redisearch(model.db()):
             raise RedisModelError(
@@ -437,6 +438,7 @@ def __init__(
         self.limit = limit or (self.knn.k if self.knn else DEFAULT_PAGE_SIZE)
         self.page_size = page_size
         self.nocontent = nocontent
+        self.single_page = single_page
 
         if sort_fields:
             self.sort_fields = self.validate_sort_fields(sort_fields)
@@ -916,6 +918,9 @@ async def execute(self, exhaust_results=True, return_raw_result=False):
         if count <= len(results):
             return self._model_cache
 
+        if self.single_page:
+            return self._model_cache
+
         # Transparently (to the user) make subsequent requests to paginate
         # through the results and finally return them all.
         query = self
@@ -948,7 +953,7 @@ async def all(self, batch_size=DEFAULT_PAGE_SIZE):
         return await self.execute()
 
     async def page(self, offset=0, limit=10):
-        return await self.copy(offset=offset, limit=limit).execute()
+        return await self.copy(offset=offset, limit=limit, single_page=True).execute()
 
     def sort_by(self, *fields: str):
         if not fields:

tests/test_json_model.py

@@ -1069,3 +1069,28 @@ class Example(JsonModel):
 
     res = await Example.find(Example.d == ex.d and Example.b == True).first()
     assert res.name == ex.name
+
+
+@py_test_mark_asyncio
+async def test_pagination():
+    class Test(JsonModel):
+        id: str = Field(primary_key=True, index=True)
+        num: int = Field(sortable=True, index=True)
+
+        @classmethod
+        async def get_page(cls, offset, limit):
+            return await cls.find().sort_by("num").page(limit=limit, offset=offset)
+
+    await Migrator().run()
+
+    pipe = Test.Meta.database.pipeline()
+    for i in range(0, 1000):
+        await Test(num=i, id=str(i)).save(pipeline=pipe)
+
+    await pipe.execute()
+    res = await Test.get_page(100, 100)
+    assert len(res) == 100
+    assert res[0].num == 100
+    res = await Test.get_page(10, 30)
+    assert len(res) == 30
+    assert res[0].num == 10