mirror of
https://github.com/arsvendg/Stirling-PDF.git
synced 2026-07-14 10:34:06 +02:00
Feature/pdf ingestion jpdfium (#6525)
This commit is contained in:
@@ -1,73 +0,0 @@
|
|||||||
package stirling.software.SPDF.pdf.parser;
|
|
||||||
|
|
||||||
import static stirling.software.SPDF.pdf.parser.PdfModels.*;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import org.apache.pdfbox.pdmodel.PDDocument;
|
|
||||||
import org.springframework.context.annotation.Primary;
|
|
||||||
import org.springframework.stereotype.Service;
|
|
||||||
|
|
||||||
import lombok.RequiredArgsConstructor;
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Chains table parsers in priority order: Tabula lattice → Tabula stream → {@link
|
|
||||||
* LineAlignmentTableParser}. The first parser returning a result above {@link
|
|
||||||
* #TABULA_CONFIDENCE_THRESHOLD} wins; results from different parsers are never mixed on one page.
|
|
||||||
*/
|
|
||||||
@Service
|
|
||||||
@Primary
|
|
||||||
@RequiredArgsConstructor
|
|
||||||
@Slf4j
|
|
||||||
public class CompositeTableParser implements TableParser {
|
|
||||||
|
|
||||||
/** Min Tabula confidence to accept results; below this LineAlignment is tried instead. */
|
|
||||||
static final float TABULA_CONFIDENCE_THRESHOLD = 0.5f;
|
|
||||||
|
|
||||||
private final TabulaTableParser tabulaParser;
|
|
||||||
private final LineAlignmentTableParser lineAlignmentParser;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<TableFragment> parse(PDDocument document, RawPage rawPage) throws IOException {
|
|
||||||
// Step 1: Tabula lattice mode (ruled/bordered tables).
|
|
||||||
List<TableFragment> latticeResults = filterConfident(tabulaParser.parse(document, rawPage));
|
|
||||||
if (!latticeResults.isEmpty()) {
|
|
||||||
log.debug(
|
|
||||||
"Page {}: using Tabula lattice ({} table(s))",
|
|
||||||
rawPage.pageNumber(),
|
|
||||||
latticeResults.size());
|
|
||||||
return latticeResults;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Step 2: Tabula stream mode (borderless/whitespace-delimited tables).
|
|
||||||
// parseStream is not on the TableParser interface — this intentionally couples to the
|
|
||||||
// concrete TabulaTableParser since stream mode is a Tabula-specific concept.
|
|
||||||
List<TableFragment> streamResults =
|
|
||||||
filterConfident(tabulaParser.parseStream(document, rawPage));
|
|
||||||
if (!streamResults.isEmpty()) {
|
|
||||||
log.debug(
|
|
||||||
"Page {}: using Tabula stream ({} table(s))",
|
|
||||||
rawPage.pageNumber(),
|
|
||||||
streamResults.size());
|
|
||||||
return streamResults;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Step 3: Geometry-based line-alignment fallback.
|
|
||||||
List<TableFragment> lineResults = lineAlignmentParser.parse(document, rawPage);
|
|
||||||
if (!lineResults.isEmpty()) {
|
|
||||||
log.debug(
|
|
||||||
"Page {}: using LineAlignment ({} table(s))",
|
|
||||||
rawPage.pageNumber(),
|
|
||||||
lineResults.size());
|
|
||||||
return lineResults;
|
|
||||||
}
|
|
||||||
|
|
||||||
return List.of();
|
|
||||||
}
|
|
||||||
|
|
||||||
private List<TableFragment> filterConfident(List<TableFragment> tables) {
|
|
||||||
return tables.stream().filter(t -> t.confidence() >= TABULA_CONFIDENCE_THRESHOLD).toList();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-528
@@ -1,528 +0,0 @@
|
|||||||
package stirling.software.SPDF.pdf.parser;
|
|
||||||
|
|
||||||
import static stirling.software.SPDF.pdf.parser.PdfModels.*;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.Comparator;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.Optional;
|
|
||||||
import java.util.TreeMap;
|
|
||||||
import java.util.regex.Pattern;
|
|
||||||
|
|
||||||
import org.apache.pdfbox.pdmodel.PDDocument;
|
|
||||||
import org.springframework.stereotype.Service;
|
|
||||||
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Fallback {@link TableParser} for borderless financial tables using text geometry.
|
|
||||||
*
|
|
||||||
* <p>Identifies "anchor lines" (≥2 numeric tokens), builds a column grid from their right-edge
|
|
||||||
* positions, groups vertically proximate anchor lines into table candidates, then scores each group
|
|
||||||
* on column consistency and anchor density (confidence ceiling 0.85).
|
|
||||||
*/
|
|
||||||
@Service
|
|
||||||
@Slf4j
|
|
||||||
public class LineAlignmentTableParser implements TableParser {
|
|
||||||
|
|
||||||
/** Width in points of each column position bucket. */
|
|
||||||
static final float COLUMN_BUCKET_PT = 5f;
|
|
||||||
|
|
||||||
/** Tolerance in buckets when matching a token's right-edge to a confirmed column position. */
|
|
||||||
private static final int COLUMN_MATCH_BUCKETS = 2;
|
|
||||||
|
|
||||||
/** Maximum gap (as a multiple of modal line spacing) before splitting a group. */
|
|
||||||
private static final float MAX_GAP_FACTOR = 2.5f;
|
|
||||||
|
|
||||||
/** Minimum anchor rows (numeric-heavy) to form a valid table. */
|
|
||||||
static final int MIN_TABLE_ROWS = 3;
|
|
||||||
|
|
||||||
/** Minimum confirmed column positions to form a valid table. */
|
|
||||||
static final int MIN_COLUMNS = 2;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Min fraction of anchor lines a column must appear on to be confirmed (permissive for N/A
|
|
||||||
* rows).
|
|
||||||
*/
|
|
||||||
private static final double COLUMN_MIN_FREQUENCY = 0.40;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Matches financial numeric tokens: integers, decimals, parenthetical negatives, currency,
|
|
||||||
* percent, nil dashes.
|
|
||||||
*/
|
|
||||||
private static final Pattern NUMERIC =
|
|
||||||
Pattern.compile("^[\\(\\-\\$£€¥]?\\d[\\d,\\.]*[\\)%]?$|^[-–—]$");
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Lines within this y-distance are merged into one row (restores rows split by LineBuilder's
|
|
||||||
* column-gap logic).
|
|
||||||
*/
|
|
||||||
static final float ROW_MERGE_TOLERANCE_PT = 2f;
|
|
||||||
|
|
||||||
// ── public API ───────────────────────────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<TableFragment> parse(PDDocument document, RawPage rawPage) throws IOException {
|
|
||||||
List<RawLine> lines = rawPage.lines();
|
|
||||||
if (lines.size() < MIN_TABLE_ROWS) return List.of();
|
|
||||||
|
|
||||||
float modalSpacing = computeModalSpacing(lines);
|
|
||||||
List<TokenizedLine> tokenized =
|
|
||||||
mergeCoincidentLines(lines.stream().map(this::tokenize).toList());
|
|
||||||
|
|
||||||
List<TokenizedLine> anchors = tokenized.stream().filter(TokenizedLine::isAnchor).toList();
|
|
||||||
|
|
||||||
if (anchors.size() < MIN_TABLE_ROWS) return List.of();
|
|
||||||
|
|
||||||
List<Float> columnGrid = buildColumnGrid(anchors);
|
|
||||||
if (columnGrid.size() < MIN_COLUMNS) {
|
|
||||||
log.debug(
|
|
||||||
"Page {}: LineAlignment — fewer than {} confirmed columns, skipping",
|
|
||||||
rawPage.pageNumber(),
|
|
||||||
MIN_COLUMNS);
|
|
||||||
return List.of();
|
|
||||||
}
|
|
||||||
|
|
||||||
List<List<TokenizedLine>> groups = groupRows(tokenized, columnGrid, modalSpacing);
|
|
||||||
|
|
||||||
List<TableFragment> results = new ArrayList<>();
|
|
||||||
for (int i = 0; i < groups.size(); i++) {
|
|
||||||
buildFragment(groups.get(i), columnGrid, rawPage.pageNumber(), i)
|
|
||||||
.ifPresent(results::add);
|
|
||||||
}
|
|
||||||
|
|
||||||
log.debug(
|
|
||||||
"Page {}: LineAlignment detected {} table(s) ({} anchor lines, {} columns)",
|
|
||||||
rawPage.pageNumber(),
|
|
||||||
results.size(),
|
|
||||||
anchors.size(),
|
|
||||||
columnGrid.size());
|
|
||||||
return results;
|
|
||||||
}
|
|
||||||
|
|
||||||
// ── coincident-line merging ──────────────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Merges tokenised lines sharing the same y-position into one row, rejoining label/value halves
|
|
||||||
* split by LineBuilder.
|
|
||||||
*/
|
|
||||||
List<TokenizedLine> mergeCoincidentLines(List<TokenizedLine> tokenized) {
|
|
||||||
if (tokenized.size() < 2) return tokenized;
|
|
||||||
|
|
||||||
List<TokenizedLine> result = new ArrayList<>();
|
|
||||||
int i = 0;
|
|
||||||
|
|
||||||
while (i < tokenized.size()) {
|
|
||||||
float baseY = tokenized.get(i).line().bounds().y();
|
|
||||||
int j = i + 1;
|
|
||||||
while (j < tokenized.size()
|
|
||||||
&& Math.abs(tokenized.get(j).line().bounds().y() - baseY)
|
|
||||||
<= ROW_MERGE_TOLERANCE_PT) {
|
|
||||||
j++;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (j == i + 1) {
|
|
||||||
result.add(tokenized.get(i));
|
|
||||||
} else {
|
|
||||||
result.add(mergeGroup(tokenized.subList(i, j)));
|
|
||||||
}
|
|
||||||
i = j;
|
|
||||||
}
|
|
||||||
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
private TokenizedLine mergeGroup(List<TokenizedLine> group) {
|
|
||||||
List<TextFragment> mergedFragments =
|
|
||||||
group.stream()
|
|
||||||
.flatMap(tl -> tl.line().fragments().stream())
|
|
||||||
.sorted(Comparator.comparingDouble(f -> f.bounds().x()))
|
|
||||||
.toList();
|
|
||||||
|
|
||||||
Bounds mergedBounds =
|
|
||||||
group.stream()
|
|
||||||
.map(tl -> tl.line().bounds())
|
|
||||||
.reduce(Bounds::merge)
|
|
||||||
.orElse(group.get(0).line().bounds());
|
|
||||||
|
|
||||||
RawLine mergedLine =
|
|
||||||
new RawLine(
|
|
||||||
group.get(0).line().lineId(),
|
|
||||||
mergedFragments,
|
|
||||||
mergedBounds,
|
|
||||||
group.get(0).line().pageNumber());
|
|
||||||
|
|
||||||
return tokenize(mergedLine);
|
|
||||||
}
|
|
||||||
|
|
||||||
// ── tokenisation ─────────────────────────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Splits fragments into word-level tokens; x-positions are estimated linearly within each
|
|
||||||
* fragment.
|
|
||||||
*/
|
|
||||||
TokenizedLine tokenize(RawLine line) {
|
|
||||||
List<LineToken> tokens = new ArrayList<>();
|
|
||||||
for (TextFragment frag : line.fragments()) {
|
|
||||||
tokens.addAll(tokensFromFragment(frag));
|
|
||||||
}
|
|
||||||
List<LineToken> numeric = tokens.stream().filter(LineToken::numeric).toList();
|
|
||||||
return new TokenizedLine(line, tokens, numeric);
|
|
||||||
}
|
|
||||||
|
|
||||||
private List<LineToken> tokensFromFragment(TextFragment frag) {
|
|
||||||
String raw = frag.text();
|
|
||||||
if (raw == null || raw.isBlank()) return List.of();
|
|
||||||
|
|
||||||
float fragX = frag.bounds().x();
|
|
||||||
float fragWidth = frag.bounds().width();
|
|
||||||
int rawLen = raw.length();
|
|
||||||
|
|
||||||
List<LineToken> result = new ArrayList<>();
|
|
||||||
int offset = 0;
|
|
||||||
for (String part : raw.split("\\s+")) {
|
|
||||||
if (part.isEmpty()) {
|
|
||||||
offset++;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
int idx = raw.indexOf(part, offset);
|
|
||||||
if (idx < 0) idx = offset;
|
|
||||||
|
|
||||||
float tokenX = rawLen > 0 ? fragX + ((float) idx / rawLen) * fragWidth : fragX;
|
|
||||||
float tokenRight =
|
|
||||||
rawLen > 0
|
|
||||||
? fragX + ((float) (idx + part.length()) / rawLen) * fragWidth
|
|
||||||
: fragX + fragWidth;
|
|
||||||
|
|
||||||
result.add(new LineToken(part, tokenX, tokenRight, NUMERIC.matcher(part).matches()));
|
|
||||||
offset = idx + part.length();
|
|
||||||
}
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
// ── column grid ──────────────────────────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns confirmed column right-edge positions — those appearing on ≥ {@value
|
|
||||||
* #COLUMN_MIN_FREQUENCY} × N anchor lines.
|
|
||||||
*/
|
|
||||||
private List<Float> buildColumnGrid(List<TokenizedLine> anchors) {
|
|
||||||
// bucket → set of line indices that contributed a numeric token to that bucket
|
|
||||||
Map<Integer, List<Integer>> bucketLines = new HashMap<>();
|
|
||||||
for (int i = 0; i < anchors.size(); i++) {
|
|
||||||
for (LineToken t : anchors.get(i).numeric()) {
|
|
||||||
int bucket = bucket(t.right());
|
|
||||||
bucketLines.computeIfAbsent(bucket, k -> new ArrayList<>()).add(i);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
int minHits =
|
|
||||||
Math.max(MIN_TABLE_ROWS, (int) Math.ceil(anchors.size() * COLUMN_MIN_FREQUENCY));
|
|
||||||
|
|
||||||
// Confirmed buckets → average right-edge for that bucket
|
|
||||||
TreeMap<Integer, Float> confirmed = new TreeMap<>();
|
|
||||||
for (Map.Entry<Integer, List<Integer>> entry : bucketLines.entrySet()) {
|
|
||||||
// Count distinct lines
|
|
||||||
long distinctLines = entry.getValue().stream().distinct().count();
|
|
||||||
if (distinctLines >= minHits) {
|
|
||||||
double avg =
|
|
||||||
entry.getValue().stream()
|
|
||||||
.distinct() // weight each line equally regardless of token count
|
|
||||||
.mapToDouble(
|
|
||||||
lineIdx ->
|
|
||||||
avgRightEdgeForBucket(
|
|
||||||
anchors, lineIdx, entry.getKey()))
|
|
||||||
.average()
|
|
||||||
.orElse(entry.getKey() * (double) COLUMN_BUCKET_PT);
|
|
||||||
confirmed.put(entry.getKey(), (float) avg);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return new ArrayList<>(confirmed.values()); // already sorted by bucket (left to right)
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the average right-edge position of tokens in {@code line} whose bucket matches {@code
|
|
||||||
* targetBucket}, falling back to the bucket's nominal centre when no tokens match.
|
|
||||||
*/
|
|
||||||
private double avgRightEdgeForBucket(
|
|
||||||
List<TokenizedLine> anchors, int lineIdx, int targetBucket) {
|
|
||||||
return anchors.get(lineIdx).numeric().stream()
|
|
||||||
.filter(t -> bucket(t.right()) == targetBucket)
|
|
||||||
.mapToDouble(LineToken::right)
|
|
||||||
.average()
|
|
||||||
.orElse(targetBucket * (double) COLUMN_BUCKET_PT);
|
|
||||||
}
|
|
||||||
|
|
||||||
// ── grouping ─────────────────────────────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Groups anchor lines into table candidates, including adjacent label rows; a gap >
|
|
||||||
* MAX_GAP_FACTOR × modal spacing splits groups.
|
|
||||||
*/
|
|
||||||
private List<List<TokenizedLine>> groupRows(
|
|
||||||
List<TokenizedLine> all, List<Float> columnGrid, float modalSpacing) {
|
|
||||||
float maxGap = modalSpacing > 0 ? modalSpacing * MAX_GAP_FACTOR : 30f;
|
|
||||||
|
|
||||||
List<List<TokenizedLine>> groups = new ArrayList<>();
|
|
||||||
List<TokenizedLine> current = new ArrayList<>();
|
|
||||||
|
|
||||||
for (int i = 0; i < all.size(); i++) {
|
|
||||||
TokenizedLine tl = all.get(i);
|
|
||||||
boolean fits = tl.isAnchor() && matchesGrid(tl, columnGrid);
|
|
||||||
|
|
||||||
if (current.isEmpty()) {
|
|
||||||
if (fits) current.add(tl);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
float gap =
|
|
||||||
tl.line().bounds().y()
|
|
||||||
- current.get(current.size() - 1).line().bounds().bottom();
|
|
||||||
|
|
||||||
if (gap > maxGap) {
|
|
||||||
groups.add(current);
|
|
||||||
current = new ArrayList<>();
|
|
||||||
if (fits) current.add(tl);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (fits) {
|
|
||||||
current.add(tl);
|
|
||||||
} else if (!tl.line().text().isBlank()) {
|
|
||||||
// Include non-anchor lines (labels) only if they have text and are within
|
|
||||||
// proximity.
|
|
||||||
current.add(tl);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!current.isEmpty()) groups.add(current);
|
|
||||||
|
|
||||||
return groups.stream().filter(g -> hasEnoughAnchorRows(g, columnGrid)).toList();
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean hasEnoughAnchorRows(List<TokenizedLine> group, List<Float> columnGrid) {
|
|
||||||
return group.stream().filter(r -> r.isAnchor() && matchesGrid(r, columnGrid)).count()
|
|
||||||
>= MIN_TABLE_ROWS;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** A line "matches" the grid when ≥ 60 % of its numeric tokens land in confirmed columns. */
|
|
||||||
private boolean matchesGrid(TokenizedLine tl, List<Float> columnGrid) {
|
|
||||||
if (tl.numeric().isEmpty()) return false;
|
|
||||||
long matches =
|
|
||||||
tl.numeric().stream()
|
|
||||||
.filter(t -> nearestColumnIndex(t.right(), columnGrid) >= 0)
|
|
||||||
.count();
|
|
||||||
return (double) matches / tl.numeric().size() >= 0.60;
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean hasInconsistentColumnMatch(TokenizedLine tl, List<Float> columnGrid) {
|
|
||||||
if (tl.numeric().isEmpty()) return false;
|
|
||||||
long hits =
|
|
||||||
tl.numeric().stream()
|
|
||||||
.filter(t -> nearestColumnIndex(t.right(), columnGrid) >= 0)
|
|
||||||
.count();
|
|
||||||
return (double) hits / tl.numeric().size() < 0.60;
|
|
||||||
}
|
|
||||||
|
|
||||||
// ── fragment assembly ────────────────────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
private Optional<TableFragment> buildFragment(
|
|
||||||
List<TokenizedLine> group, List<Float> columnGrid, int pageNumber, int tableIndex) {
|
|
||||||
|
|
||||||
long anchorCount =
|
|
||||||
group.stream().filter(r -> r.isAnchor() && matchesGrid(r, columnGrid)).count();
|
|
||||||
if (anchorCount < MIN_TABLE_ROWS) return Optional.empty();
|
|
||||||
|
|
||||||
List<String> warnings = new ArrayList<>();
|
|
||||||
List<List<String>> rawRows = new ArrayList<>();
|
|
||||||
List<TableRow> rows = new ArrayList<>();
|
|
||||||
|
|
||||||
for (int rowIdx = 0; rowIdx < group.size(); rowIdx++) {
|
|
||||||
TokenizedLine tl = group.get(rowIdx);
|
|
||||||
List<String> rawRow = buildRawRow(tl, columnGrid);
|
|
||||||
rawRows.add(Collections.unmodifiableList(rawRow));
|
|
||||||
rows.add(buildTableRow(rowIdx, tl, rawRow, columnGrid));
|
|
||||||
}
|
|
||||||
|
|
||||||
// Column count = 1 label column + confirmed numeric columns
|
|
||||||
int colCount = columnGrid.size() + 1;
|
|
||||||
Bounds bounds = computeGroupBounds(group);
|
|
||||||
float confidence = computeConfidence(group, columnGrid, warnings);
|
|
||||||
|
|
||||||
return Optional.of(
|
|
||||||
new TableFragment(
|
|
||||||
"tbl-la-p" + pageNumber + "-" + tableIndex,
|
|
||||||
pageNumber,
|
|
||||||
bounds,
|
|
||||||
List.of(),
|
|
||||||
Collections.unmodifiableList(rows),
|
|
||||||
Collections.unmodifiableList(rawRows),
|
|
||||||
colCount,
|
|
||||||
confidence,
|
|
||||||
Collections.unmodifiableList(warnings),
|
|
||||||
null));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Builds a raw row as a list of strings: index 0 = label text, indices 1..N = column values.
|
|
||||||
*/
|
|
||||||
private List<String> buildRawRow(TokenizedLine tl, List<Float> columnGrid) {
|
|
||||||
String[] cells = new String[columnGrid.size() + 1];
|
|
||||||
Arrays.fill(cells, "");
|
|
||||||
|
|
||||||
// Separate label tokens (those not landing in any confirmed column) from column tokens.
|
|
||||||
List<String> labelParts = new ArrayList<>();
|
|
||||||
for (LineToken token : tl.all()) {
|
|
||||||
int col = nearestColumnIndex(token.right(), columnGrid);
|
|
||||||
if (col >= 0 && token.numeric()) {
|
|
||||||
int cellIdx = col + 1;
|
|
||||||
cells[cellIdx] =
|
|
||||||
cells[cellIdx].isEmpty()
|
|
||||||
? token.text()
|
|
||||||
: cells[cellIdx] + " " + token.text();
|
|
||||||
} else {
|
|
||||||
labelParts.add(token.text());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
cells[0] = String.join(" ", labelParts).trim();
|
|
||||||
return Arrays.asList(cells);
|
|
||||||
}
|
|
||||||
|
|
||||||
private TableRow buildTableRow(
|
|
||||||
int rowIdx, TokenizedLine tl, List<String> rawRow, List<Float> columnGrid) {
|
|
||||||
List<TableCell> cells = new ArrayList<>(rawRow.size());
|
|
||||||
|
|
||||||
// Label cell: use the line's full bounds as an approximation.
|
|
||||||
cells.add(TableCell.of(0, rawRow.get(0), tl.line().bounds()));
|
|
||||||
|
|
||||||
for (int col = 0; col < columnGrid.size(); col++) {
|
|
||||||
String text = col + 1 < rawRow.size() ? rawRow.get(col + 1) : "";
|
|
||||||
float right = columnGrid.get(col);
|
|
||||||
float left = col > 0 ? columnGrid.get(col - 1) : right - 50f;
|
|
||||||
Bounds cellBounds =
|
|
||||||
new Bounds(
|
|
||||||
left,
|
|
||||||
tl.line().bounds().y(),
|
|
||||||
right - left,
|
|
||||||
tl.line().bounds().height());
|
|
||||||
cells.add(TableCell.of(col + 1, text, cellBounds));
|
|
||||||
}
|
|
||||||
return new TableRow(rowIdx, Collections.unmodifiableList(cells));
|
|
||||||
}
|
|
||||||
|
|
||||||
// ── confidence scoring ───────────────────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Heuristic score in [0.0, 0.85] (ceiling keeps results below Tabula lattice which starts at
|
|
||||||
* 1.0). Base 0.70; +0.05/col beyond 2 (max +0.10); +0.05 at ≥5 anchors, +0.05 at ≥8; −0.15 if
|
|
||||||
* >30 % of anchors have inconsistent columns; −0.10 if non-anchors outnumber anchors.
|
|
||||||
*/
|
|
||||||
private float computeConfidence(
|
|
||||||
List<TokenizedLine> group, List<Float> columnGrid, List<String> warnings) {
|
|
||||||
float score = 0.70f;
|
|
||||||
|
|
||||||
long anchorCount =
|
|
||||||
group.stream().filter(r -> r.isAnchor() && matchesGrid(r, columnGrid)).count();
|
|
||||||
long totalRows = group.size();
|
|
||||||
|
|
||||||
// More columns
|
|
||||||
int extraCols = Math.min(columnGrid.size() - MIN_COLUMNS, 2);
|
|
||||||
score += extraCols * 0.05f;
|
|
||||||
|
|
||||||
// More anchor rows
|
|
||||||
if (anchorCount >= 5) score += 0.05f;
|
|
||||||
if (anchorCount >= 8) score += 0.05f;
|
|
||||||
|
|
||||||
// Inconsistent column matching
|
|
||||||
long inconsistent =
|
|
||||||
group.stream()
|
|
||||||
.filter(TokenizedLine::isAnchor)
|
|
||||||
.filter(tl -> hasInconsistentColumnMatch(tl, columnGrid))
|
|
||||||
.count();
|
|
||||||
if (inconsistent > anchorCount * 0.30) {
|
|
||||||
score -= 0.15f;
|
|
||||||
warnings.add(
|
|
||||||
"Column match inconsistent on "
|
|
||||||
+ inconsistent
|
|
||||||
+ "/"
|
|
||||||
+ anchorCount
|
|
||||||
+ " anchor rows");
|
|
||||||
}
|
|
||||||
|
|
||||||
// Label-heavy
|
|
||||||
long nonAnchor = totalRows - anchorCount;
|
|
||||||
if (nonAnchor > anchorCount) {
|
|
||||||
score -= 0.10f;
|
|
||||||
warnings.add(
|
|
||||||
"Non-anchor rows ("
|
|
||||||
+ nonAnchor
|
|
||||||
+ ") outnumber anchor rows ("
|
|
||||||
+ anchorCount
|
|
||||||
+ ")");
|
|
||||||
}
|
|
||||||
|
|
||||||
return Math.max(0f, Math.min(0.85f, score));
|
|
||||||
}
|
|
||||||
|
|
||||||
// ── utility ──────────────────────────────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the grid index nearest to {@code rightEdge}, or -1 if none is within {@value
|
|
||||||
* #COLUMN_MATCH_BUCKETS} buckets.
|
|
||||||
*/
|
|
||||||
private int nearestColumnIndex(float rightEdge, List<Float> grid) {
|
|
||||||
int nearest = -1;
|
|
||||||
float minDist = COLUMN_MATCH_BUCKETS * COLUMN_BUCKET_PT + 1f;
|
|
||||||
for (int i = 0; i < grid.size(); i++) {
|
|
||||||
float dist = Math.abs(rightEdge - grid.get(i));
|
|
||||||
if (dist < minDist) {
|
|
||||||
minDist = dist;
|
|
||||||
nearest = i;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return nearest;
|
|
||||||
}
|
|
||||||
|
|
||||||
private Bounds computeGroupBounds(List<TokenizedLine> group) {
|
|
||||||
return group.stream()
|
|
||||||
.map(tl -> tl.line().bounds())
|
|
||||||
.reduce(Bounds::merge)
|
|
||||||
.orElse(new Bounds(0, 0, 0, 0));
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Modal gap between consecutive line edges, used to calibrate the group-split threshold. */
|
|
||||||
private float computeModalSpacing(List<RawLine> lines) {
|
|
||||||
if (lines.size() < 2) return 0f;
|
|
||||||
Map<Float, Long> freq = new HashMap<>();
|
|
||||||
for (int i = 1; i < lines.size(); i++) {
|
|
||||||
float gap = lines.get(i).bounds().y() - lines.get(i - 1).bounds().bottom();
|
|
||||||
if (gap > 0) freq.merge(Math.round(gap / 2f) * 2f, 1L, Long::sum);
|
|
||||||
}
|
|
||||||
return freq.entrySet().stream()
|
|
||||||
.max(Map.Entry.comparingByValue())
|
|
||||||
.map(Map.Entry::getKey)
|
|
||||||
.orElse(0f);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static int bucket(float x) {
|
|
||||||
return Math.round(x / COLUMN_BUCKET_PT);
|
|
||||||
}
|
|
||||||
|
|
||||||
// ── private data types ───────────────────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
/** A word-level token with an approximate right-edge x-position. */
|
|
||||||
record LineToken(String text, float x, float right, boolean numeric) {}
|
|
||||||
|
|
||||||
/** A {@link RawLine} with tokens pre-computed; an "anchor" has ≥ 2 numeric tokens. */
|
|
||||||
record TokenizedLine(RawLine line, List<LineToken> all, List<LineToken> numeric) {
|
|
||||||
boolean isAnchor() {
|
|
||||||
return numeric.size() >= 2;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,139 +0,0 @@
|
|||||||
package stirling.software.SPDF.pdf.parser;
|
|
||||||
|
|
||||||
import static stirling.software.SPDF.pdf.parser.PdfModels.*;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Comparator;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import org.springframework.stereotype.Service;
|
|
||||||
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Groups {@link TextFragment} objects into visual {@link RawLine}s using baseline proximity.
|
|
||||||
*
|
|
||||||
* <p>Fragments are on the same line when their baselines are within a font-size-derived tolerance.
|
|
||||||
* A new line starts whenever the horizontal gap exceeds an adaptive column-gap threshold ({@code
|
|
||||||
* max(effectiveWidth * COLUMN_GAP_RATIO, COLUMN_GAP_MIN_PT)}), splitting two-column text.
|
|
||||||
*/
|
|
||||||
@Service
|
|
||||||
@Slf4j
|
|
||||||
public class LineBuilder {
|
|
||||||
|
|
||||||
/** Baseline tolerance as a fraction of font size; 0.5 keeps mixed-size text on one line. */
|
|
||||||
private static final float BASELINE_TOLERANCE_FACTOR = 0.5f;
|
|
||||||
|
|
||||||
/** Absolute minimum tolerance so tiny font sizes don't collapse multi-line content. */
|
|
||||||
private static final float MIN_BASELINE_TOLERANCE = 2f;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Column-gap threshold as a fraction of page width; 0.10 clears tab stops but stays below
|
|
||||||
* two-column gutters.
|
|
||||||
*/
|
|
||||||
static final float COLUMN_GAP_RATIO = 0.10f;
|
|
||||||
|
|
||||||
/** Floor for the column-gap threshold so narrow pages don't over-split lines. */
|
|
||||||
static final float COLUMN_GAP_MIN_PT = 40f;
|
|
||||||
|
|
||||||
public List<RawLine> build(List<TextFragment> fragments, int pageNumber) {
|
|
||||||
if (fragments.isEmpty()) return List.of();
|
|
||||||
|
|
||||||
float effectiveWidth = inferEffectiveWidth(fragments);
|
|
||||||
float columnGapThreshold = Math.max(effectiveWidth * COLUMN_GAP_RATIO, COLUMN_GAP_MIN_PT);
|
|
||||||
log.debug(
|
|
||||||
"LineBuilder page {}: effectiveWidth={:.1f}pt, columnGapThreshold={:.1f}pt",
|
|
||||||
pageNumber,
|
|
||||||
effectiveWidth,
|
|
||||||
columnGapThreshold);
|
|
||||||
|
|
||||||
// Sort top-to-bottom first, then left-to-right within the same baseline band.
|
|
||||||
List<TextFragment> sorted =
|
|
||||||
fragments.stream()
|
|
||||||
.sorted(
|
|
||||||
Comparator.comparingDouble(TextFragment::baseline)
|
|
||||||
.thenComparingDouble(f -> f.bounds().x()))
|
|
||||||
.toList();
|
|
||||||
|
|
||||||
List<List<TextFragment>> groups = groupByBaseline(sorted, columnGapThreshold);
|
|
||||||
|
|
||||||
List<RawLine> lines = new ArrayList<>(groups.size());
|
|
||||||
for (int i = 0; i < groups.size(); i++) {
|
|
||||||
List<TextFragment> group =
|
|
||||||
groups.get(i).stream()
|
|
||||||
.sorted(Comparator.comparingDouble(f -> f.bounds().x()))
|
|
||||||
.toList();
|
|
||||||
|
|
||||||
Bounds lineBounds =
|
|
||||||
group.stream()
|
|
||||||
.map(TextFragment::bounds)
|
|
||||||
.reduce(Bounds::merge)
|
|
||||||
.orElse(new Bounds(0, 0, 0, 0));
|
|
||||||
|
|
||||||
lines.add(new RawLine("ln-p" + pageNumber + "-" + i, group, lineBounds, pageNumber));
|
|
||||||
}
|
|
||||||
return lines;
|
|
||||||
}
|
|
||||||
|
|
||||||
private List<List<TextFragment>> groupByBaseline(
|
|
||||||
List<TextFragment> sorted, float columnGapThreshold) {
|
|
||||||
List<List<TextFragment>> groups = new ArrayList<>();
|
|
||||||
List<TextFragment> current = new ArrayList<>();
|
|
||||||
float currentBaseline = Float.NaN;
|
|
||||||
|
|
||||||
for (TextFragment fragment : sorted) {
|
|
||||||
if (current.isEmpty()) {
|
|
||||||
current.add(fragment);
|
|
||||||
currentBaseline = fragment.baseline();
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
float maxFontSize =
|
|
||||||
Math.max(
|
|
||||||
fragment.fontSize(),
|
|
||||||
(float)
|
|
||||||
current.stream()
|
|
||||||
.mapToDouble(TextFragment::fontSize)
|
|
||||||
.max()
|
|
||||||
.orElse(0));
|
|
||||||
float tolerance =
|
|
||||||
Math.max(maxFontSize * BASELINE_TOLERANCE_FACTOR, MIN_BASELINE_TOLERANCE);
|
|
||||||
|
|
||||||
boolean sameBaseline = Math.abs(fragment.baseline() - currentBaseline) <= tolerance;
|
|
||||||
boolean columnGap = sameBaseline && hasColumnGap(fragment, current, columnGapThreshold);
|
|
||||||
|
|
||||||
if (sameBaseline && !columnGap) {
|
|
||||||
current.add(fragment);
|
|
||||||
// Anchor to the weighted mean baseline so long lines stay stable.
|
|
||||||
currentBaseline =
|
|
||||||
(currentBaseline * (current.size() - 1) + fragment.baseline())
|
|
||||||
/ current.size();
|
|
||||||
} else {
|
|
||||||
groups.add(current);
|
|
||||||
current = new ArrayList<>();
|
|
||||||
current.add(fragment);
|
|
||||||
currentBaseline = fragment.baseline();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!current.isEmpty()) groups.add(current);
|
|
||||||
return groups;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* True when the gap from the rightmost fragment in {@code group} to {@code next} exceeds {@code
|
|
||||||
* threshold}.
|
|
||||||
*/
|
|
||||||
private static boolean hasColumnGap(
|
|
||||||
TextFragment next, List<TextFragment> group, float threshold) {
|
|
||||||
float lastRight = group.get(group.size() - 1).bounds().right();
|
|
||||||
return next.bounds().x() - lastRight > threshold;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Infers effective page width from the rightmost fragment right-edge plus a 10 % margin. */
|
|
||||||
private static float inferEffectiveWidth(List<TextFragment> fragments) {
|
|
||||||
double maxRight =
|
|
||||||
fragments.stream().mapToDouble(f -> f.bounds().right()).max().orElse(500.0);
|
|
||||||
return (float) maxRight * 1.10f;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,79 +0,0 @@
|
|||||||
package stirling.software.SPDF.pdf.parser;
|
|
||||||
|
|
||||||
import static stirling.software.SPDF.pdf.parser.PdfModels.*;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import org.apache.pdfbox.pdmodel.PDDocument;
|
|
||||||
import org.apache.pdfbox.pdmodel.PDPage;
|
|
||||||
import org.apache.pdfbox.pdmodel.common.PDRectangle;
|
|
||||||
import org.springframework.stereotype.Service;
|
|
||||||
|
|
||||||
import lombok.RequiredArgsConstructor;
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Runs the per-page ingestion pipeline: {@link WordExtractingStripper} → {@link LineBuilder} →
|
|
||||||
* {@link TableParser}, producing a {@link PdfModels.ParsedPage} per page. The caller owns the
|
|
||||||
* {@link PDDocument} lifecycle.
|
|
||||||
*/
|
|
||||||
@Service
|
|
||||||
@RequiredArgsConstructor
|
|
||||||
@Slf4j
|
|
||||||
public class PdfIngester {
|
|
||||||
|
|
||||||
private final LineBuilder lineBuilder;
|
|
||||||
private final TableParser tableParser;
|
|
||||||
|
|
||||||
public List<ParsedPage> parse(PDDocument document) throws IOException {
|
|
||||||
return parse(document, document.getNumberOfPages());
|
|
||||||
}
|
|
||||||
|
|
||||||
public List<ParsedPage> parse(PDDocument document, int maxPages) throws IOException {
|
|
||||||
int pageCount = Math.min(document.getNumberOfPages(), maxPages);
|
|
||||||
List<ParsedPage> pages = new ArrayList<>(pageCount);
|
|
||||||
long fragmentsMs = 0;
|
|
||||||
long tablesMs = 0;
|
|
||||||
long t0 = System.currentTimeMillis();
|
|
||||||
|
|
||||||
for (int p = 1; p <= pageCount; p++) {
|
|
||||||
long ft = System.currentTimeMillis();
|
|
||||||
List<TextFragment> fragments = extractFragments(document, p);
|
|
||||||
fragmentsMs += System.currentTimeMillis() - ft;
|
|
||||||
|
|
||||||
PDPage page = document.getPage(p - 1);
|
|
||||||
PDRectangle mediaBox = page.getMediaBox();
|
|
||||||
List<RawLine> lines = lineBuilder.build(fragments, p);
|
|
||||||
RawPage rawPage = new RawPage(p, mediaBox.getWidth(), mediaBox.getHeight(), lines);
|
|
||||||
|
|
||||||
long tt = System.currentTimeMillis();
|
|
||||||
List<TableFragment> tables = tableParser.parse(document, rawPage);
|
|
||||||
tablesMs += System.currentTimeMillis() - tt;
|
|
||||||
|
|
||||||
log.debug(
|
|
||||||
"Page {}: {} fragments → {} lines, {} table(s)",
|
|
||||||
p,
|
|
||||||
fragments.size(),
|
|
||||||
lines.size(),
|
|
||||||
tables.size());
|
|
||||||
pages.add(new ParsedPage(p, mediaBox.getWidth(), mediaBox.getHeight(), tables, lines));
|
|
||||||
}
|
|
||||||
|
|
||||||
log.info(
|
|
||||||
"[timing] parse pages={} total={}ms fragments={}ms tables={}ms",
|
|
||||||
pageCount,
|
|
||||||
System.currentTimeMillis() - t0,
|
|
||||||
fragmentsMs,
|
|
||||||
tablesMs);
|
|
||||||
return pages;
|
|
||||||
}
|
|
||||||
|
|
||||||
private List<TextFragment> extractFragments(PDDocument document, int pageNumber)
|
|
||||||
throws IOException {
|
|
||||||
WordExtractingStripper stripper = new WordExtractingStripper(pageNumber);
|
|
||||||
stripper.getText(document);
|
|
||||||
return stripper.getFragments();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-113
@@ -1,113 +0,0 @@
|
|||||||
package stirling.software.SPDF.pdf.parser;
|
|
||||||
|
|
||||||
import static stirling.software.SPDF.pdf.parser.PdfModels.*;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import org.apache.pdfbox.pdmodel.PDPage;
|
|
||||||
import org.apache.pdfbox.pdmodel.font.PDFont;
|
|
||||||
import org.apache.pdfbox.text.PDFTextStripper;
|
|
||||||
import org.apache.pdfbox.text.TextPosition;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Extends {@link PDFTextStripper} to capture per-fragment geometry and font metadata.
|
|
||||||
*
|
|
||||||
* <p>Overrides {@link #writeString} to split each content-stream string into word-level {@link
|
|
||||||
* TextFragment}s with bounding boxes, baseline, font name, and bold flag. Coordinates are in
|
|
||||||
* PDFTextStripper space: (0,0) top-left, Y increases downward, {@code getY()} is the baseline.
|
|
||||||
*/
|
|
||||||
class WordExtractingStripper extends PDFTextStripper {
|
|
||||||
|
|
||||||
private final int targetPage;
|
|
||||||
private final List<TextFragment> fragments = new ArrayList<>();
|
|
||||||
private int fragmentIndex = 0;
|
|
||||||
|
|
||||||
WordExtractingStripper(int pageNumber) throws IOException {
|
|
||||||
this.targetPage = pageNumber;
|
|
||||||
setStartPage(pageNumber);
|
|
||||||
setEndPage(pageNumber);
|
|
||||||
setSortByPosition(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void startPage(PDPage page) throws IOException {
|
|
||||||
super.startPage(page);
|
|
||||||
fragments.clear();
|
|
||||||
fragmentIndex = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void writeString(String text, List<TextPosition> textPositions) throws IOException {
|
|
||||||
if (text == null || text.isBlank()) return;
|
|
||||||
|
|
||||||
// Fast path: no whitespace → emit one fragment (most financial PDFs have each
|
|
||||||
// number as its own string operation, so this is the common case).
|
|
||||||
if (text.indexOf(' ') < 0) {
|
|
||||||
emitFragment(text, textPositions);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Per-word splitting requires 1:1 text-char to TextPosition correspondence.
|
|
||||||
// Fall back to one fragment when sizes differ (ligatures, encoding edge cases).
|
|
||||||
if (textPositions.size() != text.length()) {
|
|
||||||
emitFragment(text, textPositions);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Emit one TextFragment per whitespace-delimited word with accurate per-word bounds.
|
|
||||||
int start = 0;
|
|
||||||
for (int i = 0; i <= text.length(); i++) {
|
|
||||||
if (i == text.length() || text.charAt(i) == ' ') {
|
|
||||||
if (start < i) {
|
|
||||||
emitFragment(text.substring(start, i), textPositions.subList(start, i));
|
|
||||||
}
|
|
||||||
start = i + 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void emitFragment(String text, List<TextPosition> positions) {
|
|
||||||
if (positions.isEmpty()) return;
|
|
||||||
|
|
||||||
float minX = Float.MAX_VALUE;
|
|
||||||
float minY = Float.MAX_VALUE;
|
|
||||||
float maxRight = -Float.MAX_VALUE;
|
|
||||||
float maxBaseline = -Float.MAX_VALUE;
|
|
||||||
TextPosition first = null;
|
|
||||||
|
|
||||||
for (TextPosition tp : positions) {
|
|
||||||
if (tp == null) continue;
|
|
||||||
if (first == null) first = tp;
|
|
||||||
|
|
||||||
float x = tp.getX();
|
|
||||||
// getY() is the baseline; top of character = getY() - getHeight().
|
|
||||||
float top = tp.getY() - tp.getHeight();
|
|
||||||
float right = x + tp.getWidth();
|
|
||||||
float baseline = tp.getY();
|
|
||||||
|
|
||||||
minX = Math.min(minX, x);
|
|
||||||
minY = Math.min(minY, top);
|
|
||||||
maxRight = Math.max(maxRight, right);
|
|
||||||
maxBaseline = Math.max(maxBaseline, baseline);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (first == null) return;
|
|
||||||
|
|
||||||
PDFont font = first.getFont();
|
|
||||||
String fontName = font != null ? font.getName() : "";
|
|
||||||
boolean bold = fontName != null && fontName.toLowerCase().contains("bold");
|
|
||||||
// getHeight() gives the rendered glyph height, which is the most reliable visual size.
|
|
||||||
float fontSize = first.getHeight();
|
|
||||||
|
|
||||||
Bounds bounds = new Bounds(minX, minY, maxRight - minX, maxBaseline - minY);
|
|
||||||
String id = "tf-p" + targetPage + "-" + fragmentIndex++;
|
|
||||||
fragments.add(new TextFragment(id, text, bounds, maxBaseline, fontSize, fontName, bold));
|
|
||||||
}
|
|
||||||
|
|
||||||
List<TextFragment> getFragments() {
|
|
||||||
return Collections.unmodifiableList(fragments);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,191 @@
|
|||||||
|
package stirling.software.common.pdf;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
import stirling.software.jpdfium.text.PageText;
|
||||||
|
import stirling.software.jpdfium.text.TextChar;
|
||||||
|
import stirling.software.jpdfium.text.TextLine;
|
||||||
|
import stirling.software.jpdfium.text.TextWord;
|
||||||
|
|
||||||
|
final class HeadingDetector {
|
||||||
|
|
||||||
|
private HeadingDetector() {}
|
||||||
|
|
||||||
|
/** A heading is at most this many words; longer lines are treated as body text. */
|
||||||
|
private static final int MAX_HEADING_WORDS = 12;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the Markdown heading prefix for a line. The decision combines several signals, never
|
||||||
|
* text matching, so a plain line that merely shares text with a heading is never promoted:
|
||||||
|
*
|
||||||
|
* <ul>
|
||||||
|
* <li><b>Size</b> — dominant glyph font size vs. the document body median (primary signal).
|
||||||
|
* Some PDFs encode visual size in the text matrix, so every glyph reports ~1.0; for those
|
||||||
|
* the line height is used as the proxy instead.
|
||||||
|
* <li><b>Brevity</b> — headings are short labels; a line over {@value #MAX_HEADING_WORDS}
|
||||||
|
* words is body text regardless of size.
|
||||||
|
* <li><b>Not a sentence</b> — a line ending in {@code . ! ?} reads as prose, not a heading.
|
||||||
|
* </ul>
|
||||||
|
*
|
||||||
|
* <p>Boldness is deliberately <em>not</em> a heading signal — a bold-but-not-larger line is
|
||||||
|
* emphasis, not a heading (see {@link #isBoldLabel}); promoting it to {@code #}/{@code ##} is
|
||||||
|
* the main source of false-positive headings.
|
||||||
|
*
|
||||||
|
* <ul>
|
||||||
|
* <li>size > baseline * 1.4 → {@code "# "}
|
||||||
|
* <li>size > baseline * 1.2 → {@code "## "}
|
||||||
|
* <li>otherwise → {@code ""}
|
||||||
|
* </ul>
|
||||||
|
*/
|
||||||
|
static String headingPrefix(TextLine line, float medianBodySize, float medianBodyHeight) {
|
||||||
|
String text = line.text().strip();
|
||||||
|
if (text.isEmpty() || wordCount(text) > MAX_HEADING_WORDS || endsLikeSentence(text)) {
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
|
float dominant = dominantFontSize(line);
|
||||||
|
float value;
|
||||||
|
float baseline;
|
||||||
|
if (dominant > 2f && medianBodySize > 2f) {
|
||||||
|
value = dominant;
|
||||||
|
baseline = medianBodySize;
|
||||||
|
} else {
|
||||||
|
value = line.height();
|
||||||
|
baseline = medianBodyHeight;
|
||||||
|
}
|
||||||
|
if (baseline <= 0f) {
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
|
float ratio = value / baseline;
|
||||||
|
if (ratio > 1.4f) {
|
||||||
|
return "# ";
|
||||||
|
}
|
||||||
|
if (ratio > 1.2f) {
|
||||||
|
return "## ";
|
||||||
|
}
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* True when a line should be emphasised as bold (rendered {@code **like this**}) rather than
|
||||||
|
* promoted to a heading: it is bold, short, and not a full sentence. Used for bold labels that
|
||||||
|
* are not large enough to be headings.
|
||||||
|
*/
|
||||||
|
static boolean isBoldLabel(TextLine line) {
|
||||||
|
String text = line.text().strip();
|
||||||
|
if (text.isEmpty() || wordCount(text) > MAX_HEADING_WORDS || endsLikeSentence(text)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return isBold(line);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static int wordCount(String text) {
|
||||||
|
return text.split("\\s+").length;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean endsLikeSentence(String text) {
|
||||||
|
char last = text.charAt(text.length() - 1);
|
||||||
|
return last == '.' || last == '!' || last == '?';
|
||||||
|
}
|
||||||
|
|
||||||
|
/** True when the line's dominant font is bold, inferred from PostScript font names. */
|
||||||
|
private static boolean isBold(TextLine line) {
|
||||||
|
Map<String, Integer> counts = new HashMap<>();
|
||||||
|
for (TextWord word : line.words()) {
|
||||||
|
for (TextChar ch : word.chars()) {
|
||||||
|
if (ch.isWhitespace() || ch.isNewline()) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
String name = ch.fontName();
|
||||||
|
if (name != null && !name.isBlank()) {
|
||||||
|
counts.merge(name, 1, Integer::sum);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
String dominantFont = "";
|
||||||
|
int max = -1;
|
||||||
|
for (Map.Entry<String, Integer> e : counts.entrySet()) {
|
||||||
|
if (e.getValue() > max) {
|
||||||
|
max = e.getValue();
|
||||||
|
dominantFont = e.getKey();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
String lower = dominantFont.toLowerCase(java.util.Locale.ROOT);
|
||||||
|
return lower.contains("bold")
|
||||||
|
|| lower.contains("black")
|
||||||
|
|| lower.contains("heavy")
|
||||||
|
|| lower.contains("semibold");
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Computes the median glyph font size across all pages. */
|
||||||
|
static float medianFontSize(List<PageText> allPages) {
|
||||||
|
List<Float> sizes = new ArrayList<>();
|
||||||
|
for (PageText page : allPages) {
|
||||||
|
for (TextChar ch : page.chars()) {
|
||||||
|
if (!ch.isWhitespace() && !ch.isNewline() && ch.fontSize() > 0f) {
|
||||||
|
sizes.add(ch.fontSize());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return median(sizes, 12f);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Computes the median TextLine height across all pages. Used when font size is degenerate. */
|
||||||
|
static float medianLineHeight(List<PageText> allPages) {
|
||||||
|
List<Float> heights = new ArrayList<>();
|
||||||
|
for (PageText page : allPages) {
|
||||||
|
for (TextLine line : page.lines()) {
|
||||||
|
if (line.height() > 0f && !line.text().isBlank()) {
|
||||||
|
heights.add(line.height());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return median(heights, 12f);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static float median(List<Float> values, float fallback) {
|
||||||
|
if (values.isEmpty()) {
|
||||||
|
return fallback;
|
||||||
|
}
|
||||||
|
Collections.sort(values);
|
||||||
|
int mid = values.size() / 2;
|
||||||
|
if (values.size() % 2 == 0) {
|
||||||
|
return (values.get(mid - 1) + values.get(mid)) / 2f;
|
||||||
|
}
|
||||||
|
return values.get(mid);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the font size that appears most often (by character count) in the given line. Ties
|
||||||
|
* are broken in favour of the larger size.
|
||||||
|
*/
|
||||||
|
private static float dominantFontSize(TextLine line) {
|
||||||
|
Map<Float, Integer> counts = new HashMap<>();
|
||||||
|
for (TextWord word : line.words()) {
|
||||||
|
for (TextChar ch : word.chars()) {
|
||||||
|
if (!ch.isWhitespace() && !ch.isNewline() && ch.fontSize() > 0f) {
|
||||||
|
counts.merge(ch.fontSize(), 1, Integer::sum);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (counts.isEmpty()) {
|
||||||
|
return 0f;
|
||||||
|
}
|
||||||
|
float dominant = 0f;
|
||||||
|
int maxCount = -1;
|
||||||
|
for (Map.Entry<Float, Integer> entry : counts.entrySet()) {
|
||||||
|
int count = entry.getValue();
|
||||||
|
float size = entry.getKey();
|
||||||
|
if (count > maxCount || (count == maxCount && size > dominant)) {
|
||||||
|
maxCount = count;
|
||||||
|
dominant = size;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return dominant;
|
||||||
|
}
|
||||||
|
}
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,82 @@
|
|||||||
|
package stirling.software.common.pdf;
|
||||||
|
|
||||||
|
import stirling.software.jpdfium.text.Table;
|
||||||
|
|
||||||
|
final class TableRenderer {
|
||||||
|
private TableRenderer() {}
|
||||||
|
|
||||||
|
/** Renders a Table as a GitHub-Flavoured Markdown table string. */
|
||||||
|
static String render(Table table) {
|
||||||
|
if (table.rowCount() == 0) {
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
|
String[][] grid = table.asGrid();
|
||||||
|
|
||||||
|
if (table.rowCount() < 2) {
|
||||||
|
// No separator row possible — return plain lines
|
||||||
|
StringBuilder sb = new StringBuilder();
|
||||||
|
for (int c = 0; c < grid[0].length; c++) {
|
||||||
|
if (c > 0) sb.append('\n');
|
||||||
|
sb.append(escape(grid[0][c].trim()));
|
||||||
|
}
|
||||||
|
return sb.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
int cols = grid[0].length;
|
||||||
|
|
||||||
|
// Compute column widths: max(3, max content length across all rows)
|
||||||
|
int[] widths = new int[cols];
|
||||||
|
for (int c = 0; c < cols; c++) {
|
||||||
|
widths[c] = 3;
|
||||||
|
}
|
||||||
|
for (String[] row : grid) {
|
||||||
|
for (int c = 0; c < cols; c++) {
|
||||||
|
String cell = c < row.length ? row[c].trim() : "";
|
||||||
|
widths[c] = Math.max(widths[c], escape(cell).length());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
StringBuilder sb = new StringBuilder();
|
||||||
|
|
||||||
|
// Header row
|
||||||
|
sb.append(buildRow(grid[0], widths, cols));
|
||||||
|
sb.append('\n');
|
||||||
|
|
||||||
|
// Separator row
|
||||||
|
sb.append('|');
|
||||||
|
for (int c = 0; c < cols; c++) {
|
||||||
|
sb.append('-').append("-".repeat(widths[c])).append('-').append('|');
|
||||||
|
}
|
||||||
|
sb.append('\n');
|
||||||
|
|
||||||
|
// Data rows
|
||||||
|
for (int r = 1; r < grid.length; r++) {
|
||||||
|
sb.append(buildRow(grid[r], widths, cols));
|
||||||
|
if (r < grid.length - 1) {
|
||||||
|
sb.append('\n');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return sb.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String buildRow(String[] row, int[] widths, int cols) {
|
||||||
|
StringBuilder sb = new StringBuilder();
|
||||||
|
sb.append('|');
|
||||||
|
for (int c = 0; c < cols; c++) {
|
||||||
|
String cell = c < row.length ? escape(row[c].trim()) : "";
|
||||||
|
sb.append(' ').append(padRight(cell, widths[c])).append(' ').append('|');
|
||||||
|
}
|
||||||
|
return sb.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String escape(String cell) {
|
||||||
|
return cell.replace("|", "\\|");
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String padRight(String s, int width) {
|
||||||
|
if (s.length() >= width) return s;
|
||||||
|
return s + " ".repeat(width - s.length());
|
||||||
|
}
|
||||||
|
}
|
||||||
-153
@@ -1,153 +0,0 @@
|
|||||||
package stirling.software.SPDF.pdf.parser;
|
|
||||||
|
|
||||||
import static org.assertj.core.api.Assertions.assertThat;
|
|
||||||
import static stirling.software.SPDF.pdf.parser.PdfModels.*;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import org.junit.jupiter.api.Test;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Unit tests for {@link LineAlignmentTableParser}, focused on the coincident-line merge logic and
|
|
||||||
* column-grid construction.
|
|
||||||
*/
|
|
||||||
class LineAlignmentTableParserTest {
|
|
||||||
|
|
||||||
private final LineAlignmentTableParser parser = new LineAlignmentTableParser();
|
|
||||||
|
|
||||||
// ── mergeCoincidentLines ─────────────────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
@Test
|
|
||||||
void mergeCoincidentLines_singleLine_unchanged() {
|
|
||||||
var lines = List.of(tokenized(rawLine(10f, 100f, "Revenue")));
|
|
||||||
assertThat(parser.mergeCoincidentLines(lines)).hasSize(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
void mergeCoincidentLines_distinctYLines_unchanged() {
|
|
||||||
// Two lines at different y positions — must NOT be merged.
|
|
||||||
var lines =
|
|
||||||
List.of(
|
|
||||||
tokenized(rawLine(10f, 100f, "Revenue")),
|
|
||||||
tokenized(rawLine(10f, 115f, "Cost")));
|
|
||||||
assertThat(parser.mergeCoincidentLines(lines)).hasSize(2);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
void mergeCoincidentLines_sameY_merged() {
|
|
||||||
// Simulates a financial-table row split by LineBuilder at the column gap:
|
|
||||||
// label fragment at x=72 → "Revenue"
|
|
||||||
// value fragment at x=350 → "1,234"
|
|
||||||
// Both have y=100. After merge they should form one TokenizedLine.
|
|
||||||
var label = rawLine(72f, 100f, "Revenue");
|
|
||||||
var value = rawLine(350f, 100f, "1,234");
|
|
||||||
|
|
||||||
var merged = parser.mergeCoincidentLines(List.of(tokenized(label), tokenized(value)));
|
|
||||||
|
|
||||||
assertThat(merged).hasSize(1);
|
|
||||||
// The merged line should contain tokens from both halves.
|
|
||||||
var tokens = merged.get(0).all();
|
|
||||||
assertThat(tokens.stream().map(t -> t.text()).toList())
|
|
||||||
.containsExactlyInAnyOrder("Revenue", "1,234");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
void mergeCoincidentLines_sameY_mergedLineHasCorrectBounds() {
|
|
||||||
var label = rawLine(72f, 100f, "Revenue"); // 7 chars × 6pt = 42pt wide → right = 114
|
|
||||||
var value = rawLine(350f, 100f, "1,234"); // 5 chars × 6pt = 30pt wide → right = 380
|
|
||||||
|
|
||||||
var merged = parser.mergeCoincidentLines(List.of(tokenized(label), tokenized(value)));
|
|
||||||
|
|
||||||
var bounds = merged.get(0).line().bounds();
|
|
||||||
assertThat(bounds.x()).isEqualTo(72f);
|
|
||||||
assertThat(bounds.right()).isEqualTo(380f);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
void mergeCoincidentLines_withinTolerance_merged() {
|
|
||||||
// Lines 1.5pt apart (within ROW_MERGE_TOLERANCE_PT = 2pt) should merge.
|
|
||||||
var a = rawLine(10f, 100.0f, "Alpha");
|
|
||||||
var b = rawLine(200f, 101.5f, "99");
|
|
||||||
|
|
||||||
var merged = parser.mergeCoincidentLines(List.of(tokenized(a), tokenized(b)));
|
|
||||||
assertThat(merged).hasSize(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
void mergeCoincidentLines_beyondTolerance_notMerged() {
|
|
||||||
// Lines 3pt apart (beyond ROW_MERGE_TOLERANCE_PT = 2pt) should NOT merge.
|
|
||||||
var a = rawLine(10f, 100.0f, "Alpha");
|
|
||||||
var b = rawLine(200f, 103.0f, "99");
|
|
||||||
|
|
||||||
var merged = parser.mergeCoincidentLines(List.of(tokenized(a), tokenized(b)));
|
|
||||||
assertThat(merged).hasSize(2);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
void mergeCoincidentLines_threeCoincident_allMerged() {
|
|
||||||
// Three fragments at the same y (e.g. wide financial table with two value columns).
|
|
||||||
var a = rawLine(72f, 100f, "Revenue");
|
|
||||||
var b = rawLine(300f, 100f, "1,234");
|
|
||||||
var c = rawLine(400f, 100f, "5,678");
|
|
||||||
|
|
||||||
var merged = parser.mergeCoincidentLines(List.of(tokenized(a), tokenized(b), tokenized(c)));
|
|
||||||
assertThat(merged).hasSize(1);
|
|
||||||
assertThat(merged.get(0).all()).hasSize(3);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
void mergeCoincidentLines_coincidentPairFollowedByDistinctLine_twoGroups() {
|
|
||||||
var a = rawLine(72f, 100f, "Revenue");
|
|
||||||
var b = rawLine(350f, 100f, "1,234"); // same y as a → merges with a
|
|
||||||
var c = rawLine(10f, 115f, "Expenses"); // different y → stays separate
|
|
||||||
|
|
||||||
var merged = parser.mergeCoincidentLines(List.of(tokenized(a), tokenized(b), tokenized(c)));
|
|
||||||
assertThat(merged).hasSize(2);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
void mergeCoincidentLines_numericAnchorStatus_correctAfterMerge() {
|
|
||||||
// After merging, the combined line should be an anchor (≥2 numeric tokens).
|
|
||||||
// "Revenue" alone → not an anchor. "1,234 567" alone → anchor.
|
|
||||||
// Merged → anchor with at least 2 numerics.
|
|
||||||
var label = rawLine(72f, 100f, "Revenue");
|
|
||||||
var values = rawLineMultiWord(350f, 100f, "1,234", 30f, "567", 30f);
|
|
||||||
|
|
||||||
var merged = parser.mergeCoincidentLines(List.of(tokenized(label), tokenized(values)));
|
|
||||||
|
|
||||||
assertThat(merged).hasSize(1);
|
|
||||||
assertThat(merged.get(0).isAnchor()).isTrue();
|
|
||||||
}
|
|
||||||
|
|
||||||
// ── helpers ──────────────────────────────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
/** Creates a RawLine with a single TextFragment of the given text at the given position. */
|
|
||||||
private static RawLine rawLine(float x, float y, String text) {
|
|
||||||
float width = text.length() * 6f; // ~6pt per char — rough but consistent
|
|
||||||
float height = 12f;
|
|
||||||
Bounds bounds = new Bounds(x, y, width, height);
|
|
||||||
TextFragment fragment =
|
|
||||||
new TextFragment("tf-test", text, bounds, y + height, 11f, "Helvetica", false);
|
|
||||||
return new RawLine("ln-test", List.of(fragment), bounds, 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates a RawLine with two TextFragments representing two words separated by a small gap.
|
|
||||||
* Used to simulate a values-only line with multiple numeric tokens.
|
|
||||||
*/
|
|
||||||
private static RawLine rawLineMultiWord(
|
|
||||||
float x, float y, String word1, float w1, String word2, float w2) {
|
|
||||||
float height = 12f;
|
|
||||||
Bounds b1 = new Bounds(x, y, w1, height);
|
|
||||||
Bounds b2 = new Bounds(x + w1 + 5f, y, w2, height);
|
|
||||||
TextFragment f1 = new TextFragment("tf-1", word1, b1, y + height, 11f, "Helvetica", false);
|
|
||||||
TextFragment f2 = new TextFragment("tf-2", word2, b2, y + height, 11f, "Helvetica", false);
|
|
||||||
Bounds lineBounds = new Bounds(x, y, x + w1 + 5f + w2 - x, height);
|
|
||||||
return new RawLine("ln-test", List.of(f1, f2), lineBounds, 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Tokenises a RawLine via the parser's own tokenise logic (package-private access). */
|
|
||||||
private LineAlignmentTableParser.TokenizedLine tokenized(RawLine line) {
|
|
||||||
return parser.tokenize(line);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,269 @@
|
|||||||
|
package stirling.software.common.pdf;
|
||||||
|
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||||
|
import static org.junit.jupiter.api.Assertions.fail;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.io.InputStream;
|
||||||
|
import java.nio.charset.StandardCharsets;
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.stream.Stream;
|
||||||
|
|
||||||
|
import org.junit.jupiter.api.Disabled;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
import org.junit.jupiter.api.io.TempDir;
|
||||||
|
import org.junit.jupiter.params.ParameterizedTest;
|
||||||
|
import org.junit.jupiter.params.provider.Arguments;
|
||||||
|
import org.junit.jupiter.params.provider.MethodSource;
|
||||||
|
|
||||||
|
import stirling.software.jpdfium.PdfDocument;
|
||||||
|
import stirling.software.jpdfium.text.TextLine;
|
||||||
|
import stirling.software.jpdfium.text.TextWord;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Accuracy and robustness tests for {@link PdfMarkdownConverter}, comparing conversion output
|
||||||
|
* against hand-authored golden Markdown for a set of owned/synthetic fixtures.
|
||||||
|
*
|
||||||
|
* <p>The {@link #gatedFixtures()} set is enforced in CI: those fixtures currently convert within
|
||||||
|
* the accuracy threshold and guard against regressions. Fixtures still being iterated on live in
|
||||||
|
* {@link #wipFixtures()} under a {@link Disabled} test so the goldens stay in the tree without
|
||||||
|
* breaking the build. Enable the WIP test locally to see per-fixture scores while working on the
|
||||||
|
* converter.
|
||||||
|
*/
|
||||||
|
class PdfMarkdownConverterTest {
|
||||||
|
|
||||||
|
/** Accuracy threshold: output must share at least this fraction of content with the golden. */
|
||||||
|
private static final double THRESHOLD = 0.95;
|
||||||
|
|
||||||
|
@TempDir Path tmp;
|
||||||
|
|
||||||
|
/** Fixtures that meet the accuracy threshold today and therefore gate CI. */
|
||||||
|
static Stream<Arguments> gatedFixtures() {
|
||||||
|
return Stream.of(
|
||||||
|
Arguments.of("multi-column-test_lorem.pdf", "multi-column-test_lorem.md"),
|
||||||
|
Arguments.of("bordered-table-test_widget.pdf", "bordered-table-test_widget.md"),
|
||||||
|
Arguments.of("many-tables-test_stress.pdf", "many-tables-test_stress.md"));
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Fixtures still below the threshold; tracked here, enable locally to iterate. */
|
||||||
|
static Stream<Arguments> wipFixtures() {
|
||||||
|
return Stream.of(
|
||||||
|
Arguments.of(
|
||||||
|
"wrapped-cell-test_expense-report.pdf",
|
||||||
|
"wrapped-cell-test_expense-report.md"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@ParameterizedTest(name = "{0}")
|
||||||
|
@MethodSource("gatedFixtures")
|
||||||
|
void convertMatchesGoldenMarkdown(String pdfName, String mdName) throws IOException {
|
||||||
|
assertConversionMatchesGolden(pdfName, mdName);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Disabled("WIP fixtures below the accuracy threshold; enable locally to iterate")
|
||||||
|
@ParameterizedTest(name = "{0}")
|
||||||
|
@MethodSource("wipFixtures")
|
||||||
|
void convertMatchesGoldenMarkdownWip(String pdfName, String mdName) throws IOException {
|
||||||
|
assertConversionMatchesGolden(pdfName, mdName);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Degenerate/extreme geometry must not crash the converter. A crafted or malformed PDF can
|
||||||
|
* position text anywhere via a text matrix, so a row's words can span from near the origin to a
|
||||||
|
* coordinate beyond {@link Integer#MAX_VALUE}. The old column-detection code sized an {@code
|
||||||
|
* int[]} straight from {@code (int) Math.ceil(maxX) - lo}, which either allocated a multi-GB
|
||||||
|
* array (OutOfMemoryError) or overflowed to a negative length (NegativeArraySizeException) —
|
||||||
|
* taking down the request thread. Detection must instead bail out and return no columns.
|
||||||
|
*/
|
||||||
|
@Test
|
||||||
|
void columnDetectionSurvivesDegenerateGeometry() {
|
||||||
|
// x ≈ 2.5e9 is past Integer.MAX_VALUE; combined with a near-origin word it yields an
|
||||||
|
// implausible span that the pre-fix code turned into a fatal array allocation.
|
||||||
|
List<TextLine> rows = new ArrayList<>();
|
||||||
|
for (int r = 0; r < 4; r++) {
|
||||||
|
float y = 400f - r * 12f;
|
||||||
|
TextWord near = new TextWord(List.of(), 50f, y, 30f, 10f);
|
||||||
|
TextWord far = new TextWord(List.of(), 2_500_000_000f, y, 30f, 10f);
|
||||||
|
rows.add(new TextLine(List.of(near, far), 50f, y, 2_499_999_980f, 10f));
|
||||||
|
}
|
||||||
|
|
||||||
|
List<float[]> columns =
|
||||||
|
assertDoesNotThrow(() -> PdfMarkdownConverter.findColumnRangesFromLines(rows));
|
||||||
|
assertTrue(
|
||||||
|
columns.isEmpty(),
|
||||||
|
"implausible page span should disable column detection, not allocate from it");
|
||||||
|
}
|
||||||
|
|
||||||
|
private void assertConversionMatchesGolden(String pdfName, String mdName) throws IOException {
|
||||||
|
Path pdfPath = tmp.resolve(pdfName);
|
||||||
|
try (InputStream in =
|
||||||
|
getClass().getResourceAsStream("/pdf-ingestion-fixtures/" + pdfName)) {
|
||||||
|
if (in == null) {
|
||||||
|
fail("Fixture not found on classpath: /pdf-ingestion-fixtures/" + pdfName);
|
||||||
|
}
|
||||||
|
Files.copy(in, pdfPath);
|
||||||
|
}
|
||||||
|
|
||||||
|
String actual;
|
||||||
|
try (PdfDocument doc = PdfDocument.open(pdfPath)) {
|
||||||
|
actual = new PdfMarkdownConverter().convert(doc);
|
||||||
|
}
|
||||||
|
|
||||||
|
String expected;
|
||||||
|
try (InputStream in = getClass().getResourceAsStream("/pdf-ingestion-fixtures/" + mdName)) {
|
||||||
|
if (in == null) {
|
||||||
|
fail("Golden file not found on classpath: /pdf-ingestion-fixtures/" + mdName);
|
||||||
|
}
|
||||||
|
expected = new String(in.readAllBytes(), StandardCharsets.UTF_8);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Image placeholders are not scored: their body text is a TODO ("ideally, add the info
|
||||||
|
// available about the image...") rather than real content, so comparing it would penalise
|
||||||
|
// output for matching a placeholder we intend to replace. Drop those lines from both sides.
|
||||||
|
expected = stripImagePlaceholders(expected);
|
||||||
|
actual = stripImagePlaceholders(actual);
|
||||||
|
|
||||||
|
double similarity = similarity(expected, actual);
|
||||||
|
if (similarity < THRESHOLD) {
|
||||||
|
fail(
|
||||||
|
String.format(
|
||||||
|
"Markdown output differs from golden file '%s' by %.1f%% (threshold %.0f%%):%n%s",
|
||||||
|
mdName,
|
||||||
|
(1.0 - similarity) * 100,
|
||||||
|
(1.0 - THRESHOLD) * 100,
|
||||||
|
unifiedDiff(expected, actual)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Substring identifying an image-placeholder line, which is excluded from scoring. */
|
||||||
|
private static final String IMAGE_PLACEHOLDER_MARKER = "Image intentionally redacted";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Removes non-content lines from the comparison: image placeholders (TODO text we intend to
|
||||||
|
* replace) and GFM table separator rows (the {@code |---|---|} divider, whose exact dash count
|
||||||
|
* is cosmetic — any run of three or more dashes is valid Markdown).
|
||||||
|
*/
|
||||||
|
private static String stripImagePlaceholders(String md) {
|
||||||
|
StringBuilder sb = new StringBuilder();
|
||||||
|
for (String line : md.split("\n", -1)) {
|
||||||
|
if (line.contains(IMAGE_PLACEHOLDER_MARKER)
|
||||||
|
|| line.strip().startsWith("<image redacted")
|
||||||
|
|| isTableSeparatorRow(line)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (sb.length() > 0) {
|
||||||
|
sb.append('\n');
|
||||||
|
}
|
||||||
|
sb.append(line);
|
||||||
|
}
|
||||||
|
return sb.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
/** True for a GFM table separator row, e.g. {@code |---|:--:|---|} (only |, -, :, space). */
|
||||||
|
private static boolean isTableSeparatorRow(String line) {
|
||||||
|
String t = line.strip();
|
||||||
|
if (!t.contains("-")) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return t.chars().allMatch(c -> c == '|' || c == '-' || c == ':' || c == ' ');
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Character-level similarity: proportion of expected characters that appear in the LCS. O(n*m)
|
||||||
|
* but golden files are small enough that this is fine.
|
||||||
|
*/
|
||||||
|
private static double similarity(String expected, String actual) {
|
||||||
|
if (expected.isEmpty() && actual.isEmpty()) return 1.0;
|
||||||
|
if (expected.isEmpty() || actual.isEmpty()) return 0.0;
|
||||||
|
// Strip all whitespace for a content-focused comparison
|
||||||
|
String e = expected.replaceAll("\\s+", " ").strip();
|
||||||
|
String a = actual.replaceAll("\\s+", " ").strip();
|
||||||
|
int lcs = lcsLength(e, a);
|
||||||
|
return (double) lcs / Math.max(e.length(), a.length());
|
||||||
|
}
|
||||||
|
|
||||||
|
private static int lcsLength(String a, String b) {
|
||||||
|
// Use two-row DP to keep memory reasonable
|
||||||
|
int m = a.length(), n = b.length();
|
||||||
|
int[] prev = new int[n + 1];
|
||||||
|
int[] curr = new int[n + 1];
|
||||||
|
for (int i = 1; i <= m; i++) {
|
||||||
|
for (int j = 1; j <= n; j++) {
|
||||||
|
if (a.charAt(i - 1) == b.charAt(j - 1)) {
|
||||||
|
curr[j] = prev[j - 1] + 1;
|
||||||
|
} else {
|
||||||
|
curr[j] = Math.max(curr[j - 1], prev[j]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
int[] tmp = prev;
|
||||||
|
prev = curr;
|
||||||
|
curr = tmp;
|
||||||
|
java.util.Arrays.fill(curr, 0);
|
||||||
|
}
|
||||||
|
return prev[n];
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String unifiedDiff(String expected, String actual) {
|
||||||
|
String[] expectedLines = expected.split("\n", -1);
|
||||||
|
String[] actualLines = actual.split("\n", -1);
|
||||||
|
|
||||||
|
List<String> diff = new ArrayList<>();
|
||||||
|
diff.add("--- expected");
|
||||||
|
diff.add("+++ actual");
|
||||||
|
|
||||||
|
int maxLines = Math.max(expectedLines.length, actualLines.length);
|
||||||
|
int context = 3;
|
||||||
|
boolean inHunk = false;
|
||||||
|
int hunkStart = -1;
|
||||||
|
List<String> hunkLines = new ArrayList<>();
|
||||||
|
|
||||||
|
for (int i = 0; i < maxLines; i++) {
|
||||||
|
String exp = i < expectedLines.length ? expectedLines[i] : null;
|
||||||
|
String act = i < actualLines.length ? actualLines[i] : null;
|
||||||
|
|
||||||
|
boolean changed = exp == null || act == null || !exp.equals(act);
|
||||||
|
if (changed) {
|
||||||
|
if (!inHunk) {
|
||||||
|
inHunk = true;
|
||||||
|
hunkStart = Math.max(0, i - context);
|
||||||
|
// add context lines before change
|
||||||
|
for (int c = hunkStart; c < i; c++) {
|
||||||
|
hunkLines.add(" " + (c < expectedLines.length ? expectedLines[c] : ""));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (exp != null) hunkLines.add("-" + exp);
|
||||||
|
if (act != null) hunkLines.add("+" + act);
|
||||||
|
} else {
|
||||||
|
if (inHunk) {
|
||||||
|
hunkLines.add(" " + exp);
|
||||||
|
// check if we're far enough past the last change to close the hunk
|
||||||
|
boolean moreChanges = false;
|
||||||
|
for (int j = i + 1; j < Math.min(i + context, maxLines); j++) {
|
||||||
|
String e2 = j < expectedLines.length ? expectedLines[j] : null;
|
||||||
|
String a2 = j < actualLines.length ? actualLines[j] : null;
|
||||||
|
if (e2 == null || a2 == null || !e2.equals(a2)) {
|
||||||
|
moreChanges = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!moreChanges && (i - hunkStart) >= context) {
|
||||||
|
diff.add("@@ -" + (hunkStart + 1) + " @@");
|
||||||
|
diff.addAll(hunkLines);
|
||||||
|
hunkLines.clear();
|
||||||
|
inHunk = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (inHunk && !hunkLines.isEmpty()) {
|
||||||
|
diff.add("@@ -" + (hunkStart + 1) + " @@");
|
||||||
|
diff.addAll(hunkLines);
|
||||||
|
}
|
||||||
|
|
||||||
|
return String.join("\n", diff);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
# Widget Inventory Report
|
||||||
|
|
||||||
|
This report lists current stock levels for each warehouse.
|
||||||
|
|
||||||
|
| Region | Units | Status |
|
||||||
|
|---|---|---|
|
||||||
|
| North | 1200 | OK |
|
||||||
|
| South | 950 | Low |
|
||||||
|
| East | 1430 | OK |
|
||||||
|
| West | 875 | Low |
|
||||||
@@ -0,0 +1,74 @@
|
|||||||
|
%PDF-1.4
|
||||||
|
%“Œ‹ž ReportLab Generated PDF document (opensource)
|
||||||
|
1 0 obj
|
||||||
|
<<
|
||||||
|
/F1 2 0 R /F2 3 0 R
|
||||||
|
>>
|
||||||
|
endobj
|
||||||
|
2 0 obj
|
||||||
|
<<
|
||||||
|
/BaseFont /Helvetica /Encoding /WinAnsiEncoding /Name /F1 /Subtype /Type1 /Type /Font
|
||||||
|
>>
|
||||||
|
endobj
|
||||||
|
3 0 obj
|
||||||
|
<<
|
||||||
|
/BaseFont /Helvetica-Bold /Encoding /WinAnsiEncoding /Name /F2 /Subtype /Type1 /Type /Font
|
||||||
|
>>
|
||||||
|
endobj
|
||||||
|
4 0 obj
|
||||||
|
<<
|
||||||
|
/Contents 8 0 R /MediaBox [ 0 0 612 792 ] /Parent 7 0 R /Resources <<
|
||||||
|
/Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ]
|
||||||
|
>> /Rotate 0 /Trans <<
|
||||||
|
|
||||||
|
>>
|
||||||
|
/Type /Page
|
||||||
|
>>
|
||||||
|
endobj
|
||||||
|
5 0 obj
|
||||||
|
<<
|
||||||
|
/PageMode /UseNone /Pages 7 0 R /Type /Catalog
|
||||||
|
>>
|
||||||
|
endobj
|
||||||
|
6 0 obj
|
||||||
|
<<
|
||||||
|
/Author (\(anonymous\)) /CreationDate (D:20260603003133+01'00') /Creator (\(unspecified\)) /Keywords () /ModDate (D:20260603003133+01'00') /Producer (ReportLab PDF Library - \(opensource\))
|
||||||
|
/Subject (\(unspecified\)) /Title (\(anonymous\)) /Trapped /False
|
||||||
|
>>
|
||||||
|
endobj
|
||||||
|
7 0 obj
|
||||||
|
<<
|
||||||
|
/Count 1 /Kids [ 4 0 R ] /Type /Pages
|
||||||
|
>>
|
||||||
|
endobj
|
||||||
|
8 0 obj
|
||||||
|
<<
|
||||||
|
/Filter [ /ASCII85Decode /FlateDecode ] /Length 500
|
||||||
|
>>
|
||||||
|
stream
|
||||||
|
Gas1[9i&Y\%))C:pc(6t3;pQ8%0T@tD+-Nf,MP8j(><jDruNO^VsZ'm=ue7^Ia=;l(`h-+jUU3'Knh#YjH-MEIFj6r!oqf+FjMh;(rCq>R4tMCHL4NI*\1+UNiI'V9NC%VeJKn/YI0J];XQt&X83?=ihrg<*Mcn1n!1nWcDaQPe\P"9gnJuHl(jf]JQgZ[,&^uobI4QF',k"*^S)3c;)GMWC(T'=",ErnS#U=YCUN0&q4+*KmK1Zd*NI\GQDiZUG7;PTja8lulb"\PWWO#WcfI[ZB:6s*3g$be%?JH<b[c(?4J1!2SLDmbmkh8.c&CU)B?Xu,cp$<hP@=fLc>(n`oaEJ[XE'%QW=HE04M<,;ERm[MS=uYF=nN3jG'f@#?O48Ia,6Y-3m&tTWVq1?DeiBkp.Ug*;lVZX`Z=P.eklHhNV;!R_?QOuoeJ<0%7idG7GM8boU$^>N.N,2^;25]0Z8M<<]XMCct>noC'Qfb?`*[Mo+,F9#>t~>endstream
|
||||||
|
endobj
|
||||||
|
xref
|
||||||
|
0 9
|
||||||
|
0000000000 65535 f
|
||||||
|
0000000061 00000 n
|
||||||
|
0000000102 00000 n
|
||||||
|
0000000209 00000 n
|
||||||
|
0000000321 00000 n
|
||||||
|
0000000514 00000 n
|
||||||
|
0000000582 00000 n
|
||||||
|
0000000862 00000 n
|
||||||
|
0000000921 00000 n
|
||||||
|
trailer
|
||||||
|
<<
|
||||||
|
/ID
|
||||||
|
[<ee376a59c53e3f2af87024f65fd4222c><ee376a59c53e3f2af87024f65fd4222c>]
|
||||||
|
% ReportLab generated PDF document -- digest (opensource)
|
||||||
|
|
||||||
|
/Info 6 0 R
|
||||||
|
/Root 5 0 R
|
||||||
|
/Size 9
|
||||||
|
>>
|
||||||
|
startxref
|
||||||
|
1511
|
||||||
|
%%EOF
|
||||||
@@ -0,0 +1,222 @@
|
|||||||
|
Intro paragraph for section 1.
|
||||||
|
|
||||||
|
| Name | Qty |
|
||||||
|
|---|---|
|
||||||
|
| alpha | 101 |
|
||||||
|
| delta | 201 |
|
||||||
|
|
||||||
|
# Section 2 Heading
|
||||||
|
|
||||||
|
| Name | Qty | Price |
|
||||||
|
|---|---|---|
|
||||||
|
| alpha | 101 | charlie |
|
||||||
|
| delta | 201 | foxtrot |
|
||||||
|
| golf | 301 | india |
|
||||||
|
|
||||||
|
## Section 3 Heading
|
||||||
|
|
||||||
|
| Name | Qty | Price | Region |
|
||||||
|
|---|---|---|---|
|
||||||
|
| alpha | 101 | charlie | 3 |
|
||||||
|
| delta | 201 | foxtrot | 13 |
|
||||||
|
| golf | 301 | india | 23 |
|
||||||
|
| juliet | 401 | lima | 33 |
|
||||||
|
|
||||||
|
Intro paragraph for section 4.
|
||||||
|
|
||||||
|
| Name | Qty | Price | Region | Status |
|
||||||
|
|---|---|---|---|---|
|
||||||
|
| alpha | 101 | charlie | 3 | echo |
|
||||||
|
| delta | 201 | foxtrot | 13 | hotel |
|
||||||
|
| golf | 301 | india | 23 | kilo |
|
||||||
|
| juliet | 401 | lima | 33 | november |
|
||||||
|
| mike | 501 | oscar | 43 | alpha |
|
||||||
|
|
||||||
|
# Section 5 Heading
|
||||||
|
|
||||||
|
| Name | Qty |
|
||||||
|
|---|---|
|
||||||
|
| alpha | 101 |
|
||||||
|
| delta | 201 |
|
||||||
|
| golf | 301 |
|
||||||
|
| juliet | 401 |
|
||||||
|
| mike | 501 |
|
||||||
|
| papa | 601 |
|
||||||
|
|
||||||
|
| Name | Qty | Price |
|
||||||
|
|---|---|---|
|
||||||
|
| alpha | 101 | charlie |
|
||||||
|
| delta | 201 | foxtrot |
|
||||||
|
|
||||||
|
# Section 7 Heading
|
||||||
|
|
||||||
|
Intro paragraph for section 7.
|
||||||
|
|
||||||
|
| Name | Qty | Price | Region |
|
||||||
|
|---|---|---|---|
|
||||||
|
| alpha | 101 | charlie | 3 |
|
||||||
|
| delta | 201 | foxtrot | 13 |
|
||||||
|
| golf | 301 | india | 23 |
|
||||||
|
|
||||||
|
## Section 8 Heading
|
||||||
|
|
||||||
|
| Name | Qty | Price | Region | Status |
|
||||||
|
|---|---|---|---|---|
|
||||||
|
| alpha | 101 | charlie | 3 | echo |
|
||||||
|
| delta | 201 | foxtrot | 13 | hotel |
|
||||||
|
| golf | 301 | india | 23 | kilo |
|
||||||
|
| juliet | 401 | lima | 33 | november |
|
||||||
|
|
||||||
|
| Name | Qty |
|
||||||
|
|---|---|
|
||||||
|
| alpha | 101 |
|
||||||
|
| delta | 201 |
|
||||||
|
| golf | 301 |
|
||||||
|
| juliet | 401 |
|
||||||
|
| mike | 501 |
|
||||||
|
|
||||||
|
# Section 10 Heading
|
||||||
|
|
||||||
|
Intro paragraph for section 10.
|
||||||
|
|
||||||
|
| Name | Qty | Price |
|
||||||
|
|---|---|---|
|
||||||
|
| alpha | 101 | charlie |
|
||||||
|
| delta | 201 | foxtrot |
|
||||||
|
| golf | 301 | india |
|
||||||
|
| juliet | 401 | lima |
|
||||||
|
| mike | 501 | oscar |
|
||||||
|
| papa | 601 | bravo |
|
||||||
|
|
||||||
|
| Name | Qty | Price | Region |
|
||||||
|
|---|---|---|---|
|
||||||
|
| alpha | 101 | charlie | 3 |
|
||||||
|
| delta | 201 | foxtrot | 13 |
|
||||||
|
|
||||||
|
# Section 12 Heading
|
||||||
|
|
||||||
|
| Name | Qty | Price | Region | Status |
|
||||||
|
|---|---|---|---|---|
|
||||||
|
| alpha | 101 | charlie | 3 | echo |
|
||||||
|
| delta | 201 | foxtrot | 13 | hotel |
|
||||||
|
| golf | 301 | india | 23 | kilo |
|
||||||
|
|
||||||
|
## Section 13 Heading
|
||||||
|
|
||||||
|
Intro paragraph for section 13.
|
||||||
|
|
||||||
|
| Name | Qty |
|
||||||
|
|---|---|
|
||||||
|
| alpha | 101 |
|
||||||
|
| delta | 201 |
|
||||||
|
| golf | 301 |
|
||||||
|
| juliet | 401 |
|
||||||
|
|
||||||
|
| Name | Qty | Price |
|
||||||
|
|---|---|---|
|
||||||
|
| alpha | 101 | charlie |
|
||||||
|
| delta | 201 | foxtrot |
|
||||||
|
| golf | 301 | india |
|
||||||
|
| juliet | 401 | lima |
|
||||||
|
| mike | 501 | oscar |
|
||||||
|
|
||||||
|
# Section 15 Heading
|
||||||
|
|
||||||
|
| Name | Qty | Price | Region |
|
||||||
|
|---|---|---|---|
|
||||||
|
| alpha | 101 | charlie | 3 |
|
||||||
|
| delta | 201 | foxtrot | 13 |
|
||||||
|
| golf | 301 | india | 23 |
|
||||||
|
| juliet | 401 | lima | 33 |
|
||||||
|
| mike | 501 | oscar | 43 |
|
||||||
|
| papa | 601 | bravo | 53 |
|
||||||
|
|
||||||
|
Intro paragraph for section 16.
|
||||||
|
|
||||||
|
| Name | Qty | Price | Region | Status |
|
||||||
|
|---|---|---|---|---|
|
||||||
|
| alpha | 101 | charlie | 3 | echo |
|
||||||
|
| delta | 201 | foxtrot | 13 | hotel |
|
||||||
|
|
||||||
|
# Section 17 Heading
|
||||||
|
|
||||||
|
| Name | Qty |
|
||||||
|
|---|---|
|
||||||
|
| alpha | 101 |
|
||||||
|
| delta | 201 |
|
||||||
|
| golf | 301 |
|
||||||
|
|
||||||
|
## Section 18 Heading
|
||||||
|
|
||||||
|
| Name | Qty | Price |
|
||||||
|
|---|---|---|
|
||||||
|
| alpha | 101 | charlie |
|
||||||
|
| delta | 201 | foxtrot |
|
||||||
|
| golf | 301 | india |
|
||||||
|
| juliet | 401 | lima |
|
||||||
|
|
||||||
|
Intro paragraph for section 19.
|
||||||
|
|
||||||
|
| Name | Qty | Price | Region |
|
||||||
|
|---|---|---|---|
|
||||||
|
| alpha | 101 | charlie | 3 |
|
||||||
|
| delta | 201 | foxtrot | 13 |
|
||||||
|
| golf | 301 | india | 23 |
|
||||||
|
| juliet | 401 | lima | 33 |
|
||||||
|
| mike | 501 | oscar | 43 |
|
||||||
|
|
||||||
|
# Section 20 Heading
|
||||||
|
|
||||||
|
| Name | Qty | Price | Region | Status |
|
||||||
|
|---|---|---|---|---|
|
||||||
|
| alpha | 101 | charlie | 3 | echo |
|
||||||
|
| delta | 201 | foxtrot | 13 | hotel |
|
||||||
|
| golf | 301 | india | 23 | kilo |
|
||||||
|
| juliet | 401 | lima | 33 | november |
|
||||||
|
| mike | 501 | oscar | 43 | alpha |
|
||||||
|
| papa | 601 | bravo | 53 | delta |
|
||||||
|
|
||||||
|
| Name | Qty |
|
||||||
|
|---|---|
|
||||||
|
| alpha | 101 |
|
||||||
|
| delta | 201 |
|
||||||
|
|
||||||
|
# Section 22 Heading
|
||||||
|
|
||||||
|
Intro paragraph for section 22.
|
||||||
|
|
||||||
|
| Name | Qty | Price |
|
||||||
|
|---|---|---|
|
||||||
|
| alpha | 101 | charlie |
|
||||||
|
| delta | 201 | foxtrot |
|
||||||
|
| golf | 301 | india |
|
||||||
|
|
||||||
|
## Section 23 Heading
|
||||||
|
|
||||||
|
| Name | Qty | Price | Region |
|
||||||
|
|---|---|---|---|
|
||||||
|
| alpha | 101 | charlie | 3 |
|
||||||
|
| delta | 201 | foxtrot | 13 |
|
||||||
|
| golf | 301 | india | 23 |
|
||||||
|
| juliet | 401 | lima | 33 |
|
||||||
|
|
||||||
|
| Name | Qty | Price | Region | Status |
|
||||||
|
|---|---|---|---|---|
|
||||||
|
| alpha | 101 | charlie | 3 | echo |
|
||||||
|
| delta | 201 | foxtrot | 13 | hotel |
|
||||||
|
| golf | 301 | india | 23 | kilo |
|
||||||
|
| juliet | 401 | lima | 33 | november |
|
||||||
|
| mike | 501 | oscar | 43 | alpha |
|
||||||
|
|
||||||
|
# Section 25 Heading
|
||||||
|
|
||||||
|
Intro paragraph for section 25.
|
||||||
|
|
||||||
|
| Name | Qty |
|
||||||
|
|---|---|
|
||||||
|
| alpha | 101 |
|
||||||
|
| delta | 201 |
|
||||||
|
| golf | 301 |
|
||||||
|
| juliet | 401 |
|
||||||
|
| mike | 501 |
|
||||||
|
| papa | 601 |
|
||||||
@@ -0,0 +1,169 @@
|
|||||||
|
%PDF-1.4
|
||||||
|
%“Œ‹ž ReportLab Generated PDF document (opensource)
|
||||||
|
1 0 obj
|
||||||
|
<<
|
||||||
|
/F1 2 0 R /F2 3 0 R
|
||||||
|
>>
|
||||||
|
endobj
|
||||||
|
2 0 obj
|
||||||
|
<<
|
||||||
|
/BaseFont /Helvetica /Encoding /WinAnsiEncoding /Name /F1 /Subtype /Type1 /Type /Font
|
||||||
|
>>
|
||||||
|
endobj
|
||||||
|
3 0 obj
|
||||||
|
<<
|
||||||
|
/BaseFont /Helvetica-Bold /Encoding /WinAnsiEncoding /Name /F2 /Subtype /Type1 /Type /Font
|
||||||
|
>>
|
||||||
|
endobj
|
||||||
|
4 0 obj
|
||||||
|
<<
|
||||||
|
/Contents 13 0 R /MediaBox [ 0 0 612 792 ] /Parent 12 0 R /Resources <<
|
||||||
|
/Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ]
|
||||||
|
>> /Rotate 0 /Trans <<
|
||||||
|
|
||||||
|
>>
|
||||||
|
/Type /Page
|
||||||
|
>>
|
||||||
|
endobj
|
||||||
|
5 0 obj
|
||||||
|
<<
|
||||||
|
/Contents 14 0 R /MediaBox [ 0 0 612 792 ] /Parent 12 0 R /Resources <<
|
||||||
|
/Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ]
|
||||||
|
>> /Rotate 0 /Trans <<
|
||||||
|
|
||||||
|
>>
|
||||||
|
/Type /Page
|
||||||
|
>>
|
||||||
|
endobj
|
||||||
|
6 0 obj
|
||||||
|
<<
|
||||||
|
/Contents 15 0 R /MediaBox [ 0 0 612 792 ] /Parent 12 0 R /Resources <<
|
||||||
|
/Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ]
|
||||||
|
>> /Rotate 0 /Trans <<
|
||||||
|
|
||||||
|
>>
|
||||||
|
/Type /Page
|
||||||
|
>>
|
||||||
|
endobj
|
||||||
|
7 0 obj
|
||||||
|
<<
|
||||||
|
/Contents 16 0 R /MediaBox [ 0 0 612 792 ] /Parent 12 0 R /Resources <<
|
||||||
|
/Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ]
|
||||||
|
>> /Rotate 0 /Trans <<
|
||||||
|
|
||||||
|
>>
|
||||||
|
/Type /Page
|
||||||
|
>>
|
||||||
|
endobj
|
||||||
|
8 0 obj
|
||||||
|
<<
|
||||||
|
/Contents 17 0 R /MediaBox [ 0 0 612 792 ] /Parent 12 0 R /Resources <<
|
||||||
|
/Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ]
|
||||||
|
>> /Rotate 0 /Trans <<
|
||||||
|
|
||||||
|
>>
|
||||||
|
/Type /Page
|
||||||
|
>>
|
||||||
|
endobj
|
||||||
|
9 0 obj
|
||||||
|
<<
|
||||||
|
/Contents 18 0 R /MediaBox [ 0 0 612 792 ] /Parent 12 0 R /Resources <<
|
||||||
|
/Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ]
|
||||||
|
>> /Rotate 0 /Trans <<
|
||||||
|
|
||||||
|
>>
|
||||||
|
/Type /Page
|
||||||
|
>>
|
||||||
|
endobj
|
||||||
|
10 0 obj
|
||||||
|
<<
|
||||||
|
/PageMode /UseNone /Pages 12 0 R /Type /Catalog
|
||||||
|
>>
|
||||||
|
endobj
|
||||||
|
11 0 obj
|
||||||
|
<<
|
||||||
|
/Author (\(anonymous\)) /CreationDate (D:20260603005358+01'00') /Creator (\(unspecified\)) /Keywords () /ModDate (D:20260603005358+01'00') /Producer (ReportLab PDF Library - \(opensource\))
|
||||||
|
/Subject (\(unspecified\)) /Title (\(anonymous\)) /Trapped /False
|
||||||
|
>>
|
||||||
|
endobj
|
||||||
|
12 0 obj
|
||||||
|
<<
|
||||||
|
/Count 6 /Kids [ 4 0 R 5 0 R 6 0 R 7 0 R 8 0 R 9 0 R ] /Type /Pages
|
||||||
|
>>
|
||||||
|
endobj
|
||||||
|
13 0 obj
|
||||||
|
<<
|
||||||
|
/Filter [ /ASCII85Decode /FlateDecode ] /Length 1007
|
||||||
|
>>
|
||||||
|
stream
|
||||||
|
GauHKgN)$k&:O:Sn<io8&IUqd[51N1e*/]GIR%m`>DZmeMUK]*(BdhV"2[X,j0;*\%_E*0HXJRc`<Z.PlPcH-)*5ON#Qr4-#h+U(ll5egXa[FW7^<l-+Mko1pU57W'%??d'1Q-,]\qWS80;JOp0HFGa1T[+D>q%4S#/VM`O[Rh4i5T.Phi,$]aT$05!q:PBuCQU/.p2]@1koN*Tb*K9k5G\ht+Dr\K=+8\NZ"alMaOEo**@OK:8-.O1X3-?Gg`@m3%,ti3'">T-&c=M&Wuu?cDbGDp.gO<KniopM)A\M"ajn9N]6p@tefHlX67:iW3SE/[O\LV1TKe.i9es,%kWY+1-s,ft.u27]:^>F0!r6&&CLC$tM?fIR"M37["/*k9@YkpKKSS@Np"1/4#R]`I^(g*1Sc,9L3Qt6N(T@F`A>oBGgL-!r#Y4)R\G`D,iVtFeJUE9u4iuUQ?D%C&SB4kkp.>D5tii>nDKJ"Y07jANhOb$R(_$=U7Stjs)-/KZ(6IBm`6<Z:IO1/g<Q6n^@fdK*]SO#g&Wj4B)g1,#O?30",57V_ONl0p`%uQN]'EAZV$475Z"'DApH2)Sg6UQ75XC?4^'<&6&d?YC`OF9F3eE;WIMt@a?'q)c\3oWQ_BD]d`4=O\,'aSUFV4HsE7)O:lPOi6Ht1,[dTm6JqQM6es[?9G4VC(YieF*)uM6[SZT#[TN2,BIir^1;/Ku"E1laH[\"M+F'8=n0!;?_#hHd!hkpV0u\Ij\4VC-km.[F&JhGmbc`6@I1=mf>u<3;i.Bh4+MFJ"H:.XWUQX6%LU(sg4Tt$_":5`p.2,gZkpUfdg,Hd(qR1)9\ltF2^8b5,,XbY%VfhD52O7A.c.u]dhTc5t%0<0L5E38`Bq+i;"%J7kcc#@i)@okdN-qiaA"33DdPgPrUs7;j%+47_cnGN@&ug9/dqGOAHA4f.N*&guHspf?E;GIc-Wt>:<(m1AmcS_Zc2VlEI'_S_>@#!MF^m1$$<mB1`gt\X~>endstream
|
||||||
|
endobj
|
||||||
|
14 0 obj
|
||||||
|
<<
|
||||||
|
/Filter [ /ASCII85Decode /FlateDecode ] /Length 987
|
||||||
|
>>
|
||||||
|
stream
|
||||||
|
GatU3gN&c;&:O:SkV;H,eI!J\f?X"LSPIZ'"4Y.F#oAAY?N.Y?8Iu:s)eV;,aNG1Lea>G$!MSc\rU6m7jF'AOI09V1,^TSTi$A+f4sZVQ%2^>uj$40\AI>WbZo9q!NL^CS9P3E9X.:XEMb$a/X"qH9hN6fY,]D!OEOVT,722%RJnVqK4f'[4d3(/hbJWJRs,>>28jk5A:nCl/%FlC#LntsAC5cE$q`QO_@Pk%Lp>7V23")NNrFkcXfuoI=SJJ-`g)_+K\@,SQ@8ORGg(_(B.[u[WXD%Q8@I";9d(]M62K_)Q+-<\kHY5,)o99%BB2bcQVkd:+MZVH=$Z`S@BhH]-XfPANk@qBN.:Jc'?.Kn\p7(aPI<Cb@g:XRZ9Km+RD-e6S\N*kQMA?P5>QOI(du7U]WDrNNPW%d"8P_j^Y8d%G<t1\CJ_5-m+>,'JJLXrV.UD!ah19&9b#*fgR2o730<9)QX)X0"EK6u;mBJs3/fl\d&K$B3bXI5R>F*E,^\%+b?0o8s$o.CuX4uDAT_?G0(p4N3La,8qfi'j?e`e88KrZ8*NDgc:62'icCb],4B]Z"SO&e/BRC*C$2PmbSKAjc\$FLD8?&qHVH3G4p834/77n[%()-p/JDRBapcO2b\,3dW%#U9u!ilSkd%2'rr&g[u".1O]W%0J<@#(ptUD;%0:^.^ls:.#.V6NgR[`2\RUW!k$-*GZIf3DO<K8np=hCA>BiB_Mu"=LVGlO\1Z]0pF(@UaiVQ=dh?h5kfQ_gj>$jHW$8TCt:C.jVU98ne.XoiMtoV;q8XhnlOE;3a]=dGJ8KL&+Khj"&P4Q=P-:nHsDprY"B4+#A3dF,<W=NC>;b&gf(sT\Ts*iH)f!KhfHV;\mMSHej.9.XrBG41_<:b)MG;-Y(:&nCKS0F]r&CGl>EfMc0td\0GHScl3Lr;?OUoo6619Qdr)S8S);]7L5rmWW&(5t4Dil"USDhhY/Y=!=!X:85**$:~>endstream
|
||||||
|
endobj
|
||||||
|
15 0 obj
|
||||||
|
<<
|
||||||
|
/Filter [ /ASCII85Decode /FlateDecode ] /Length 976
|
||||||
|
>>
|
||||||
|
stream
|
||||||
|
GatU3gN&c;'R]XVkgAc"70atdYFXp#3h7VV#7/=-%N$"G?N.YO&iX#cVsS_l_5i8)eum:1-)(7`mXJ7LnhqY0hGZal,We=q^e"$M]Lu;_=4AoIN$QOjOF.@i*Sg!_rLL=-'?kk;m;M&R`$D>'HCL7<qMHOgP.\NgCm:Zf5tLAgarh6YCKLONS%?!`3T6F7YKNJ(dBFh(U1"e7D6YdC:71/`?cjR"QrKtsGg*:'=Ck>]$A,-S`H1I/1T]4\B3=gQ9:I4j9f]+af*Z7*GH5H+;j73Z-T#DAcgpO<SFuA['l7@MF*6c^<pB]o84rG$&I@Cs3`KIG,N/bG0f<k/M@gUKb"%\W-lZ#AU+i=gUKkm46K-b>W(/'b?XF9+X+'-Dqi"+1U7?6=ZRJNBSJ6ojDTa+]o4RF^26C+i0s(9G2o;$@RNbs\(f75],L(SVpI0M!'7JVhZ"$t/%kb1+)F\p54/@jpVJF2+)7^F=gVcp8(h*m%F#'p9c%9Ep9?b7g^F5>(>I3t^d_"f'aue%^E\X4kN:g\P[;sC=g3h,nD/n9*`94uoM?sBCL<kr$AOqh:,Y&c90,npSDXN*bEfY(k^0LZ_\I@Y+L2nn64-qsuX5D'=o'B2"8rCsRJ?h/-4Ur6khb;ph%X"8-mXTUU5-!Uh$iVuRi1.=>4;XilfMPT4]&FC.U%DI(c6uf3*XPJP2MRdq@Ag3uYF().nqLFAE2Nih'(^p\5FnSNa>n+cI?U65A61_N1<9ZXH4Xr)Fgq(6md3H9[MQ3Q^%aq>E?XM:O:RKGjc+QV2MB!.I.17QpSt]X[C*6ap.`#'o;8F(ebZ.VMM6k`BkZB\I,2MNoX]J"k]Qd";,@($aWX&29q"6k;>Let)@]QHm:i/lf[DB_&U@ROq-0MLQp;@j+]?$"E)brXVun52AVQo$"[a7@!?!LT*>$&:5X_.R;9)'$l-S.>WjLQIVTo.JU%(H\,-*pl_kP9~>endstream
|
||||||
|
endobj
|
||||||
|
16 0 obj
|
||||||
|
<<
|
||||||
|
/Filter [ /ASCII85Decode /FlateDecode ] /Length 1024
|
||||||
|
>>
|
||||||
|
stream
|
||||||
|
GauHKflEQ9'Rf^WgrHc4<#\/Qm7c-rFIIq+TFSD%Z#L'6o(Nl&^_!k0ds=.%-s&pt#i0QBKE91*<^/MJJCcfoHA_e;aL?\&_BAj]Dt;HW$6(8Ql\%O7-5%uT8<qrc9!'@hZ!'`C3a&iu\ZDZi+5lF*E@>0ZIL#\l)(+[ABOTNKmq!2F,S:.F93Z6QIu[nf\Q[qCE`Y-=.8k$67iCR!7=El+50a@f&b^6'Yg'mqlcRQ-5j:%[K@'5!A_m0L)&VlW1T50^X)"3Ma3,U1P8Di$>uPZ)Zj_igBc0lm]WE0#e>*M53(Yh6\9jHYh6B+3bM\b[Q9j'O_9:!:W0<K\bX;'ZV[%iHrL=:rH.Wh5O-II8-Rh3..Sd^\dNItUUd<nli^`$=A@?\WW4/7Wnp>$Ijm,#(bKn_D?UYMGJ7LLqC0\[$l<8U*O5^GnN;!N6YB'?d[d8DAPt^>+E:r0<2$'VL/TtuNg;C@5iM#%KdS-GU->0]`/20eLXVW#qnjsU.P:Xj&=enVE[mpqDCn2!qDRuQhI/#cZ-#m6`U9'SI4"9\<WSWoVPaf@]<NRl?FrTPOd:V_=>"r:4p.\W>IK_$#C,EkU#uO1g6*HoUK':XiJjtQfI'Sdc)B3J1eqgGJ+l?"$<J+^?VHgiq^90uD"@6ar+/_WhKG+8t!Slo>//&C$^f'TA!2:K!0pd;^Zif)c[:f!C/8hNKc7+'+1WbOFKr9T7c_G$s*O634O2Zs:"iN>j,pWU+:kEQ>5YbF=$27*59iJE<glrr=EAMssR&N"lVT1:*a,OcI=8\"6/>A//7(KsL\pUG.G[+JB-r8t;Sih+(W.A'8Q*LZK*I9WjCLjEt>lT%2RFJZg0Ps:5c,HdK#tSNI:#Rp!]O$Ic=T%K0[._E_Fcjn>OcM,iSAf9iF7,,+Qe:@o'Y4o_:54t*l+TAg<i_F?ke9:\G<n<b*t@"_`_;08ft@[9;qtKC#H0Z6cJ+d)MdidY-OFV1K"=!=K=^?hK-Q.s+?\[I98%IXRiAI.!:AVTf`~>endstream
|
||||||
|
endobj
|
||||||
|
17 0 obj
|
||||||
|
<<
|
||||||
|
/Filter [ /ASCII85Decode /FlateDecode ] /Length 1075
|
||||||
|
>>
|
||||||
|
stream
|
||||||
|
GauHKgN&c;&:O:SkV;H,6&Q<FCM0)BVUK5trr=4p-3<-<P.#jI+b[BoQ`]$,GaorC,Bfp>Z[5)3-pL]0bpl':D91fR,o"F49.1/bfmFt32ljt6eO[j7!K]\nZ:^QQASu[l@3no(6*HL'@3I!Qfi7%,.N\.>A91O)D\n5*o@JWSOI@ng5p/"_I`g*Y$j0+5PWaso'25ltcglFd,QIaO'dPO0Yr\h5/,=m\PiP:P+Gg0&N;_5iLN$]BD.#VL+h,tSe\fL&,;+2fg&%\pAJiV#eVhq@ro%%/`[(&8n29YiYd>bDF^Bg[AVf/n>[FE(au"ZAe&>%Q[7/n3-QhsPXuPbp#<$d"UR8u-nBnr!Q$Wjd1;9WN/,KG8])Ca5rrDrI'Ue'*I0C%pn+f`Hd"4sB_&2*)S$pX=F/6"DC"TU`bMtd/m7u]?]=J5L[SNBuE:6Ri,NmW7.*qUp)97Tt+a84b\os`Ti8/uRD<mg2;n&q)23L#\f:[QJk+sYYhIC_O\TNS/;3<qfN@GE^L#jl^i&)"7_/%Cb;-M;;ooT&`R;C&\WTZ4"\YIcTZDa;0CKTX+?@ra\94$H:Q<l)r*NHFJWjMr7[tCBb^PX,G]H!fs0g3,5^'AZ%<4Zqp(JCd+;^lkoDJ%q(Bb84V=:PCgOtM#Rr-=oHW&DmO?/!mYrV;g]MR?14cGuH_H*]73!34(()[A.)c<V3:@I>lhrl*Xrn(a0\,%4%*k^rL\k3%6ako`&A3MoN^CXV77D!Qg<S_OEMIh5(T*nFt'&4]_38'Q<s*V7!;A%[email protected]/(oCu;?^7kb[#R/-P*GF@KHDm6E*dLMg/4Q$W(<Ta[fVpGB5td>%=j9Ge+0B@dZDHELb2fDU(,iiXXRl^*U,U#Fld!R72UIpK<KU`cn&R/_eYS//1PE/$d7p:t-BP62fL<3/QQ4%=NoD?Tlf:A,GpJc<]*uYaL6fSAqm"-E.#%h]idd9$6\DZKKp8Vd[>GWu#-DXi653a?U$fqCs18gt(5/#U%!u,gkMK;>OT_/='S:kn,iD@u]<8-rlTRu'+\7L$U7-#!5-5\WQn(n:q@-p24u!~>endstream
|
||||||
|
endobj
|
||||||
|
18 0 obj
|
||||||
|
<<
|
||||||
|
/Filter [ /ASCII85Decode /FlateDecode ] /Length 590
|
||||||
|
>>
|
||||||
|
stream
|
||||||
|
GasbXgMWc?&;KY!MRgt!"n`^Bf\9$c*`Q-Sb6tfd8P(q-dT1eng=QV-!OG*\kiWo2AGBdKLqI^%h,XNB)-gDk+GFVBa?g*a%:!J\97Vc8-jH8>8P>0S@Wr)o*"Hu<6qPp`EF:M3'l4@S\c2]`&[J%dO@5p$<(([H6:SlB;FS8L`&pO%6Y\V"/O7F]E%L@d.%>L@"4bK_XXs&";n_.W^Nr847HH,X@$.pC"4bYC?9RH,dN?h8<BTH9l89:QMq:es\ePUpFRc4?hV'h3b4`sE_b4r->a+8/!?Q=D\F41Nc@'B`';4XgMeh!;U23C+>AbMQD-o--lJ/":m#(Yt,X5(`1KL,GTMBLlr6=-1mi#k.-Ou\\T4$Pun2dEU(\?$&;1@T4dm^t!KuOD-U@N_AMr"&uVpsGm,+8I7B*f!%9.o4cC1<Nr^$d5!dH-#UIr,n6Z;JUFYWCTVA\,or>a[CZ12(hd>1*0bU`k2-MXo1[Gor#kmXGIM'#R49X#NSAOpdf'0ilUH4:M(^Snc3;m/+><UlJ1jSN&ZuoQ68F8`c/Y-e0[!aljuioC5fR7-VUAX`%g<0P5J7"CFlQJT1~>endstream
|
||||||
|
endobj
|
||||||
|
xref
|
||||||
|
0 19
|
||||||
|
0000000000 65535 f
|
||||||
|
0000000061 00000 n
|
||||||
|
0000000102 00000 n
|
||||||
|
0000000209 00000 n
|
||||||
|
0000000321 00000 n
|
||||||
|
0000000516 00000 n
|
||||||
|
0000000711 00000 n
|
||||||
|
0000000906 00000 n
|
||||||
|
0000001101 00000 n
|
||||||
|
0000001296 00000 n
|
||||||
|
0000001491 00000 n
|
||||||
|
0000001561 00000 n
|
||||||
|
0000001842 00000 n
|
||||||
|
0000001932 00000 n
|
||||||
|
0000003031 00000 n
|
||||||
|
0000004109 00000 n
|
||||||
|
0000005176 00000 n
|
||||||
|
0000006292 00000 n
|
||||||
|
0000007459 00000 n
|
||||||
|
trailer
|
||||||
|
<<
|
||||||
|
/ID
|
||||||
|
[<ba877f458edd6b06b69a7e843c67586d><ba877f458edd6b06b69a7e843c67586d>]
|
||||||
|
% ReportLab generated PDF document -- digest (opensource)
|
||||||
|
|
||||||
|
/Info 11 0 R
|
||||||
|
/Root 10 0 R
|
||||||
|
/Size 19
|
||||||
|
>>
|
||||||
|
startxref
|
||||||
|
8140
|
||||||
|
%%EOF
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
# Lorem Ipsum in Two Columns
|
||||||
|
|
||||||
|
## 1. Origins
|
||||||
|
|
||||||
|
Lorem ipsum dolor sit amet consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
|
||||||
|
|
||||||
|
## 2. Structure
|
||||||
|
|
||||||
|
Ut enim ad minim veniam quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
|
||||||
|
|
||||||
|
## 3. Usage
|
||||||
|
|
||||||
|
Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
|
||||||
|
|
||||||
|
## 4. Variations
|
||||||
|
|
||||||
|
Excepteur sint occaecat cupidatat non proident sunt in culpa qui officia deserunt mollit anim id est laborum.
|
||||||
|
|
||||||
|
## 5. Typography
|
||||||
|
|
||||||
|
Curabitur pretium tincidunt lacus. Nulla gravida orci a odio. Nullam various turpis et commodo pharetra est.
|
||||||
|
|
||||||
|
## 6. Conclusion
|
||||||
|
|
||||||
|
Nunc nonummy metus. Vestibulum volutpat pretium libero. Cras id dui. Aenean ut eros et nisl sagittis vestibulum.
|
||||||
@@ -0,0 +1,74 @@
|
|||||||
|
%PDF-1.4
|
||||||
|
%“Œ‹ž ReportLab Generated PDF document (opensource)
|
||||||
|
1 0 obj
|
||||||
|
<<
|
||||||
|
/F1 2 0 R /F2 3 0 R
|
||||||
|
>>
|
||||||
|
endobj
|
||||||
|
2 0 obj
|
||||||
|
<<
|
||||||
|
/BaseFont /Helvetica /Encoding /WinAnsiEncoding /Name /F1 /Subtype /Type1 /Type /Font
|
||||||
|
>>
|
||||||
|
endobj
|
||||||
|
3 0 obj
|
||||||
|
<<
|
||||||
|
/BaseFont /Helvetica-Bold /Encoding /WinAnsiEncoding /Name /F2 /Subtype /Type1 /Type /Font
|
||||||
|
>>
|
||||||
|
endobj
|
||||||
|
4 0 obj
|
||||||
|
<<
|
||||||
|
/Contents 8 0 R /MediaBox [ 0 0 612 792 ] /Parent 7 0 R /Resources <<
|
||||||
|
/Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ]
|
||||||
|
>> /Rotate 0 /Trans <<
|
||||||
|
|
||||||
|
>>
|
||||||
|
/Type /Page
|
||||||
|
>>
|
||||||
|
endobj
|
||||||
|
5 0 obj
|
||||||
|
<<
|
||||||
|
/PageMode /UseNone /Pages 7 0 R /Type /Catalog
|
||||||
|
>>
|
||||||
|
endobj
|
||||||
|
6 0 obj
|
||||||
|
<<
|
||||||
|
/Author (\(anonymous\)) /CreationDate (D:20260603021636+01'00') /Creator (\(unspecified\)) /Keywords () /ModDate (D:20260603021636+01'00') /Producer (ReportLab PDF Library - \(opensource\))
|
||||||
|
/Subject (\(unspecified\)) /Title (\(anonymous\)) /Trapped /False
|
||||||
|
>>
|
||||||
|
endobj
|
||||||
|
7 0 obj
|
||||||
|
<<
|
||||||
|
/Count 1 /Kids [ 4 0 R ] /Type /Pages
|
||||||
|
>>
|
||||||
|
endobj
|
||||||
|
8 0 obj
|
||||||
|
<<
|
||||||
|
/Filter [ /ASCII85Decode /FlateDecode ] /Length 861
|
||||||
|
>>
|
||||||
|
stream
|
||||||
|
Gat=i>Ak00&;B$5/*8Q/Z)fmNp(^2^OK'MC[dT6#Oq.&b^4c4;1No6>+D%TC.n+fice+l9R0[L%'(o<DJBpB+r$jsRcu23$RjI].E7rS*BB"3t\qRKaS-SYt[_<-]),Cp@'$i;6dQuJ#Q*+lGY?X<phgEWPa?op]_1g@kf_>[email protected]:T=#%ZIIl18hB7Zf<piVi-V+;]ct^jS<=Z4l:IOd[,o"%q.hK[[k]r1!^oX'%44os7T9[m%YrbZ3KU/;aR0$cV$;D._".OT8)jeEBKU'l<A`'aD&R'L"Bo]Q)R+=cKOEld8s#M0ZYZN4[lRm1*F6^d9-Gfl5>I(hVU+?`]UK%;aabAH:q>9NUGQq^.=u])Wt-ETI))C'a[FE@elj!RSrf2Q'F>URAO.C,!DneTPqrj#4e2kb9%1"4qfZ)"#&^0j9nHQ?9nF!j7mVPP5\*Uq'_jMVS]9%`kQB\8*AF_bpr/hGj;HCUOSQU-%5:6S79Ud\b!*tPbr_'pCr$Ea#(FYP31NFhSX.-("1M:$cgH#hX8L(2]R3Q>'BYHCS%pI!;=WdJp,'ii[`QPZ_9mcd\baZ2U(_;c\-p,8EoIEpQ*lstL>]LE;C#\dLnT2R:)BM-fTc['3_He[U,k'!Bo".uERd>SkhRj^J+koSIrZ_dEf_5L'/1h.`+DTK(R:P,WH)h5\se=SZ"L/5b8b..,e/E\o+4YQ+*im^C>AERG/TieEK\)#>U@HXnJ,H0A9-MqhhkDp8%.6Lr,OrK*lih;B<-opZ8%EU?,$r^jmCDAQ`-0/-8/`[p]7Fm%0f:E&S*FV)DX2>#q\bRqA=^_`43#8EA$u%8r6F5`rc9>K@q>E4q^*~>endstream
|
||||||
|
endobj
|
||||||
|
xref
|
||||||
|
0 9
|
||||||
|
0000000000 65535 f
|
||||||
|
0000000061 00000 n
|
||||||
|
0000000102 00000 n
|
||||||
|
0000000209 00000 n
|
||||||
|
0000000321 00000 n
|
||||||
|
0000000514 00000 n
|
||||||
|
0000000582 00000 n
|
||||||
|
0000000862 00000 n
|
||||||
|
0000000921 00000 n
|
||||||
|
trailer
|
||||||
|
<<
|
||||||
|
/ID
|
||||||
|
[<21a9fbd0a0991a91b6e6e2db0856056e><21a9fbd0a0991a91b6e6e2db0856056e>]
|
||||||
|
% ReportLab generated PDF document -- digest (opensource)
|
||||||
|
|
||||||
|
/Info 6 0 R
|
||||||
|
/Root 5 0 R
|
||||||
|
/Size 9
|
||||||
|
>>
|
||||||
|
startxref
|
||||||
|
1872
|
||||||
|
%%EOF
|
||||||
+62
@@ -0,0 +1,62 @@
|
|||||||
|
# Employee Expense Report
|
||||||
|
|
||||||
|
Reimbursement Request
|
||||||
|
|
||||||
|
EMP-1047
|
||||||
|
|
||||||
|
**Report Header**
|
||||||
|
|
||||||
|
| Employee Name | Michael Tran |
|
||||||
|
|---|---|
|
||||||
|
| Employee ID | EMP-1047 |
|
||||||
|
| Department | Client Services |
|
||||||
|
| Report Date | January 20th, 2026 |
|
||||||
|
| Reporting Period | January 5th–16th, 2026 |
|
||||||
|
| Manager Approver | Laura Simmons |
|
||||||
|
|
||||||
|
**Company Information**
|
||||||
|
|
||||||
|
| Company | Summit Consulting Partners |
|
||||||
|
|---|---|
|
||||||
|
| Company Address | 88 Riverside Plaza, Suite 1400, New York, NY 10069 |
|
||||||
|
| Accounting Department Email | expenses@example.com |
|
||||||
|
|
||||||
|
**Trip Purpose**
|
||||||
|
|
||||||
|
The trip was undertaken for client onsite meetings with Atlantic Energy Solutions in Boston, MA.
|
||||||
|
|
||||||
|
**Expense Details**
|
||||||
|
|
||||||
|
| Description | Amount | Date | Category |
|
||||||
|
|---|---|---|---|
|
||||||
|
| Flight (NYC to Boston roundtrip) | $325.40 | January 5th, 2026 | Airline ticket |
|
||||||
|
| Hotel (3 nights at Harborview Hotel) | $822.75 | January 5th–8th, 2026 | Lodging |
|
||||||
|
| Taxi from airport to hotel | $48.00 | January 5th, 2026 | Ground transportation |
|
||||||
|
| Client dinner (3 attendees) | $186.20 | January 6th, 2026 | Meals |
|
||||||
|
| Parking at JFK Airport | $72.00 | January 5th–8th, 2026 | Parking |
|
||||||
|
| Breakfast (per diem not used) | $18.50 | January 7th, 2026 | Meals |
|
||||||
|
|
||||||
|
| Description | Amount | Date | Category |
|
||||||
|
|---|---|---|---|
|
||||||
|
| Uber to client office | $22.10 | January 7th, 2026 | Ground transportation |
|
||||||
|
| Printing + presentation materials | $46.90 | January 8th, 2026 | Materials |
|
||||||
|
| Lunch with client | $39.75 | January 8th, 2026 | Meals |
|
||||||
|
| Office supplies (notebooks, pens) | $27.60 | January 10th, 2026 | Supplies |
|
||||||
|
| Mileage reimbursement (client visit in NJ, 42 miles @ $0.67/mile) | $28.14 | January 14th, 2026 | Mileage |
|
||||||
|
| Team lunch meeting (internal) | $64.30 | January 15th, 2026 | Meals |
|
||||||
|
|
||||||
|
Total Expenses $1,701.64
|
||||||
|
|
||||||
|
Reimbursement Method
|
||||||
|
|
||||||
|
Reimbursement method Direct deposit
|
||||||
|
|
||||||
|
Notes
|
||||||
|
|
||||||
|
All receipts are attached. Expenses are business-related and comply with company travel policy.
|
||||||
|
|
||||||
|
**Approval**
|
||||||
|
|
||||||
|
Michael Tran, Employee
|
||||||
|
|
||||||
|
Laura Simmons, Manager
|
||||||
BIN
Binary file not shown.
+27
-5
@@ -1,11 +1,13 @@
|
|||||||
package stirling.software.SPDF.model.api.converters;
|
package stirling.software.SPDF.model.api.converters;
|
||||||
|
|
||||||
import org.springframework.core.io.Resource;
|
import java.nio.charset.StandardCharsets;
|
||||||
|
|
||||||
import org.springframework.http.MediaType;
|
import org.springframework.http.MediaType;
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||||
import org.springframework.web.multipart.MultipartFile;
|
import org.springframework.web.multipart.MultipartFile;
|
||||||
|
|
||||||
|
import io.github.pixee.security.Filenames;
|
||||||
import io.swagger.v3.oas.annotations.Operation;
|
import io.swagger.v3.oas.annotations.Operation;
|
||||||
|
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
@@ -15,8 +17,11 @@ import stirling.software.common.annotations.AutoJobPostMapping;
|
|||||||
import stirling.software.common.annotations.api.ConvertApi;
|
import stirling.software.common.annotations.api.ConvertApi;
|
||||||
import stirling.software.common.enumeration.ResourceWeight;
|
import stirling.software.common.enumeration.ResourceWeight;
|
||||||
import stirling.software.common.model.api.PDFFile;
|
import stirling.software.common.model.api.PDFFile;
|
||||||
import stirling.software.common.util.PDFToFile;
|
import stirling.software.common.pdf.PdfMarkdownConverter;
|
||||||
|
import stirling.software.common.util.TempFile;
|
||||||
import stirling.software.common.util.TempFileManager;
|
import stirling.software.common.util.TempFileManager;
|
||||||
|
import stirling.software.common.util.WebResponseUtils;
|
||||||
|
import stirling.software.jpdfium.PdfDocument;
|
||||||
|
|
||||||
@ConvertApi
|
@ConvertApi
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
@@ -33,10 +38,27 @@ public class ConvertPDFToMarkdown {
|
|||||||
summary = "Convert PDF to Markdown",
|
summary = "Convert PDF to Markdown",
|
||||||
description =
|
description =
|
||||||
"This endpoint converts a PDF file to Markdown format. Input:PDF Output:Markdown Type:SISO")
|
"This endpoint converts a PDF file to Markdown format. Input:PDF Output:Markdown Type:SISO")
|
||||||
public ResponseEntity<Resource> processPdfToMarkdown(@ModelAttribute PDFFile file)
|
public ResponseEntity<byte[]> processPdfToMarkdown(@ModelAttribute PDFFile file)
|
||||||
throws Exception {
|
throws Exception {
|
||||||
MultipartFile inputFile = file.getFileInput();
|
MultipartFile inputFile = file.getFileInput();
|
||||||
PDFToFile pdfToFile = new PDFToFile(tempFileManager);
|
|
||||||
return pdfToFile.processPdfToMarkdown(inputFile);
|
String originalName = Filenames.toSimpleFileName(inputFile.getOriginalFilename());
|
||||||
|
String baseName =
|
||||||
|
originalName.contains(".")
|
||||||
|
? originalName.substring(0, originalName.lastIndexOf('.'))
|
||||||
|
: originalName;
|
||||||
|
|
||||||
|
String markdown;
|
||||||
|
try (TempFile tempInput = new TempFile(tempFileManager, ".pdf")) {
|
||||||
|
inputFile.transferTo(tempInput.getFile());
|
||||||
|
try (PdfDocument doc = PdfDocument.open(tempInput.getPath())) {
|
||||||
|
markdown = new PdfMarkdownConverter().convert(doc);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return WebResponseUtils.bytesToWebResponse(
|
||||||
|
markdown.getBytes(StandardCharsets.UTF_8),
|
||||||
|
baseName + ".md",
|
||||||
|
MediaType.valueOf("text/markdown"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+48
-46
@@ -1,16 +1,17 @@
|
|||||||
package stirling.software.SPDF.model.api.converters;
|
package stirling.software.SPDF.model.api.converters;
|
||||||
|
|
||||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
|
||||||
import static org.mockito.ArgumentMatchers.any;
|
import static org.mockito.ArgumentMatchers.any;
|
||||||
import static org.mockito.Mockito.*;
|
import static org.mockito.Mockito.*;
|
||||||
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.multipart;
|
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.multipart;
|
||||||
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
|
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
import java.nio.charset.StandardCharsets;
|
import java.nio.charset.StandardCharsets;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
import org.mockito.ArgumentCaptor;
|
|
||||||
import org.mockito.MockedConstruction;
|
import org.mockito.MockedConstruction;
|
||||||
|
import org.mockito.MockedStatic;
|
||||||
import org.mockito.Mockito;
|
import org.mockito.Mockito;
|
||||||
import org.springframework.core.io.ByteArrayResource;
|
import org.springframework.core.io.ByteArrayResource;
|
||||||
import org.springframework.core.io.Resource;
|
import org.springframework.core.io.Resource;
|
||||||
@@ -21,9 +22,10 @@ import org.springframework.test.web.servlet.MockMvc;
|
|||||||
import org.springframework.test.web.servlet.setup.MockMvcBuilders;
|
import org.springframework.test.web.servlet.setup.MockMvcBuilders;
|
||||||
import org.springframework.web.bind.annotation.ExceptionHandler;
|
import org.springframework.web.bind.annotation.ExceptionHandler;
|
||||||
import org.springframework.web.bind.annotation.RestControllerAdvice;
|
import org.springframework.web.bind.annotation.RestControllerAdvice;
|
||||||
import org.springframework.web.multipart.MultipartFile;
|
|
||||||
|
|
||||||
import stirling.software.common.util.PDFToFile;
|
import stirling.software.common.pdf.PdfMarkdownConverter;
|
||||||
|
import stirling.software.common.util.TempFile;
|
||||||
|
import stirling.software.jpdfium.PdfDocument;
|
||||||
|
|
||||||
class ConvertPDFToMarkdownTest {
|
class ConvertPDFToMarkdownTest {
|
||||||
|
|
||||||
@@ -47,68 +49,68 @@ class ConvertPDFToMarkdownTest {
|
|||||||
@Test
|
@Test
|
||||||
void pdfToMarkdownReturnsMarkdownBytes() throws Exception {
|
void pdfToMarkdownReturnsMarkdownBytes() throws Exception {
|
||||||
byte[] md = "# heading\n\ncontent\n".getBytes(StandardCharsets.UTF_8);
|
byte[] md = "# heading\n\ncontent\n".getBytes(StandardCharsets.UTF_8);
|
||||||
|
String expectedMd = "# heading\n\ncontent\n";
|
||||||
|
|
||||||
try (MockedConstruction<PDFToFile> construction =
|
File tmpFile = File.createTempFile("test", ".pdf");
|
||||||
Mockito.mockConstruction(
|
tmpFile.deleteOnExit();
|
||||||
PDFToFile.class,
|
|
||||||
(mock, ctx) -> {
|
|
||||||
when(mock.processPdfToMarkdown(any(MultipartFile.class)))
|
|
||||||
.thenAnswer(
|
|
||||||
inv ->
|
|
||||||
ResponseEntity.ok()
|
|
||||||
.header("Content-Type", "text/markdown")
|
|
||||||
.body(new ByteArrayResource(md)));
|
|
||||||
})) {
|
|
||||||
|
|
||||||
MockMvc mvc = mockMvc();
|
try (MockedConstruction<TempFile> tempMock =
|
||||||
|
Mockito.mockConstruction(
|
||||||
|
TempFile.class,
|
||||||
|
(mock, ctx) -> {
|
||||||
|
when(mock.getFile()).thenReturn(tmpFile);
|
||||||
|
when(mock.getPath()).thenReturn(tmpFile.toPath());
|
||||||
|
});
|
||||||
|
MockedStatic<PdfDocument> docStatic = Mockito.mockStatic(PdfDocument.class);
|
||||||
|
MockedConstruction<PdfMarkdownConverter> converterMock =
|
||||||
|
Mockito.mockConstruction(
|
||||||
|
PdfMarkdownConverter.class,
|
||||||
|
(mock, ctx) -> when(mock.convert(any())).thenReturn(expectedMd))) {
|
||||||
|
|
||||||
|
PdfDocument mockDoc = Mockito.mock(PdfDocument.class);
|
||||||
|
docStatic.when(() -> PdfDocument.open(any(Path.class))).thenReturn(mockDoc);
|
||||||
|
|
||||||
MockMultipartFile file =
|
MockMultipartFile file =
|
||||||
new MockMultipartFile(
|
new MockMultipartFile(
|
||||||
"fileInput", // must match the field name in PDFFile
|
"fileInput", "input.pdf", "application/pdf", new byte[] {1, 2, 3});
|
||||||
"input.pdf",
|
|
||||||
"application/pdf",
|
|
||||||
new byte[] {1, 2, 3});
|
|
||||||
|
|
||||||
// ResponseEntity<Resource> is written synchronously on the request thread,
|
mockMvc()
|
||||||
// so there is no async dispatch to wait for (unlike the old StreamingResponseBody
|
.perform(multipart("/api/v1/convert/pdf/markdown").file(file))
|
||||||
// path).
|
|
||||||
mvc.perform(multipart("/api/v1/convert/pdf/markdown").file(file))
|
|
||||||
.andExpect(status().isOk())
|
.andExpect(status().isOk())
|
||||||
.andExpect(header().string("Content-Type", "text/markdown"))
|
.andExpect(header().string("Content-Type", "text/markdown"))
|
||||||
.andExpect(content().bytes(md));
|
.andExpect(content().bytes(md));
|
||||||
|
|
||||||
// Verify that exactly one instance was created
|
|
||||||
assert construction.constructed().size() == 1;
|
|
||||||
|
|
||||||
// And that the uploaded file was passed to processPdfToMarkdown()
|
|
||||||
PDFToFile created = construction.constructed().get(0);
|
|
||||||
ArgumentCaptor<MultipartFile> captor = ArgumentCaptor.forClass(MultipartFile.class);
|
|
||||||
verify(created, times(1)).processPdfToMarkdown(captor.capture());
|
|
||||||
MultipartFile passed = captor.getValue();
|
|
||||||
|
|
||||||
// Minimal plausibility checks
|
|
||||||
assertEquals("input.pdf", passed.getOriginalFilename());
|
|
||||||
assertEquals("application/pdf", passed.getContentType());
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void pdfToMarkdownWhenServiceThrowsReturns500() throws Exception {
|
void pdfToMarkdownWhenServiceThrowsReturns500() throws Exception {
|
||||||
try (MockedConstruction<PDFToFile> ignored =
|
File tmpFile = File.createTempFile("test", ".pdf");
|
||||||
Mockito.mockConstruction(
|
tmpFile.deleteOnExit();
|
||||||
PDFToFile.class,
|
|
||||||
(mock, ctx) -> {
|
|
||||||
when(mock.processPdfToMarkdown(any(MultipartFile.class)))
|
|
||||||
.thenThrow(new RuntimeException("boom"));
|
|
||||||
})) {
|
|
||||||
|
|
||||||
MockMvc mvc = mockMvc();
|
try (MockedConstruction<TempFile> tempMock =
|
||||||
|
Mockito.mockConstruction(
|
||||||
|
TempFile.class,
|
||||||
|
(mock, ctx) -> {
|
||||||
|
when(mock.getFile()).thenReturn(tmpFile);
|
||||||
|
when(mock.getPath()).thenReturn(tmpFile.toPath());
|
||||||
|
});
|
||||||
|
MockedStatic<PdfDocument> docStatic = Mockito.mockStatic(PdfDocument.class);
|
||||||
|
MockedConstruction<PdfMarkdownConverter> converterMock =
|
||||||
|
Mockito.mockConstruction(
|
||||||
|
PdfMarkdownConverter.class,
|
||||||
|
(mock, ctx) ->
|
||||||
|
when(mock.convert(any()))
|
||||||
|
.thenThrow(new RuntimeException("boom")))) {
|
||||||
|
|
||||||
|
PdfDocument mockDoc = Mockito.mock(PdfDocument.class);
|
||||||
|
docStatic.when(() -> PdfDocument.open(any(Path.class))).thenReturn(mockDoc);
|
||||||
|
|
||||||
MockMultipartFile file =
|
MockMultipartFile file =
|
||||||
new MockMultipartFile(
|
new MockMultipartFile(
|
||||||
"fileInput", "x.pdf", "application/pdf", new byte[] {0x01});
|
"fileInput", "x.pdf", "application/pdf", new byte[] {0x01});
|
||||||
|
|
||||||
mvc.perform(multipart("/api/v1/convert/pdf/markdown").file(file))
|
mockMvc()
|
||||||
|
.perform(multipart("/api/v1/convert/pdf/markdown").file(file))
|
||||||
.andExpect(status().isInternalServerError());
|
.andExpect(status().isInternalServerError());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-1
@@ -21,7 +21,8 @@ public enum AiWorkflowOutcome {
|
|||||||
COMPLETED("completed"),
|
COMPLETED("completed"),
|
||||||
UNSUPPORTED_CAPABILITY("unsupported_capability"),
|
UNSUPPORTED_CAPABILITY("unsupported_capability"),
|
||||||
CANNOT_CONTINUE("cannot_continue"),
|
CANNOT_CONTINUE("cannot_continue"),
|
||||||
GENERATE_FILE("generate_file");
|
GENERATE_FILE("generate_file"),
|
||||||
|
CONVERT_MARKDOWN("convert_markdown");
|
||||||
|
|
||||||
private final String value;
|
private final String value;
|
||||||
|
|
||||||
|
|||||||
+74
-10
@@ -66,6 +66,7 @@ import tools.jackson.databind.ObjectMapper;
|
|||||||
public class AiWorkflowService {
|
public class AiWorkflowService {
|
||||||
|
|
||||||
private static final String DOCUMENTS_ENDPOINT = "/api/v1/documents";
|
private static final String DOCUMENTS_ENDPOINT = "/api/v1/documents";
|
||||||
|
private static final String PDF_TO_MARKDOWN_ENDPOINT = "/api/v1/convert/pdf/markdown";
|
||||||
|
|
||||||
private final CustomPDFDocumentFactory pdfDocumentFactory;
|
private final CustomPDFDocumentFactory pdfDocumentFactory;
|
||||||
private final AiEngineClient aiEngineClient;
|
private final AiEngineClient aiEngineClient;
|
||||||
@@ -194,6 +195,7 @@ public class AiWorkflowService {
|
|||||||
return switch (response.getOutcome()) {
|
return switch (response.getOutcome()) {
|
||||||
case NEED_CONTENT -> onNeedContent(response, filesById, request, listener);
|
case NEED_CONTENT -> onNeedContent(response, filesById, request, listener);
|
||||||
case NEED_INGEST -> onNeedIngest(response, filesById, request, listener);
|
case NEED_INGEST -> onNeedIngest(response, filesById, request, listener);
|
||||||
|
case CONVERT_MARKDOWN -> onConvertMarkdown(response, filesById, listener);
|
||||||
case TOOL_CALL -> onToolCall(response, filesById, listener);
|
case TOOL_CALL -> onToolCall(response, filesById, listener);
|
||||||
case PLAN -> onPlan(response, filesById, request, listener);
|
case PLAN -> onPlan(response, filesById, request, listener);
|
||||||
case ANSWER -> onAnswer(response, filesById, request, listener);
|
case ANSWER -> onAnswer(response, filesById, request, listener);
|
||||||
@@ -330,6 +332,77 @@ public class AiWorkflowService {
|
|||||||
return new WorkflowState.Pending(nextRequest);
|
return new WorkflowState.Pending(nextRequest);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Deterministically convert each requested PDF to Markdown via the {@code
|
||||||
|
* /convert/pdf/markdown} endpoint (backed by {@code PdfMarkdownConverter}) and return the
|
||||||
|
* {@code .md} file(s) as a completed result. No AI resume — the conversion output is the final
|
||||||
|
* answer.
|
||||||
|
*/
|
||||||
|
private WorkflowState onConvertMarkdown(
|
||||||
|
AiWorkflowResponse response,
|
||||||
|
Map<String, MultipartFile> filesById,
|
||||||
|
ProgressListener listener) {
|
||||||
|
List<AiFile> filesToConvert = response.getFilesToIngest();
|
||||||
|
if (filesToConvert == null || filesToConvert.isEmpty()) {
|
||||||
|
return new WorkflowState.Terminal(
|
||||||
|
cannotContinue(
|
||||||
|
"AI engine requested markdown conversion without listing any files."));
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
List<Resource> resultFiles = new ArrayList<>();
|
||||||
|
List<String> inputNames = new ArrayList<>();
|
||||||
|
for (int i = 0; i < filesToConvert.size(); i++) {
|
||||||
|
AiFile file = filesToConvert.get(i);
|
||||||
|
MultipartFile multipartFile = filesById.get(file.getId());
|
||||||
|
if (multipartFile == null) {
|
||||||
|
return new WorkflowState.Terminal(
|
||||||
|
cannotContinue(
|
||||||
|
"AI engine requested markdown conversion for unknown file: "
|
||||||
|
+ file.getName()));
|
||||||
|
}
|
||||||
|
listener.onProgress(
|
||||||
|
AiWorkflowProgressEvent.executingTool(
|
||||||
|
PDF_TO_MARKDOWN_ENDPOINT, i + 1, filesToConvert.size()));
|
||||||
|
Resource input = toResource(multipartFile);
|
||||||
|
PipelineDefinition definition =
|
||||||
|
new PipelineDefinition(
|
||||||
|
"convert-markdown",
|
||||||
|
List.of(new PipelineStep(PDF_TO_MARKDOWN_ENDPOINT, Map.of())),
|
||||||
|
null);
|
||||||
|
PolicyExecutionResult result =
|
||||||
|
policyExecutor.execute(
|
||||||
|
definition,
|
||||||
|
PolicyInputs.of(List.of(input)),
|
||||||
|
PolicyProgressListener.NOOP);
|
||||||
|
resultFiles.addAll(result.files());
|
||||||
|
inputNames.add(multipartFile.getOriginalFilename());
|
||||||
|
}
|
||||||
|
return new WorkflowState.Terminal(
|
||||||
|
buildCompletedResponse(null, resultFiles, inputNames, null));
|
||||||
|
} catch (InternalApiTimeoutException e) {
|
||||||
|
log.error("PDF to Markdown conversion timed out: {}", e.getMessage());
|
||||||
|
return new WorkflowState.Terminal(
|
||||||
|
cannotContinue(toolTimeoutMessage(PDF_TO_MARKDOWN_ENDPOINT, e)));
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("Failed to convert PDF to Markdown: {}", e.getMessage(), e);
|
||||||
|
return new WorkflowState.Terminal(
|
||||||
|
cannotContinue(toolFailureMessage(PDF_TO_MARKDOWN_ENDPOINT, e)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private Resource toResource(MultipartFile file) throws IOException {
|
||||||
|
TempFile tempFile = tempFileManager.createManagedTempFile("ai-workflow");
|
||||||
|
file.transferTo(tempFile.getPath());
|
||||||
|
final String originalName = Filenames.toSimpleFileName(file.getOriginalFilename());
|
||||||
|
return new FileSystemResource(tempFile.getFile()) {
|
||||||
|
@Override
|
||||||
|
public String getFilename() {
|
||||||
|
return originalName;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
private void ingestFile(AiFile file, MultipartFile multipartFile) throws IOException {
|
private void ingestFile(AiFile file, MultipartFile multipartFile) throws IOException {
|
||||||
List<AiPageText> pages = new ArrayList<>();
|
List<AiPageText> pages = new ArrayList<>();
|
||||||
try (PDDocument document = pdfDocumentFactory.load(multipartFile, true)) {
|
try (PDDocument document = pdfDocumentFactory.load(multipartFile, true)) {
|
||||||
@@ -551,16 +624,7 @@ public class AiWorkflowService {
|
|||||||
private List<Resource> toResources(Map<String, MultipartFile> filesById) throws IOException {
|
private List<Resource> toResources(Map<String, MultipartFile> filesById) throws IOException {
|
||||||
List<Resource> resources = new ArrayList<>();
|
List<Resource> resources = new ArrayList<>();
|
||||||
for (MultipartFile file : filesById.values()) {
|
for (MultipartFile file : filesById.values()) {
|
||||||
TempFile tempFile = tempFileManager.createManagedTempFile("ai-workflow");
|
resources.add(toResource(file));
|
||||||
file.transferTo(tempFile.getPath());
|
|
||||||
final String originalName = Filenames.toSimpleFileName(file.getOriginalFilename());
|
|
||||||
resources.add(
|
|
||||||
new FileSystemResource(tempFile.getFile()) {
|
|
||||||
@Override
|
|
||||||
public String getFilename() {
|
|
||||||
return originalName;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
return resources;
|
return resources;
|
||||||
}
|
}
|
||||||
|
|||||||
-78
@@ -30,11 +30,7 @@ import lombok.RequiredArgsConstructor;
|
|||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
|
||||||
import stirling.software.SPDF.pdf.parser.PageImageLocator;
|
import stirling.software.SPDF.pdf.parser.PageImageLocator;
|
||||||
import stirling.software.SPDF.pdf.parser.PdfIngester;
|
|
||||||
import stirling.software.SPDF.pdf.parser.PdfModels.ParsedPage;
|
|
||||||
import stirling.software.SPDF.pdf.parser.PdfModels.RawLine;
|
|
||||||
import stirling.software.SPDF.pdf.parser.PdfModels.TableFragment;
|
import stirling.software.SPDF.pdf.parser.PdfModels.TableFragment;
|
||||||
import stirling.software.SPDF.pdf.parser.PdfModels.TextFragment;
|
|
||||||
import stirling.software.SPDF.pdf.parser.TabulaTableParser;
|
import stirling.software.SPDF.pdf.parser.TabulaTableParser;
|
||||||
import stirling.software.common.util.ExceptionUtils;
|
import stirling.software.common.util.ExceptionUtils;
|
||||||
import stirling.software.common.util.PdfUtils;
|
import stirling.software.common.util.PdfUtils;
|
||||||
@@ -50,7 +46,6 @@ import stirling.software.proprietary.model.api.ai.FolioType;
|
|||||||
public class PdfContentExtractor {
|
public class PdfContentExtractor {
|
||||||
|
|
||||||
private final TabulaTableParser tabulaTableParser;
|
private final TabulaTableParser tabulaTableParser;
|
||||||
private final PdfIngester pdfIngester;
|
|
||||||
|
|
||||||
private static final int MAX_CHARACTERS_PER_PAGE = 4_000;
|
private static final int MAX_CHARACTERS_PER_PAGE = 4_000;
|
||||||
|
|
||||||
@@ -196,8 +191,6 @@ public class PdfContentExtractor {
|
|||||||
case PAGE_TEXT, FULL_TEXT ->
|
case PAGE_TEXT, FULL_TEXT ->
|
||||||
Optional.<PdfContentResult>ofNullable(
|
Optional.<PdfContentResult>ofNullable(
|
||||||
extractText(lf, fileReq, remainingPages, remainingCharacters));
|
extractText(lf, fileReq, remainingPages, remainingCharacters));
|
||||||
case PAGE_LAYOUT ->
|
|
||||||
Optional.<PdfContentResult>ofNullable(extractPageLayout(lf, remainingPages));
|
|
||||||
default -> {
|
default -> {
|
||||||
log.warn(
|
log.warn(
|
||||||
"Content type {} not yet implemented, skipping for {}",
|
"Content type {} not yet implemented, skipping for {}",
|
||||||
@@ -222,35 +215,6 @@ public class PdfContentExtractor {
|
|||||||
return extracted.isEmpty() ? null : buildExtractedFileText(lf.fileName(), extracted);
|
return extracted.isEmpty() ? null : buildExtractedFileText(lf.fileName(), extracted);
|
||||||
}
|
}
|
||||||
|
|
||||||
private PageLayoutFileResult extractPageLayout(LoadedFile lf, int maxPages) throws IOException {
|
|
||||||
List<ParsedPage> parsedPages = pdfIngester.parse(lf.document(), maxPages);
|
|
||||||
List<LayoutPage> pages = new ArrayList<>();
|
|
||||||
for (ParsedPage pp : parsedPages) {
|
|
||||||
if (pp.layoutLines().isEmpty()) continue;
|
|
||||||
List<LayoutLine> lines = new ArrayList<>();
|
|
||||||
for (RawLine rawLine : pp.layoutLines()) {
|
|
||||||
List<LayoutFragment> fragments = new ArrayList<>();
|
|
||||||
for (TextFragment tf : rawLine.fragments()) {
|
|
||||||
fragments.add(
|
|
||||||
new LayoutFragment(
|
|
||||||
tf.text(),
|
|
||||||
tf.bounds().x(),
|
|
||||||
tf.bounds().y(),
|
|
||||||
tf.bounds().width(),
|
|
||||||
tf.fontSize(),
|
|
||||||
tf.bold()));
|
|
||||||
}
|
|
||||||
lines.add(new LayoutLine(rawLine.bounds().y(), fragments));
|
|
||||||
}
|
|
||||||
pages.add(new LayoutPage(pp.pageNumber(), lines));
|
|
||||||
}
|
|
||||||
if (pages.isEmpty()) return null;
|
|
||||||
PageLayoutFileResult result = new PageLayoutFileResult();
|
|
||||||
result.setFileName(lf.fileName());
|
|
||||||
result.setPages(pages);
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
private WorkflowArtifact buildArtifact(ArtifactKind kind, List<PdfContentResult> results) {
|
private WorkflowArtifact buildArtifact(ArtifactKind kind, List<PdfContentResult> results) {
|
||||||
return switch (kind) {
|
return switch (kind) {
|
||||||
case EXTRACTED_TEXT -> {
|
case EXTRACTED_TEXT -> {
|
||||||
@@ -258,11 +222,6 @@ public class PdfContentExtractor {
|
|||||||
artifact.setFiles(results.stream().map(ExtractedFileText.class::cast).toList());
|
artifact.setFiles(results.stream().map(ExtractedFileText.class::cast).toList());
|
||||||
yield artifact;
|
yield artifact;
|
||||||
}
|
}
|
||||||
case PAGE_LAYOUT -> {
|
|
||||||
PageLayoutArtifact artifact = new PageLayoutArtifact();
|
|
||||||
artifact.setFiles(results.stream().map(PageLayoutFileResult.class::cast).toList());
|
|
||||||
yield artifact;
|
|
||||||
}
|
|
||||||
case TOOL_REPORT ->
|
case TOOL_REPORT ->
|
||||||
throw new IllegalArgumentException(
|
throw new IllegalArgumentException(
|
||||||
"TOOL_REPORT artifacts are not produced by PdfContentExtractor");
|
"TOOL_REPORT artifacts are not produced by PdfContentExtractor");
|
||||||
@@ -569,7 +528,6 @@ public class PdfContentExtractor {
|
|||||||
*/
|
*/
|
||||||
enum ArtifactKind {
|
enum ArtifactKind {
|
||||||
EXTRACTED_TEXT("extracted_text"),
|
EXTRACTED_TEXT("extracted_text"),
|
||||||
PAGE_LAYOUT("page_layout"),
|
|
||||||
TOOL_REPORT("tool_report");
|
TOOL_REPORT("tool_report");
|
||||||
|
|
||||||
private final String value;
|
private final String value;
|
||||||
@@ -633,40 +591,4 @@ public class PdfContentExtractor {
|
|||||||
this.report = report;
|
this.report = report;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Serialization contract with the Python engine — see PageLayoutArtifactContractTest.
|
|
||||||
|
|
||||||
/** One text fragment with its bounding-box geometry and font properties. */
|
|
||||||
record LayoutFragment(
|
|
||||||
String text, float x, float y, float width, float fontSize, boolean bold) {}
|
|
||||||
|
|
||||||
/** A visual line on the page: y-coordinate and all fragments on that line. */
|
|
||||||
record LayoutLine(float y, List<LayoutFragment> fragments) {}
|
|
||||||
|
|
||||||
/** All layout lines for a single page. */
|
|
||||||
record LayoutPage(int pageNumber, List<LayoutLine> lines) {}
|
|
||||||
|
|
||||||
/** Page layout data for one file, as a PdfContentResult. */
|
|
||||||
@Data
|
|
||||||
static final class PageLayoutFileResult implements PdfContentResult {
|
|
||||||
private String fileName;
|
|
||||||
private List<LayoutPage> pages = new ArrayList<>();
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ArtifactKind getArtifactKind() {
|
|
||||||
return ArtifactKind.PAGE_LAYOUT;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int pagesConsumed() {
|
|
||||||
return pages.size();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Artifact carrying full spatial page layout for all input files. */
|
|
||||||
@Data
|
|
||||||
static final class PageLayoutArtifact implements WorkflowArtifact {
|
|
||||||
private final ArtifactKind kind = ArtifactKind.PAGE_LAYOUT;
|
|
||||||
private List<PageLayoutFileResult> files = new ArrayList<>();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
+29
@@ -439,6 +439,35 @@ class AiWorkflowServiceTest {
|
|||||||
verify(internalApiClient, never()).post(anyString(), any());
|
verify(internalApiClient, never()).post(anyString(), any());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void convertMarkdownRunsDeterministicConversionAndReturnsMdFile() throws IOException {
|
||||||
|
MockMultipartFile input = pdf("multi-column-test_lorem.pdf", "pdf-bytes");
|
||||||
|
when(fileIdStrategy.idFor(any())).thenReturn("doc-1");
|
||||||
|
stubOrchestrator(
|
||||||
|
"""
|
||||||
|
{
|
||||||
|
"outcome":"convert_markdown",
|
||||||
|
"reason":"PDF to Markdown requested.",
|
||||||
|
"filesToIngest":[{"id":"doc-1","name":"multi-column-test_lorem.pdf"}]
|
||||||
|
}
|
||||||
|
""");
|
||||||
|
when(toolMetadataService.shouldUnpackZipResponse("/api/v1/convert/pdf/markdown"))
|
||||||
|
.thenReturn(false);
|
||||||
|
stubEndpoint(
|
||||||
|
"/api/v1/convert/pdf/markdown",
|
||||||
|
pdfResource("# Title", "multi-column-test_lorem.md"));
|
||||||
|
AtomicInteger ids = stubFileStorage();
|
||||||
|
|
||||||
|
AiWorkflowResponse result = service.orchestrate(requestFor(input, "convert to markdown"));
|
||||||
|
|
||||||
|
assertEquals(AiWorkflowOutcome.COMPLETED, result.getOutcome());
|
||||||
|
assertEquals(1, result.getResultFiles().size());
|
||||||
|
// Extension changes (pdf -> md), so the converter's response filename wins.
|
||||||
|
assertEquals("multi-column-test_lorem.md", result.getResultFiles().get(0).getFileName());
|
||||||
|
assertEquals(1, ids.get());
|
||||||
|
verify(internalApiClient, times(1)).post(eq("/api/v1/convert/pdf/markdown"), any());
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void toolCallWithoutEndpointFallsBackToCannotContinue() throws IOException {
|
void toolCallWithoutEndpointFallsBackToCannotContinue() throws IOException {
|
||||||
MockMultipartFile input = pdf("input.pdf", "bytes");
|
MockMultipartFile input = pdf("input.pdf", "bytes");
|
||||||
|
|||||||
-66
@@ -1,66 +0,0 @@
|
|||||||
package stirling.software.proprietary.service;
|
|
||||||
|
|
||||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
|
||||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import org.junit.jupiter.api.Test;
|
|
||||||
|
|
||||||
import stirling.software.proprietary.service.PdfContentExtractor.LayoutFragment;
|
|
||||||
import stirling.software.proprietary.service.PdfContentExtractor.LayoutLine;
|
|
||||||
import stirling.software.proprietary.service.PdfContentExtractor.LayoutPage;
|
|
||||||
import stirling.software.proprietary.service.PdfContentExtractor.PageLayoutArtifact;
|
|
||||||
import stirling.software.proprietary.service.PdfContentExtractor.PageLayoutFileResult;
|
|
||||||
|
|
||||||
import tools.jackson.databind.JsonNode;
|
|
||||||
import tools.jackson.databind.json.JsonMapper;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Contract test: verifies that {@link PageLayoutArtifact} serializes to the JSON field names that
|
|
||||||
* the Python engine expects in {@code engine/src/stirling/contracts/pdf_to_markdown.py}.
|
|
||||||
*
|
|
||||||
* <p>The companion Python test in {@code tests/test_pdf_to_markdown.py} deserializes the same JSON
|
|
||||||
* literal and asserts field values. If either side renames a field, one of these tests fails.
|
|
||||||
*/
|
|
||||||
class PageLayoutArtifactContractTest {
|
|
||||||
|
|
||||||
static final String CONTRACT_JSON =
|
|
||||||
"""
|
|
||||||
{"kind":"page_layout","files":[{"fileName":"test.pdf","pages":[{"pageNumber":1,"lines":[{"y":10.0,"fragments":[{"text":"Hello","x":1.0,"y":2.0,"width":30.0,"fontSize":12.0,"bold":true}]}]}]}]}""";
|
|
||||||
|
|
||||||
@Test
|
|
||||||
void pageLayoutArtifact_serialisesToExpectedJson() throws Exception {
|
|
||||||
LayoutFragment fragment = new LayoutFragment("Hello", 1.0f, 2.0f, 30.0f, 12.0f, true);
|
|
||||||
LayoutLine line = new LayoutLine(10.0f, List.of(fragment));
|
|
||||||
LayoutPage page = new LayoutPage(1, List.of(line));
|
|
||||||
|
|
||||||
PageLayoutFileResult fileResult = new PageLayoutFileResult();
|
|
||||||
fileResult.setFileName("test.pdf");
|
|
||||||
fileResult.setPages(List.of(page));
|
|
||||||
|
|
||||||
PageLayoutArtifact artifact = new PageLayoutArtifact();
|
|
||||||
artifact.setFiles(List.of(fileResult));
|
|
||||||
|
|
||||||
JsonNode json = new JsonMapper().valueToTree(artifact);
|
|
||||||
|
|
||||||
assertEquals("page_layout", json.get("kind").asText());
|
|
||||||
|
|
||||||
JsonNode file = json.get("files").get(0);
|
|
||||||
assertEquals("test.pdf", file.get("fileName").asText());
|
|
||||||
|
|
||||||
JsonNode pg = file.get("pages").get(0);
|
|
||||||
assertEquals(1, pg.get("pageNumber").asInt());
|
|
||||||
|
|
||||||
JsonNode ln = pg.get("lines").get(0);
|
|
||||||
assertEquals(10.0, ln.get("y").asDouble(), 0.001);
|
|
||||||
|
|
||||||
JsonNode frag = ln.get("fragments").get(0);
|
|
||||||
assertEquals("Hello", frag.get("text").asText());
|
|
||||||
assertEquals(1.0, frag.get("x").asDouble(), 0.001);
|
|
||||||
assertEquals(2.0, frag.get("y").asDouble(), 0.001);
|
|
||||||
assertEquals(30.0, frag.get("width").asDouble(), 0.001);
|
|
||||||
assertEquals(12.0, frag.get("fontSize").asDouble(), 0.001);
|
|
||||||
assertTrue(frag.get("bold").asBoolean());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -5,7 +5,6 @@ from .orchestrator import OrchestratorAgent
|
|||||||
from .pdf_edit import PdfEditAgent, PdfEditParameterSelector, PdfEditPlanSelection
|
from .pdf_edit import PdfEditAgent, PdfEditParameterSelector, PdfEditPlanSelection
|
||||||
from .pdf_questions import PdfQuestionAgent
|
from .pdf_questions import PdfQuestionAgent
|
||||||
from .pdf_review import PdfReviewAgent
|
from .pdf_review import PdfReviewAgent
|
||||||
from .pdf_to_markdown import PdfToMarkdownAgent
|
|
||||||
from .user_spec import UserSpecAgent
|
from .user_spec import UserSpecAgent
|
||||||
|
|
||||||
__all__ = [
|
__all__ = [
|
||||||
@@ -16,6 +15,5 @@ __all__ = [
|
|||||||
"PdfEditPlanSelection",
|
"PdfEditPlanSelection",
|
||||||
"PdfQuestionAgent",
|
"PdfQuestionAgent",
|
||||||
"PdfReviewAgent",
|
"PdfReviewAgent",
|
||||||
"PdfToMarkdownAgent",
|
|
||||||
"UserSpecAgent",
|
"UserSpecAgent",
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -11,14 +11,13 @@ from pydantic_ai.tools import RunContext
|
|||||||
from stirling.agents.pdf_edit import PdfEditAgent
|
from stirling.agents.pdf_edit import PdfEditAgent
|
||||||
from stirling.agents.pdf_questions import PdfQuestionAgent
|
from stirling.agents.pdf_questions import PdfQuestionAgent
|
||||||
from stirling.agents.pdf_review import PdfReviewAgent
|
from stirling.agents.pdf_review import PdfReviewAgent
|
||||||
from stirling.agents.pdf_to_markdown import PdfToMarkdownAgent
|
|
||||||
from stirling.agents.user_spec import UserSpecAgent
|
from stirling.agents.user_spec import UserSpecAgent
|
||||||
from stirling.contracts import (
|
from stirling.contracts import (
|
||||||
AgentDraftWorkflowResponse,
|
AgentDraftWorkflowResponse,
|
||||||
|
ConvertMarkdownResponse,
|
||||||
ExtractedTextArtifact,
|
ExtractedTextArtifact,
|
||||||
OrchestratorRequest,
|
OrchestratorRequest,
|
||||||
OrchestratorResponse,
|
OrchestratorResponse,
|
||||||
PageLayoutArtifact,
|
|
||||||
PdfEditResponse,
|
PdfEditResponse,
|
||||||
PdfQuestionOrchestrateResponse,
|
PdfQuestionOrchestrateResponse,
|
||||||
PdfReviewOrchestrateResponse,
|
PdfReviewOrchestrateResponse,
|
||||||
@@ -27,7 +26,6 @@ from stirling.contracts import (
|
|||||||
format_conversation_history,
|
format_conversation_history,
|
||||||
format_file_names,
|
format_file_names,
|
||||||
)
|
)
|
||||||
from stirling.contracts.pdf_to_markdown import PdfToMarkdownOrchestrateResponse
|
|
||||||
from stirling.services import AppRuntime
|
from stirling.services import AppRuntime
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
@@ -72,9 +70,11 @@ class OrchestratorAgent:
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
ToolOutput(
|
ToolOutput(
|
||||||
self.delegate_pdf_to_markdown,
|
self.delegate_pdf_ingest,
|
||||||
name="delegate_pdf_to_markdown",
|
name="delegate_pdf_ingest",
|
||||||
description=("Delegate requests to reconstruct a PDF as a Markdown document."),
|
description=(
|
||||||
|
"Delegate requests to convert a PDF to Markdown or extract its content as readable text."
|
||||||
|
),
|
||||||
),
|
),
|
||||||
ToolOutput(
|
ToolOutput(
|
||||||
self.unsupported_capability,
|
self.unsupported_capability,
|
||||||
@@ -92,8 +92,8 @@ class OrchestratorAgent:
|
|||||||
"Use delegate_pdf_review when the user wants the PDF returned with review"
|
"Use delegate_pdf_review when the user wants the PDF returned with review"
|
||||||
" comments attached — anything like 'review this', 'annotate with comments',"
|
" comments attached — anything like 'review this', 'annotate with comments',"
|
||||||
" 'leave feedback on the PDF'. "
|
" 'leave feedback on the PDF'. "
|
||||||
"Use delegate_pdf_to_markdown for any request to convert a PDF to Markdown "
|
"Use delegate_pdf_ingest for any request to convert a PDF to Markdown "
|
||||||
"or reconstruct its content as readable text. "
|
"or extract its content as readable text. "
|
||||||
"Use unsupported_capability when the user asks about the assistant itself "
|
"Use unsupported_capability when the user asks about the assistant itself "
|
||||||
"or when none of the other outputs fit; supply a helpful message."
|
"or when none of the other outputs fit; supply a helpful message."
|
||||||
),
|
),
|
||||||
@@ -133,13 +133,12 @@ class OrchestratorAgent:
|
|||||||
return await self._run_pdf_edit(request)
|
return await self._run_pdf_edit(request)
|
||||||
case SupportedCapability.AGENT_DRAFT:
|
case SupportedCapability.AGENT_DRAFT:
|
||||||
return await self._run_agent_draft(request)
|
return await self._run_agent_draft(request)
|
||||||
case SupportedCapability.PDF_TO_MARKDOWN:
|
|
||||||
return await self._run_pdf_to_markdown(request)
|
|
||||||
case (
|
case (
|
||||||
SupportedCapability.ORCHESTRATE
|
SupportedCapability.ORCHESTRATE
|
||||||
| SupportedCapability.AGENT_REVISE
|
| SupportedCapability.AGENT_REVISE
|
||||||
| SupportedCapability.AGENT_NEXT_ACTION
|
| SupportedCapability.AGENT_NEXT_ACTION
|
||||||
| SupportedCapability.MATH_AUDITOR_AGENT
|
| SupportedCapability.MATH_AUDITOR_AGENT
|
||||||
|
| SupportedCapability.PDF_TO_MARKDOWN
|
||||||
):
|
):
|
||||||
raise ValueError(f"Cannot resume orchestrator with capability: {capability}")
|
raise ValueError(f"Cannot resume orchestrator with capability: {capability}")
|
||||||
case _ as unreachable:
|
case _ as unreachable:
|
||||||
@@ -163,11 +162,12 @@ class OrchestratorAgent:
|
|||||||
async def _run_agent_draft(self, request: OrchestratorRequest) -> AgentDraftWorkflowResponse:
|
async def _run_agent_draft(self, request: OrchestratorRequest) -> AgentDraftWorkflowResponse:
|
||||||
return await UserSpecAgent(self.runtime).orchestrate(request)
|
return await UserSpecAgent(self.runtime).orchestrate(request)
|
||||||
|
|
||||||
async def delegate_pdf_to_markdown(self, ctx: RunContext[OrchestratorDeps]) -> PdfToMarkdownOrchestrateResponse:
|
async def delegate_pdf_ingest(self, ctx: RunContext[OrchestratorDeps]) -> ConvertMarkdownResponse:
|
||||||
return await self._run_pdf_to_markdown(ctx.deps.request)
|
request = ctx.deps.request
|
||||||
|
return ConvertMarkdownResponse(
|
||||||
async def _run_pdf_to_markdown(self, request: OrchestratorRequest) -> PdfToMarkdownOrchestrateResponse:
|
reason="PDF to Markdown requested — Java converts deterministically.",
|
||||||
return await PdfToMarkdownAgent(self.runtime).orchestrate(request)
|
files_to_ingest=request.files,
|
||||||
|
)
|
||||||
|
|
||||||
async def delegate_pdf_review(self, ctx: RunContext[OrchestratorDeps]) -> PdfReviewOrchestrateResponse:
|
async def delegate_pdf_review(self, ctx: RunContext[OrchestratorDeps]) -> PdfReviewOrchestrateResponse:
|
||||||
return await self._run_pdf_review(ctx.deps.request)
|
return await self._run_pdf_review(ctx.deps.request)
|
||||||
@@ -204,10 +204,5 @@ class OrchestratorAgent:
|
|||||||
file_names = [f.file_name for f in artifact.files]
|
file_names = [f.file_name for f in artifact.files]
|
||||||
descriptions.append(f"- extracted_text: {total_pages} pages from {file_names}")
|
descriptions.append(f"- extracted_text: {total_pages} pages from {file_names}")
|
||||||
continue
|
continue
|
||||||
if isinstance(artifact, PageLayoutArtifact):
|
|
||||||
total_pages = sum(len(f.pages) for f in artifact.files)
|
|
||||||
file_names = [f.file_name for f in artifact.files]
|
|
||||||
descriptions.append(f"- page_layout: {total_pages} pages from {file_names}")
|
|
||||||
continue
|
|
||||||
descriptions.append("- unknown artifact")
|
descriptions.append("- unknown artifact")
|
||||||
return "\n".join(descriptions)
|
return "\n".join(descriptions)
|
||||||
|
|||||||
@@ -1,3 +0,0 @@
|
|||||||
from .agent import PdfToMarkdownAgent
|
|
||||||
|
|
||||||
__all__ = ["PdfToMarkdownAgent"]
|
|
||||||
@@ -1,435 +0,0 @@
|
|||||||
"""PDF to Markdown Agent.
|
|
||||||
|
|
||||||
Converts a parsed PDF document into a single clean Markdown document, preserving
|
|
||||||
headings, paragraphs, and tables in reading order.
|
|
||||||
"""
|
|
||||||
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
import asyncio
|
|
||||||
import logging
|
|
||||||
import re
|
|
||||||
import time
|
|
||||||
|
|
||||||
from pydantic import BaseModel, Field
|
|
||||||
from pydantic_ai import Agent
|
|
||||||
from pydantic_ai.output import NativeOutput
|
|
||||||
|
|
||||||
from stirling.contracts import (
|
|
||||||
EditCannotDoResponse,
|
|
||||||
GenerateFileResponse,
|
|
||||||
NeedContentFileRequest,
|
|
||||||
NeedContentResponse,
|
|
||||||
OrchestratorRequest,
|
|
||||||
PdfContentType,
|
|
||||||
SupportedCapability,
|
|
||||||
format_conversation_history,
|
|
||||||
)
|
|
||||||
from stirling.contracts.pdf_to_markdown import (
|
|
||||||
PageLayout,
|
|
||||||
PageLayoutArtifact,
|
|
||||||
PdfToMarkdownCannotDoResponse,
|
|
||||||
PdfToMarkdownOrchestrateResponse,
|
|
||||||
PdfToMarkdownRequest,
|
|
||||||
PdfToMarkdownResponse,
|
|
||||||
PdfToMarkdownSuccessResponse,
|
|
||||||
)
|
|
||||||
from stirling.services import AppRuntime
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
# Warn when output tokens are close to the typical model output limit (~8192 for most
|
|
||||||
# configurations). The actual limit is model-specific; this threshold catches likely truncation.
|
|
||||||
_OUTPUT_TOKEN_TRUNCATION_THRESHOLD = 7500
|
|
||||||
|
|
||||||
# Chunking limits — keep each LLM call to a manageable payload size.
|
|
||||||
# Fragment count is the primary driver of JSON payload size (each fragment carries x/y/width/
|
|
||||||
# fontSize/bold metadata beyond its text). Page cap prevents low-text pages accumulating.
|
|
||||||
_MAX_CHUNK_FRAGMENTS = 1_000
|
|
||||||
_MAX_CHUNK_PAGES = 10
|
|
||||||
|
|
||||||
# Max concurrent LLM calls — limits API rate pressure on large documents.
|
|
||||||
_MAX_PARALLEL_CHUNKS = 3
|
|
||||||
|
|
||||||
# ── LLM output model ────────────────────────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
|
|
||||||
class _ReconstructionOutput(BaseModel):
|
|
||||||
markdown: str = Field(description="Full document reconstructed as clean Markdown.")
|
|
||||||
|
|
||||||
|
|
||||||
# ── Agent ────────────────────────────────────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
|
|
||||||
class PdfToMarkdownAgent:
|
|
||||||
def __init__(self, runtime: AppRuntime) -> None:
|
|
||||||
self.runtime = runtime
|
|
||||||
self._sem = asyncio.Semaphore(_MAX_PARALLEL_CHUNKS)
|
|
||||||
self._reconstruct_agent = Agent(
|
|
||||||
model=runtime.smart_model,
|
|
||||||
output_type=NativeOutput(_ReconstructionOutput),
|
|
||||||
system_prompt=(
|
|
||||||
"You reconstruct PDF pages into clean Markdown from spatial fragment data.\n"
|
|
||||||
"Input: PAGE LAYOUT — per-fragment x/y/font data for structural analysis.\n\n"
|
|
||||||
"COLUMN DETECTION (for tables in page_layout):\n"
|
|
||||||
"- Look at the x-positions of fragments across 3+ consecutive lines.\n"
|
|
||||||
"- If fragments cluster at the same x-positions across multiple lines, those are table columns.\n"
|
|
||||||
"- Each distinct x-cluster is one column."
|
|
||||||
" Name them from the header row (the first line in the cluster).\n"
|
|
||||||
"- Do NOT merge values from different x-columns into one cell.\n\n"
|
|
||||||
"ROW DETECTION:\n"
|
|
||||||
"- Each unique y-coordinate (or group within 3pt) is one table row.\n"
|
|
||||||
"- Every line of layout data is its own row — do not merge rows.\n"
|
|
||||||
"- If a column has no fragment on a given y-row, that cell is empty.\n\n"
|
|
||||||
"TABLE RENDERING:\n"
|
|
||||||
"- Render as: | col1 | col2 | col3 |\n"
|
|
||||||
" | --- | --- | --- |\n"
|
|
||||||
" | val | val | val |\n"
|
|
||||||
"- One source row = one table row. Never collapse multiple rows into one.\n"
|
|
||||||
"- Preserve numeric values exactly (no rounding, no formatting changes).\n"
|
|
||||||
"- Bold cells: wrap with ** in the Markdown cell.\n"
|
|
||||||
"- CRITICAL: the separator row `| --- | --- |` appears EXACTLY ONCE per table, immediately\n"
|
|
||||||
" after the header row. NEVER put `| --- |` after a data row or between data rows.\n"
|
|
||||||
" NEVER put a blank line inside a table. All rows (header + data) must be consecutive.\n"
|
|
||||||
"- Do NOT produce a header-only table followed by a second table with the data rows.\n"
|
|
||||||
" One logical table = one markdown table block, with header, one separator, then all data.\n\n"
|
|
||||||
"GROUP HEADERS (label-only rows inside a table):\n"
|
|
||||||
"- A row is a group header when: the first column has text AND every numeric column is empty.\n"
|
|
||||||
"- Do NOT render group headers as table rows with empty cells.\n"
|
|
||||||
"- Break the table, emit the label as **bold text** on its own line,"
|
|
||||||
" then start a new table for the rows that follow.\n"
|
|
||||||
"- Example labels: 'Policy functions', 'Non-current assets'.\n\n"
|
|
||||||
"TOTAL AND SUBTOTAL ROWS:\n"
|
|
||||||
"- Detect rows whose first cell contains (case-insensitive):"
|
|
||||||
" total, subtotal, surplus, balance, net, sum.\n"
|
|
||||||
"- These rows have numeric content — they are NOT group headers.\n"
|
|
||||||
"- Render the entire row in bold: | **Total income** | **1,234** | **5,678** |\n"
|
|
||||||
"- Keep total rows attached to the group they summarise.\n\n"
|
|
||||||
"MULTI-LEVEL TABLES (year or period as a row label):\n"
|
|
||||||
"- Detect when a row contains only a single label (a year like '2010' or period like 'Q1 2023')"
|
|
||||||
" with no numeric content, followed by repeated metric rows.\n"
|
|
||||||
"- Do NOT render the year as a table row.\n"
|
|
||||||
"- Normalise: add 'Year' as the first column, 'Metric' as the second,"
|
|
||||||
" and repeat the year value on each metric row.\n\n"
|
|
||||||
"PROSE REGIONS:\n"
|
|
||||||
"- Lines where x-positions vary across lines (not repeating columns) are prose.\n"
|
|
||||||
"- Merge lines at the same x-level into paragraphs. Separate indented lines.\n\n"
|
|
||||||
"HEADINGS:\n"
|
|
||||||
"- A line is a heading when it is bold OR font_size ≥2pt above body.\n"
|
|
||||||
" CRITICAL EXCEPTION: a bold fragment is a TABLE HEADER CELL, not a document heading, when\n"
|
|
||||||
" the same y-row in page_layout contains other fragments at different x-positions.\n"
|
|
||||||
" Only classify a bold line as a document heading when it is the SOLE fragment on its y-row.\n"
|
|
||||||
" Example: 'Non-current assets' at y=120 with '2010'@x=350, '2009'@x=420, '2008'@x=490\n"
|
|
||||||
" → this is a table header row, NOT a heading. Render it as the first cell of the table.\n"
|
|
||||||
"- Use ## for section headings, ### for sub-headings. Use # only for the document title.\n\n"
|
|
||||||
"ORDERING:\n"
|
|
||||||
"- Process content top-to-bottom as it appears on the page.\n"
|
|
||||||
"- Interleave prose blocks and table blocks in page order.\n"
|
|
||||||
"- Do not move text that appears before a table to after it, or vice versa.\n\n"
|
|
||||||
"FIDELITY:\n"
|
|
||||||
"- Do NOT invent, summarise, or omit any content.\n"
|
|
||||||
"- Do NOT add commentary, metadata, or JSON — output Markdown only."
|
|
||||||
),
|
|
||||||
model_settings={
|
|
||||||
**runtime.smart_model_settings,
|
|
||||||
"temperature": 0.0,
|
|
||||||
"max_tokens": _OUTPUT_TOKEN_TRUNCATION_THRESHOLD,
|
|
||||||
},
|
|
||||||
)
|
|
||||||
|
|
||||||
async def orchestrate(self, request: OrchestratorRequest) -> PdfToMarkdownOrchestrateResponse:
|
|
||||||
"""Entry point for the orchestrator delegate.
|
|
||||||
|
|
||||||
First turn: requests PAGE_LAYOUT extraction from Java via NeedContentResponse.
|
|
||||||
Resume turn: runs the LLM reconstruction and returns a write-file plan step.
|
|
||||||
"""
|
|
||||||
layout_artifact = next(
|
|
||||||
(a for a in request.artifacts if isinstance(a, PageLayoutArtifact)),
|
|
||||||
None,
|
|
||||||
)
|
|
||||||
if layout_artifact is None:
|
|
||||||
return NeedContentResponse(
|
|
||||||
resume_with=SupportedCapability.PDF_TO_MARKDOWN,
|
|
||||||
reason="Page layout data is required to reconstruct the document.",
|
|
||||||
files=[
|
|
||||||
NeedContentFileRequest(file=f, content_types=[PdfContentType.PAGE_LAYOUT]) for f in request.files
|
|
||||||
],
|
|
||||||
max_pages=self.runtime.settings.max_pages,
|
|
||||||
max_characters=self.runtime.settings.max_characters,
|
|
||||||
)
|
|
||||||
|
|
||||||
page_layout = [page for entry in layout_artifact.files for page in entry.pages]
|
|
||||||
file_names = [f.name for f in request.files]
|
|
||||||
result = await self.handle(
|
|
||||||
PdfToMarkdownRequest(
|
|
||||||
user_message=request.user_message,
|
|
||||||
file_names=file_names,
|
|
||||||
conversation_history=request.conversation_history,
|
|
||||||
page_layout=page_layout,
|
|
||||||
)
|
|
||||||
)
|
|
||||||
if isinstance(result, PdfToMarkdownCannotDoResponse):
|
|
||||||
return EditCannotDoResponse(reason=result.reason)
|
|
||||||
|
|
||||||
base = file_names[0].rsplit(".", 1)[0] if file_names else "document"
|
|
||||||
return GenerateFileResponse(
|
|
||||||
content=result.markdown,
|
|
||||||
filename=f"{base}-reconstruction.md",
|
|
||||||
summary="Reconstructed the document as a Markdown file.",
|
|
||||||
)
|
|
||||||
|
|
||||||
async def handle(self, request: PdfToMarkdownRequest) -> PdfToMarkdownResponse:
|
|
||||||
total_fragments = sum(len(line.fragments) for page in request.page_layout for line in page.lines)
|
|
||||||
logger.info(
|
|
||||||
"[pdf-to-markdown] received layout-pages=%d fragments=%d",
|
|
||||||
len(request.page_layout),
|
|
||||||
total_fragments,
|
|
||||||
)
|
|
||||||
|
|
||||||
if not request.page_layout:
|
|
||||||
logger.warning("[pdf-to-markdown] no content extracted from document; returning cannot_do")
|
|
||||||
return PdfToMarkdownCannotDoResponse(
|
|
||||||
reason=(
|
|
||||||
"No content was extracted from the document. "
|
|
||||||
"The file may be a scanned image PDF with no readable text. "
|
|
||||||
"Try running OCR on the document first."
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
chunks = _build_page_chunks(request.page_layout)
|
|
||||||
logger.info("[pdf-to-markdown] chunks=%d (max %d in parallel)", len(chunks), _MAX_PARALLEL_CHUNKS)
|
|
||||||
|
|
||||||
if len(chunks) == 1:
|
|
||||||
return await self._reconstruct_chunk(request, chunks[0], chunk_num=1, total_chunks=1)
|
|
||||||
|
|
||||||
total = len(chunks)
|
|
||||||
results = await asyncio.gather(
|
|
||||||
*(
|
|
||||||
self._reconstruct_chunk(request, chunk, chunk_num=i + 1, total_chunks=total)
|
|
||||||
for i, chunk in enumerate(chunks)
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
markdown_parts: list[str] = []
|
|
||||||
for result in results:
|
|
||||||
if isinstance(result, PdfToMarkdownSuccessResponse) and result.markdown:
|
|
||||||
markdown_parts.append(result.markdown)
|
|
||||||
elif isinstance(result, PdfToMarkdownCannotDoResponse):
|
|
||||||
logger.warning("[pdf-to-markdown] chunk dropped: %s", result.reason)
|
|
||||||
|
|
||||||
if not markdown_parts:
|
|
||||||
return PdfToMarkdownCannotDoResponse(reason="The document could not be reconstructed. All chunks failed.")
|
|
||||||
|
|
||||||
logger.info("[pdf-to-markdown] assembly: %d/%d chunks produced output", len(markdown_parts), len(chunks))
|
|
||||||
return PdfToMarkdownSuccessResponse(markdown="\n\n".join(markdown_parts))
|
|
||||||
|
|
||||||
async def _reconstruct_chunk(
|
|
||||||
self,
|
|
||||||
request: PdfToMarkdownRequest,
|
|
||||||
pages: list[PageLayout],
|
|
||||||
chunk_num: int,
|
|
||||||
total_chunks: int,
|
|
||||||
) -> PdfToMarkdownResponse:
|
|
||||||
chunk_request = PdfToMarkdownRequest(
|
|
||||||
user_message=request.user_message,
|
|
||||||
file_names=request.file_names,
|
|
||||||
conversation_history=request.conversation_history,
|
|
||||||
page_layout=pages,
|
|
||||||
)
|
|
||||||
try:
|
|
||||||
async with self._sem:
|
|
||||||
return await self._reconstruct_document(chunk_request, chunk_num, total_chunks)
|
|
||||||
except Exception as e:
|
|
||||||
logger.error("[pdf-to-markdown] chunk %d/%d failed: %s", chunk_num, total_chunks, e, exc_info=True)
|
|
||||||
return PdfToMarkdownCannotDoResponse(
|
|
||||||
reason="The document could not be reconstructed. The AI model failed to process it."
|
|
||||||
)
|
|
||||||
|
|
||||||
async def _reconstruct_document(
|
|
||||||
self, request: PdfToMarkdownRequest, chunk_num: int = 1, total_chunks: int = 1
|
|
||||||
) -> PdfToMarkdownSuccessResponse:
|
|
||||||
content = _build_reconstruction_prompt(request)
|
|
||||||
logger.info("[timing] chunk %d/%d llm-call prompt-chars=%d", chunk_num, total_chunks, len(content))
|
|
||||||
t0 = time.monotonic()
|
|
||||||
result = await self._reconstruct_agent.run([content])
|
|
||||||
llm_ms = int((time.monotonic() - t0) * 1000)
|
|
||||||
output: _ReconstructionOutput = result.output
|
|
||||||
usage = result.usage()
|
|
||||||
logger.info(
|
|
||||||
"[timing] chunk %d/%d llm-done ms=%d input-tokens=%s output-tokens=%s markdown-chars=%d",
|
|
||||||
chunk_num,
|
|
||||||
total_chunks,
|
|
||||||
llm_ms,
|
|
||||||
usage.input_tokens,
|
|
||||||
usage.output_tokens,
|
|
||||||
len(output.markdown),
|
|
||||||
)
|
|
||||||
if usage.output_tokens and usage.output_tokens >= _OUTPUT_TOKEN_TRUNCATION_THRESHOLD:
|
|
||||||
logger.warning(
|
|
||||||
"[timing] chunk %d/%d output likely truncated (output-tokens=%d)",
|
|
||||||
chunk_num,
|
|
||||||
total_chunks,
|
|
||||||
usage.output_tokens,
|
|
||||||
)
|
|
||||||
markdown = _remove_extra_separators(_fix_markdown_tables(_merge_orphaned_table_rows(output.markdown)))
|
|
||||||
return PdfToMarkdownSuccessResponse(markdown=markdown)
|
|
||||||
|
|
||||||
|
|
||||||
# ── Chunking ────────────────────────────────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
|
|
||||||
def _build_page_chunks(pages: list[PageLayout]) -> list[list[PageLayout]]:
|
|
||||||
chunks: list[list[PageLayout]] = []
|
|
||||||
current: list[PageLayout] = []
|
|
||||||
current_fragments = 0
|
|
||||||
for page in pages:
|
|
||||||
page_fragments = sum(len(line.fragments) for line in page.lines)
|
|
||||||
fragment_full = current and current_fragments + page_fragments > _MAX_CHUNK_FRAGMENTS
|
|
||||||
page_full = len(current) >= _MAX_CHUNK_PAGES
|
|
||||||
if fragment_full or page_full:
|
|
||||||
chunks.append(current)
|
|
||||||
current = []
|
|
||||||
current_fragments = 0
|
|
||||||
current.append(page)
|
|
||||||
current_fragments += page_fragments
|
|
||||||
if current:
|
|
||||||
chunks.append(current)
|
|
||||||
return chunks
|
|
||||||
|
|
||||||
|
|
||||||
# ── Prompt builders (module-level, no state) ────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
|
|
||||||
def _build_reconstruction_prompt(request: PdfToMarkdownRequest) -> str:
|
|
||||||
history = format_conversation_history(request.conversation_history)
|
|
||||||
file_names = ", ".join(request.file_names) if request.file_names else "Unknown files"
|
|
||||||
layout_section = _format_layout(request.page_layout)
|
|
||||||
|
|
||||||
return (
|
|
||||||
f"Files: {file_names}\n\n"
|
|
||||||
f"User request: {request.user_message}\n\n"
|
|
||||||
f"Conversation history:\n{history}\n\n"
|
|
||||||
"PAGE LAYOUT (structural source — x/y fragment positions):\n"
|
|
||||||
"Each line is: y=NNN | text@(x,y) fs=N text@(x,y) fs=N ...\n"
|
|
||||||
"- y=NNN is the vertical position (row). Lines close in y are the same visual row.\n"
|
|
||||||
"- x=NNN is the horizontal position (column). Consistent x across rows = a column.\n"
|
|
||||||
"- fs=N is font size. Larger = likely a heading.\n"
|
|
||||||
"- **bold** markers indicate bold text.\n\n"
|
|
||||||
f"{layout_section}"
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
# ── LLM output post-processing ──────────────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
|
|
||||||
def _fix_markdown_tables(markdown: str) -> str:
|
|
||||||
"""Remove blank lines between table rows produced by the LLM."""
|
|
||||||
lines = markdown.split("\n")
|
|
||||||
result: list[str] = []
|
|
||||||
i = 0
|
|
||||||
while i < len(lines):
|
|
||||||
result.append(lines[i])
|
|
||||||
if lines[i].strip().startswith("|"):
|
|
||||||
j = i + 1
|
|
||||||
while j < len(lines) and lines[j].strip() == "":
|
|
||||||
j += 1
|
|
||||||
if j < len(lines) and lines[j].strip().startswith("|"):
|
|
||||||
i = j
|
|
||||||
continue
|
|
||||||
i += 1
|
|
||||||
return "\n".join(result)
|
|
||||||
|
|
||||||
|
|
||||||
_SEP_CELL = re.compile(r"^:?-+:?$")
|
|
||||||
|
|
||||||
|
|
||||||
def _is_sep_row(line: str) -> bool:
|
|
||||||
"""Return True when a pipe row is a Markdown table separator (| --- | --- |)."""
|
|
||||||
stripped = line.strip()
|
|
||||||
if not stripped.startswith("|"):
|
|
||||||
return False
|
|
||||||
cells = [c.strip() for c in stripped.split("|") if c.strip()]
|
|
||||||
return bool(cells) and all(_SEP_CELL.match(c) for c in cells)
|
|
||||||
|
|
||||||
|
|
||||||
def _merge_orphaned_table_rows(markdown: str) -> str:
|
|
||||||
"""Merge pipe-row blocks that lack a separator into the preceding table.
|
|
||||||
|
|
||||||
When the LLM incorrectly breaks a table (e.g. on a false group-header), it emits
|
|
||||||
orphaned pipe rows with no header or separator. These are invalid markdown and get
|
|
||||||
merged back into the preceding table, discarding the intervening non-table content.
|
|
||||||
"""
|
|
||||||
lines = markdown.split("\n")
|
|
||||||
|
|
||||||
segments: list[tuple[str, list[str]]] = []
|
|
||||||
i = 0
|
|
||||||
while i < len(lines):
|
|
||||||
if lines[i].strip().startswith("|"):
|
|
||||||
block: list[str] = []
|
|
||||||
while i < len(lines) and lines[i].strip().startswith("|"):
|
|
||||||
block.append(lines[i])
|
|
||||||
i += 1
|
|
||||||
has_sep = any(_is_sep_row(row) for row in block)
|
|
||||||
segments.append(("table" if has_sep else "orphan", block))
|
|
||||||
else:
|
|
||||||
block = []
|
|
||||||
while i < len(lines) and not lines[i].strip().startswith("|"):
|
|
||||||
block.append(lines[i])
|
|
||||||
i += 1
|
|
||||||
segments.append(("prose", block))
|
|
||||||
|
|
||||||
result: list[tuple[str, list[str]]] = []
|
|
||||||
last_table_idx: int | None = None
|
|
||||||
for seg_type, seg_lines in segments:
|
|
||||||
if seg_type == "orphan":
|
|
||||||
if last_table_idx is not None:
|
|
||||||
result = result[: last_table_idx + 1]
|
|
||||||
result[-1] = ("table", result[-1][1] + seg_lines)
|
|
||||||
else:
|
|
||||||
result.append((seg_type, seg_lines))
|
|
||||||
else:
|
|
||||||
if seg_type == "table":
|
|
||||||
last_table_idx = len(result)
|
|
||||||
result.append((seg_type, seg_lines))
|
|
||||||
|
|
||||||
return "\n".join(line for _, seg_lines in result for line in seg_lines)
|
|
||||||
|
|
||||||
|
|
||||||
def _remove_extra_separators(markdown: str) -> str:
|
|
||||||
"""Within each contiguous table block, keep only the first separator row."""
|
|
||||||
lines = markdown.split("\n")
|
|
||||||
result: list[str] = []
|
|
||||||
seen_sep = False
|
|
||||||
|
|
||||||
for line in lines:
|
|
||||||
if not line.strip().startswith("|"):
|
|
||||||
seen_sep = False
|
|
||||||
result.append(line)
|
|
||||||
continue
|
|
||||||
if _is_sep_row(line):
|
|
||||||
if seen_sep:
|
|
||||||
continue
|
|
||||||
seen_sep = True
|
|
||||||
result.append(line)
|
|
||||||
|
|
||||||
return "\n".join(result)
|
|
||||||
|
|
||||||
|
|
||||||
# ── Formatting helpers (module-level, no state) ──────────────────────────────────────────────────
|
|
||||||
|
|
||||||
|
|
||||||
def _format_layout(pages: list[PageLayout]) -> str:
|
|
||||||
if not pages:
|
|
||||||
return "None"
|
|
||||||
parts: list[str] = []
|
|
||||||
for page in pages:
|
|
||||||
line_strs: list[str] = []
|
|
||||||
for line in page.lines:
|
|
||||||
frags = " ".join(
|
|
||||||
f"{'**' if f.bold else ''}{f.text}{'**' if f.bold else ''}@({f.x:.0f},{f.y:.0f}) fs={f.font_size:.0f}"
|
|
||||||
for f in line.fragments
|
|
||||||
)
|
|
||||||
line_strs.append(f"y={line.y:.0f} | {frags}")
|
|
||||||
parts.append(f"--- Page {page.page_number} ---\n" + "\n".join(line_strs))
|
|
||||||
return "\n\n".join(parts)
|
|
||||||
@@ -13,6 +13,7 @@ from .common import (
|
|||||||
AiFile,
|
AiFile,
|
||||||
ArtifactKind,
|
ArtifactKind,
|
||||||
ConversationMessage,
|
ConversationMessage,
|
||||||
|
ConvertMarkdownResponse,
|
||||||
ExtractedFileText,
|
ExtractedFileText,
|
||||||
GenerateFileResponse,
|
GenerateFileResponse,
|
||||||
MathAuditorToolReportArtifact,
|
MathAuditorToolReportArtifact,
|
||||||
@@ -96,17 +97,6 @@ from .pdf_questions import (
|
|||||||
PdfQuestionTerminalResponse,
|
PdfQuestionTerminalResponse,
|
||||||
)
|
)
|
||||||
from .pdf_review import PdfReviewOrchestrateResponse
|
from .pdf_review import PdfReviewOrchestrateResponse
|
||||||
from .pdf_to_markdown import (
|
|
||||||
LayoutFragment,
|
|
||||||
LayoutLine,
|
|
||||||
PageLayout,
|
|
||||||
PageLayoutArtifact,
|
|
||||||
PageLayoutFileEntry,
|
|
||||||
PdfToMarkdownCannotDoResponse,
|
|
||||||
PdfToMarkdownOrchestrateResponse,
|
|
||||||
PdfToMarkdownRequest,
|
|
||||||
PdfToMarkdownResponse,
|
|
||||||
)
|
|
||||||
from .progress import (
|
from .progress import (
|
||||||
ProgressEvent,
|
ProgressEvent,
|
||||||
WholeDocCompressionRound,
|
WholeDocCompressionRound,
|
||||||
@@ -139,10 +129,6 @@ __all__ = [
|
|||||||
"ConversationMessage",
|
"ConversationMessage",
|
||||||
"DeleteDocumentResponse",
|
"DeleteDocumentResponse",
|
||||||
"PurgeOwnerResponse",
|
"PurgeOwnerResponse",
|
||||||
"PdfToMarkdownCannotDoResponse",
|
|
||||||
"PdfToMarkdownOrchestrateResponse",
|
|
||||||
"PdfToMarkdownRequest",
|
|
||||||
"PdfToMarkdownResponse",
|
|
||||||
"Discrepancy",
|
"Discrepancy",
|
||||||
"DiscrepancyKind",
|
"DiscrepancyKind",
|
||||||
"EditCannotDoResponse",
|
"EditCannotDoResponse",
|
||||||
@@ -166,15 +152,11 @@ __all__ = [
|
|||||||
"NeedContentFileRequest",
|
"NeedContentFileRequest",
|
||||||
"NeedContentResponse",
|
"NeedContentResponse",
|
||||||
"NeedIngestResponse",
|
"NeedIngestResponse",
|
||||||
|
"ConvertMarkdownResponse",
|
||||||
"NextExecutionAction",
|
"NextExecutionAction",
|
||||||
"OrchestratorRequest",
|
"OrchestratorRequest",
|
||||||
"OrchestratorResponse",
|
"OrchestratorResponse",
|
||||||
"LayoutFragment",
|
|
||||||
"LayoutLine",
|
|
||||||
"Page",
|
"Page",
|
||||||
"PageLayout",
|
|
||||||
"PageLayoutArtifact",
|
|
||||||
"PageLayoutFileEntry",
|
|
||||||
"PageRange",
|
"PageRange",
|
||||||
"PageText",
|
"PageText",
|
||||||
"PdfCommentInstruction",
|
"PdfCommentInstruction",
|
||||||
|
|||||||
@@ -62,6 +62,7 @@ class WorkflowOutcome(StrEnum):
|
|||||||
CANNOT_CONTINUE = "cannot_continue"
|
CANNOT_CONTINUE = "cannot_continue"
|
||||||
UNSUPPORTED_CAPABILITY = "unsupported_capability"
|
UNSUPPORTED_CAPABILITY = "unsupported_capability"
|
||||||
GENERATE_FILE = "generate_file"
|
GENERATE_FILE = "generate_file"
|
||||||
|
CONVERT_MARKDOWN = "convert_markdown"
|
||||||
|
|
||||||
|
|
||||||
class ArtifactKind(StrEnum):
|
class ArtifactKind(StrEnum):
|
||||||
@@ -183,6 +184,19 @@ class NeedIngestResponse(ApiModel):
|
|||||||
content_types: list[PdfContentType] = Field(default_factory=list)
|
content_types: list[PdfContentType] = Field(default_factory=list)
|
||||||
|
|
||||||
|
|
||||||
|
class ConvertMarkdownResponse(ApiModel):
|
||||||
|
"""Terminal signal: convert the listed files to Markdown deterministically.
|
||||||
|
|
||||||
|
This is a deterministic, non-AI conversion. Java runs the PDF→Markdown converter
|
||||||
|
(``PdfMarkdownConverter``) on each file and returns the resulting ``.md`` file(s) as a
|
||||||
|
completed result. There is no resume turn — the conversion output is the final answer.
|
||||||
|
"""
|
||||||
|
|
||||||
|
outcome: Literal[WorkflowOutcome.CONVERT_MARKDOWN] = WorkflowOutcome.CONVERT_MARKDOWN
|
||||||
|
reason: str
|
||||||
|
files_to_ingest: list[AiFile]
|
||||||
|
|
||||||
|
|
||||||
class ToolOperationStep(ApiModel):
|
class ToolOperationStep(ApiModel):
|
||||||
kind: Literal[StepKind.TOOL] = StepKind.TOOL
|
kind: Literal[StepKind.TOOL] = StepKind.TOOL
|
||||||
tool: AnyToolId
|
tool: AnyToolId
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ from .common import (
|
|||||||
AiFile,
|
AiFile,
|
||||||
ArtifactKind,
|
ArtifactKind,
|
||||||
ConversationMessage,
|
ConversationMessage,
|
||||||
|
ConvertMarkdownResponse,
|
||||||
ExtractedFileText,
|
ExtractedFileText,
|
||||||
GenerateFileResponse,
|
GenerateFileResponse,
|
||||||
NeedContentResponse,
|
NeedContentResponse,
|
||||||
@@ -23,7 +24,6 @@ from .common import (
|
|||||||
from .execution import NextExecutionAction
|
from .execution import NextExecutionAction
|
||||||
from .pdf_edit import PdfEditTerminalResponse
|
from .pdf_edit import PdfEditTerminalResponse
|
||||||
from .pdf_questions import PdfQuestionTerminalResponse
|
from .pdf_questions import PdfQuestionTerminalResponse
|
||||||
from .pdf_to_markdown import PageLayoutArtifact
|
|
||||||
|
|
||||||
|
|
||||||
class ExtractedTextArtifact(ApiModel):
|
class ExtractedTextArtifact(ApiModel):
|
||||||
@@ -32,7 +32,7 @@ class ExtractedTextArtifact(ApiModel):
|
|||||||
|
|
||||||
|
|
||||||
WorkflowArtifact = Annotated[
|
WorkflowArtifact = Annotated[
|
||||||
ExtractedTextArtifact | PageLayoutArtifact | ToolReportArtifact,
|
ExtractedTextArtifact | ToolReportArtifact,
|
||||||
Field(discriminator="kind"),
|
Field(discriminator="kind"),
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -61,6 +61,7 @@ type OrchestratorResponse = Annotated[
|
|||||||
| GenerateFileResponse
|
| GenerateFileResponse
|
||||||
| NeedContentResponse
|
| NeedContentResponse
|
||||||
| NeedIngestResponse
|
| NeedIngestResponse
|
||||||
|
| ConvertMarkdownResponse
|
||||||
| AgentDraftResponse
|
| AgentDraftResponse
|
||||||
| NextExecutionAction
|
| NextExecutionAction
|
||||||
| UnsupportedCapabilityResponse,
|
| UnsupportedCapabilityResponse,
|
||||||
|
|||||||
@@ -1,105 +0,0 @@
|
|||||||
"""Contracts for the PDF to Markdown Agent.
|
|
||||||
|
|
||||||
The agent accepts a parsed document and returns a single Markdown document that
|
|
||||||
faithfully reconstructs the PDF content — headings, paragraphs, and tables in
|
|
||||||
reading order, using page_layout as the primary source of truth for structure.
|
|
||||||
|
|
||||||
Java extracts page layout via PdfIngester and returns it as a PageLayoutArtifact
|
|
||||||
through the orchestrator resume_with pattern.
|
|
||||||
"""
|
|
||||||
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
from typing import Annotated, Literal
|
|
||||||
|
|
||||||
from pydantic import Field
|
|
||||||
|
|
||||||
from stirling.models import ApiModel
|
|
||||||
|
|
||||||
from .common import ArtifactKind, ConversationMessage, GenerateFileResponse, NeedContentResponse
|
|
||||||
from .pdf_edit import EditCannotDoResponse
|
|
||||||
|
|
||||||
# ── Input: layout models (mirror Java's RawLine / TextFragment geometry) ────────────────────────
|
|
||||||
|
|
||||||
|
|
||||||
class LayoutFragment(ApiModel):
|
|
||||||
"""One text fragment with its bounding-box geometry and font properties."""
|
|
||||||
|
|
||||||
text: str
|
|
||||||
x: float
|
|
||||||
y: float
|
|
||||||
width: float
|
|
||||||
font_size: float
|
|
||||||
bold: bool
|
|
||||||
|
|
||||||
|
|
||||||
class LayoutLine(ApiModel):
|
|
||||||
"""A visual line on the page: one y-coordinate and all fragments on that line."""
|
|
||||||
|
|
||||||
y: float
|
|
||||||
fragments: list[LayoutFragment]
|
|
||||||
|
|
||||||
|
|
||||||
class PageLayout(ApiModel):
|
|
||||||
"""All layout lines for a single page, in top-to-bottom order."""
|
|
||||||
|
|
||||||
page_number: int
|
|
||||||
lines: list[LayoutLine]
|
|
||||||
|
|
||||||
|
|
||||||
# ── Artifact: page layout (produced by Java, consumed by orchestrate()) ──────────────────────────
|
|
||||||
|
|
||||||
|
|
||||||
class PageLayoutFileEntry(ApiModel):
|
|
||||||
"""Page layout data for one file, as extracted by Java's PdfIngester."""
|
|
||||||
|
|
||||||
file_name: str
|
|
||||||
pages: list[PageLayout] = Field(default_factory=list)
|
|
||||||
|
|
||||||
|
|
||||||
class PageLayoutArtifact(ApiModel):
|
|
||||||
"""Artifact carrying full spatial page layout for all input files."""
|
|
||||||
|
|
||||||
kind: Literal[ArtifactKind.PAGE_LAYOUT] = ArtifactKind.PAGE_LAYOUT
|
|
||||||
files: list[PageLayoutFileEntry] = Field(default_factory=list)
|
|
||||||
|
|
||||||
|
|
||||||
# ── Input: full request ──────────────────────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
|
|
||||||
class PdfToMarkdownRequest(ApiModel):
|
|
||||||
"""Request sent by Java after PdfIngester has parsed the document.
|
|
||||||
|
|
||||||
page_layout: per-fragment positional data from the original (y-sorted) line order.
|
|
||||||
Each fragment carries its x/y position, width, font size, and bold flag.
|
|
||||||
This is the primary source of truth for column detection and heading hierarchy.
|
|
||||||
"""
|
|
||||||
|
|
||||||
user_message: str
|
|
||||||
file_names: list[str] = Field(default_factory=list)
|
|
||||||
conversation_history: list[ConversationMessage] = Field(default_factory=list)
|
|
||||||
page_layout: list[PageLayout] = Field(default_factory=list)
|
|
||||||
|
|
||||||
|
|
||||||
# ── Output: response variants ────────────────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
|
|
||||||
class PdfToMarkdownSuccessResponse(ApiModel):
|
|
||||||
outcome: Literal["document_reconstructed"] = "document_reconstructed"
|
|
||||||
markdown: str
|
|
||||||
|
|
||||||
|
|
||||||
class PdfToMarkdownCannotDoResponse(ApiModel):
|
|
||||||
outcome: Literal["cannot_do"] = "cannot_do"
|
|
||||||
reason: str
|
|
||||||
|
|
||||||
|
|
||||||
type PdfToMarkdownResponse = Annotated[
|
|
||||||
PdfToMarkdownSuccessResponse | PdfToMarkdownCannotDoResponse,
|
|
||||||
Field(discriminator="outcome"),
|
|
||||||
]
|
|
||||||
|
|
||||||
type PdfToMarkdownOrchestrateResponse = Annotated[
|
|
||||||
GenerateFileResponse | EditCannotDoResponse | NeedContentResponse,
|
|
||||||
Field(discriminator="outcome"),
|
|
||||||
]
|
|
||||||
@@ -1,138 +0,0 @@
|
|||||||
"""Tests for PDF to Markdown agent.
|
|
||||||
|
|
||||||
Two cases:
|
|
||||||
1. Narrative-only page: request validates and routes to reconstruction.
|
|
||||||
2. Mixed text + table page: layout with table region validates correctly.
|
|
||||||
"""
|
|
||||||
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
from stirling.contracts.pdf_to_markdown import (
|
|
||||||
LayoutFragment,
|
|
||||||
LayoutLine,
|
|
||||||
PageLayout,
|
|
||||||
PageLayoutArtifact,
|
|
||||||
PdfToMarkdownRequest,
|
|
||||||
PdfToMarkdownSuccessResponse,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def _frag(text: str, x: float, y: float, font_size: float = 10.0, bold: bool = False) -> LayoutFragment:
|
|
||||||
return LayoutFragment(text=text, x=x, y=y, width=float(len(text) * 6), font_size=font_size, bold=bold)
|
|
||||||
|
|
||||||
|
|
||||||
def _line(y: float, *frags: LayoutFragment) -> LayoutLine:
|
|
||||||
return LayoutLine(y=y, fragments=list(frags))
|
|
||||||
|
|
||||||
|
|
||||||
# ── Test 1: Narrative-only reconstruction ────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
|
|
||||||
# ── Contract test: Java serialization ↔ Python deserialization ──────────────────────────────────
|
|
||||||
# This JSON is also asserted field-by-field in PageLayoutArtifactContractTest.java.
|
|
||||||
# If either side renames a field, one of these tests fails.
|
|
||||||
_CONTRACT_JSON = (
|
|
||||||
'{"kind":"page_layout","files":[{"fileName":"test.pdf","pages":'
|
|
||||||
'[{"pageNumber":1,"lines":[{"y":10.0,"fragments":'
|
|
||||||
'[{"text":"Hello","x":1.0,"y":2.0,"width":30.0,"fontSize":12.0,"bold":true}]}]}]}]}'
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def test_page_layout_artifact_deserialises_java_json() -> None:
|
|
||||||
artifact = PageLayoutArtifact.model_validate_json(_CONTRACT_JSON)
|
|
||||||
|
|
||||||
assert artifact.kind == "page_layout"
|
|
||||||
assert artifact.files[0].file_name == "test.pdf"
|
|
||||||
page = artifact.files[0].pages[0]
|
|
||||||
assert page.page_number == 1
|
|
||||||
line = page.lines[0]
|
|
||||||
assert line.y == 10.0
|
|
||||||
frag = line.fragments[0]
|
|
||||||
assert frag.text == "Hello"
|
|
||||||
assert frag.x == 1.0
|
|
||||||
assert frag.y == 2.0
|
|
||||||
assert frag.width == 30.0
|
|
||||||
assert frag.font_size == 12.0
|
|
||||||
assert frag.bold is True
|
|
||||||
|
|
||||||
|
|
||||||
def test_narrative_reconstruction_request_validates() -> None:
|
|
||||||
"""A prose-only page with no tables produces a valid PdfToMarkdownRequest."""
|
|
||||||
layout = PageLayout(
|
|
||||||
page_number=1,
|
|
||||||
lines=[
|
|
||||||
_line(72.0, _frag("Annual Report 2023", x=72.0, y=72.0, font_size=18.0, bold=True)),
|
|
||||||
_line(100.0, _frag("Our revenue grew significantly", x=72.0, y=100.0)),
|
|
||||||
_line(114.0, _frag("during the fiscal year ended", x=72.0, y=114.0)),
|
|
||||||
_line(128.0, _frag("December 31, 2023.", x=72.0, y=128.0)),
|
|
||||||
],
|
|
||||||
)
|
|
||||||
request = PdfToMarkdownRequest(
|
|
||||||
user_message="reconstruct this document",
|
|
||||||
page_layout=[layout],
|
|
||||||
)
|
|
||||||
|
|
||||||
assert len(request.page_layout) == 1
|
|
||||||
assert len(request.page_layout[0].lines) == 4
|
|
||||||
assert request.page_layout[0].lines[0].fragments[0].bold is True
|
|
||||||
assert request.page_layout[0].lines[0].fragments[0].font_size == 18.0
|
|
||||||
|
|
||||||
|
|
||||||
def test_narrative_reconstruction_response_validates() -> None:
|
|
||||||
"""PdfToMarkdownSuccessResponse accepts markdown and returns document_reconstructed outcome."""
|
|
||||||
response = PdfToMarkdownSuccessResponse(
|
|
||||||
markdown="# Annual Report 2023\n\nOur revenue grew significantly during the fiscal year.",
|
|
||||||
)
|
|
||||||
|
|
||||||
assert response.outcome == "document_reconstructed"
|
|
||||||
assert response.markdown.startswith("#")
|
|
||||||
|
|
||||||
|
|
||||||
# ── Test 2: Mixed text + table reconstruction ─────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
|
|
||||||
def test_mixed_page_layout_validates() -> None:
|
|
||||||
"""A page with both prose lines and a table region produces a valid request."""
|
|
||||||
layout = PageLayout(
|
|
||||||
page_number=1,
|
|
||||||
lines=[
|
|
||||||
# Prose heading
|
|
||||||
_line(50.0, _frag("Projects in Development", x=72.0, y=50.0, font_size=14.0, bold=True)),
|
|
||||||
# Table header row
|
|
||||||
_line(
|
|
||||||
80.0,
|
|
||||||
_frag("Project Name", x=72.0, y=80.0, bold=True),
|
|
||||||
_frag("Location", x=200.0, y=80.0, bold=True),
|
|
||||||
_frag("Size (MW)", x=290.0, y=80.0, bold=True),
|
|
||||||
),
|
|
||||||
# Table data rows
|
|
||||||
_line(
|
|
||||||
95.0,
|
|
||||||
_frag("Chaplin Wind 1", x=72.0, y=95.0),
|
|
||||||
_frag("Saskatchewan", x=200.0, y=95.0),
|
|
||||||
_frag("177", x=290.0, y=95.0),
|
|
||||||
),
|
|
||||||
_line(
|
|
||||||
110.0,
|
|
||||||
_frag("Amherst Island 2", x=72.0, y=110.0),
|
|
||||||
_frag("Ontario", x=200.0, y=110.0),
|
|
||||||
_frag("75", x=290.0, y=110.0),
|
|
||||||
),
|
|
||||||
# Prose after table
|
|
||||||
_line(140.0, _frag("Notes:", x=72.0, y=140.0, bold=True)),
|
|
||||||
_line(154.0, _frag("1 PPA signed", x=85.0, y=154.0)),
|
|
||||||
],
|
|
||||||
)
|
|
||||||
request = PdfToMarkdownRequest(
|
|
||||||
user_message="markdown",
|
|
||||||
page_layout=[layout],
|
|
||||||
)
|
|
||||||
|
|
||||||
assert len(request.page_layout[0].lines) == 6
|
|
||||||
# Header line has 3 fragments at distinct x-positions (column detection)
|
|
||||||
header_line = request.page_layout[0].lines[1]
|
|
||||||
xs = [f.x for f in header_line.fragments]
|
|
||||||
assert xs == [72.0, 200.0, 290.0]
|
|
||||||
# Data rows have matching x-positions
|
|
||||||
data_row = request.page_layout[0].lines[2]
|
|
||||||
assert [f.x for f in data_row.fragments] == [72.0, 200.0, 290.0]
|
|
||||||
@@ -233,8 +233,7 @@ Feature: API Validation
|
|||||||
When I send the API request to the endpoint "/api/v1/convert/pdf/markdown"
|
When I send the API request to the endpoint "/api/v1/convert/pdf/markdown"
|
||||||
Then the response status code should be 200
|
Then the response status code should be 200
|
||||||
And the response file should have size greater than 100
|
And the response file should have size greater than 100
|
||||||
And the response file should have extension ".zip"
|
And the response file should have extension ".md"
|
||||||
And the response ZIP should contain 4 files
|
|
||||||
|
|
||||||
|
|
||||||
@positive @pdftocsv
|
@positive @pdftocsv
|
||||||
|
|||||||
+3
-3
@@ -911,7 +911,7 @@ main() {
|
|||||||
CUCUMBER_JUNIT_DIR="$PROJECT_ROOT/testing/cucumber/junit"
|
CUCUMBER_JUNIT_DIR="$PROJECT_ROOT/testing/cucumber/junit"
|
||||||
mkdir -p "$CUCUMBER_JUNIT_DIR"
|
mkdir -p "$CUCUMBER_JUNIT_DIR"
|
||||||
cd "testing/cucumber"
|
cd "testing/cucumber"
|
||||||
start_test_timer "Stirling-PDF-Regression"
|
start_test_timer "Stirling-PDF-Regression $CONTAINER_NAME"
|
||||||
|
|
||||||
# Snapshot docker log line count before behave so we can extract only behave-window logs
|
# Snapshot docker log line count before behave so we can extract only behave-window logs
|
||||||
DOCKER_LOG_BEFORE=$(docker logs "$CONTAINER_NAME" 2>&1 | wc -l)
|
DOCKER_LOG_BEFORE=$(docker logs "$CONTAINER_NAME" 2>&1 | wc -l)
|
||||||
@@ -999,7 +999,7 @@ main() {
|
|||||||
# Save docker logs from the behave window to a dedicated file
|
# Save docker logs from the behave window to a dedicated file
|
||||||
local cucumber_log="$REPORT_DIR/cucumber-docker-context.log"
|
local cucumber_log="$REPORT_DIR/cucumber-docker-context.log"
|
||||||
docker logs "$CONTAINER_NAME" 2>&1 | tail -n +"$((DOCKER_LOG_BEFORE + 1))" > "$cucumber_log" 2>/dev/null || true
|
docker logs "$CONTAINER_NAME" 2>&1 | tail -n +"$((DOCKER_LOG_BEFORE + 1))" > "$cucumber_log" 2>/dev/null || true
|
||||||
test_failure_logs["Stirling-PDF-Regression"]="$cucumber_log"
|
test_failure_logs["Stirling-PDF-Regression $CONTAINER_NAME"]="$cucumber_log"
|
||||||
|
|
||||||
gha_group "Docker logs during behave run: $CONTAINER_NAME"
|
gha_group "Docker logs during behave run: $CONTAINER_NAME"
|
||||||
tail -100 "$cucumber_log"
|
tail -100 "$cucumber_log"
|
||||||
@@ -1012,7 +1012,7 @@ main() {
|
|||||||
capture_file_list "$CONTAINER_NAME" "$AFTER_FILE"
|
capture_file_list "$CONTAINER_NAME" "$AFTER_FILE"
|
||||||
compare_file_lists "$BEFORE_FILE" "$AFTER_FILE" "$DIFF_FILE" "$CONTAINER_NAME"
|
compare_file_lists "$BEFORE_FILE" "$AFTER_FILE" "$DIFF_FILE" "$CONTAINER_NAME"
|
||||||
fi
|
fi
|
||||||
stop_test_timer "Stirling-PDF-Regression"
|
stop_test_timer "Stirling-PDF-Regression $CONTAINER_NAME"
|
||||||
fi
|
fi
|
||||||
# `down` with the override removes the agent bind-mount cleanly. The
|
# `down` with the override removes the agent bind-mount cleanly. The
|
||||||
# SIGTERM that `down` sends is what triggers dumponexit=true in the
|
# SIGTERM that `down` sends is what triggers dumponexit=true in the
|
||||||
|
|||||||
Reference in New Issue
Block a user