fix(scripts): drop rich import from analysis scripts (red CI after rich removal)

The cli refactor dropped rich from dependencies, but four scripts still did
`from rich.console import Console` / `rich.table import Table`. Their test
modules import the scripts, so a clean `uv sync --frozen` (CI: core+dev, no
rich) failed at collection with ModuleNotFoundError on macOS/Windows/Linux.

Add a shared plain-text shim `scripts/_plain_console.py` (Console/Table via
click.echo, markup stripped) and switch all four scripts to it. Verified: all
four import with rich blocked, and tests/test_synthid_corpus.py +
tests/test_synthid_pixel_probe.py pass.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Victor Kuznetsov
2026-05-31 15:41:50 -07:00
parent f16216cabc
commit b0aad476fb
6 changed files with 66 additions and 7 deletions
+1 -1
View File
File diff suppressed because one or more lines are too long
+61
View File
@@ -0,0 +1,61 @@
"""Minimal plain-text stand-ins for the rich Console/Table API.
rich was dropped as a project dependency (see the CLI plain-text refactor), but
the analysis scripts still printed through it. These shims keep the scripts
runnable without rich: ``[bold]``/``[/]``-style markup is stripped and tables
render as aligned plain text. Output goes through ``click.echo`` to match the
package CLI (no bare ``print`` in tooling).
"""
from __future__ import annotations
import re
from typing import Any
import click
# Matches rich style tags: the bare close ``[/]`` and named open/close tags such
# as ``[yellow]``, ``[bold yellow]``, ``[/green]``. Anchored to lowercase-letter
# starts so numeric/data brackets (``[1024]``, ``[file.png]``) are left intact.
_MARKUP = re.compile(r"\[(?:/|/?[a-z][a-z ]*)\]")
def _strip(obj: Any) -> str:
return _MARKUP.sub("", str(obj))
class Table:
"""Drop-in for ``rich.table.Table`` covering add_column/add_row + render."""
def __init__(self, *args: Any, title: str | None = None, **kwargs: Any) -> None:
self.title = title
self._headers: list[str] = []
self._rows: list[list[str]] = []
def add_column(self, header: str = "", *args: Any, **kwargs: Any) -> None:
self._headers.append(_strip(header))
def add_row(self, *cells: Any) -> None:
self._rows.append([_strip(c) for c in cells])
def render(self) -> str:
all_rows = ([self._headers] if self._headers else []) + self._rows
cols = max((len(r) for r in all_rows), default=0)
widths = [0] * cols
for row in all_rows:
for i, cell in enumerate(row):
widths[i] = max(widths[i], len(cell))
lines: list[str] = []
if self.title:
lines.append(_strip(self.title))
if self._headers:
lines.append(" ".join(h.ljust(widths[i]) for i, h in enumerate(self._headers)))
lines.extend(" ".join(c.ljust(widths[i]) for i, c in enumerate(row)) for row in self._rows)
return "\n".join(lines)
class Console:
"""Drop-in for ``rich.console.Console`` covering ``print`` (with Table)."""
def print(self, *objects: Any, **kwargs: Any) -> None:
click.echo(" ".join(o.render() if isinstance(o, Table) else _strip(o) for o in objects))
+1 -2
View File
@@ -30,8 +30,7 @@ from collections import Counter
from pathlib import Path
import click
from rich.console import Console
from rich.table import Table
from _plain_console import Console, Table
from remove_ai_watermarks.identify import identify
from remove_ai_watermarks.metadata import _png_late_metadata
+1 -2
View File
@@ -26,9 +26,8 @@ from datetime import datetime, timezone
from pathlib import Path
import click
from _plain_console import Console, Table
from PIL import Image
from rich.console import Console
from rich.table import Table
from remove_ai_watermarks.noai.c2pa import extract_c2pa_info
+1 -1
View File
@@ -30,8 +30,8 @@ from typing import TYPE_CHECKING
import click
import numpy as np
from _plain_console import Console
from PIL import Image
from rich.console import Console
if TYPE_CHECKING:
from numpy.typing import NDArray
+1 -1
View File
@@ -33,8 +33,8 @@ from typing import Any
import cv2
import numpy as np
from _plain_console import Console
from PIL import Image, ImageDraw, ImageFont
from rich.console import Console
from remove_ai_watermarks import text_protector as tp