mirror of
https://github.com/infiniflow/ragflow.git
synced 2026-07-20 14:41:05 +08:00
a7b193d77b
### What problem does this PR solve? Table structure recognition rows, columns, headers, and spans are produced in cropped table image coordinates, while OCR boxes are matched later in page-cumulative coordinates. Comparing those boxes without normalization can skip or misassign table row and column metadata. Closes #16992. ### What is changed? - Map TSR components from cropped or rotated table-image coordinates back into page-cumulative coordinates before matching OCR boxes. - Reuse one inverse rotation transform for rotated OCR boxes and TSR components. - Keep TSR layout ids in the same `table-N` form used by table OCR boxes. - Sort columns by mapped page x-coordinate after coordinate normalization. - Add focused unit coverage for page offsets, zoom scaling, and 90/180/270 degree rotated tables. ### Type of change - [x] Bug fix - [x] Test coverage ### How has this been tested? - `uv run --group test pytest test/unit_test/deepdoc/parser/test_pdf_parser_table_coordinates.py -q` - `uv run --no-sync --group test pytest --confcutdir=test/unit_test/deepdoc/parser test/unit_test/deepdoc/parser/test_pdf_parser_table_coordinates.py -q` - `uv run ruff check deepdoc/parser/pdf_parser.py test/unit_test/deepdoc/parser/test_pdf_parser_table_coordinates.py` - `uv run --no-sync python -m py_compile deepdoc/parser/pdf_parser.py test/unit_test/deepdoc/parser/test_pdf_parser_table_coordinates.py` - `git diff --check` A later dependency-sync attempt was blocked while resolving the `en-core-web-sm` wheel from GitHub, and the repository-level unit-test conftest can try to download missing NLTK `wordnet` data when it is not already present locally. The focused parser test above does not require that data fixture. --------- Co-authored-by: zq <zhouquan1511@163.com>
98 lines
2.6 KiB
Go
98 lines
2.6 KiB
Go
package pdf
|
|
|
|
import (
|
|
"context"
|
|
"image"
|
|
"testing"
|
|
|
|
tbl "ragflow/internal/deepdoc/parser/pdf/table"
|
|
pdf "ragflow/internal/deepdoc/parser/pdf/type"
|
|
)
|
|
|
|
type orientationScoringDoc struct{}
|
|
|
|
func (d *orientationScoringDoc) DLA(_ context.Context, _ image.Image) ([]pdf.DLARegion, error) {
|
|
return nil, nil
|
|
}
|
|
|
|
func (d *orientationScoringDoc) TSR(_ context.Context, _ image.Image) ([]pdf.TSRCell, error) {
|
|
return nil, nil
|
|
}
|
|
|
|
func (d *orientationScoringDoc) OCRDetect(_ context.Context, img image.Image) ([]pdf.OCRBox, error) {
|
|
regions := 1
|
|
if img.Bounds().Dy() > img.Bounds().Dx() {
|
|
regions = 5
|
|
}
|
|
boxes := make([]pdf.OCRBox, regions)
|
|
for i := range boxes {
|
|
x0 := float64((i + 1) * 10)
|
|
boxes[i] = pdf.OCRBox{
|
|
X0: x0, Y0: 10,
|
|
X1: x0 + 5, Y1: 10,
|
|
X2: x0 + 5, Y2: 30,
|
|
X3: x0, Y3: 30,
|
|
}
|
|
}
|
|
return boxes, nil
|
|
}
|
|
|
|
func (d *orientationScoringDoc) OCRRecognize(_ context.Context, _ image.Image) ([]pdf.OCRText, error) {
|
|
return nil, nil
|
|
}
|
|
|
|
func (d *orientationScoringDoc) Health() bool { return true }
|
|
|
|
type staticTableBuilder struct {
|
|
cells []pdf.TSRCell
|
|
}
|
|
|
|
func (b *staticTableBuilder) Name() string { return "static" }
|
|
|
|
func (b *staticTableBuilder) DetectCells(_ context.Context, _ image.Image) ([]pdf.TSRCell, error) {
|
|
return append([]pdf.TSRCell(nil), b.cells...), nil
|
|
}
|
|
|
|
func (b *staticTableBuilder) GroupCells(cells []pdf.TSRCell) [][]pdf.TSRCell {
|
|
if len(cells) == 0 {
|
|
return nil
|
|
}
|
|
return [][]pdf.TSRCell{{cells[0]}}
|
|
}
|
|
|
|
func TestProcessOneTable_AutoRotateNormalizesCellBounds(t *testing.T) {
|
|
autoRotate := true
|
|
cfg := pdf.DefaultParserConfig()
|
|
cfg.AutoRotateTables = &autoRotate
|
|
cfg.SkipOCR = true
|
|
p := NewParser(cfg)
|
|
|
|
pageImg := image.NewRGBA(image.Rect(0, 0, 320, 220))
|
|
boxes := []pdf.TextBox{
|
|
{X0: 10, X1: 60, Top: 10, Bottom: 30, Text: "cell", LayoutType: pdf.LayoutTypeTable},
|
|
}
|
|
match := tbl.TableMatch{
|
|
Region: pdf.DLARegion{X0: 10, Y0: 10, X1: 210, Y1: 110, Label: pdf.LayoutTypeTable},
|
|
BoxIdx: []int{0},
|
|
}
|
|
builder := &staticTableBuilder{
|
|
cells: []pdf.TSRCell{
|
|
{X0: 10, Y0: 20, X1: 60, Y1: 80, Label: "table row"},
|
|
},
|
|
}
|
|
|
|
item := p.processOneTable(context.Background(), pageImg, boxes, 0, &orientationScoringDoc{}, builder, match, pdf.DlaScale)
|
|
if len(item.Cells) != 1 {
|
|
t.Fatalf("cells = %d, want 1", len(item.Cells))
|
|
}
|
|
|
|
got := item.Cells[0]
|
|
if got.X0 != 20 || got.Y0 != 45 || got.X1 != 80 || got.Y1 != 95 {
|
|
t.Errorf("cell bounds = (%.0f,%.0f,%.0f,%.0f), want (20,45,80,95)",
|
|
got.X0, got.Y0, got.X1, got.Y1)
|
|
}
|
|
if got.X0 > got.X1 || got.Y0 > got.Y1 {
|
|
t.Fatalf("cell bounds are inverted: (%.0f,%.0f,%.0f,%.0f)", got.X0, got.Y0, got.X1, got.Y1)
|
|
}
|
|
}
|