mirror of
https://github.com/infiniflow/ragflow.git
synced 2026-08-16 21:50:58 +08:00
## Summary Adds page-range parsing support to the Go-native pipeline path and introduces strict `parse_type` validation for both dataset and document update endpoints. ## What changed ### Pages range parsing - **`internal/utility/pdf_pages.go`** — `NormalizePDFPages`: normalizes raw page ranges (list of `[from,to]` 1-indexed inclusive ranges) into sorted, merged, deduplicated `[][]int`. Invalid ranges are dropped. - **`internal/ingestion/pipeline/pdf_pages.go`** — `NormalizeParserConfigPages`: walks any parser_config map and normalizes `"pages"` values under every component → filetype setup, so the persisted config always carries clean, merged ranges. - **`internal/deepdoc/parser/pdf/parser.go`** — integrates `resolvePagesToProcess` to filter parsed PDF pages by the configured ranges. - Pipeline integration (parser pages): `internal/parser/parser/pdf_parser_common.go`, `chunk_process.go`, plus associated e2e and unit tests. ### Parse type validation (shared logic) - **`internal/service/parser_mode.go`** (new) — `ValidateParseTypeMode`: shared function that validates `parse_type` (1=BuiltIn/parser_id, 2=Pipeline/pipeline_id) and ensures the corresponding field is present. Used by both dataset and document update endpoints. - **`internal/service/dataset/crud.go`** / `update.go` — replaces inline `isPipelineMode`/`isBuiltinMode` computation with the shared `service.ValidateParseTypeMode`. - **`internal/service/document/document_dataset_update.go`** — adds strict `parse_type` validation in `validateDatasetDocumentUpdate`, simplifies the reparse logic to a two-way switch (isBuiltin/isPipeline) now that parse_type is always valid. - **`internal/service/document/document.go`** — adds `ParseType` field to `UpdateDatasetDocumentRequest`. - **`internal/service/document/document_dataset_update.go`** — `updateDocumentParserConfig` fallback path when DSL loading fails. - **`internal/service/parser_mode_test.go`** (new) — test coverage for nil, invalid, and missing-field scenarios. ### Frontend - **`web/src/interfaces/request/document.ts`** — adds `parseType` to `IChangeParserRequestBody`. - **`web/src/hooks/use-document-request.ts`** — `useSetDocumentPipelineParser` sends `parse_type` in the PATCH payload. - **`web/src/pages/dataset/dataset/use-change-document-parser.ts`** — Go/Python branching for the document parser config dialog. - **`web/src/components/document-pipeline-dialog/use-document-pipeline-form.ts`** — `buildSubmitData` returns `parseType` (bugfix: was dropped from the return value). ### Test changes - **Removed**: 2 tests that verified the old "mutually exclusive" error (replaced by `ValidateParseTypeMode` coverage). - **Modified**: 6 tests across document and dataset packages to include `ParseType` in request structs. - **Added**: new e2e tests for pages parsing (`pages_e2e_test.go`, `pdf_parser_pages_e2e_test.go`) and unit tests for `NormalizePDFPages`, `NormalizeParserConfigPages`, `resolvePagesToProcess`. ## Backward compatibility - The `parse_type` field is **required** when `parser_id` or `pipeline_id` is sent. This changes the contract for both dataset and document PATCH endpoints, but aligns the Go backend with the existing frontend behavior (the frontend already sends `parse_type`). Callers that omit `parse_type` when updating parser/pipeline selections will receive a clear error message. - Existing callers that only update fields like `name`, `enabled`, or `meta_fields` are unaffected. - Test updates ensure all known call sites are compliant.
50 lines
1.5 KiB
Go
50 lines
1.5 KiB
Go
package pipeline
|
|
|
|
import "ragflow/internal/utility"
|
|
|
|
// NormalizeParserConfigPages walks cfg and normalizes the "pages" field under
|
|
// every component's filetype setup under fail-fast semantics.
|
|
//
|
|
// When normalization succeeds, the normalized value is written back. When any
|
|
// "pages" value is invalid (non-list, or contains an invalid range), an error
|
|
// is returned immediately and the request should be rejected — no partial
|
|
// dropping, no保留 of malformed values.
|
|
//
|
|
// The walk is generic (not hardcoded to "pdf"): any filetype setup carrying a
|
|
// "pages" key is normalized. Setups without "pages" are skipped, so this is
|
|
// safe to run on any parser_config and never creates or deletes keys other
|
|
// than overwriting "pages" in place. Structural mismatches (non-map cpnID
|
|
// value, non-map setup) are silently skipped — they are not "pages" errors.
|
|
func NormalizeParserConfigPages(cfg map[string]any) error {
|
|
if cfg == nil {
|
|
return nil
|
|
}
|
|
for _, v := range cfg {
|
|
params, ok := v.(map[string]any)
|
|
if !ok {
|
|
continue
|
|
}
|
|
for _, fv := range params {
|
|
setup, ok := fv.(map[string]any)
|
|
if !ok {
|
|
continue
|
|
}
|
|
raw, ok := setup["pages"]
|
|
if !ok {
|
|
continue
|
|
}
|
|
normalized, err := utility.NormalizePDFPages(raw)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if normalized != nil {
|
|
setup["pages"] = normalized
|
|
}
|
|
// nil (no value): leave the key as-is. Empty/null pages are
|
|
// equivalent to "parse all pages"; overwriting with nil would
|
|
// not change behavior but would mutate the map unnecessarily.
|
|
}
|
|
}
|
|
return nil
|
|
}
|