polytool 0.2.0__tar.gz → 0.2.1__tar.gz

{polytool-0.2.0 → polytool-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: polytool
-Version: 0.2.0
+Version: 0.2.1
 Summary: One-binary CLI bundling 26 everyday utilities — image/video/PDF conversion, background removal, OCR, QR codes, hashing, downloads, and more
 Project-URL: Homepage, https://github.com/k6w/polytool
 Project-URL: Repository, https://github.com/k6w/polytool

{polytool-0.2.0 → polytool-0.2.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "polytool"
-version = "0.2.0"
+version = "0.2.1"
 description = "One-binary CLI bundling 26 everyday utilities — image/video/PDF conversion, background removal, OCR, QR codes, hashing, downloads, and more"
 readme = "README.md"
 requires-python = ">=3.13"
@@ -76,8 +76,8 @@ dev = [
 ]
 
 [project.scripts]
-polytool = "polytool.cli:app"
-pt = "polytool.cli:app"
+polytool = "polytool.cli:run"
+pt = "polytool.cli:run"
 
 [project.urls]
 Homepage = "https://github.com/k6w/polytool"

{polytool-0.2.0 → polytool-0.2.1}/src/polytool/__init__.py

@@ -1,4 +1,4 @@
 """polytool — one-binary CLI bundling 26 everyday utilities."""
 
-__version__ = "0.2.0"
+__version__ = "0.2.1"
 __all__ = ["__version__"]

{polytool-0.2.0 → polytool-0.2.1}/src/polytool/__main__.py

@@ -1,6 +1,6 @@
 """Allow `python -m polytool` invocation."""
 
-from polytool.cli import app
+from polytool.cli import run
 
 if __name__ == "__main__":
-    app()
+    run()

{polytool-0.2.0 → polytool-0.2.1}/src/polytool/cli/__init__.py

@@ -7,6 +7,8 @@ Heavy imports (Pillow, ffmpeg, rembg) happen inside command bodies via
 
 from __future__ import annotations
 
+import sys
+
 import typer
 
 from polytool import __version__
@@ -28,9 +30,7 @@ from polytool.cli import (
     text,
     vid,
 )
-from polytool.core.errors import install_excepthook
-
-install_excepthook()
+from polytool.core.errors import PolytoolError, render_panel
 
 app = typer.Typer(
     name="polytool",
@@ -38,9 +38,25 @@ app = typer.Typer(
     no_args_is_help=True,
     add_completion=False,
     rich_markup_mode="rich",
+    # We handle PolytoolError ourselves via the `main()` wrapper below; disable
+    # Typer's pretty-traceback so it doesn't squash our hints.
+    pretty_exceptions_enable=False,
 )
 
 
+def run() -> None:
+    """Console-script entry point — runs the Typer app and renders PolytoolError nicely.
+
+    (Defined with a unique name to avoid clashing with the ``@app.callback()``
+    function below — both would otherwise be named ``main`` in this module.)
+    """
+    try:
+        app()
+    except PolytoolError as exc:
+        render_panel(exc.message, exc.hint)
+        sys.exit(1)
+
+
 def _version_callback(value: bool) -> None:
     if value:
         typer.echo(f"polytool {__version__}")

{polytool-0.2.0 → polytool-0.2.1}/src/polytool/cli/img.py

@@ -41,7 +41,7 @@ def _open_image(source: Path):
         except ImportError as exc:
             raise PolytoolError(
                 "HEIC support missing.",
-                hint="Install: [cyan]uv tool install 'polytool[img]'[/cyan]",
+                hint="Install: [cyan]uv tool install 'polytool\\[img]'[/cyan]",
             ) from exc
     if suffix == ".avif":
         try:
@@ -49,7 +49,7 @@ def _open_image(source: Path):
         except ImportError as exc:
             raise PolytoolError(
                 "AVIF support missing.",
-                hint="Install: [cyan]uv tool install 'polytool[img]'[/cyan]",
+                hint="Install: [cyan]uv tool install 'polytool\\[img]'[/cyan]",
             ) from exc
 
     try:

{polytool-0.2.0 → polytool-0.2.1}/src/polytool/cli/shot.py

@@ -121,7 +121,7 @@ def cmd_install() -> None:
     except FileNotFoundError as exc:
         raise PolytoolError(
             "Playwright not found.",
-            hint="Install: [cyan]uv tool install 'polytool[shot]'[/cyan]",
+            hint="Install: [cyan]uv tool install 'polytool\\[shot]'[/cyan]",
         ) from exc
     except subprocess.CalledProcessError as exc:
         raise PolytoolError(f"playwright install failed (exit {exc.returncode})") from exc

{polytool-0.2.0 → polytool-0.2.1}/src/polytool/core/errors.py

@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-import sys
 from typing import NoReturn
 
 import typer
@@ -11,8 +10,20 @@ from rich.panel import Panel
 from polytool.core.console import err_console
 
 
+def render_panel(message: str, hint: str | None) -> None:
+    """Render the standard red error panel to stderr."""
+    body = f"[red bold]{message}[/red bold]"
+    if hint:
+        body += f"\n\n[dim]Hint:[/dim] {hint}"
+    err_console.print(Panel(body, border_style="red", title="Error"))
+
+
 class PolytoolError(Exception):
-    """A user-facing error with an optional fix hint."""
+    """A user-facing error with an optional fix hint.
+
+    The CLI entry point (``polytool.cli.main``) catches this and renders
+    ``render_panel`` instead of letting Python or Typer print a stack trace.
+    """
 
     def __init__(self, message: str, hint: str | None = None) -> None:
         super().__init__(message)
@@ -24,10 +35,16 @@ class MissingExtraError(PolytoolError):
     """Raised when an optional dependency group isn't installed."""
 
     def __init__(self, module: str, extra: str) -> None:
+        from rich.markup import escape
+
         message = f"Missing optional dependency: '{module}' (from the '{extra}' extra)."
+        # rich.markup.escape only escapes `[` — `]` is left literal because
+        # Rich only treats `[` as the markup-tag opener.
+        spec = escape(f"polytool[{extra}]")
+        full = escape("polytool[full]")
         hint = (
-            f"Install with: [cyan]uv tool install 'polytool[{extra}]'[/cyan]\n"
-            f"Or for everything: [cyan]uv tool install 'polytool[full]'[/cyan]"
+            f"Install with: [cyan]uv tool install '{spec}'[/cyan]\n"
+            f"Or for everything: [cyan]uv tool install '{full}'[/cyan]"
         )
         super().__init__(message, hint)
         self.module = module
@@ -36,21 +53,14 @@ class MissingExtraError(PolytoolError):
 
 def fail(message: str, hint: str | None = None) -> NoReturn:
     """Print a red error panel and exit with code 1."""
-    body = f"[red bold]{message}[/red bold]"
-    if hint:
-        body += f"\n\n[dim]Hint:[/dim] {hint}"
-    err_console.print(Panel(body, border_style="red", title="Error"))
+    render_panel(message, hint)
     raise typer.Exit(code=1)
 
 
 def install_excepthook() -> None:
-    """Install a sys.excepthook that renders PolytoolError nicely."""
-    original = sys.excepthook
-
-    def hook(exc_type, exc_value, tb):
-        if isinstance(exc_value, PolytoolError):
-            fail(exc_value.message, exc_value.hint)
-            return
-        original(exc_type, exc_value, tb)
+    """No-op kept for backwards compatibility.
 
-    sys.excepthook = hook
+    Earlier versions installed a ``sys.excepthook``. The CLI entry-point now
+    handles ``PolytoolError`` directly via a try/except wrapper.
+    """
+    return

{polytool-0.2.0 → polytool-0.2.1}/src/polytool/core/ffmpeg.py

@@ -28,8 +28,10 @@ def ffmpeg_path() -> str:
 
     from polytool.core.errors import PolytoolError
 
+    from rich.markup import escape
+
     raise PolytoolError(
         "ffmpeg not found.",
         hint="Install ffmpeg system-wide, or install the 'vid' extra: "
-        "[cyan]uv tool install 'polytool[vid]'[/cyan]",
+        f"[cyan]uv tool install '{escape('polytool[vid]')}'[/cyan]",
     )