Configuration de l'output final

copienator/commands/reading_grouped_annotations.py

@@ -20,6 +20,7 @@ from copienator import (
     workspace_from_args,
 )
 from copienator.annotation_actions import apply_checkbox_actions, apply_score_overrides
+from copienator.answer_info import build_answer_info
 from copienator.annotation_data import AnnotationData, RefaireList, load_annotation_data
 from copienator.commands import annotating
 from copienator.commands.reading_annotations import (
@@ -189,14 +190,13 @@ def apply_actions_and_regenerate_grouped(
     logs = [f"\nProcessing compilation for: Copie{student_id}"]
     output_dir = workspace.root / annotation_dir / f"Copie{student_id}"
     labels_data = data.get(student_id, {})
-    dirty_labels = apply_checkbox_actions(labels_data, actions, logs.append)
+    apply_checkbox_actions(labels_data, actions, logs.append)
     if update_score:
-        dirty_labels |= apply_score_overrides(
+        apply_score_overrides(
             labels_data, output_dir / "score.json", logs.append
         )
 
     selected_labels = selected_labels if selected_labels is not None else set()
-    dirty_labels |= selected_labels
     simple_layout = None
     simple_annotated = None
     if selected_labels and annotation_dir == "Anot":
@@ -239,6 +239,8 @@ def apply_actions_and_regenerate_grouped(
         else {}
     )
     scores = dict.fromkeys(all_labels, "")
+    touched = dict.fromkeys(all_labels, False)
+    answer_labels: list[str] = []
     dirty_images: dict[str, Image.Image] = {}
     concat_images: list[Image.Image] = []
     filtered_groups: list[list[Image.Image]] = []
@@ -255,6 +257,9 @@ def apply_actions_and_regenerate_grouped(
         ):
             result["score"] = old_scores[label]
         scores[label] = str(result.get("score", 0))
+        touched[label] = False
+        if result.get("error") == "empty-answer":
+            continue
         saved_image = output_dir / f"{label}.jpg"
         if selected_labels and label not in selected_labels and saved_image.is_file():
             with Image.open(saved_image) as saved:
@@ -271,12 +276,14 @@ def apply_actions_and_regenerate_grouped(
                 dirty_images[label] = final_image
             scores[label] = str(old_scores.get(label, scores[label]))
             concat_images.append(final_image)
+            answer_labels.append(label)
             # Keep previously reviewed content, including handwriting.
             if annotation_dir == "BGnot":
                 extras = get_extra_pdfs_as_images(
                     workspace.root, label, annotating, all_labels
                 )
                 filtered_groups.append([*extras, final_image])
+                touched[label] = True
             else:
                 filtered_groups.append([final_image])
             continue
@@ -313,9 +320,9 @@ def apply_actions_and_regenerate_grouped(
                     body = sub_note.crop((0, old_header_height, width, height))
                     final_image.paste(body, (0, new_header_height), mask=body)
 
-        if label in dirty_labels or has_notes or selected_labels:
-            dirty_images[label] = final_image
-            logs.append(f"  Saved dirty image: {label}.jpg")
+        # Persist every final block, including unchanged answers, for returns.
+        dirty_images[label] = final_image
+        answer_labels.append(label)
         concat_images.append(final_image)
 
         feedbacks = result.get("feedback", [])
@@ -329,11 +336,13 @@ def apply_actions_and_regenerate_grouped(
                 else []
             )
             filtered_groups.append([*extras, final_image])
+            touched[label] = annotation_dir == "BGnot"
 
     concat_image = concatenate(concat_images)
     if incomplete:
         return ExitCode.PARTIAL, "\n".join(logs)
-    with staged_files(output_dir, remove=("Concat_F.pdf", "Concat_F.jpg")) as staging:
+    with staged_files(output_dir, remove=("Concat.jpg", "Concat_F.pdf", "Concat_F.jpg",
+                                         "touched.json", "answer_labels.json")) as staging:
         if simple_layout is not None:
             simple_layout["replaced"] = sorted(
                 set(simple_layout["replaced"]) | selected_labels
@@ -342,6 +351,9 @@ def apply_actions_and_regenerate_grouped(
         for label, image in dirty_images.items():
             image.save(staging / f"{label}.jpg")
         atomic_write_json(staging / "score.json", scores)
+        atomic_write_json(staging / "info.json", build_answer_info(
+            scores, labels_data, answer_labels, touched
+        ))
         if concat_image is not None:
             concat_image.save(staging / "Concat.jpg")
         if filtered_groups: