Rewrite internal watermark pipeline and preserve behavior

scripts/metadata_removal_audit.py

@@ -32,7 +32,7 @@ from pathlib import Path
 import click
 import numpy as np
 
-from remove_ai_watermarks.noai.constants import SUPPORTED_FORMATS
+from remove_ai_watermarks._internal.constants import SUPPORTED_FORMATS
 
 log = logging.getLogger(__name__)
 

scripts/smoke_matrix.py

@@ -590,8 +590,8 @@ def _diffusion_rows(r: Runner, tmp: Path, doubao: Path) -> None:
     try:
         import numpy as np
 
+        from remove_ai_watermarks._internal.watermark_remover import WatermarkRemover
         from remove_ai_watermarks.image_io import imread
-        from remove_ai_watermarks.noai.watermark_remover import WatermarkRemover
 
         src = imread(str(mj))
         h, w = src.shape[:2]

scripts/synthid_corpus.py

@@ -29,7 +29,7 @@ import click
 from _plain_console import Console, Table
 from PIL import Image
 
-from remove_ai_watermarks.noai.c2pa import extract_c2pa_info
+from remove_ai_watermarks._internal.c2pa import extract_c2pa_info
 
 log = logging.getLogger(__name__)
 console = Console()

scripts/visible_positives.py

@@ -38,7 +38,7 @@ sys.path.insert(0, str(Path(__file__).parent.parent))
 
 # The package's own format set. An inlined copy here silently skipped .heif, which
 # CLAUDE.md documents as supported.
-from remove_ai_watermarks.noai.constants import SUPPORTED_FORMATS as _EXTS
+from remove_ai_watermarks._internal.constants import SUPPORTED_FORMATS as _EXTS
 
 REPO = Path(__file__).resolve().parents[1]
 CORPUS = REPO / ".local-eval" / "originals"