Refaire fixes and GUI support

copienator/commands/annotating_by_label.py

@@ -10,9 +10,6 @@ from typing import Any
 from PIL import Image, ImageDraw
 from reportlab.pdfgen import canvas
 
-from copienator.commands import annotating
-from copienator.commands import annotating_with_checks
-from copienator import utils
 from copienator import (
     CliError,
     EvaluationWorkspace,
@@ -22,9 +19,11 @@ from copienator import (
     evaluation_parser,
     execute,
     read_json,
+    utils,
     workspace_from_args,
 )
 from copienator.annotation_data import load_annotation_data
+from copienator.commands import annotating, annotating_with_checks
 from copienator.filesystem import staged_directory
 from copienator.utils import natural_key
 
@@ -184,7 +183,9 @@ def _serialize_label_groups(groups: list[list[str]]) -> str:
     return "".join(",".join(group) + "\n" for group in groups)
 
 
-def _load_label_groups(workspace: EvaluationWorkspace, labels: list[str]) -> list[list[str]]:
+def _load_label_groups(
+    workspace: EvaluationWorkspace, labels: list[str]
+) -> list[list[str]]:
     label_groups = workspace.label_groups_file
     if not label_groups.exists():
         gemini_groups = _gemini_label_groups(workspace, labels)
@@ -328,20 +329,38 @@ def _generate_groups(
     return generated, problems
 
 
-def run(workspace: EvaluationWorkspace, *, overwrite: bool = False) -> ExitCode:
+def run(
+    workspace: EvaluationWorkspace, *, overwrite: bool = False, refaire: bool = False
+) -> ExitCode:
     workspace.require_files("labels", "correction.json")
     workspace.require_directories("Copies", "Par label")
     labels = utils.read_all_labels(workspace.root)
-    groups = _load_label_groups(workspace, labels)
-    loaded = load_annotation_data(workspace)
+    refaire_list = annotating_with_checks._load_refaire(workspace) if refaire else None
+    loaded = load_annotation_data(workspace, refaire_list=refaire_list)
+    groups = (
+        [
+            [label]
+            for label in sorted(
+                {label for answers in loaded.data.values() for label in answers},
+                key=natural_key,
+            )
+        ]
+        if refaire
+        else _load_label_groups(workspace, labels)
+    )
     for warning in loaded.warnings:
         print(f"Warning: {warning}")
     if not loaded.data:
         print("Warning: no annotation data was found.")
         return ExitCode.PARTIAL
 
-    output_root = workspace.annotation_dir("grouped")
-    if overwrite:
+    output_root = workspace.annotation_dir("refaire" if refaire else "grouped")
+    if refaire and output_root.exists() and not overwrite:
+        raise CliError(
+            "BRnot already exists; use --overwrite to replace the previous redo."
+        )
+    if overwrite or refaire:
+
         class IncompleteGroupedOutput(Exception):
             pass
 
@@ -356,7 +375,9 @@ def run(workspace: EvaluationWorkspace, *, overwrite: bool = False) -> ExitCode:
                 if generated == 0 or problems or loaded.warnings:
                     raise IncompleteGroupedOutput
         except IncompleteGroupedOutput:
-            print("Warning: grouped overwrite was incomplete; previous BGnot was preserved.")
+            print(
+                f"Warning: grouped overwrite was incomplete; previous {output_root.name} was preserved."
+            )
             return ExitCode.PARTIAL
     else:
         output_root.mkdir(parents=True, exist_ok=True)
@@ -375,7 +396,14 @@ def run(workspace: EvaluationWorkspace, *, overwrite: bool = False) -> ExitCode:
 
 def build_parser() -> argparse.ArgumentParser:
     parser = evaluation_parser("Generate annotated PDFs grouped by labels.")
-    parser.add_argument("--overwrite", action="store_true", help="Replace BGnot safely")
+    parser.add_argument(
+        "--overwrite", action="store_true", help="Replace annotation outputs safely"
+    )
+    parser.add_argument(
+        "--refaire",
+        action="store_true",
+        help="Group only the answers in refaire.json, writing to BRnot",
+    )
     return parser
 
 
@@ -384,7 +412,9 @@ def main(argv: Sequence[str] | None = None) -> int:
     return execute(
         parser,
         argv,
-        lambda args: run(workspace_from_args(args), overwrite=args.overwrite),
+        lambda args: run(
+            workspace_from_args(args), overwrite=args.overwrite, refaire=args.refaire
+        ),
     )