mirror of
https://github.com/infiniflow/ragflow.git
synced 2026-07-11 22:25:41 +08:00
feat(ingestion): mirror Go pipeline progress into the document table;
harden resume guards
- pipeline: bind the owning document via WithDocumentID; after each
TrackProgress event aggregate ingestion_task_log progress and mirror
progress/run/progress_msg back into the document table, so GET
/api/v1/datasets/{dataset_id}/documents reflects live Go pipeline
progress without a bespoke endpoint.
- canvas: extend the S3 resume guard to reject legacy no-op nodes (e.g.
ExitLoop) so component_total equals the count of progress-reporting
components and the aggregate percent can reach 100%.
- runtime/canvas: route progress through TrackProgress; add interrupt
test coverage (r3_interrupt_test.go).
- dao/entity: add IngestionTask.DocumentID column and AggregateProgress
support used by the mirror; IngestionTaskLog keeps a Checkpoint column
alongside the progress fields.
feat(deepdoc): cache DocAnalyzer inference results in Redis (1h TTL)
- Redis-backed DocAnalyzerCache decorator over inference.Client; cache
key = "ddoc:cache:<method>:" + sha256 of the JPEG-encoded image bytes
(deterministic).
- TTL = 1h; hits skip the inner HTTP call and return cached JSON; inner
errors are not cached.
refactor(deepdoc): align figure cropping with Python cropout + bounded
page caches
- CropSectionByDLA mirrors Python cropout: best-overlap DLA
figure/equation region, fallback to section bbox per page, vertical
concat on gray background.
- sliding-window page-image cache bounds peak memory to the recent
window instead of the whole PDF.
- rename DLADebug -> DLARegions across parser/chunker/tests.
refactor(parser): drop lib_type selector; align NewXxxParser with
NewPDFParser
- remove config["lib_type"] lookup and the libType param/field/switch
from all nine constructors; surface the CGO-required error at
ParseWithResult time instead of construction time; drop resolveLibType,
its test, and the four lib_type constants.
feat(utility): add a reusable workerpool for bounded concurrent
execution
- internal/utility/workerpool.go (+ tests).
refactor: translate Chinese prose comments to English in non-harness Go
files.
chore: upgrade github.com/cloudwego/eino from v0.9.9 to v0.9.12.
157 lines
5.1 KiB
Go
157 lines
5.1 KiB
Go
package layout
|
|
|
|
import (
|
|
"strings"
|
|
|
|
pdf "ragflow/internal/deepdoc/parser/pdf/type"
|
|
util "ragflow/internal/deepdoc/parser/pdf/util"
|
|
)
|
|
|
|
// ResolvePageSpan computes the ending page and bottom coordinate for a box
|
|
// that may span multiple pages. When pageHeights is nil or the box fits
|
|
// within its starting page the returned (toPage, bottom) equal the inputs.
|
|
//
|
|
// Zero or negative page heights are treated as invalid: the span stops at
|
|
// the preceding page, guarding against infinite loops caused by corrupted
|
|
// page images.
|
|
func ResolvePageSpan(pageNum int, bottom float64, pageHeights map[int]float64) (toPage int, newBottom float64) {
|
|
toPage = pageNum
|
|
newBottom = bottom
|
|
if pageHeights == nil {
|
|
return
|
|
}
|
|
ph, ok := pageHeights[pageNum]
|
|
if !ok || ph <= 0 || bottom <= ph {
|
|
return
|
|
}
|
|
remaining := bottom
|
|
for remaining > ph && ph > 0 {
|
|
nextPh, ok := pageHeights[toPage+1]
|
|
if !ok || nextPh <= 0 {
|
|
// Unknown or invalid next page height — extend by the
|
|
// last known height once and stop (Python: _line_tag
|
|
// while-loop break path).
|
|
remaining -= ph
|
|
toPage++
|
|
break
|
|
}
|
|
remaining -= ph
|
|
ph = nextPh
|
|
toPage++
|
|
}
|
|
newBottom = remaining
|
|
return
|
|
}
|
|
|
|
// boxesToSections converts layout boxes to section format with position tags.
|
|
//
|
|
// pageHeights provides the PDF-point height of each page (image height / zoom).
|
|
// Boxes that extend beyond their page produce multi-page position tags
|
|
// (Python's _line_tag while-loop detection via resolvePageSpan).
|
|
//
|
|
// Python equivalent: output consumed by naive.py::chunk()
|
|
func BoxesToSections(boxes []pdf.TextBox, pageHeights map[int]float64) []pdf.Section {
|
|
sections := make([]pdf.Section, 0, len(boxes))
|
|
for _, b := range boxes {
|
|
t := strings.TrimSpace(b.Text)
|
|
if t == "" {
|
|
continue
|
|
}
|
|
toPage, bottom := ResolvePageSpan(b.PageNumber, b.Bottom, pageHeights)
|
|
|
|
var posTag string
|
|
var pageNums []int
|
|
if b.PageNumber == toPage {
|
|
posTag = util.FormatPositionTag(b.PageNumber, b.X0, b.X1, b.Top, bottom)
|
|
pageNums = []int{b.PageNumber}
|
|
} else {
|
|
posTag = util.FormatPositionTagRange(b.PageNumber, toPage, b.X0, b.X1, b.Top, bottom)
|
|
pageNums = make([]int, 0, toPage-b.PageNumber+1)
|
|
for p := b.PageNumber; p <= toPage; p++ {
|
|
pageNums = append(pageNums, p)
|
|
}
|
|
}
|
|
sections = append(sections, pdf.Section{
|
|
Text: t,
|
|
PositionTag: posTag,
|
|
LayoutType: b.LayoutType,
|
|
Positions: []pdf.Position{{PageNumbers: pageNums, Left: b.X0, Right: b.X1, Top: b.Top, Bottom: bottom}},
|
|
})
|
|
}
|
|
return sections
|
|
}
|
|
|
|
// NormalizeSectionPositions ensures each Section's Positions field is populated
|
|
// by parsing PositionTag when Positions is empty. Sections that already have
|
|
// Positions populated are left unchanged.
|
|
//
|
|
// This mirrors the Python normalize_pdf_items_metadata — canonicalizing
|
|
// position metadata from the string tag format into the typed []Position form.
|
|
//
|
|
// Callers should invoke this AFTER Parse() returns, just before consuming
|
|
// Sections (e.g., before serialization to JSON or passing to the chunker).
|
|
// The normalization is intentionally NOT embedded inside the parser pipeline
|
|
// because Sections may come from multiple sources (deepdoc, MinerU, Docling,
|
|
// JSON deserialization, etc.).
|
|
func NormalizeSectionPositions(sections []pdf.Section) {
|
|
for i := range sections {
|
|
if len(sections[i].Positions) == 0 && sections[i].PositionTag != "" {
|
|
sections[i].Positions = util.ExtractPositions(sections[i].PositionTag)
|
|
}
|
|
}
|
|
}
|
|
|
|
// SectionsToMarkdown converts Sections to a markdown string.
|
|
//
|
|
// Title sections get a "## " prefix.
|
|
// Figure sections produce an "" tag.
|
|
// Text and all other sections are appended verbatim.
|
|
//
|
|
// This mirrors the Python parser.py:665-671 markdown output path.
|
|
func SectionsToMarkdown(sections []pdf.Section) string {
|
|
var b strings.Builder
|
|
for _, s := range sections {
|
|
if s.LayoutType == pdf.LayoutTypeTitle {
|
|
b.WriteString("\n## ")
|
|
}
|
|
if s.LayoutType == pdf.LayoutTypeFigure && s.Image != "" {
|
|
b.WriteString("\n
|
|
b.WriteString(s.Image)
|
|
b.WriteString(")")
|
|
continue
|
|
}
|
|
b.WriteString(s.Text)
|
|
b.WriteString("\n")
|
|
}
|
|
return b.String()
|
|
}
|
|
|
|
// SectionsToJSON converts Sections to a Python-compatible JSON dict format.
|
|
//
|
|
// Each dict has keys: text, layout_type, doc_type_kwd, _pdf_positions, image.
|
|
// The _pdf_positions key mirrors Python's PDF_POSITIONS_KEY constant —
|
|
// the canonical position format consumed by the chunker's extract_pdf_positions.
|
|
//
|
|
// This mirrors the Python parser.py:662 set_output("json", bboxes) path.
|
|
func SectionsToJSON(sections []pdf.Section) []map[string]any {
|
|
result := make([]map[string]any, len(sections))
|
|
for i, s := range sections {
|
|
positions := make([][]any, len(s.Positions))
|
|
for j, p := range s.Positions {
|
|
pages := make([]any, len(p.PageNumbers))
|
|
for k, pn := range p.PageNumbers {
|
|
pages[k] = pn
|
|
}
|
|
positions[j] = []any{pages, p.Left, p.Right, p.Top, p.Bottom}
|
|
}
|
|
result[i] = map[string]any{
|
|
"text": s.Text,
|
|
"layout_type": s.LayoutType,
|
|
"doc_type_kwd": s.DocTypeKwd,
|
|
"_pdf_positions": positions,
|
|
"image": s.Image,
|
|
}
|
|
}
|
|
return result
|
|
}
|