cli2 5.0.0rc2__tar.gz → 5.0.0rc6__tar.gz

{cli2-5.0.0rc2/cli2.egg-info → cli2-5.0.0rc6}/PKG-INFO

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

{cli2-5.0.0rc2 → cli2-5.0.0rc6/cli2.egg-info}/PKG-INFO

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

{cli2-5.0.0rc2 → cli2-5.0.0rc6}/setup.py

@@ -44,7 +44,7 @@ from setuptools import setup
 
 setup(
     name='cli2',
-    version='5.0.0rc2',
+    version='5.0.0rc6',
     setup_requires='setupmeta',
     packages=['cli2'],
     install_requires=[

{cli2-5.0.0rc2 → cli2-5.0.0rc6}/tests/test_ansible.py

@@ -1,5 +1,5 @@
 import cli2
-import cclient
+import chttpx
 import httpx
 import mock
 import pytest
@@ -32,7 +32,7 @@ async def test_mask(monkeypatch):
 
 @pytest.mark.asyncio
 async def test_response_error(httpx_mock):
-    class Client(cclient.Client):
+    class Client(chttpx.Client):
         mask_keys = ['secret']
 
     class Action(cansible.ActionBase):

{cli2-5.0.0rc2 → cli2-5.0.0rc6}/tests/test_cli.py

@@ -47,7 +47,7 @@ def test_cli(name, command):
 
 
 def test_hide():
-    autotest('tests/test_hide.txt', 'cli2-client-example object find --help')
+    autotest('tests/test_hide.txt', 'cli2-chttpx-example object find --help')
 
 
 def test_load_module():

{cli2-5.0.0rc2 → cli2-5.0.0rc6}/tests/test_client.py

@@ -1,6 +1,6 @@
 from datetime import datetime
 import cli2
-import cclient
+import chttpx
 import httpx
 import inspect
 import mock
@@ -11,7 +11,7 @@ async def _response(**kwargs):
     return httpx.Response(**kwargs)
 
 
-class HandlerSentinel(cclient.Handler):
+class HandlerSentinel(chttpx.Handler):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.calls = []
@@ -23,9 +23,9 @@ class HandlerSentinel(cclient.Handler):
 
 @pytest.fixture
 def client_class():
-    class TestClient(cclient.Client):
+    class TestClient(chttpx.Client):
         """ doc """
-        class Paginator(cclient.Paginator):
+        class Paginator(chttpx.Paginator):
             def pagination_parameters(self, params, page_number):
                 if page_number > 1:
                     params['page'] = page_number
@@ -118,7 +118,7 @@ async def test_client_cli_override(client_class, httpx_mock):
 
 
 def test_client_model(client_class):
-    assert issubclass(client_class.Model, cclient.Model)
+    assert issubclass(client_class.Model, chttpx.Model)
     assert client_class.Model._client_class == client_class
 
     class TestModel(client_class.Model):
@@ -152,7 +152,7 @@ async def test_async_factory(httpx_mock, client_class):
 
 @pytest.mark.asyncio
 async def test_client_cli_side_effect(client_class, httpx_mock):
-    from cclient import example
+    from chttpx import example
 
     # test that this didn't spill over client_class
     test_client_cli(client_class, httpx_mock)
@@ -261,7 +261,7 @@ async def test_handler(client_class):
     client = client_class()
     client.client_reset = mock.AsyncMock()
     client.token_reset = mock.AsyncMock()
-    handler = cclient.Handler(accepts=[201], refuses=[218], retokens=[418])
+    handler = chttpx.Handler(accepts=[201], refuses=[218], retokens=[418])
 
     response = httpx.Response(status_code=201)
     result = await handler(client, response, 0, log)
@@ -276,7 +276,7 @@ async def test_handler(client_class):
 
     response = httpx.Response(status_code=200, content='[2]')
     response.request = httpx.Request('POST', '/', json=[1])
-    with pytest.raises(cclient.RetriesExceededError) as exc:
+    with pytest.raises(chttpx.RetriesExceededError) as exc:
         await handler(client, response, handler.tries + 1, log)
     log.info.assert_called_once_with(
         'retry', status_code=200, tries=0, sleep=.0
@@ -287,7 +287,7 @@ async def test_handler(client_class):
 
     response = httpx.Response(status_code=200)
     response.request = httpx.Request('GET', '/')
-    with pytest.raises(cclient.RetriesExceededError) as exc:
+    with pytest.raises(chttpx.RetriesExceededError) as exc:
         await handler(client, response, handler.tries + 1, log)
 
     msg = 'Unacceptable response <Response [200 OK]> after 31 tries\n\x1b[0m\x1b[1mGET /\x1b[0m\n\x1b[1mHTTP 200\x1b[0m'  # noqa
@@ -295,7 +295,7 @@ async def test_handler(client_class):
 
     response = httpx.Response(status_code=218)
     response.request = httpx.Request('POST', '/')
-    with pytest.raises(cclient.RefusedResponseError) as exc:
+    with pytest.raises(chttpx.RefusedResponseError) as exc:
         await handler(client, response, 1, log)
 
     assert exc.value.response
@@ -306,7 +306,7 @@ async def test_handler(client_class):
 
     response = httpx.Response(status_code=418)
     response.request = httpx.Request('POST', '/')
-    with pytest.raises(cclient.TokenGetError):
+    with pytest.raises(chttpx.TokenGetError):
         await handler(client, response, 1, log)
 
     assert not client.client_reset.await_count
@@ -337,7 +337,7 @@ async def test_handler(client_class):
     assert not result
     assert client.token_reset.await_count == 1
 
-    handler = cclient.Handler(accepts=[], refuses=[222])
+    handler = chttpx.Handler(accepts=[], refuses=[222])
 
     response = httpx.Response(status_code=123)
     result = await handler(client, response, 0, log)
@@ -476,7 +476,7 @@ async def test_pagination_model(httpx_mock, client_class):
 
 
 def test_paginator_fields(client_class):
-    paginator = cclient.Paginator(client_class(), '/')
+    paginator = chttpx.Paginator(client_class(), '/')
     paginator.total_items = 95
     paginator.per_page = 10
     assert paginator.total_pages == 10
@@ -517,7 +517,7 @@ async def test_pagination_patterns(httpx_mock, client_class):
     class Offset(client_class.Model):
         url_list = '/off'
 
-        class Paginator(cclient.Paginator):
+        class Paginator(chttpx.Paginator):
             def pagination_initialize(self, data):
                 self.total_items = data['total']
 
@@ -552,8 +552,21 @@ async def test_pagination_patterns(httpx_mock, client_class):
     assert params == dict(offset=1, limit=1)
 
 
+@pytest.fixture
+def reverse_client(httpx_mock, client_class):
+    class Paginator(client_class.Paginator):
+        def pagination_initialize(self, data):
+            self.total_pages = data['total_pages']
+
+    # test that we can reverse pagination too
+    class Client(client_class):
+        paginator = Paginator
+
+    return Client(base_url='http://lol')
+
+
 @pytest.mark.asyncio
-async def test_pagination_reverse(httpx_mock, client_class):
+async def test_pagination_reverse(reverse_client, httpx_mock):
     httpx_mock.add_response(
         url='http://lol/bar',
         json=dict(total_pages=3, items=[dict(a=1), dict(a=2)]),
@@ -566,27 +579,32 @@ async def test_pagination_reverse(httpx_mock, client_class):
         url='http://lol/bar?page=3',
         json=dict(total_pages=3, items=[dict(a=5)]),
     )
-
-    class Paginator(client_class.Paginator):
-        def pagination_initialize(self, data):
-            self.total_pages = data['total_pages']
-
-    # test that we can reverse pagination too
-    class Client(client_class):
-        paginator = Paginator
-
-    client = Client(base_url='http://lol')
-    paginator = client.paginate('/bar')
+    paginator = reverse_client.paginate('/bar')
     paginator = paginator.reverse()
     results = await paginator.list()
     assert [x['a'] for x in results] == [5, 4, 3, 2, 1]
 
 
+@pytest.mark.asyncio
+async def test_pagination_last(httpx_mock, reverse_client):
+    httpx_mock.add_response(
+        url='http://lol/bar',
+        json=dict(total_pages=3, items=[dict(a=1), dict(a=2)]),
+    )
+    httpx_mock.add_response(
+        url='http://lol/bar?page=3',
+        json=dict(total_pages=3, items=[dict(a=5)]),
+    )
+    paginator = reverse_client.paginate('/bar')
+    last_item = await paginator.last_item()
+    assert last_item['a'] == 5
+
+
 def test_descriptor(client_class):
     class Model(client_class.Model):
-        id = cclient.Field()
-        bar = cclient.Field('nested/bar')
-        foo = cclient.Field('undeclared/foo')
+        id = chttpx.Field()
+        bar = chttpx.Field('nested/bar')
+        foo = chttpx.Field('undeclared/foo')
 
     model = Model(data=dict(id=1, nested=dict(bar=2)))
     assert model.data['id'] == 1
@@ -621,7 +639,7 @@ def test_descriptor(client_class):
 
 def test_jsonstring(client_class):
     class Model(client_class.Model):
-        json = cclient.JSONStringField()
+        json = chttpx.JSONStringField()
 
     client = client_class()
     model = client.Model(data=dict(json='{"foo": 1}'))
@@ -641,7 +659,7 @@ def test_jsonstring(client_class):
 
 def test_datetime(client_class):
     class Model(client_class.Model):
-        dt = cclient.DateTimeField()
+        dt = chttpx.DateTimeField()
 
     model = Model(dict(dt='2020-11-12T01:02:03'))
     assert model.dt == datetime(2020, 11, 12, 1, 2, 3)
@@ -651,10 +669,10 @@ def test_datetime(client_class):
 
 def test_model_inheritance(client_class):
     class Model(client_class.Model):
-        foo = cclient.Field()
+        foo = chttpx.Field()
 
     class Model2(Model):
-        bar = cclient.Field()
+        bar = chttpx.Field()
 
     client = client_class()
     assert [*client.Model._fields.keys()] == ['foo']
@@ -663,10 +681,10 @@ def test_model_inheritance(client_class):
 
 def test_relation_simple(client_class):
     class Child(client_class.Model):
-        foo = cclient.Field()
+        foo = chttpx.Field()
 
     class Father(client_class.Model):
-        child = cclient.Related('Child')
+        child = chttpx.Related('Child')
 
     client = client_class()
     model = client.Father(dict(child=dict(foo=1)))
@@ -685,10 +703,10 @@ def test_relation_simple(client_class):
 
 def test_relation_many(client_class):
     class Child(client_class.Model):
-        foo = cclient.Field()
+        foo = chttpx.Field()
 
     class Father(client_class.Model):
-        children = cclient.Related('Child', many=True)
+        children = chttpx.Related('Child', many=True)
 
     client = client_class()
     model = client.Father(dict(children=[dict(foo=1)]))
@@ -714,8 +732,8 @@ async def test_python_expression(httpx_mock, client_class):
 
     class Model(client_class.Model):
         url_list = '/foo'
-        a = cclient.Field()
-        b = cclient.Field()
+        a = chttpx.Field()
+        b = chttpx.Field()
         paginator = Paginator
 
     def mock():
@@ -766,8 +784,8 @@ async def test_python_expression(httpx_mock, client_class):
 async def test_expression_parameter(httpx_mock, client_class):
     class Model(client_class.Model):
         url_list = '/foo'
-        a = cclient.Field()
-        b = cclient.Field(parameter='b')
+        a = chttpx.Field()
+        b = chttpx.Field(parameter='b')
 
     httpx_mock.add_response(url='http://lol/foo?b=1', json=dict(
         items=[dict(a=1, b=1), dict(a=3, b=1)],
@@ -796,7 +814,7 @@ async def test_model_crud(httpx_mock, client_class):
 @pytest.mark.asyncio
 async def test_client_cli2(httpx_mock, client_class):
     class Foo(client_class.Model):
-        id = cclient.Field()
+        id = chttpx.Field()
         url_list = '/foo'
 
     assert client_class.cli.name == 'test'
@@ -837,14 +855,14 @@ async def test_object_command(httpx_mock, client_class):
 ))
 def test_datetime_fmts(intern, extern, client_class):
     class DtModel(client_class.Model):
-        dt = cclient.DateTimeField()
+        dt = chttpx.DateTimeField()
     model = client_class().DtModel(dict(dt=intern))
     assert model.dt == extern
 
 
 def test_datetime_fmt(client_class):
     class DtModel(client_class.Model):
-        dt = cclient.DateTimeField(fmt='%d/%m/%Y %H:%M:%S')
+        dt = chttpx.DateTimeField(fmt='%d/%m/%Y %H:%M:%S')
     model = client_class().DtModel(dict(dt='13/02/2025 12:34:56'))
     assert model.dt == datetime(2025, 2, 13, 12, 34, 56)
 
@@ -854,15 +872,15 @@ def test_datetime_fmt(client_class):
 
 def test_datetime_error(client_class):
     class DtModel(client_class.Model):
-        dt = cclient.DateTimeField()
+        dt = chttpx.DateTimeField()
     model = client_class().DtModel(dict(dt='13/024:56'))
-    with pytest.raises(cclient.FieldExternalizeError):
+    with pytest.raises(chttpx.FieldExternalizeError):
         model.dt
 
 
 def test_datetime_default_fmt(client_class):
     class DtModel(client_class.Model):
-        dt = cclient.DateTimeField()
+        dt = chttpx.DateTimeField()
     model = client_class().DtModel()
     model.dt = datetime(2025, 2, 13, 16, 9, 30)
     assert model.data['dt'] == '2025-02-13T16:09:30.000000'
@@ -874,11 +892,11 @@ def test_datetime_default_fmt(client_class):
 
 @pytest.mark.asyncio
 async def test_mask_recursive(client_class, monkeypatch):
-    client = client_class(mask=cclient.Mask(['scrt', 'password']))
+    client = client_class(mask=chttpx.Mask(['scrt', 'password']))
     client.client.send = mock.AsyncMock()
 
     log = mock.Mock()
-    monkeypatch.setattr(cclient, 'log', log)
+    monkeypatch.setattr(chttpx, 'log', log)
     response = httpx.Response(
         status_code=200,
         content='{"pub": 1, "foo": [{"scrt": "pass"}]}',
@@ -908,11 +926,11 @@ async def test_mask_recursive(client_class, monkeypatch):
     'key', ('json', 'data'),
 )
 async def test_mask_logs(client_class, key, monkeypatch):
-    client = client_class(mask=cclient.Mask(['scrt', 'password']))
+    client = client_class(mask=chttpx.Mask(['scrt', 'password']))
     client.client.send = mock.AsyncMock()
 
     log = mock.Mock()
-    monkeypatch.setattr(cclient, 'log', log)
+    monkeypatch.setattr(chttpx, 'log', log)
     response = httpx.Response(
         status_code=200,
         content='{"pub": 1, "scrt": "pass"}',
@@ -948,26 +966,26 @@ async def test_mask_exceptions(client_class):
     response.request = httpx.Request('POST', '/', json=dict(a=1, b=2))
     client.mask.keys.add('a')
     client.mask.keys.add('c')
-    error = cclient.ResponseError(client, response, 1)
+    error = chttpx.ResponseError(client, response, 1)
     expected = "\n\x1b[0m\x1b[1mPOST /\x1b[0m\n\x1b[94ma\x1b[39;49;00m:\x1b[37m \x1b[39;49;00m\x1b[33m'\x1b[39;49;00m\x1b[33m***MASKED***\x1b[39;49;00m\x1b[33m'\x1b[39;49;00m\x1b[37m\x1b[39;49;00m\n\x1b[94mb\x1b[39;49;00m:\x1b[37m \x1b[39;49;00m2\x1b[37m\x1b[39;49;00m\n\n\x1b[1mHTTP 218\x1b[0m\n\x1b[94mc\x1b[39;49;00m:\x1b[37m \x1b[39;49;00m\x1b[33m'\x1b[39;49;00m\x1b[33m***MASKED***\x1b[39;49;00m\x1b[33m'\x1b[39;49;00m\x1b[37m\x1b[39;49;00m\n\x1b[94md\x1b[39;49;00m:\x1b[37m \x1b[39;49;00m4\x1b[37m\x1b[39;49;00m\n"  # noqa
     assert str(error) == expected
 
     # this needs to work with form data too
     response = httpx.Response(status_code=218, content='{"c": 3, "d": 4}')
     response.request = httpx.Request('POST', '/', data=dict(a=1, b=2))
-    client.mask = cclient.Mask(['a', 'c'])
-    error = cclient.ResponseError(client, response, 1)
+    client.mask = chttpx.Mask(['a', 'c'])
+    error = chttpx.ResponseError(client, response, 1)
     expected = "\n\x1b[0m\x1b[1mPOST /\x1b[0m\n\x1b[94ma\x1b[39;49;00m:\x1b[37m \x1b[39;49;00m\x1b[33m'\x1b[39;49;00m\x1b[33m***MASKED***\x1b[39;49;00m\x1b[33m'\x1b[39;49;00m\x1b[37m\x1b[39;49;00m\n\x1b[94mb\x1b[39;49;00m:\x1b[37m \x1b[39;49;00m\x1b[33m'\x1b[39;49;00m\x1b[33m2\x1b[39;49;00m\x1b[33m'\x1b[39;49;00m\x1b[37m\x1b[39;49;00m\n\n\x1b[1mHTTP 218\x1b[0m\n\x1b[94mc\x1b[39;49;00m:\x1b[37m \x1b[39;49;00m\x1b[33m'\x1b[39;49;00m\x1b[33m***MASKED***\x1b[39;49;00m\x1b[33m'\x1b[39;49;00m\x1b[37m\x1b[39;49;00m\n\x1b[94md\x1b[39;49;00m:\x1b[37m \x1b[39;49;00m4\x1b[37m\x1b[39;49;00m\n"  # noqa
     assert str(error) == expected
 
 
 @pytest.mark.asyncio
 async def test_request_mask(client_class, monkeypatch):
-    client = client_class(mask=cclient.Mask(['password']))
+    client = client_class(mask=chttpx.Mask(['password']))
     client.client.send = mock.AsyncMock()
 
     log = mock.Mock()
-    monkeypatch.setattr(cclient, 'log', log)
+    monkeypatch.setattr(chttpx, 'log', log)
     response = httpx.Response(
         status_code=200,
         content='{"pub": 1, "scrt": "pass"}',
@@ -998,7 +1016,7 @@ async def test_log_content(client_class, monkeypatch):
     client = client_class()
     client.client.send = mock.AsyncMock()
     log = mock.Mock()
-    monkeypatch.setattr(cclient, 'log', log)
+    monkeypatch.setattr(chttpx, 'log', log)
     response = httpx.Response(status_code=200, content='lol:]bar')
     response.request = httpx.Request('POST', '/')
     client.client.send.return_value = response
@@ -1019,7 +1037,7 @@ async def test_log_quiet(client_class, monkeypatch):
     client = client_class()
     client.client.send = mock.AsyncMock()
     log = mock.Mock()
-    monkeypatch.setattr(cclient, 'log', log)
+    monkeypatch.setattr(chttpx, 'log', log)
     response = httpx.Response(status_code=200, content='[1]')
     response.request = httpx.Request('GET', '/')
     client.client.send.return_value = response
@@ -1047,8 +1065,8 @@ def test_class_override(client_class):
 @pytest.mark.asyncio
 async def test_save(client_class, httpx_mock):
     class TestModel(client_class.Model):
-        id = cclient.Field()
-        foo = cclient.Field()
+        id = chttpx.Field()
+        foo = chttpx.Field()
 
     client = client_class()
     model = client.TestModel(id=1, foo='bar')
@@ -1081,22 +1099,22 @@ async def test_save(client_class, httpx_mock):
 
 def test_id_value(client_class):
     class TestModel(client_class.Model):
-        id = cclient.Field()
+        id = chttpx.Field()
     assert client_class().TestModel(id=1).id_value == 1
 
     class TestModel2(client_class.Model):
-        bar = cclient.Field()
+        bar = chttpx.Field()
         id_field = 'bar'
     assert client_class().TestModel2(bar=1).id_value == 1
 
 
 @pytest.mark.asyncio
 async def test_debug(client_class, monkeypatch):
-    client = client_class(mask=cclient.Mask(['scrt', 'password']), debug=True)
+    client = client_class(mask=chttpx.Mask(['scrt', 'password']), debug=True)
     client.client.send = mock.AsyncMock()
 
     log = mock.Mock()
-    monkeypatch.setattr(cclient, 'log', log)
+    monkeypatch.setattr(chttpx, 'log', log)
 
     response = httpx.Response(
         status_code=200,