cli2 3.3.30__tar.gz → 3.3.32__tar.gz

{cli2-3.3.30/cli2.egg-info → cli2-3.3.32}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cli2
-Version: 3.3.30
+Version: 3.3.32
 Summary: image:: https://yourlabs.io/oss/cli2/badges/master/pipeline.svg
 Home-page: https://yourlabs.io/oss/cli2
 Author: James Pic

{cli2-3.3.30 → cli2-3.3.32}/cli2/client.py

@@ -75,9 +75,18 @@ class Paginator:
     .. py:attribute:: model
 
         :py:class:`Model` class or ``dict`` by default.
+
+    .. py:attribute:: postfilter
+
+        Callback called for every item after filtering.
+
+    .. py:attribute:: prefilter
+
+        Callback called for every item before filtering.
     """
 
-    def __init__(self, client, url, params=None, model=None, expressions=None):
+    def __init__(self, client, url, params=None, model=None, expressions=None,
+                 prefilter=None, postfilter=None):
         """
         Initialize a paginator object with a client on a URL with parameters.
 
@@ -93,6 +102,8 @@ class Paginator:
         self.page_start = 1
         self.per_page = None
         self.initialized = False
+        self.prefilter = prefilter
+        self.postfilter = postfilter
         self.expressions = []
         for expression in (expressions or []):
             if not isinstance(expression, Expression):
@@ -266,10 +277,13 @@ class Paginator:
             await self.initialize(response)
         return response
 
-    async def __aiter__(self, callback=None):
+    async def __aiter__(self, prefilter=None, postfilter=None):
         """
         Asynchronous iterator.
         """
+        prefilter = prefilter or self.prefilter
+        postfilter = postfilter or self.postfilter
+
         if self._reverse and not self.total_pages:
             first_page_response = await self.page_response(1)
             page = self.total_pages
@@ -278,16 +292,24 @@ class Paginator:
 
         python_filter = self.python_filter()
 
+        async def yielder(items):
+            for item in items:
+                if prefilter:
+                    await async_resolve(prefilter(item))
+                if not python_filter or python_filter.matches(item):
+                    if postfilter:
+                        await async_resolve(postfilter(item))
+                    yield item
+
         while items := await self.page_items(page):
-            if items == 'continue':
+            if not items:
                 continue
 
             if self._reverse:
                 items = reversed(items)
 
-            for item in items:
-                if not python_filter or python_filter.matches(item):
-                    yield item
+            async for item in yielder(items):
+                yield item
 
             if self._reverse:
                 page -= 1
@@ -296,9 +318,8 @@ class Paginator:
                 if page == 1:
                     # use cached first page response
                     items = self.response_items(first_page_response)
-                    for item in reversed(items):
-                        if not python_filter or python_filter.matches(item):
-                            yield item
+                    async for item in yielder(reversed(items)):
+                        yield item
                     break
             else:
                 if page == self.total_pages:

{cli2-3.3.30 → cli2-3.3.32}/cli2/test_client.py

@@ -347,7 +347,20 @@ async def test_pagination(httpx_mock):
     httpx_mock.add_response(url='http://lol/?page=2', json=[dict(a=2)])
     httpx_mock.add_response(url='http://lol/?page=3', json=[])
     client = Client(base_url='http://lol')
-    assert await client.paginate('/').list() == [dict(a=1), dict(a=2)]
+    paginator = client.paginate('/')
+
+    def prefilter(item):
+        item['b'] = item['a']
+
+    def postfilter(item):
+        item['c'] = item['b']
+
+    paginator.prefilter = prefilter
+    paginator.postfilter = postfilter
+    assert await paginator.list() == [
+        dict(a=1, b=1, c=1),
+        dict(a=2, b=2, c=2)
+    ]
 
 
 @pytest.mark.asyncio

{cli2-3.3.30 → cli2-3.3.32/cli2.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cli2
-Version: 3.3.30
+Version: 3.3.32
 Summary: image:: https://yourlabs.io/oss/cli2/badges/master/pipeline.svg
 Home-page: https://yourlabs.io/oss/cli2
 Author: James Pic

{cli2-3.3.30 → cli2-3.3.32}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup
 
 setup(
     name='cli2',
-    version='3.3.30',
+    version='3.3.32',
     setup_requires='setupmeta',
     install_requires=[
         'docstring_parser',