cli2 4.0.8__tar.gz → 4.0.11__tar.gz

{cli2-4.0.8/cli2.egg-info → cli2-4.0.11}/PKG-INFO

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

{cli2-4.0.8 → cli2-4.0.11}/cli2/__init__.py

@@ -38,7 +38,7 @@ except ImportError:
     pass
 from .display import diff, diff_data, render, print, highlight
 from .lock import Lock
-from .log import configure, log, get_logger
+from .log import configure, log
 from .table import Table
 
 

{cli2-4.0.8 → cli2-4.0.11}/cli2/client.py

@@ -10,7 +10,6 @@ import json
 import math
 import os
 import ssl
-import structlog
 import yaml
 
 from datetime import datetime
@@ -26,6 +25,7 @@ from . import display
 from .asyncio import async_resolve
 from .cli import Command, Group, cmd, hide
 from .colors import colors
+from .log import log
 
 
 class Paginator:
@@ -196,7 +196,14 @@ class Paginator:
             data = response.json()
         except json.JSONDecodeError:
             return []
+        return self.data_items(data)
 
+    def data_items(self, data):
+        """
+        Given response data, return items.
+
+        :param data: Response JSON data
+        """
         items_list = []
         if isinstance(data, list):
             items_list = data
@@ -1029,11 +1036,14 @@ class Handler:
         self.backoff = self.backoff_default if backoff is None else backoff
 
     async def __call__(self, client, response, tries, mask, log):
+        seconds = tries * self.backoff
+
         if isinstance(response, Exception):
             if tries >= self.tries:
                 raise response
             # httpx session is rendered unusable after a TransportError
             if isinstance(response, httpx.TransportError):
+                await asyncio.sleep(seconds)
                 log.warn('reconnect', error=repr(response))
                 await client.client_reset()
             return
@@ -1050,7 +1060,6 @@ class Handler:
         if tries >= self.tries:
             raise RetriesExceededError(client, response, tries, mask)
 
-        seconds = tries * self.backoff
         kwargs = dict(
             status_code=response.status_code,
             tries=tries,
@@ -1263,7 +1272,6 @@ class Client(metaclass=ClientMetaclass):
                 truststore.SSLContext(ssl.PROTOCOL_TLS_CLIENT),
             )
 
-        self.logger = structlog.get_logger('cli2')
         self.token_getting = False
         self.token = None
 
@@ -1500,13 +1508,13 @@ class Client(metaclass=ClientMetaclass):
             extensions=extensions,
         )
 
-        log = self.logger.bind(method=method, url=str(request.url))
+        _log = log.bind(method=method, url=str(request.url))
         if not quiet or self.debug:
             key, value = self.request_log_data(request, mask, quiet)
             kwargs = dict()
             if value:
                 kwargs[key] = value
-            log.debug('request', **kwargs)
+            _log.debug('request', **kwargs)
 
         response = await self.send(
             request,
@@ -1519,13 +1527,13 @@ class Client(metaclass=ClientMetaclass):
             follow_redirects=follow_redirects,
         )
 
-        _log = dict(status_code=response.status_code)
+        kwargs = dict(status_code=response.status_code)
         if not quiet or self.debug:
             key, value = self.response_log_data(response, mask)
             if value:
-                _log[key] = value
+                kwargs[key] = value
 
-        log.info('response', **_log)
+        _log.info('response', **kwargs)
 
         return response
 

{cli2-4.0.8 → cli2-4.0.11}/cli2/log.py

@@ -70,9 +70,6 @@ class YAMLFormatter:
         return '\n' + value
 
 
-configured = False
-
-
 def configure():
     LOG_LEVEL = os.getenv('LOG_LEVEL', 'WARNING').upper()
 
@@ -200,17 +197,6 @@ def configure():
         ],
     )
 
-    global configured
-    configured = True
-
-
-def get_logger():
-    """
-    Return the beautiful and configured cli2 logger.
-    """
-    if not configured:
-        configure()
-    return structlog.get_logger('cli2')
-
 
-log = get_logger()
+configure()
+log = structlog.get_logger('cli2')

{cli2-4.0.8 → cli2-4.0.11/cli2.egg-info}/PKG-INFO

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

{cli2-4.0.8 → cli2-4.0.11}/setup.py

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

{cli2-4.0.8 → cli2-4.0.11}/tests/test_client.py

@@ -1,5 +1,6 @@
 from datetime import datetime
 import cli2
+import cli2.client
 import httpx
 import inspect
 import mock
@@ -858,11 +859,12 @@ def test_datetime_default_fmt(client_class):
 
 
 @pytest.mark.asyncio
-async def test_mask_recursive(client_class):
+async def test_mask_recursive(client_class, monkeypatch):
     client = client_class(mask=['scrt', 'password'])
     client.client.send = mock.AsyncMock()
 
-    client.logger = mock.Mock()
+    log = mock.Mock()
+    monkeypatch.setattr(cli2.client, 'log', log)
     response = httpx.Response(
         status_code=200,
         content='{"pub": 1, "foo": [{"scrt": "pass"}]}',
@@ -871,11 +873,11 @@ async def test_mask_recursive(client_class):
     response.request = httpx.Request('POST', '/', json=data)
     client.client.send.return_value = response
     await client.post('/', json=data)
-    client.logger.bind.assert_called_once_with(
+    log.bind.assert_called_once_with(
         method='POST',
         url='http://lol/',
     )
-    log = client.logger.bind.return_value
+    log = log.bind.return_value
     log.debug.assert_called_once_with(
         'request',
         json=[{'foo': [{'src': 'pass'}]}],
@@ -891,11 +893,12 @@ async def test_mask_recursive(client_class):
 @pytest.mark.parametrize(
     'key', ('json', 'data'),
 )
-async def test_mask_logs(client_class, key):
+async def test_mask_logs(client_class, key, monkeypatch):
     client = client_class(mask=['scrt', 'password'])
     client.client.send = mock.AsyncMock()
 
-    client.logger = mock.Mock()
+    log = mock.Mock()
+    monkeypatch.setattr(cli2.client, 'log', log)
     response = httpx.Response(
         status_code=200,
         content='{"pub": 1, "scrt": "pass"}',
@@ -904,11 +907,11 @@ async def test_mask_logs(client_class, key):
     response.request = httpx.Request('POST', '/', **{key: data})
     client.client.send.return_value = response
     await client.post('/', **{key: data})
-    client.logger.bind.assert_called_once_with(
+    log.bind.assert_called_once_with(
         method='POST',
         url='http://lol/',
     )
-    log = client.logger.bind.return_value
+    log = log.bind.return_value
     log.debug.assert_called_once_with(
         'request',
         **{key: dict(foo='bar', password='***MASKED***')},
@@ -942,11 +945,12 @@ async def test_mask_exceptions(client_class):
 
 
 @pytest.mark.asyncio
-async def test_request_mask(client_class):
+async def test_request_mask(client_class, monkeypatch):
     client = client_class(mask=['password'])
     client.client.send = mock.AsyncMock()
 
-    client.logger = mock.Mock()
+    log = mock.Mock()
+    monkeypatch.setattr(cli2.client, 'log', log)
     response = httpx.Response(
         status_code=200,
         content='{"pub": 1, "scrt": "pass"}',
@@ -955,11 +959,11 @@ async def test_request_mask(client_class):
     response.request = httpx.Request('POST', '/', json=data)
     client.client.send.return_value = response
     await client.post('/', json=data, mask=['scrt'])
-    client.logger.bind.assert_called_once_with(
+    log.bind.assert_called_once_with(
         method='POST',
         url='http://lol/'
     )
-    log = client.logger.bind.return_value
+    log = log.bind.return_value
     log.debug.assert_called_once_with(
         'request',
         json=dict(foo='bar', password='secret'),
@@ -972,19 +976,20 @@ async def test_request_mask(client_class):
 
 
 @pytest.mark.asyncio
-async def test_log_content(client_class):
+async def test_log_content(client_class, monkeypatch):
     client = client_class()
     client.client.send = mock.AsyncMock()
-    client.logger = mock.Mock()
+    log = mock.Mock()
+    monkeypatch.setattr(cli2.client, 'log', log)
     response = httpx.Response(status_code=200, content='lol:]bar')
     response.request = httpx.Request('POST', '/')
     client.client.send.return_value = response
     await client.post('/', content='lol:]foo')
-    client.logger.bind.assert_called_once_with(
+    log.bind.assert_called_once_with(
         method='POST',
         url='http://lol/'
     )
-    log = client.logger.bind.return_value
+    log = log.bind.return_value
     log.debug.assert_called_once_with('request', content='lol:]foo')
     log.info.assert_called_once_with(
         'response', status_code=200, content=b'lol:]bar'
@@ -992,20 +997,20 @@ async def test_log_content(client_class):
 
 
 @pytest.mark.asyncio
-async def test_log_quiet(client_class):
+async def test_log_quiet(client_class, monkeypatch):
     client = client_class()
     client.client.send = mock.AsyncMock()
-    client.logger = mock.Mock()
+    log = mock.Mock()
+    monkeypatch.setattr(cli2.client, 'log', log)
     response = httpx.Response(status_code=200, content='[1]')
     response.request = httpx.Request('GET', '/')
     client.client.send.return_value = response
     await client.get('/', json=[1], quiet=True)
-    log = client.logger.bind.return_value
-    client.logger.bind.assert_called_once_with(
+    log.bind.assert_called_once_with(
         method='GET',
         url='http://lol/',
     )
-    log = client.logger.bind.return_value
+    log = log.bind.return_value
     assert not log.debug.call_args_list
     log.info.assert_called_once_with('response', status_code=200)
 
@@ -1068,11 +1073,13 @@ def test_id_value(client_class):
 
 
 @pytest.mark.asyncio
-async def test_debug(client_class):
+async def test_debug(client_class, monkeypatch):
     client = client_class(mask=['scrt', 'password'], debug=True)
     client.client.send = mock.AsyncMock()
 
-    client.logger = mock.Mock()
+    log = mock.Mock()
+    monkeypatch.setattr(cli2.client, 'log', log)
+
     response = httpx.Response(
         status_code=200,
         content='{"pub": 1, "scrt": "pass"}',
@@ -1081,11 +1088,11 @@ async def test_debug(client_class):
     response.request = httpx.Request('POST', '/', json=data)
     client.client.send.return_value = response
     await client.post('/', json=data, quiet=True)
-    client.logger.bind.assert_called_once_with(
+    log.bind.assert_called_once_with(
         method='POST',
         url='http://lol/',
     )
-    log = client.logger.bind.return_value
+    log = log.bind.return_value
     log.debug.assert_called_once_with(
         'request',
         json=dict(foo='bar', password='secret'),