mirror of
https://github.com/infiniflow/ragflow.git
synced 2026-07-11 14:15:40 +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.
114 lines
2.8 KiB
Go
114 lines
2.8 KiB
Go
package util
|
||
|
||
import (
|
||
"math/rand/v2"
|
||
"strings"
|
||
|
||
pdf "ragflow/internal/deepdoc/parser/pdf/type"
|
||
)
|
||
|
||
// IsASCIIPrintable returns true for characters that match Python's
|
||
// is_english regex: [ a-zA-Z0-9,/¸;:'\[\]\(\)!@#$%^&*\"?<>._-]
|
||
func IsASCIIPrintable(r rune) bool {
|
||
if r == ' ' {
|
||
return true
|
||
}
|
||
if r >= 'a' && r <= 'z' {
|
||
return true
|
||
}
|
||
if r >= 'A' && r <= 'Z' {
|
||
return true
|
||
}
|
||
if r >= '0' && r <= '9' {
|
||
return true
|
||
}
|
||
// Additional ASCII symbols from the Python regex
|
||
switch r {
|
||
case ',', '/', '¸', ';', ':', '\'', '[', ']', '(', ')',
|
||
'!', '@', '#', '$', '%', '^', '&', '*', '"', '?',
|
||
'<', '>', '.', '_', '-':
|
||
return true
|
||
}
|
||
return false
|
||
}
|
||
|
||
// DefaultSampleChars returns a random sample of up to n character texts,
|
||
// concatenated. Matches Python's random.choices([c["text"] for c in
|
||
// page_chars], k=min(100, len(page_chars))).
|
||
func DefaultSampleChars(chars []pdf.TextChar, n int) string {
|
||
if n <= 0 || len(chars) == 0 {
|
||
return ""
|
||
}
|
||
m := min(n, len(chars))
|
||
// Fisher-Yates shuffle on indices, then take first m.
|
||
indices := make([]int, len(chars))
|
||
for i := range indices {
|
||
indices[i] = i
|
||
}
|
||
rand.Shuffle(len(indices), func(i, j int) {
|
||
indices[i], indices[j] = indices[j], indices[i]
|
||
})
|
||
var buf strings.Builder
|
||
for i := 0; i < m; i++ {
|
||
buf.WriteString(chars[indices[i]].Text)
|
||
}
|
||
return buf.String()
|
||
}
|
||
|
||
// FullTextFromChars concatenates all chars text across pages for scan noise detection.
|
||
func FullTextFromChars(pageChars map[int][]pdf.TextChar) string {
|
||
var sb strings.Builder
|
||
for _, chars := range pageChars {
|
||
for _, c := range chars {
|
||
sb.WriteString(c.Text)
|
||
}
|
||
}
|
||
return sb.String()
|
||
}
|
||
|
||
// DetectEnglishPage reports whether one page contains a run of 30+
|
||
// consecutive ASCII-printable characters in a random sample of up to 100
|
||
// extracted character texts.
|
||
func DetectEnglishPage(chars []pdf.TextChar, sample pdf.SampleFunc) bool {
|
||
if len(chars) == 0 {
|
||
return false
|
||
}
|
||
if sample == nil {
|
||
sample = DefaultSampleChars
|
||
}
|
||
|
||
sampleText := sample(chars, 100)
|
||
run := 0
|
||
for _, r := range sampleText {
|
||
if IsASCIIPrintable(r) {
|
||
run++
|
||
if run >= 30 {
|
||
return true
|
||
}
|
||
} else {
|
||
run = 0
|
||
}
|
||
}
|
||
return false
|
||
}
|
||
|
||
// DetectEnglish detects whether a PDF is primarily English by per-page
|
||
// majority vote, matching Python's is_english logic in __images__
|
||
// (pdf_parser.py:1519-1526).
|
||
//
|
||
// Each page votes via DetectEnglishPage. Returns true when a strict majority
|
||
// of pages vote yes. totalPages remains the denominator so image-only pages
|
||
// still dilute the majority, matching Python behavior.
|
||
func DetectEnglish(pageChars map[int][]pdf.TextChar, totalPages int, sample pdf.SampleFunc) bool {
|
||
if totalPages == 0 || len(pageChars) == 0 {
|
||
return false
|
||
}
|
||
pagesWithSeq := 0
|
||
for _, chars := range pageChars {
|
||
if DetectEnglishPage(chars, sample) {
|
||
pagesWithSeq++
|
||
}
|
||
}
|
||
return pagesWithSeq > totalPages/2
|
||
}
|