Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1671518ca8 | ||
|
|
6c73174829 | ||
|
|
5434a5bf21 | ||
|
|
44ccba2151 | ||
|
|
e83873e822 |
+72
-12
@@ -13,6 +13,7 @@ join keys (spec §2).
|
|||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
import json
|
import json
|
||||||
|
import math
|
||||||
import os
|
import os
|
||||||
import tempfile
|
import tempfile
|
||||||
import time
|
import time
|
||||||
@@ -342,6 +343,13 @@ def _pdf_has_text_layer(pdf_bytes: bytes) -> bool:
|
|||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
# Canvas page width the frontend renders each PDF page at (app src/utils/exam-canvas/model.ts
|
||||||
|
# PAGE_WIDTH). All auto-map canvas coords are emitted in this 780-wide, proportional-height space.
|
||||||
|
CANVAS_PAGE_WIDTH = 780.0
|
||||||
|
# Response/answer-region detector (api/services/docling/regions.py) renders at 144 DPI = 2 px / PDF point.
|
||||||
|
REGIONS_PX_PER_PT = 2.0
|
||||||
|
|
||||||
|
|
||||||
def _pdf_page_geometry(pdf_bytes: bytes) -> List[Dict[str, float]]:
|
def _pdf_page_geometry(pdf_bytes: bytes) -> List[Dict[str, float]]:
|
||||||
with tempfile.NamedTemporaryFile(prefix="cc-auto-map-geom-", suffix=".pdf", delete=False) as fh:
|
with tempfile.NamedTemporaryFile(prefix="cc-auto-map-geom-", suffix=".pdf", delete=False) as fh:
|
||||||
fh.write(pdf_bytes)
|
fh.write(pdf_bytes)
|
||||||
@@ -355,14 +363,23 @@ def _pdf_page_geometry(pdf_bytes: bytes) -> List[Dict[str, float]]:
|
|||||||
for page in doc:
|
for page in doc:
|
||||||
media = page.mediabox
|
media = page.mediabox
|
||||||
crop = page.cropbox
|
crop = page.cropbox
|
||||||
rendered_w = float(crop.width or page.rect.width or 595.0)
|
page_pt_w = float(crop.width or page.rect.width or 1.0)
|
||||||
rendered_h = float(crop.height or page.rect.height or 842.0)
|
page_pt_h = float(crop.height or page.rect.height or 1.0)
|
||||||
|
# Emit canvas coords in the FRONTEND render space: the app draws each page at
|
||||||
|
# CANVAS_PAGE_WIDTH (app model.ts PAGE_WIDTH=780) with proportional height and stacks
|
||||||
|
# pages by those heights. Previously rendered_w/h were left in PDF points (~595x842),
|
||||||
|
# so every shape landed shrunk (~0.76x) and shifted up-left on the 780-wide canvas.
|
||||||
|
rendered_w = CANVAS_PAGE_WIDTH
|
||||||
|
# Mirror the app's canvas.height = Math.ceil(viewport.height) EXACTLY (pdfLoader.ts),
|
||||||
|
# so page_top accumulates identically. Using the raw float drifts ~1px/page, compounding
|
||||||
|
# to a visible upward shift on later pages of long papers (~36px over 40 pages).
|
||||||
|
rendered_h = float(math.ceil(CANVAS_PAGE_WIDTH * page_pt_h / page_pt_w))
|
||||||
pages.append({
|
pages.append({
|
||||||
"media_x0": float(media.x0),
|
"media_x0": float(media.x0),
|
||||||
"crop_x0": float(crop.x0),
|
"crop_x0": float(crop.x0),
|
||||||
"crop_y0": float(crop.y0),
|
"crop_y0": float(crop.y0),
|
||||||
"page_pt_w": float(crop.width or page.rect.width or 1),
|
"page_pt_w": page_pt_w,
|
||||||
"page_pt_h": float(crop.height or page.rect.height or 1),
|
"page_pt_h": page_pt_h,
|
||||||
"rendered_w": rendered_w,
|
"rendered_w": rendered_w,
|
||||||
"rendered_h": rendered_h,
|
"rendered_h": rendered_h,
|
||||||
"page_top": page_top,
|
"page_top": page_top,
|
||||||
@@ -384,11 +401,12 @@ def _pdf_page_geometry(pdf_bytes: bytes) -> List[Dict[str, float]]:
|
|||||||
def _page_geom(pages: List[Dict[str, float]], page_number: int) -> Dict[str, float]:
|
def _page_geom(pages: List[Dict[str, float]], page_number: int) -> Dict[str, float]:
|
||||||
if 1 <= page_number <= len(pages):
|
if 1 <= page_number <= len(pages):
|
||||||
return pages[page_number - 1]
|
return pages[page_number - 1]
|
||||||
|
_fallback_h = float(math.ceil(CANVAS_PAGE_WIDTH * 842.0 / 595.0))
|
||||||
return {
|
return {
|
||||||
"media_x0": 0.0, "crop_x0": 0.0, "crop_y0": 0.0,
|
"media_x0": 0.0, "crop_x0": 0.0, "crop_y0": 0.0,
|
||||||
"page_pt_w": 595.0, "page_pt_h": 842.0,
|
"page_pt_w": 595.0, "page_pt_h": 842.0,
|
||||||
"rendered_w": 595.0, "rendered_h": 842.0,
|
"rendered_w": CANVAS_PAGE_WIDTH, "rendered_h": _fallback_h,
|
||||||
"page_top": (page_number - 1) * 842.0,
|
"page_top": (page_number - 1) * _fallback_h,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -397,12 +415,16 @@ def _box_to_canvas(box: Optional[Dict[str, Any]], page_number: int, pages: List[
|
|||||||
return None
|
return None
|
||||||
g = _page_geom(pages, page_number)
|
g = _page_geom(pages, page_number)
|
||||||
if box.get("coord_origin") == "TOPLEFT" and {"x", "y", "w", "h"}.issubset(box):
|
if box.get("coord_origin") == "TOPLEFT" and {"x", "y", "w", "h"}.issubset(box):
|
||||||
scale = 0.5 if box.get("unit") == "px" else 1.0
|
# Scale the box into the 780-wide canvas space. px boxes (opencv/gemma regions) are in
|
||||||
|
# rendered-image px at REGIONS_PX_PER_PT px/point; TOPLEFT point boxes are 1 px/point.
|
||||||
|
px_per_pt = REGIONS_PX_PER_PT if box.get("unit") == "px" else 1.0
|
||||||
|
sx = g["rendered_w"] / (g["page_pt_w"] * px_per_pt)
|
||||||
|
sy = g["rendered_h"] / (g["page_pt_h"] * px_per_pt)
|
||||||
return {
|
return {
|
||||||
"x": round(float(box["x"]) * scale, 2),
|
"x": round(float(box["x"]) * sx, 2),
|
||||||
"y": round(g["page_top"] + float(box["y"]) * scale, 2),
|
"y": round(g["page_top"] + float(box["y"]) * sy, 2),
|
||||||
"w": round(float(box["w"]) * scale, 2),
|
"w": round(float(box["w"]) * sx, 2),
|
||||||
"h": round(float(box["h"]) * scale, 2),
|
"h": round(float(box["h"]) * sy, 2),
|
||||||
}
|
}
|
||||||
if not {"l", "t", "r", "b"}.issubset(box):
|
if not {"l", "t", "r", "b"}.issubset(box):
|
||||||
return None
|
return None
|
||||||
@@ -540,15 +562,53 @@ def _map_first_pass_to_rows(template_id: str, first_pass: Dict[str, Any], pdf_by
|
|||||||
response_form = _response_form_from_region_type(region.get("region_type"))
|
response_form = _response_form_from_region_type(region.get("region_type"))
|
||||||
if response_form:
|
if response_form:
|
||||||
response_areas.append({"id": _ai_id(template_id, "region", page_index, idx), "template_id": template_id, "question_id": first_part_by_page.get(page_index, default_qid), "page": page_index + 1, "bounds": bounds, "kind": "response", "response_form": response_form, "source": "ai", "confirmed": False, "confidence": _safe_confidence(region.get("confidence")), "derivation": region.get("detection_method") or "opencv-response-region"})
|
response_areas.append({"id": _ai_id(template_id, "region", page_index, idx), "template_id": template_id, "question_id": first_part_by_page.get(page_index, default_qid), "page": page_index + 1, "bounds": bounds, "kind": "response", "response_form": response_form, "source": "ai", "confirmed": False, "confidence": _safe_confidence(region.get("confidence")), "derivation": region.get("detection_method") or "opencv-response-region"})
|
||||||
|
# Integrity guard: every response_area/boundary question_id must reference an inserted question
|
||||||
|
# (FK exam_response_areas/exam_boundaries -> exam_questions). On papers where band detection yields
|
||||||
|
# few/no questions but opencv/gemma still emit regions, those regions point at the synthetic
|
||||||
|
# default_qid which was never inserted. Ensure that fallback container question exists and reattach
|
||||||
|
# any orphan child rows to it, so persistence can't violate the FK.
|
||||||
|
qid_set = {q["id"] for q in questions}
|
||||||
|
orphans = [r for r in (response_areas + boundaries) if r.get("question_id") not in qid_set]
|
||||||
|
if orphans:
|
||||||
|
if default_qid not in qid_set:
|
||||||
|
questions.insert(0, {"id": default_qid, "template_id": template_id, "label": "Unassigned",
|
||||||
|
"order": 0, "max_marks": 0, "is_container": True, "source": "ai",
|
||||||
|
"confirmed": False, "confidence": 0.5,
|
||||||
|
"derivation": "auto-map-fallback-container"})
|
||||||
|
qid_set.add(default_qid)
|
||||||
|
for r in orphans:
|
||||||
|
r["question_id"] = default_qid
|
||||||
|
|
||||||
return {"questions": questions, "response_areas": response_areas, "boundaries": boundaries, "layout": layout}
|
return {"questions": questions, "response_areas": response_areas, "boundaries": boundaries, "layout": layout}
|
||||||
|
|
||||||
|
|
||||||
|
def _dedupe_rows_by_id(rows: List[Dict[str, Any]]) -> List[Dict[str, Any]]:
|
||||||
|
"""Preserve first occurrence of stable AI row ids emitted by noisy OCR detectors."""
|
||||||
|
out: List[Dict[str, Any]] = []
|
||||||
|
seen: set[str] = set()
|
||||||
|
for row in rows:
|
||||||
|
row_id = row.get("id")
|
||||||
|
if row_id:
|
||||||
|
key = str(row_id)
|
||||||
|
if key in seen:
|
||||||
|
continue
|
||||||
|
seen.add(key)
|
||||||
|
out.append(row)
|
||||||
|
return out
|
||||||
|
|
||||||
|
|
||||||
def _refresh_ai_rows(ctx: ExamContext, template_id: str, rows: Dict[str, List[Dict[str, Any]]]) -> None:
|
def _refresh_ai_rows(ctx: ExamContext, template_id: str, rows: Dict[str, List[Dict[str, Any]]]) -> None:
|
||||||
sb = ctx.supabase
|
sb = ctx.supabase
|
||||||
for table in ("exam_response_areas", "exam_boundaries", "exam_template_layout", "exam_questions"):
|
for table in ("exam_response_areas", "exam_boundaries", "exam_template_layout", "exam_questions"):
|
||||||
sb.table(table).delete().eq("template_id", template_id).eq("source", "ai").eq("confirmed", False).execute()
|
sb.table(table).delete().eq("template_id", template_id).eq("source", "ai").eq("confirmed", False).execute()
|
||||||
for table, key in (("exam_questions", "questions"), ("exam_response_areas", "response_areas"), ("exam_boundaries", "boundaries"), ("exam_template_layout", "layout")):
|
for table, key in (("exam_questions", "questions"), ("exam_response_areas", "response_areas"), ("exam_boundaries", "boundaries"), ("exam_template_layout", "layout")):
|
||||||
payload = rows.get(key) or []
|
# A row that survived the delete above is confirmed-AI or manual — the teacher's curated version.
|
||||||
|
# AI ids are a deterministic uuid5 of (template_id, semantic key), so a re-run re-emits the SAME id
|
||||||
|
# for a confirmed ghost; re-inserting it would PK-collide and fail the whole batch. Skip those ids so
|
||||||
|
# confirmed work is preserved and the insert is safe (fixes the re-map-after-confirm collision).
|
||||||
|
kept = sb.table(table).select("id").eq("template_id", template_id).execute()
|
||||||
|
kept_ids = {str(r["id"]) for r in (getattr(kept, "data", None) or []) if isinstance(r, dict) and r.get("id")}
|
||||||
|
payload = [r for r in _dedupe_rows_by_id(rows.get(key) or []) if str(r.get("id")) not in kept_ids]
|
||||||
if payload:
|
if payload:
|
||||||
sb.table(table).insert(payload).execute()
|
sb.table(table).insert(payload).execute()
|
||||||
|
|
||||||
|
|||||||
@@ -642,6 +642,20 @@ def test_auto_map_fast_path_merges_ai_rows_and_returns_detail(monkeypatch):
|
|||||||
assert store["exam_boundaries"] and store["exam_boundaries"][0]["derivation"] == "docling-main-band"
|
assert store["exam_boundaries"] and store["exam_boundaries"][0]["derivation"] == "docling-main-band"
|
||||||
|
|
||||||
|
|
||||||
|
def test_auto_map_deduplicates_repeated_response_area_ids(monkeypatch):
|
||||||
|
store = _template_with_source()
|
||||||
|
client, store = make_client(store=store)
|
||||||
|
_patch_auto_map(monkeypatch, store, fast=True)
|
||||||
|
dup = {"page_index": 0, "bbox": {"l": 50, "t": 700, "r": 100, "b": 680, "coord_origin": "BOTTOMLEFT"}, "region_type": "answer_lines", "confidence": 0.9}
|
||||||
|
monkeypatch.setattr(templates_mod, "detect_response_regions_from_pdf", lambda *_a, **_k: [dup, dict(dup)])
|
||||||
|
|
||||||
|
resp = client.post("/api/exam/templates/t1/auto-map")
|
||||||
|
|
||||||
|
assert resp.status_code == 200
|
||||||
|
response_area_ids = [r["id"] for r in store["exam_response_areas"]]
|
||||||
|
assert len(response_area_ids) == len(set(response_area_ids))
|
||||||
|
|
||||||
|
|
||||||
def test_auto_map_preserves_manual_and_confirmed_rows_on_rerun(monkeypatch):
|
def test_auto_map_preserves_manual_and_confirmed_rows_on_rerun(monkeypatch):
|
||||||
store = _template_with_source()
|
store = _template_with_source()
|
||||||
store.update({
|
store.update({
|
||||||
@@ -660,6 +674,27 @@ def test_auto_map_preserves_manual_and_confirmed_rows_on_rerun(monkeypatch):
|
|||||||
assert "old-ai" not in ids
|
assert "old-ai" not in ids
|
||||||
|
|
||||||
|
|
||||||
|
def test_auto_map_rerun_after_confirm_does_not_pk_collide(monkeypatch):
|
||||||
|
# Regression: a confirmed ghost keeps its DETERMINISTIC uuid5 id, which auto-map re-emits on a
|
||||||
|
# re-run — the old code re-inserted that id and PK-collided. Use the real generated id (not an
|
||||||
|
# arbitrary one, unlike the test above) so the collision path is actually exercised.
|
||||||
|
store = _template_with_source()
|
||||||
|
store.update({"exam_questions": [], "exam_response_areas": [], "exam_boundaries": [], "exam_template_layout": []})
|
||||||
|
client, store = make_client(store=store)
|
||||||
|
_patch_auto_map(monkeypatch, store, fast=True)
|
||||||
|
assert client.post("/api/exam/templates/t1/auto-map").status_code == 200
|
||||||
|
ghost_id = next(q["id"] for q in store["exam_questions"] if q["source"] == "ai")
|
||||||
|
# teacher confirms that ghost (row kept, deterministic id unchanged)
|
||||||
|
for q in store["exam_questions"]:
|
||||||
|
if q["id"] == ghost_id:
|
||||||
|
q["confirmed"] = True
|
||||||
|
# re-run auto-map: must not re-insert the same id, and must preserve the teacher's confirmation
|
||||||
|
assert client.post("/api/exam/templates/t1/auto-map").status_code == 200
|
||||||
|
same = [r for r in store["exam_questions"] if r["id"] == ghost_id]
|
||||||
|
assert len(same) == 1, "confirmed ghost must not be duplicated (PK collision) on re-run"
|
||||||
|
assert same[0]["confirmed"] is True, "teacher's confirmation must survive a re-run"
|
||||||
|
|
||||||
|
|
||||||
def test_auto_map_non_owner_is_403_before_download(monkeypatch):
|
def test_auto_map_non_owner_is_403_before_download(monkeypatch):
|
||||||
store = _template_with_source(owner=OTHER_TEACHER)
|
store = _template_with_source(owner=OTHER_TEACHER)
|
||||||
client, store = make_client(user_id=TEACHER, institute_ids=(INST_A,), store=store)
|
client, store = make_client(user_id=TEACHER, institute_ids=(INST_A,), store=store)
|
||||||
|
|||||||
Reference in New Issue
Block a user