mirror of
https://github.com/infiniflow/ragflow.git
synced 2026-07-12 06:35:44 +08:00
12787996d1
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.
38 lines
1.3 KiB
Go
38 lines
1.3 KiB
Go
//go:build cgo
|
|
|
|
package pdf
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
|
|
pdf "ragflow/internal/deepdoc/parser/pdf/type"
|
|
)
|
|
|
|
// Parse runs the full PDF extraction pipeline from raw bytes.
|
|
//
|
|
// Engine lifetime / ownership: Parse creates the native PDF engine and
|
|
// transfers ownership of it to the returned *pdf.ParseResult (result.Engine is
|
|
// populated inside ParseRaw/processPages). The engine is intentionally kept
|
|
// alive past Parse so the serialization step can still use it — most
|
|
// importantly the markdown path (cropMarkdownFigures) renders and crops figure
|
|
// images on demand. Parse must therefore NOT close the engine itself.
|
|
//
|
|
// The caller (the adapter layer: pdfParseResultToJSONWithOptions /
|
|
// pdfParseResultToMarkdownWithOptions) releases the engine via result.Close()
|
|
// once serialization is complete. The only place Parse closes the engine is on
|
|
// its own error return, since in that case no ParseResult is handed back for
|
|
// the caller to release.
|
|
func (p *Parser) Parse(ctx context.Context, data []byte, docAnalyzer pdf.DocAnalyzer) (*pdf.ParseResult, error) {
|
|
engine, err := NewEngine(data)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("pdfoxide.NewEngine: %w", err)
|
|
}
|
|
res, err := p.ParseRaw(ctx, engine, docAnalyzer)
|
|
if err != nil {
|
|
_ = engine.Close()
|
|
return nil, err
|
|
}
|
|
return res, nil
|
|
}
|