cli2 5.1.8__tar.gz → 5.2.1rc1__tar.gz

{cli2-5.1.8/cli2.egg-info → cli2-5.2.1rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: cli2
-Version: 5.1.8
+Version: 5.2.1rc1
 Summary: image:: https://yourlabs.io/oss/cli2/badges/master/pipeline.svg
 Home-page: https://yourlabs.io/oss/cli2
 Author: James Pic
@@ -63,5 +63,6 @@ Batteries included, all of which are useful on their own:
   testing library so that you can go straight to the point in pytest
 - a good old fcntl based locking
 - a command line to run any python function over a beautiful CLI
+- **AI assisted programing CLI & framework with code2**
 
 `Documentation available on RTFD <https://cli2.rtfd.io>`_.

{cli2-5.1.8 → cli2-5.2.1rc1}/README.rst

@@ -25,5 +25,6 @@ Batteries included, all of which are useful on their own:
   testing library so that you can go straight to the point in pytest
 - a good old fcntl based locking
 - a command line to run any python function over a beautiful CLI
+- **AI assisted programing CLI & framework with code2**
 
 `Documentation available on RTFD <https://cli2.rtfd.io>`_.

{cli2-5.1.8 → cli2-5.2.1rc1}/cli2/__init__.py

@@ -8,6 +8,8 @@ from .cli import (
     Command,
     Group,
     EntryPoint,
+    Cli2Error,
+    Cli2ValueError,
 )
 from .asyncio import async_resolve, async_run, Queue
 from .colors import colors as c

{cli2-5.1.8 → cli2-5.2.1rc1}/cli2/cli.py

@@ -14,6 +14,14 @@ from .asyncio import async_resolve
 from .colors import colors
 
 
+class Cli2Error(Exception):
+    pass
+
+
+class Cli2ValueError(Cli2Error):
+    pass
+
+
 class Overrides(dict):
     """
     Lazy overrides dict
@@ -652,9 +660,14 @@ class Command(EntryPoint, dict):
         except KeyboardInterrupt:
             print('exiting cleanly...')
             self.exit_code = 1
+        except Exception as exc:
+            self.handle_exception(exc)
         finally:
             self.post_result = self.post_call()
 
+    def handle_exception(self, exc):
+        raise exc
+
     async def async_call(self, *argv):
         """ Call with async stuff in single event loop """
         error = self.parse(*argv)
@@ -669,8 +682,11 @@ class Command(EntryPoint, dict):
 
         await self.factories_resolve()
 
-        result = self.call(*self.bound.args, **self.bound.kwargs)
-        return await async_resolve(result, output=True)
+        try:
+            result = self.call(*self.bound.args, **self.bound.kwargs)
+            return await async_resolve(result, output=True)
+        except Exception as exc:
+            self.handle_exception(exc)
 
     async def factories_resolve(self):
         """ Resolve all factories values. """
@@ -1047,7 +1063,7 @@ class Argument:
             if self.default != self.param.empty:
                 return self.default
             msg = f'{self.param.name} has no CLI bound value nor default'
-            raise ValueError(msg) from exc
+            raise Cli2ValueError(msg) from exc
 
     @value.setter
     def value(self, value):

{cli2-5.1.8 → cli2-5.2.1rc1}/cli2/test.py

@@ -21,8 +21,8 @@ def autotest(path, cmd, ignore=None, env=None):
     """
     environ = copy.copy(os.environ)
     if env:
-        for key, value in env.items():
-            environ[key] = value
+        environ.update(env)
+    environ['CLI2_THEME'] = 'standard'
     environ['FORCE_TERMSIZE'] = '1'
     environ['PATH'] = ':'.join([
         environ.get('HOME', '') + '/.local/bin',

{cli2-5.1.8 → cli2-5.2.1rc1/cli2.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: cli2
-Version: 5.1.8
+Version: 5.2.1rc1
 Summary: image:: https://yourlabs.io/oss/cli2/badges/master/pipeline.svg
 Home-page: https://yourlabs.io/oss/cli2
 Author: James Pic
@@ -63,5 +63,6 @@ Batteries included, all of which are useful on their own:
   testing library so that you can go straight to the point in pytest
 - a good old fcntl based locking
 - a command line to run any python function over a beautiful CLI
+- **AI assisted programing CLI & framework with code2**
 
 `Documentation available on RTFD <https://cli2.rtfd.io>`_.

{cli2-5.1.8 → cli2-5.2.1rc1}/cli2.egg-info/SOURCES.txt

@@ -53,5 +53,6 @@ tests/test_log.py
 tests/test_mask.py
 tests/test_node.py
 tests/test_notlevenshtein.py
+tests/test_prompt2.py
 tests/test_restful.py
 tests/test_table.py

{cli2-5.1.8 → cli2-5.2.1rc1}/setup.py

@@ -44,7 +44,7 @@ from setuptools import setup
 
 setup(
     name='cli2',
-    version='5.1.8',
+    version='5.2.1rc1',
     setup_requires='setupmeta',
     packages=['cli2'],
     install_requires=[

{cli2-5.1.8 → cli2-5.2.1rc1}/tests/test_command.py

@@ -100,7 +100,7 @@ def test_vararg_after_kwarg():
 
     cmd.parse('x')
     assert cmd['one'].value == 'x'
-    with pytest.raises(ValueError):
+    with pytest.raises(cli2.Cli2ValueError):
         cmd['two'].value
 
 
@@ -318,7 +318,7 @@ def test_kwarg_priority():
         """docstring"""
     cmd = cli2.Command(foo)
     cmd.parse('foo=bar')
-    with pytest.raises(ValueError):
+    with pytest.raises(cli2.Cli2ValueError):
         cmd['missing'].value
 
 

{cli2-5.1.8 → cli2-5.2.1rc1}/tests/test_inject.py

@@ -21,7 +21,7 @@ with open(__file__, 'r') as f:
             # default should not be enabled
             dict(),
             [],
-            ValueError,
+            cli2.Cli2ValueError,
         ),
         # test bools
         (

cli2-5.2.1rc1/tests/test_prompt2.py

@@ -0,0 +1,144 @@
+from cli2.test import autotest
+from pathlib import Path
+import pytest
+import os
+
+from unittest import mock
+from prompt2 import cli, Model, Prompt
+
+
+def test_paths():
+    assert cli.cli('paths') == [
+        str(Prompt.LOCAL_PATH),
+        str(Prompt.USER_PATH),
+    ]
+
+
+@pytest.fixture
+def user():
+    return Path(os.getenv('PROMPT2_USER_PATH')) / 'user.txt'
+
+
+@pytest.fixture
+def local():
+    return Path(os.getenv('PROMPT2_LOCAL_PATH')) / 'local.txt'
+
+
+@pytest.fixture
+def kwargs(prompt2_env, user, local):
+    prompt2_env['DEBUG'] = '1'
+    return dict(
+        ignore=[
+            str(user.parent.parent),
+            str(local.parent.parent),
+            str(Path(__file__).parent.parent),
+        ],
+        env=prompt2_env,
+    )
+
+
+@pytest.mark.asyncio
+async def test_python(prompt2_env):
+    model = Model.get()
+
+    prompt = Prompt()
+    prompt.parts.append('make a hello world in python')
+    result = await model(prompt)
+    assert 'To run this:' in result
+    result = await model(prompt, 'wholefile')
+    assert result == 'print("Hello, World!")'
+
+
+def test_parsers(kwargs):
+    autotest(
+        'tests/prompt2/test_parsers.txt',
+        'prompt2 parsers',
+        **kwargs,
+    )
+    autotest(
+        'tests/prompt2/test_parser_success.txt',
+        'prompt2 parser wholefile',
+        **kwargs,
+    )
+    autotest(
+        'tests/prompt2/test_parser_fail.txt',
+        'prompt2 parser',
+        **kwargs,
+    )
+
+
+def test_crud(user, kwargs):
+    autotest(
+        'tests/prompt2/test_edit_user.txt',
+        'prompt2 edit user',
+        **kwargs,
+    )
+    autotest(
+        'tests/prompt2/test_edit_local.txt',
+        'prompt2 edit local local',
+        **kwargs,
+    )
+    autotest(
+        'tests/prompt2/test_list.txt',
+        'prompt2 list',
+        **kwargs,
+    )
+    autotest(
+        'tests/prompt2/test_show_user.txt',
+        'prompt2 show user',
+        **kwargs,
+    )
+    autotest(
+        'tests/prompt2/test_show_local.txt',
+        'prompt2 show local',
+        **kwargs,
+    )
+    autotest(
+        'tests/prompt2/test_render_local.txt',
+        'prompt2 render local',
+        **kwargs,
+    )
+    with user.open('w') as f:
+        f.write('With context {{ foo }}')
+    autotest(
+        'tests/prompt2/test_render_user_fail.txt',
+        'prompt2 render user',
+        **kwargs,
+    )
+    autotest(
+        'tests/prompt2/test_render_user_success.txt',
+        'prompt2 render user foo=bar',
+        **kwargs,
+    )
+    autotest(
+        'tests/prompt2/test_messages_user_fail.txt',
+        'prompt2 messages user',
+        **kwargs,
+    )
+    autotest(
+        'tests/prompt2/test_messages_user_success.txt',
+        'prompt2 messages user foo=bar',
+        **kwargs,
+    )
+    autotest(
+        'tests/prompt2/test_send_user_fail.txt',
+        'prompt2 send user',
+        **kwargs,
+    )
+    autotest(
+        'tests/prompt2/test_send_user_success.txt',
+        'prompt2 send user foo=bar',
+        **kwargs,
+    )
+    with user.open('w') as f:
+        f.write('Write hello world in python')
+    autotest(
+        'tests/prompt2/test_send_code_noparser.txt',
+        'prompt2 send user',
+        **kwargs,
+    )
+    autotest(
+        'tests/prompt2/test_send_code_withparser.txt',
+        'prompt2 send user wholefile',
+        **kwargs,
+    )