cli2 3.3.23__tar.gz → 3.3.25__tar.gz

{cli2-3.3.23/cli2.egg-info → cli2-3.3.25}/PKG-INFO

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

{cli2-3.3.23 → cli2-3.3.25}/cli2/__init__.py

@@ -16,7 +16,6 @@ try:
         FieldValueError,
         FieldExternalizeError,
         Client,
-        ClientProxy,
         DateTimeField,
         Field,
         Handler,

{cli2-3.3.23 → cli2-3.3.25}/cli2/client.py

@@ -675,21 +675,19 @@ class ModelGroup(Group):
             )
         )
 
+        url_list_methods = ['find', 'get', 'delete', 'create']
         if cls.url_list:
-            self.cmd(cls.find)
-            self.cmd(cls.get)
-            self.cmd(cls.delete)
-            self.cmd(cls.create)
+            for name in url_list_methods:
+                self.cmd(getattr(cls, name))
 
-        self.load_cls(cls, exclude=['find', 'get', 'delete', 'create'])
+        self.load_cls(cls, exclude=url_list_methods)
 
 
 class ModelMetaclass(type):
-    def __new__(cls, name, bases, attributes, client=None):
-        attributes['_client_key'] = client
+    def __new__(cls, name, bases, attributes):
         cls = super().__new__(cls, name, bases, attributes)
-
-        if getattr(cls, 'client', None):
+        client = getattr(cls, 'client', None)
+        if client:
             return cls
 
         client_class = getattr(cls, '_client_class', None)
@@ -740,6 +738,7 @@ class Model(metaclass=ModelMetaclass):
 
         The URL to get the list of objects, you're supposed to configure it as
         a model attribute in your model subclass.
+        This may be a format string using a client ``client`` variable.
 
     .. py:attribute:: url_detail
 
@@ -1198,11 +1197,9 @@ class Client(metaclass=ClientMetaclass):
         self.token = None
 
         for model in self.models:
-            if model._client_key:
-                client = getattr(self, model._client_key)
-            else:
-                client = self
-            model = type(model.__name__, (model,), dict(client=client))
+            model = type(model.__name__, (model,), dict(client=self))
+            if model.url_list:
+                model.url_list = model.url_list.format(client=self)
             setattr(self, model.__name__, model)
 
     @property
@@ -1479,6 +1476,11 @@ class Client(metaclass=ClientMetaclass):
 
         return data
 
+    @cmd
+    async def get(self, url, *args, **kwargs):
+        """ GET Request """
+        return await self.request('GET', url, *args, **kwargs)
+
     @cmd(name='request')
     async def request_cmd(self, method, url, *args, **kwargs):
         """
@@ -1505,11 +1507,6 @@ class Client(metaclass=ClientMetaclass):
                 kwargs[key] = yaml.safe_load(fh.read())
         return await self.request(method, url, *args, **kwargs)
 
-    @cmd
-    async def get(self, url, *args, **kwargs):
-        """ GET Request """
-        return await self.request('GET', url, *args, **kwargs)
-
     async def post(self, url, *args, **kwargs):
         """ POST Request """
         return await self.request('POST', url, *args, **kwargs)
@@ -1552,85 +1549,6 @@ class Client(metaclass=ClientMetaclass):
         details.
         """
 
-    @property
-    def base_url(self):
-        return self.client.base_url
-
-
-class ClientProxy:
-    """
-    Proxy a :py:cls:`Client` with another :py:attr:`base_url`.
-
-    Allows to declare sub-clients:
-
-    .. code-block:: python
-
-        class YourClient(cli2.Client):
-            def __init__(self, *args, **kwargs):
-                super().__init__(*args, **kwargs)
-                self.widget_client = cli2.ClientProxy(self, '/widgets')
-                self.thing_client = cli2.ClientProxy(self, '/things')
-
-    You generally don't need this class.
-
-    .. py:attribute:: client
-
-        Actual :py:cls:`Client` instance
-
-    .. py.attribute:: base_url
-
-        Extra base_url
-    """
-    def __init__(self, client, base_url):
-        self.base_url = base_url
-        self.client = client
-
-    def url_rewrite(self, url):
-        return '/'.join([
-            str(self.client.base_url),
-            str(self.base_url.lstrip('/')),
-            url.lstrip('/')
-        ])
-
-    async def request(self, method, url, *args, **kwargs):
-        """
-        Join the actual client's base_url, our base_url and the url.
-        """
-        return await self.client.request(
-            method, self.url_rewrite(url), *args, **kwargs
-        )
-
-    @cmd
-    async def get(self, url, *args, **kwargs):
-        """ GET Request """
-        return await self.request('GET', url, *args, **kwargs)
-
-    async def post(self, url, *args, **kwargs):
-        """ POST Request """
-        return await self.request('POST', url, *args, **kwargs)
-
-    async def put(self, url, *args, **kwargs):
-        """ PUT Request """
-        return await self.request('PUT', url, *args, **kwargs)
-
-    async def head(self, url, *args, **kwargs):
-        """ HEAD Request """
-        return await self.request('HEAD', url, *args, **kwargs)
-
-    async def delete(self, url, *args, **kwargs):
-        """ DELETE Request """
-        return await self.request('DELETE', url, *args, **kwargs)
-
-    def paginate(self, url, *args, **kwargs):
-        """ Paginate proxy """
-        return self.client.paginate(self.url_rewrite(url), *args, **kwargs)
-
-    def pagination_initialize(self, paginator, data):
-        return self.client.pagination_initialize(paginator, data)
-
-    def pagination_parameters(self, paginator, page_number):
-        return self.client.pagination_parameters(paginator, page_number)
-
 
 class Expression:
     def __init__(self, field, value):

{cli2-3.3.23 → cli2-3.3.25}/cli2/group.py

@@ -183,6 +183,8 @@ class Group(EntryPoint, dict):
         """
         exclude = exclude or []
         for name, method in cls.__dict__.items():
+            if name in exclude:
+                continue
             wrapped_method = getattr(method, '__func__', None)
             if hasattr(wrapped_method, 'cli2'):
                 self.cmd(wrapped_method)

{cli2-3.3.23 → cli2-3.3.25}/cli2/test_client.py

@@ -4,7 +4,6 @@ import httpx
 import inspect
 import mock
 import pytest
-import uuid
 
 
 async def _response(**kwargs):
@@ -53,6 +52,23 @@ async def test_client_cli(client_class, httpx_mock):
     await client_class.cli['testmodel']['find'].async_call()
 
 
+@pytest.mark.asyncio
+async def test_client_cli_override(client_class, httpx_mock):
+    class Client(client_class):
+        def __init__(self, *args, **kwargs):
+            self.test = 'bar'
+            super().__init__(*args, **kwargs)
+
+    class TestModel(Client.Model):
+        url_list = '{client.test}/foo'
+
+        @classmethod
+        @cli2.cmd
+        async def find(cls, foo):
+            return cls.url_list
+    assert await Client.cli['testmodel']['find'].async_call('bar') == 'bar/foo'
+
+
 def test_client_model(client_class):
     assert issubclass(client_class.Model, cli2.Model)
     assert client_class.Model._client_class == client_class
@@ -942,66 +958,17 @@ async def test_debug():
 
 
 @pytest.mark.asyncio
-async def test_client_proxy(httpx_mock):
-    class ProxyTestClient(cli2.Client):
+async def test_url_list(client_class):
+    class Client(client_class):
         def __init__(self, *args, **kwargs):
-            self.sub = cli2.ClientProxy(self, base_url='/bar')
+            self.foo = '/foo'
             super().__init__(*args, **kwargs)
-            self.tokens = []
-
-        async def token_get(self):
-            token = str(uuid.uuid4())
-            self.tokens.append(token)
-            return token
-
-    class TestModel(ProxyTestClient.Model, client='sub'):
-        url_list = '/foo'
-        id = cli2.Field()
-
-    client = ProxyTestClient(base_url='http://ex')
-    assert not client.token
 
-    # TestModel uses a sub-client
-    assert client.TestModel.client == client.sub
-
-    httpx_mock.add_response(url='http://ex/test1')
-    await client.get('/test1')
-
-    httpx_mock.add_response(url='http://ex/bar/sub')
-    await client.sub.get('/sub')
-    # don't get a new token, use the parent's
-    assert len(client.tokens) == 1
-
-    client = ProxyTestClient(base_url='http://ex2')
-    assert not client.token
-    httpx_mock.add_response(url='http://ex2/bar/sub2')
-    await client.sub.get('/sub2')
-
-    httpx_mock.add_response(url='http://ex2/root')
-    await client.get('/root')
-    # don't get a new token, use the parent's
-    assert len(client.tokens) == 1
-
-    httpx_mock.add_response(
-        url='http://ex2/bar/foo',
-        json=[dict(id=1), dict(id=2)],
-    )
-    result = await client.TestModel.find().list()
-    assert result[0].id == 1
-    assert result[1].id == 2
-
-    httpx_mock.add_response(
-        url='http://ex2/bar/foo/1',
-        json=dict(id=1),
-    )
-    result = await client.TestModel.get(id=1)
-    assert result.id == 1
+    class TestModel(Client.Model):
+        url_list = '{client.foo}/bar'
 
-    httpx_mock.add_response(
-        url='http://ex2/bar/foo/1',
-        method='DELETE',
-    )
-    await result.delete()
+    client = Client()
+    assert client.TestModel.url_list == '/foo/bar'
 
 
 @pytest.mark.asyncio

{cli2-3.3.23 → cli2-3.3.25}/cli2/test_group.py

@@ -224,8 +224,13 @@ def test_load_cls():
         @cli2.cmd
         def test2(self):
             pass
+
+        @cli2.cmd
+        def exclude(self):
+            pass
     group = Group()
-    group.load_cls(Foo)
+    group.load_cls(Foo, exclude=['exclude'])
     assert 'bar' not in group
     assert 'test' in group
     assert 'test2' in group
+    assert 'exclude' not in group

{cli2-3.3.23 → cli2-3.3.25/cli2.egg-info}/PKG-INFO

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

{cli2-3.3.23 → cli2-3.3.25}/setup.py

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