Use click.UsageError in more places

Author: davegaeddert

plain-code/plain/code/cli.py

@@ -100,8 +100,7 @@ def fix(ctx, path, unsafe_fixes, add_noqa):
         ruff_args.extend(["--exclude", e])
 
     if unsafe_fixes and add_noqa:
-        print("Cannot use both --unsafe-fixes and --add-noqa")
-        sys.exit(1)
+        raise click.UsageError("Cannot use both --unsafe-fixes and --add-noqa")
 
     if unsafe_fixes:
         print_event("Ruff fix (with unsafe fixes)")

plain-dev/plain/dev/cli.py

@@ -261,8 +261,7 @@ def logs(follow, pid, path, services):
 def entrypoint(show_list, entrypoint):
     """Entrypoints registered under plain.dev"""
     if not show_list and not entrypoint:
-        click.secho("Please provide an entrypoint name or use --list", fg="red")
-        sys.exit(1)
+        raise click.UsageError("Please provide an entrypoint name or use --list")
 
     for entry_point in entry_points().select(group=ENTRYPOINT_GROUP):
         if show_list:

plain-dev/plain/dev/contribute/cli.py

@@ -96,8 +96,7 @@ def cli(packages, repo, reset, all_packages):
         elif package.startswith("plainx-"):
             plainx_packages.append(str(repo))
         else:
-            click.secho(f"Unknown package {package}", fg="red")
-            sys.exit(2)
+            raise click.UsageError(f"Unknown package {package}")
 
     if plain_packages:
         result = subprocess.run(["uv", "add", "--editable", "--dev"] + plain_packages)

plain-models/plain/models/backups/cli.py

@@ -66,12 +66,10 @@ def restore_backup(backup_name, latest, pg_restore):
     backups_handler = DatabaseBackups()
 
     if backup_name and latest:
-        click.secho("Only one of --latest or backup_name is allowed", fg="red")
-        exit(1)
+        raise click.UsageError("Only one of --latest or backup_name is allowed")
 
     if not backup_name and not latest:
-        click.secho("Backup name or --latest is required", fg="red")
-        exit(1)
+        raise click.UsageError("Backup name or --latest is required")
 
     if not backup_name and latest:
         backup_name = backups_handler.find_backups()[0].name

plain-vendor/plain/vendor/cli.py

@@ -70,10 +70,9 @@ def update(name):
         deps = [dep for dep in deps if dep.name in name]
         if len(deps) != len(name):
             not_found = set(name) - {dep.name for dep in deps}
-            click.secho(
-                f"Some dependencies not found: {', '.join(not_found)}", fg="red"
+            raise click.UsageError(
+                f"Some dependencies not found: {', '.join(not_found)}"
             )
-            exit(1)
 
     for dep in deps:
         click.secho(f"Updating {dep.name} {dep.installed}...", bold=True, nl=False)

plain/plain/cli/build.py

@@ -37,12 +37,9 @@ def build(keep_original, fingerprint, compress):
     """Pre-deployment build step (compile assets, css, js, etc.)"""
 
     if not keep_original and not fingerprint:
-        click.secho(
-            "You must either keep the original assets or fingerprint them.",
-            fg="red",
-            err=True,
+        raise click.UsageError(
+            "You must either keep the original assets or fingerprint them."
         )
-        sys.exit(1)
 
     # Run user-defined build commands first
     pyproject_path = plain.runtime.APP_PATH.parent / "pyproject.toml"

plain/plain/cli/docs.py

@@ -1,6 +1,5 @@
 import ast
 import importlib.util
-import sys
 from pathlib import Path
 
 import click
@@ -16,8 +15,7 @@
 @click.argument("module", default="")
 def docs(module, llm, open):
     if not module and not llm:
-        click.secho("You must specify a module or use --llm", fg="red")
-        sys.exit(1)
+        raise click.UsageError("You must specify a module or use --llm")
 
     if llm:
         paths = [Path(__file__).parent.parent]
@@ -49,14 +47,12 @@ def docs(module, llm, open):
         # Get the README.md file for the module
         spec = importlib.util.find_spec(module)
         if not spec:
-            click.secho(f"Module {module} not found", fg="red")
-            sys.exit(1)
+            raise click.UsageError(f"Module {module} not found")
 
         module_path = Path(spec.origin).parent
         readme_path = module_path / "README.md"
         if not readme_path.exists():
-            click.secho(f"README.md not found for {module}", fg="red")
-            sys.exit(1)
+            raise click.UsageError(f"README.md not found for {module}")
 
         if open:
             click.launch(str(readme_path))

plain/plain/cli/urls.py

@@ -1,5 +1,3 @@
-import sys
-
 import click
 
 
@@ -17,8 +15,7 @@ def list_urls(flat):
     from plain.urls import URLResolver, get_resolver
 
     if not settings.URLS_ROUTER:
-        click.secho("URLS_ROUTER is not set", fg="red")
-        sys.exit(1)
+        raise click.UsageError("URLS_ROUTER is not set")
 
     resolver = get_resolver(settings.URLS_ROUTER)
     if flat: