cli2 3.3.32__tar.gz → 3.3.33__tar.gz

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

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

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

@@ -700,13 +700,7 @@ class ModelGroup(Group):
                 dict(model=cls),
             )
         )
-
-        url_list_methods = ['find', 'get', 'delete', 'create']
-        if cls.url_list:
-            for name in url_list_methods:
-                self.cmd(getattr(cls, name))
-
-        self.load_cls(cls, exclude=url_list_methods)
+        self.load_cls(cls)
 
 
 class ModelMetaclass(type):
@@ -820,7 +814,7 @@ class Model(metaclass=ModelMetaclass):
 
     @classmethod
     @hide('expressions')
-    @cmd(color='green')
+    @cmd(color='green', condition=lambda cls: cls.url_list)
     def find(cls, *expressions, **params):
         """
         Find objects filtered by GET params
@@ -874,7 +868,7 @@ class Model(metaclass=ModelMetaclass):
             raise Exception(f'{type(self).__name__}.url_list not set')
         return self.url_detail.format(self=self)
 
-    @cmd(color='red')
+    @cmd(color='red', condition=lambda cls: cls.url_list)
     async def delete(self):
         """
         Delete model.
@@ -884,7 +878,7 @@ class Model(metaclass=ModelMetaclass):
         return await self.client.delete(self.url)
 
     @classmethod
-    @cmd(doc="""
+    @cmd(condition=lambda cls: cls.url_list, doc="""
     POST request to create.
 
     Example:
@@ -900,7 +894,7 @@ class Model(metaclass=ModelMetaclass):
         return obj
 
     @classmethod
-    @cmd(color='green', doc="""
+    @cmd(color='green', condition=lambda cls: cls.url_list, doc="""
     Get a model based on kwargs.
 
     Example:

{cli2-3.3.32 → cli2-3.3.33}/cli2/group.py

@@ -177,21 +177,35 @@ class Group(EntryPoint, dict):
                 self.group(name).load(target, parent=obj)
         return self
 
-    def load_cls(self, cls, exclude=None):
+    def load_cls(self, cls, leaf=None):
         """
         Load all methods which have been decorated with @cmd
+
+        Note that you can define conditions, this is how we hide functions such
+        as create/delete/get from models without url_list:
+
+        .. code-block:: python
+
+            @cli2.cmd(condition=lambda cls: cls.url_list)
         """
-        exclude = exclude or []
+        leaf = leaf if leaf else cls
+        for base in cls.__bases__:
+            self.load_cls(base, leaf=leaf)
+
         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)
-            elif hasattr(method, 'cli2'):
-                self.cmd(method)
-        for base in cls.__bases__:
-            self.load_cls(base, exclude=exclude)
+            cfg = getattr(
+                wrapped_method,
+                'cli2',
+                getattr(method, 'cli2', None),
+            )
+            if cfg is None:
+                continue
+            condition = cfg.get('condition', None)
+            if condition:
+                if not condition(leaf):
+                    continue
+            self.cmd(method)
 
     def __call__(self, *argv):
         self.exit_code = 0

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

@@ -68,6 +68,15 @@ async def test_client_cli_override(client_class, httpx_mock):
             return cls.url_list
     assert await Client.cli['testmodel']['find'].async_call('bar') == 'bar/foo'
 
+    class TestModel2(Client.Model):
+        @classmethod
+        @cli2.cmd
+        async def find(cls):
+            return 'foo'
+
+    assert await Client.cli['testmodel2']['find'].async_call() == 'foo'
+    assert 'get' not in Client.cli['testmodel2']
+
 
 def test_client_model(client_class):
     assert issubclass(client_class.Model, cli2.Model)

{cli2-3.3.32 → cli2-3.3.33}/cli2/test_group.py

@@ -225,11 +225,11 @@ def test_load_cls():
         def test2(self):
             pass
 
-        @cli2.cmd
+        @cli2.cmd(condition=lambda cls: False)
         def exclude(self):
             pass
     group = Group()
-    group.load_cls(Foo, exclude=['exclude'])
+    group.load_cls(Foo)
     assert 'bar' not in group
     assert 'test' in group
     assert 'test2' in group

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

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

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

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