mirror of
https://github.com/infiniflow/ragflow.git
synced 2026-07-23 00:46:42 +08:00
bb6b43b5c9
## Summary Three groups of changes across the Go ingestion pipeline: ### 1. DOCX parsing improvements - **docx_parser.go**: Enhanced DOCX parsing with better structure extraction and media handling - **docx_parser_cgo_test.go**, **docx_parser_test.go**: Companion tests - **office_parsers_no_cgo.go**: Stub sync for non-CGO builds ### 2. Email (.eml) parsing: base64 Content-Transfer-Encoding decoding - **email_parser.go** (`decodeCTE`): Added Content-Transfer-Encoding decoding for base64 and quoted-printable. Go's `mime/multipart.Reader` does not decode Content-Transfer-Encoding automatically, so attachments with `Content-Transfer-Encoding: base64` remained base64-encoded in the output. The new `decodeCTE` helper is called after reading each multipart part's raw bytes in `readMailBody`, mirroring Python's `part.get_payload(decode=True)`. - **email_parser_test.go**: Two new tests — simple base64 attachment and nested multipart/alternative with base64 attachment. ### 3. Extractor LLM driver fix + ModelDriver consolidation - **extractor.go**: Fixed a bug where the Extractor component used `ModelFactory.CreateModelDriver()`, which creates bare model instances without API keys or provider configuration. Switched to `models.GetPreconfiguredDriver()` which resolves the actual pre-configured driver from `ProviderManager`, matching the codepath used by `llm.go`. This fixes auto keyword/question extraction in DSL pipelines that require LLM calls. - **get_driver.go** (new): Extracted shared `GetPreconfiguredDriver()` from `llm.go:newChatModelDriver()` so both `llm.go` and `extractor.go` use the same codepath. - **get_driver_test.go** (new): Tests for the shared driver resolution. - **llm.go**: Replaced inline driver resolution with `models.GetPreconfiguredDriver()`. ### 4. Chunker fixes and observability - **group.go** (`extractLineRecords`): Fixed to also read `markdown` and `html` payload keys — previously it only read `text`/`content`, causing GroupTitleChunker to silently return empty results for markdown-format parser output. - **common.go** (`compileDelimPattern`): Aligned with Python's `_compile_delimiter_pattern` — only backtick-wrapped delimiters produce an active regex pattern; plain delimiters are not compiled into the split regex. - **token.go** (`applyChildrenDelim`): Set `DocType` and `CKType` to `"text"` on created ChunkDocs so the token-size merge path correctly identifies and merges text segments. - **parser.go**, **extractor.go**, **tokenizer.go**, **group.go**, **hierarchy.go**: Added debug-level logging for pipeline diagnostics. - **parser_dispatch_test.go**, **group_test.go**: New tests. ## Verification - All Go tests pass: `bash build.sh --test ./internal/parser/parser/...` and `bash build.sh --test ./internal/ingestion/component/...` - Build succeeds: `bash build.sh --go`
63 lines
2.1 KiB
Go
63 lines
2.1 KiB
Go
//
|
|
// Copyright 2026 The InfiniFlow Authors. All Rights Reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
//
|
|
|
|
package models
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
)
|
|
|
|
// GetPreconfiguredDriver returns the provider's pre-built ModelDriver from
|
|
// ProviderManager, with an optional base URL override applied.
|
|
//
|
|
// The caller MUST NOT mutate the returned driver — use NewInstance to
|
|
// create a derived copy with custom base URLs.
|
|
//
|
|
// Returns:
|
|
// - driver, nil — found and (optionally) overridden
|
|
// - nil, error — provider manager uninitialized, provider unknown,
|
|
// or provider does not support custom base URLs
|
|
func GetPreconfiguredDriver(driver string, baseURLOverride string) (ModelDriver, error) {
|
|
baseURLOverride = strings.TrimSpace(baseURLOverride)
|
|
if strings.EqualFold(driver, "dummy") {
|
|
baseURL := map[string]string(nil)
|
|
if baseURLOverride != "" {
|
|
baseURL = map[string]string{"default": strings.TrimRight(baseURLOverride, "/")}
|
|
}
|
|
return NewDummyModel(baseURL, URLSuffix{Chat: "chat/completions"}), nil
|
|
}
|
|
|
|
pm := GetProviderManager()
|
|
if pm == nil {
|
|
return nil, fmt.Errorf("provider manager not initialized")
|
|
}
|
|
provider := pm.FindProvider(driver)
|
|
if provider == nil || provider.ModelDriver == nil {
|
|
return nil, fmt.Errorf("provider %q is not configured", driver)
|
|
}
|
|
md := provider.ModelDriver
|
|
if baseURLOverride != "" {
|
|
md = md.NewInstance(map[string]string{
|
|
"default": strings.TrimRight(baseURLOverride, "/"),
|
|
})
|
|
if md == nil {
|
|
return nil, fmt.Errorf("provider %q does not support a custom base_url", driver)
|
|
}
|
|
}
|
|
return md, nil
|
|
}
|