Fix coloring help messages and suggesting command names to all groups

Author: BartoszCki

Pipfile

@@ -15,11 +15,12 @@ click = "*"
 terminaltables = "*"
 click-didyoumean = "*"
 click-help-colors = "*"
-tox = "*"
+colorama = "*"
 
 [dev-packages]
 twine = "*"
 pypandoc = "*"
 pytest = "*"
 mock = "*"
 coverage = "*"
+tox = "*"

Pipfile.lock

@@ -0,0 +1,27 @@
+import click
+import colorama
+from click._compat import get_text_stderr
+
+import paperspace.cli.jobs
+import paperspace.cli.models
+import paperspace.cli.projects
+
+
+def show(self, file=None):
+    if file is None:
+        file = get_text_stderr()
+    color = None
+    hint = ''
+    if (self.cmd is not None and
+            self.cmd.get_help_option(self.ctx) is not None):
+        hint = ('Try "%s %s" for help.\n'
+                % (self.ctx.command_path, self.ctx.help_option_names[0]))
+    if self.ctx is not None:
+        color = self.ctx.color
+        click.echo(self.ctx.get_usage() + '\n%s' % hint, file=file, color=color)
+    msg = colorama.Fore.RED + 'Error: %s' % self.format_message() + colorama.Style.RESET_ALL
+    click.echo(msg, file=file, color=color)
+
+
+# not-very-elegant way to color click's error messages
+click.exceptions.UsageError.show = show

paperspace/cli/__init__.py

@@ -5,11 +5,8 @@
 
 from paperspace import constants, client, config
 from paperspace.cli import common
-from paperspace.cli.common import api_key_option, del_if_value_is_none
-from paperspace.cli.jobs import jobs_group
-from paperspace.cli.models import models_group
-from paperspace.cli.projects import projects_group
 from paperspace.cli.cli_types import ChoiceType, json_string
+from paperspace.cli.common import api_key_option, del_if_value_is_none
 from paperspace.cli.validators import validate_mutually_exclusive, validate_email
 from paperspace.commands import experiments as experiments_commands, deployments as deployments_commands, \
     machines as machines_commands, login as login_commands
@@ -1064,10 +1061,5 @@ def version():
     command.execute()
 
 
-cli.add_command(jobs_group)
-cli.add_command(projects_group)
-cli.add_command(models_group)
-
-
 if __name__ == '__main__':
     cli()

paperspace/cli/cli.py

@@ -2,10 +2,11 @@
 
 from paperspace import client, config
 from paperspace.cli import common
+from paperspace.cli.cli import cli
 from paperspace.commands import jobs as jobs_commands
 
 
-@click.group("jobs", help="Manage gradient jobs", cls=common.ClickGroup)
+@cli.group("jobs", help="Manage gradient jobs", cls=common.ClickGroup)
 def jobs_group():
     pass
 

paperspace/cli/jobs.py

@@ -2,10 +2,11 @@
 
 from paperspace import client, config
 from paperspace.cli import common
+from paperspace.cli.cli import cli
 from paperspace.commands import models as models_commands
 
 
-@click.group("models", help="Manage models", cls=common.ClickGroup)
+@cli.group("models", help="Manage models", cls=common.ClickGroup)
 def models_group():
     pass
 

paperspace/cli/models.py

@@ -1,11 +1,10 @@
-import click
-
 from paperspace import client, config
+from paperspace.cli.cli import cli
 from paperspace.commands import projects as projects_commands
 from . import common
 
 
-@click.group("projects", help="Manage projects", cls=common.ClickGroup)
+@cli.group("projects", help="Manage projects", cls=common.ClickGroup)
 def projects_group():
     pass
 

paperspace/cli/projects.py

@@ -50,12 +50,8 @@
         'terminaltables',
         'click-didyoumean',
         'click-help-colors',
+        'colorama',
     ],
-    extras_require={
-        ':sys_platform == "win32"': [
-            'colorama',
-        ],
-    },
     entry_points={'console_scripts': [
         'paperspace-python = paperspace.main:main',
     ]},