cli2 3.3.40__tar.gz → 3.3.42__tar.gz

{cli2-3.3.40/cli2.egg-info → cli2-3.3.42}/PKG-INFO

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

{cli2-3.3.40 → cli2-3.3.42}/cli2/client.py

@@ -70,9 +70,7 @@ class Paginator:
 
     .. py:attribute:: callback
 
-        Callback called for every item before filtering by expressions.
-        This must return True or the item will be filtered *out* of yielded
-        results.
+        Async callback called for every item before filtering by expressions.
     """
 
     def __init__(self, client, url, params=None, model=None, expressions=None,
@@ -274,10 +272,9 @@ class Paginator:
         python_filter = self.python_filter()
 
         async def yielder(items):
+            if callback:
+                await asyncio.gather(*[callback(item) for item in items])
             for item in items:
-                if callback:
-                    if not await async_resolve(callback(item)):
-                        continue
                 if not python_filter or python_filter.matches(item):
                     yield item
 

{cli2-3.3.40 → cli2-3.3.42}/cli2/group.py

@@ -195,19 +195,29 @@ class Group(EntryPoint, dict):
         for name, method in cls.__dict__.items():
             if leaf and getattr(final, name, '_') is None:
                 continue
-            wrapped_method = getattr(method, '__func__', None)
-            cfg = getattr(
-                wrapped_method,
-                'cli2',
-                getattr(method, 'cli2', None),
-            )
-            if cfg is None:
-                continue
-            condition = cfg.get('condition', None)
-            if condition:
-                if not condition(final):
-                    continue
-            self.cmd(method)
+            self.load_method(final, method)
+
+    def load_obj(self, obj):
+        """
+        Load all methods which have been decorated with @cmd
+        """
+        for name in dir(obj):
+            self.load_method(obj, getattr(obj, name))
+
+    def load_method(self, obj, method):
+        wrapped_method = getattr(method, '__func__', None)
+        cfg = getattr(
+            wrapped_method,
+            'cli2',
+            getattr(method, 'cli2', None),
+        )
+        if cfg is None:
+            return
+        condition = cfg.get('condition', None)
+        if condition:
+            if not condition(obj):
+                return
+        self.cmd(method)
 
     def __call__(self, *argv):
         self.exit_code = 0

{cli2-3.3.40 → cli2-3.3.42}/cli2/logging.py

@@ -22,6 +22,10 @@ class YAMLFormatter:
 
 def configure():
     LOG_LEVEL = os.getenv('LOG_LEVEL', 'WARNING').upper()
+
+    if os.getenv('DEBUG'):
+        LOG_LEVEL = 'DEBUG'
+
     timestamper = structlog.processors.TimeStamper(fmt='%Y-%m-%d %H:%M:%S')
     pre_chain = [
         # add log level and timestamp to event_dict

{cli2-3.3.40 → cli2-3.3.42}/cli2/test_client.py

@@ -376,9 +376,8 @@ async def test_pagination(httpx_mock):
     httpx_mock.add_response(url='http://lol/?page=3', json=[])
     client = Client(base_url='http://lol')
 
-    def callback(item):
+    async def callback(item):
         item['b'] = item['a']
-        return True
 
     paginator = client.paginate(
         '/',

{cli2-3.3.40 → cli2-3.3.42}/cli2/test_group.py

@@ -232,9 +232,17 @@ def test_load_cls():
     group.load_cls(Foo)
     assert list(group.keys()) == ['help', 'test', 'test2']
 
+    group = Group()
+    group.load_obj(Foo())
+    assert list(group.keys()) == ['help', 'test', 'test2']
+
     class Child(Foo):
         test2 = None
 
     group = Group()
     group.load_cls(Child)
     assert list(group.keys()) == ['help', 'test']
+
+    group = Group()
+    group.load_obj(Child())
+    assert list(group.keys()) == ['help', 'test']

{cli2-3.3.40 → cli2-3.3.42/cli2.egg-info}/PKG-INFO

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

{cli2-3.3.40 → cli2-3.3.42}/setup.py

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