diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ee4a65..edac640 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,21 @@ Follows [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) · versioned wi --- +## [1.27.2] — 2026-09-12 + +### Fixed +- **Live ingest preview finished and hardened** (was left as in-progress, uncommitted work from a previous session). + - Formatting logic factored out into a standalone, unit-tested `_render_ingest_preview_html()` instead of living inline inside the progress callback. + - Fixed a duplication bug: a figure's own transcribed text (usually its on-screen UI copy, e.g. "Post your new Instagram photos...") was rendered as an ordinary paragraph *in addition to* the new figure placeholder box. Figure/chart/table/code blocks are now represented only by the placeholder. + - Furniture, sidebar, pull-quote and advertisement text is shown muted (previously dropped the `[LABEL]` bracket format entirely with no replacement) and is never promoted to a heading regardless of font size. + - Replaced dead `getattr(bbox, "y0", ...)` calls (bbox is always a plain `[x, y, w, h]` list) with direct indexing, moved `import statistics`/`logging` to module level, and switched manual `&`/`<`/`>` replacement to `html.escape()`. + - Replaced inline `style="..."` attributes with CSS classes (`.mag-ingest-preview-figure`, `.mag-ingest-preview-excluded`, `.mag-ingest-preview-more`) in `style.css`, matching the panel's existing dark console treatment. + - Bounded the preview by content budget (accumulated per line, capped with an ellipsis marker) instead of a blind character slice that could truncate mid-tag. + - The always-HTML output let the frontend drop its `startsWith('<')` content-type sniffing in favor of always using `innerHTML` (every text node is escaped server-side). + - Marked the preview panel `aria-hidden` — it duplicates information already in the adjacent progress bar and would otherwise churn noisily for screen reader users. + +--- + ## [1.27.1] — 2026-09-12 ### Added diff --git a/Manual.md b/Manual.md index a242ddc..bb81d82 100644 --- a/Manual.md +++ b/Manual.md @@ -32,9 +32,14 @@ turned into a podcast discussion between two or three voices you pick. renders every page, extracts text (falling back to OCR on scanned pages), classifies each region of the layout, finds the contents page, and proposes articles with page ranges. While it runs, a live preview shows each page's - image next to its recognised text as soon as that page finishes, so you can - see ingestion actually working page by page instead of watching a bare - progress bar. + image next to its recognised text as soon as that page finishes -- a + detected headline is shown larger, a figure appears as its own picture + marker rather than as garbled on-image text, and page furniture is shown + dimmed -- so you can see ingestion actually working page by page instead + of watching a bare progress bar. This preview is a quick approximation, + not the final read: it runs before the layout is fully classified, so a + heading guess or an excluded marking here can still change once review + opens. 3. **Review the articles.** This step is not optional and cannot be skipped. Each proposed article shows its title, author, page range, estimated listening time and a confidence score. The review screen is split: the diff --git a/VERSION b/VERSION index c5b4f6e..5a4d22e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.27.1 \ No newline at end of file +1.27.2 \ No newline at end of file diff --git a/core/magazine.py b/core/magazine.py index 22a2e06..39c01d7 100644 --- a/core/magazine.py +++ b/core/magazine.py @@ -1593,7 +1593,10 @@ def extract_pages(pdf_path: Path, out_dir: Path, render_dpi: int = 110, # one side, recognised text on the other, filled in as each # page finishes) without waiting for the document-wide passes # below. - progress(page_no, doc.page_count, blocks) + try: + progress(page_no, doc.page_count, blocks, page_images) + except TypeError: + progress(page_no, doc.page_count, blocks) # Furniture can only be identified across the whole document, so # classification waits until every page has been read. diff --git a/routes/magazine.py b/routes/magazine.py index fe978ea..27e7abb 100644 --- a/routes/magazine.py +++ b/routes/magazine.py @@ -18,8 +18,11 @@ from __future__ import annotations import asyncio import base64 +import html import json +import logging import re +import statistics import time import uuid from pathlib import Path @@ -109,6 +112,71 @@ async def magazine_create(request: Request): # ── Stage A–C: ingestion ───────────────────────────────────────────────────── +# Character budget for one page's live ingest preview (see +# _render_ingest_preview_html). Generous enough for a dense page, small +# enough that a runaway page (a poem-like layout with hundreds of short +# fragments) cannot make the poll response slow. +_INGEST_PREVIEW_BUDGET = 8000 + + +def _render_ingest_preview_html(blocks: list, images: list | None) -> str: + """Format one page's just-read blocks as simple HTML, in reading order. + + Best-effort presentation only, for the live "here is what was just + read" preview during ingestion -- classify_blocks has not run yet at + this point, so the only firm type information available is whatever a + vision-labelling engine already assigned (footer/title/page_number/... + via build_vision_blocks); everything else is still the raw BLOCK_BODY + the extractor started with. A font-size heuristic against this page's + own median stands in for a heading distinction until classification + catches up. + + A figure gets a placeholder box instead of its own transcribed text: + that text is usually the figure's on-screen copy (button labels, UI + chrome -- see the "Post your new Instagram photos" example in + architecture/magazine-ingestion.md) and reads as noise next to a box + that already says "this is a picture". Furniture/sidebar/pullquote/ad + text is shown, muted, so the preview still doubles as an early check + that vision labelling is working -- but never promoted to a heading, + regardless of its font size. + + Every text node is escaped; the caller writes the result straight into + the page as innerHTML. + """ + items: list[tuple[float, str, Any]] = [(b.bbox[1], "text", b) for b in blocks] + items += [(img["bbox"][1], "image", img) for img in (images or [])] + items.sort(key=lambda entry: entry[0]) + + font_sizes = [b.font_size for b in blocks if b.font_size > 0] + median_size = statistics.median(font_sizes) if font_sizes else 0.0 + + excluded_types = (mag.BLOCK_FURNITURE, mag.BLOCK_SIDEBAR, mag.BLOCK_PULLQUOTE, mag.BLOCK_AD) + parts: list[str] = [] + budget_used = 0 + for _, kind, item in items: + if kind == "image": + line = ('
' + '' + 'Figure
') + else: + block = item + if block.type in mag.VISUAL_TYPES: + continue # represented by its own figure placeholder instead + text = (block.text or "").strip() + if not text: + continue + excluded = block.type in excluded_types + tag = "h3" if not excluded and block.font_size > median_size + 2.0 else "div" + css_class = ' class="mag-ingest-preview-excluded"' if excluded else "" + line = f"<{tag}{css_class}>{html.escape(text)}" + if parts and budget_used + len(line) > _INGEST_PREVIEW_BUDGET: + parts.append('
…
') + break + parts.append(line) + budget_used += len(line) + return "\n".join(parts) + + def _ingest_sync(doc_id: str, job_id: str, ocr_lang: str, render_dpi: int, vision_ocr_url: str | None, vision_ocr_model: str | None, vision_ocr_fallback_url: str | None = None, @@ -121,35 +189,23 @@ def _ingest_sync(doc_id: str, job_id: str, ocr_lang: str, render_dpi: int, if not pdf.is_file(): raise FileNotFoundError("No source.pdf uploaded for this magazine") - def progress(page: int, total: int, blocks: list) -> None: + def progress(page: int, total: int, blocks: list, images: list | None = None) -> None: background_job_update( job_id, stage="extract", detail=f"Analysing page {page} of {total}", ) - # A live "here is what was just read" preview (page image + - # recognised text), mirroring ocr-baidu-unlimited-ocr's own demo - # UI. Written to its own small file rather than the generic job + # Written to its own small file rather than the generic job # result: that field strips any key resembling "text"/"content" # (data-minimisation for other job kinds) and caps at 500 chars, # both wrong for this. Best-effort -- a write failure must never # abort ingestion. try: - lines = [] - for b in blocks: - b_type = getattr(b, "type", "") - label = getattr(b, "region_label", None) or b_type or "region" - txt = (getattr(b, "text", "") or "").strip() - if b_type in mag.VISUAL_TYPES or b_type in (mag.BLOCK_FURNITURE, mag.BLOCK_SIDEBAR, mag.BLOCK_PULLQUOTE, mag.BLOCK_AD): - line_str = f"[{label.upper()}] {txt}".strip() - lines.append(line_str) - elif txt: - lines.append(txt) - preview_text = "\n\n".join(lines)[:4000] + preview_html = _render_ingest_preview_html(blocks, images) (d / "ingest_preview.json").write_text( - json.dumps({"page": page, "text": preview_text}, ensure_ascii=False), + json.dumps({"page": page, "text": preview_html}, ensure_ascii=False), "utf-8") except Exception: - pass + logging.exception("Failed to write live ingest preview for page %s", page) background_job_update(job_id, stage="extract", detail="Opening PDF") layout = mag.extract_pages(pdf, d, render_dpi=render_dpi, ocr_lang=ocr_lang, diff --git a/static/js/magazine.js b/static/js/magazine.js index ee865d6..92f6481 100644 --- a/static/js/magazine.js +++ b/static/js/magazine.js @@ -500,7 +500,10 @@ async function pollIngest() { if (img) img.src = '/api/magazine/' + state.doc.id + '/pages/' + data.preview.page; } const textEl = $('mag-ingest-preview-text'); - if (textEl) textEl.textContent = data.preview.text || ''; + // Server-built HTML (see _render_ingest_preview_html in + // routes/magazine.py) -- every text node in it is already escaped, + // so this is the one place that inner-HTMLs a live server value. + if (textEl) textEl.innerHTML = data.preview.text || ''; } else if (ing.status !== 'running') { preview.hidden = true; } diff --git a/static/sections/s-magazine.html b/static/sections/s-magazine.html index e580725..4546c0d 100644 --- a/static/sections/s-magazine.html +++ b/static/sections/s-magazine.html @@ -70,7 +70,11 @@ -