mirror of
https://github.com/infiniflow/ragflow.git
synced 2026-08-04 23:00:30 +08:00
## Summary
This PR refactors the Go knowledge-compilation ingestion pipeline
(`internal/ingestion/knowledge_compile` +
`internal/ingestion/component/knowledge_compiler`) with three related
changes:
- **Token-budget batching for LLM merge decisions.**
`LLMMergeDecider.DecideBatch` previously stuffed every `(existing,
candidate)` pair into a single LLM call, risking `max_token` overflow.
It now splits pairs into token-bounded sub-batches (budget =
`llmMaxTokens * 0.85`) via `tokenizer.NumTokensFromString`, runs them
concurrently while preserving the global pair index, and never
reindexes.
- **Process-level global compile pool.** Introduces a single vCPU-sized
goroutine pool (`pool.go`, env `KC_COMPILE_CONCURRENCY`) dedicated to
*all* knowledge-compilation stages. KNN search loop, `DecideBatch`
sub-batches, `WriteMerged`/`DeleteMerged` internals, and the
component-level (structure/mindmap) per-call pools are all unified into
it via an injected submitter. No more per-job short-lived goroutines in
`runCompilerJobs` (futures are collected then awaited on the caller).
Fan-out stays bounded by the pool worker count; these stages are
docengine-bounded / LLM-bounded, not CPU-bounded.
- **DocEngine-only deletion.** `Consumer.processBatch` deletion no
longer loads the deleted docs' products into memory. Two sequential
DocEngine calls replace the old in-memory surgery:
- `DeleteDocLevelForDocs` — one `DeleteChunks` over `doc_id IN
deletedDocIDs` (merged rows carry `doc_id == kb`, so only per-doc
products match).
- `StripMergedSources` — one `Search` of `kc_merged=1` rows filtered by
`source_doc_ids IN deletedDocIDs` (intersection pushed down to the
engine), `UpdateChunks` the source array of survivors, and
`DeleteChunks` the rows whose array became empty.
## Changes
- `internal/ingestion/knowledge_compile/pool.go` (new): global
`compilerPool` +
`runCompilerJobs`/`SubmitCompilerJob`/`SubmitCompilerJobs`.
- `internal/ingestion/knowledge_compile/consumer.go`: deletion rewritten
to the two DocEngine calls;
`mergedBase`/`toDelete`/`stripDeletedSources` removed.
- `internal/ingestion/knowledge_compile/writer.go`:
`DeleteDocLevelForDocs` + `StripMergedSources` replace
`DeleteMergedForDoc`/`DeleteMerged`.
- `internal/ingestion/knowledge_compile/reader.go`: drop
`LoadMergedBySourceDoc` + `containsString` (keep `LoadDocProducts` for
the completion branch).
- `internal/ingestion/knowledge_compile/dedup.go`: `NewLLMDeduper` takes
`llmMaxTokens`; wires `SetMaxBatchTokens`/`SetSubmitter`.
- `internal/ingestion/knowledge_compiler/{structure,merge}.go`,
`mindmap/mindmap.go`, `pool_wiring.go`: token-budget split + submitter
injection.
- Tests: `structure_test.go` (token-budget split), `dedup_test.go`,
`consumer_test.go` (tombstone + DocEngine deletion assertions) updated.
## Validation
`bash build.sh --test -race ./internal/ingestion/knowledge_compile/...
./internal/ingestion/component/knowledge_compiler/...` passes (unit
tier, no external services).
🤖 Generated with [CodeBuddy](https://www.codebuddy.ai)
---------
Co-authored-by: yuzhichang <yuzhichang@infiniflow.ai>
209 lines
8.0 KiB
Go
209 lines
8.0 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 knowledge_compile
|
|
|
|
import (
|
|
"context"
|
|
|
|
kccommon "ragflow/internal/ingestion/component/knowledge_compiler/common"
|
|
"ragflow/internal/ingestion/component/knowledge_compiler/structure"
|
|
)
|
|
|
|
// Deduper folds a set of per-document compiled Products into the dataset-level
|
|
// merged set. The LLM-backed implementation reuses the component's
|
|
// GroupedDeduper + LLMMergeDecider (§11.6).
|
|
//
|
|
// Dedup folds the completed batch's products among themselves (in-memory, before
|
|
// any engine round-trip). Decide judges whether an incoming product duplicates
|
|
// an existing merged row found by KNN and, when so, returns the merged row
|
|
// (mirrors Python _struct_doc_storage_dedup_batch: KNN top1 + LLM merge).
|
|
type Deduper interface {
|
|
Dedup(ctx context.Context, rows []kccommon.Product) ([]kccommon.Product, error)
|
|
Decide(ctx context.Context, existing, incoming kccommon.Product, bestScore float64) (kccommon.Product, bool, error)
|
|
// DecideBatch judges every (existing, candidates) group in a single LLM
|
|
// round-trip, folding each group's candidates into its existing row and
|
|
// reporting the merged row plus any candidates judged distinct (new rows).
|
|
// It replaces the per-pair Decide loop at the batch hot path.
|
|
DecideBatch(ctx context.Context, groups []MergeGroup) ([]MergeGroup, error)
|
|
}
|
|
|
|
// MergeGroup is one KNN-found existing merged row plus the batch of incoming
|
|
// products that all KNN-hit it. DecideBatch folds the candidates into Existing
|
|
// and fills Merged (the updated row), Duplicate (whether anything was merged),
|
|
// and Distinct (candidates judged not-duplicates, i.e. new merged rows).
|
|
type MergeGroup struct {
|
|
Existing kccommon.Product
|
|
Candidates []kccommon.Product
|
|
Score float64
|
|
|
|
Merged kccommon.Product
|
|
Duplicate bool
|
|
Distinct []kccommon.Product
|
|
}
|
|
|
|
// DeduperFactory builds a per-tenant Deduper. It is invoked once per batch so
|
|
// the LLM deps can be resolved for the owning tenant.
|
|
type DeduperFactory func(tenant string) (Deduper, error)
|
|
|
|
// llmDeduper wraps the component's GroupedDeduper (which internally uses
|
|
// LLMMergeDecider for duplicate-judging), scoped to the whole KB batch.
|
|
type llmDeduper struct {
|
|
group *structure.GroupedDeduper
|
|
decider *structure.LLMMergeDecider
|
|
embed kccommon.Embedder
|
|
}
|
|
|
|
// NewLLMDeduper builds a KB-scoped deduper from the runtime chat/embed deps.
|
|
// llmMaxTokens is the chat model's token budget (0 disables per-batch token
|
|
// splitting in DecideBatch).
|
|
func NewLLMDeduper(chat kccommon.ChatInvoker, embed kccommon.Embedder, llmID string, threshold float64, llmMaxTokens int) Deduper {
|
|
decider := structure.NewLLMMergeDecider(chat, llmID, embed, threshold)
|
|
decider.SetMaxBatchTokens(llmMaxTokens)
|
|
// Share the process-wide, vCPU-sized compiler pool so DecideBatch's
|
|
// token-bounded sub-batches run concurrently with the rest of the pipeline
|
|
// (LLM-bounded), all under one concurrency limit. SubmitCompilerJobs enqueues
|
|
// every sub-batch then waits on their futures on the caller goroutine — it
|
|
// never blocks on a single job, so a stopped pool returns an error instead of
|
|
// hanging DecideBatch.
|
|
decider.SetSubmitter(func(ctx context.Context, fn func() error) error {
|
|
return SubmitCompilerJobs(ctx, []compilerJob{fn})
|
|
})
|
|
return &llmDeduper{group: structure.NewGroupedDeduper(decider), decider: decider, embed: embed}
|
|
}
|
|
|
|
func (x *llmDeduper) Dedup(ctx context.Context, rows []kccommon.Product) ([]kccommon.Product, error) {
|
|
for _, r := range rows {
|
|
if err := x.group.Add(ctx, r); err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
// Apply the aliases recorded by the LLM merge decider to relation endpoints
|
|
// so merged entities collapse consistently with the per-document dedup path.
|
|
if err := x.group.RewriteRelations(ctx, x.decider.Aliases(), x.embed); err != nil {
|
|
return nil, err
|
|
}
|
|
return x.group.Rows(), nil
|
|
}
|
|
|
|
// Decide delegates the per-pair duplicate judgment to the LLM merge decider,
|
|
// which re-embeds the merged payload and unions provenance on a duplicate verdict.
|
|
func (x *llmDeduper) Decide(ctx context.Context, existing, incoming kccommon.Product, bestScore float64) (kccommon.Product, bool, error) {
|
|
decision, merged, err := x.decider.Decide(ctx, existing, incoming, bestScore)
|
|
if err != nil {
|
|
return kccommon.Product{}, false, err
|
|
}
|
|
if decision == structure.DecisionMerge {
|
|
return merged, true, nil
|
|
}
|
|
return kccommon.Product{}, false, nil
|
|
}
|
|
|
|
// DecideBatch folds every group with a single LLM call. All candidate pairs
|
|
// across all groups are judged at once (mergePairsBatch); each group then folds
|
|
// its candidates into its existing row in order so a chain of merges within a
|
|
// group accumulates correctly.
|
|
func (x *llmDeduper) DecideBatch(ctx context.Context, groups []MergeGroup) ([]MergeGroup, error) {
|
|
// Assign a flat pair index to every (group, candidate).
|
|
var inputs []structure.MergePairInput
|
|
pairIndexOf := make([][]int, len(groups))
|
|
for gi := range groups {
|
|
pairIndexOf[gi] = make([]int, len(groups[gi].Candidates))
|
|
for ci := range groups[gi].Candidates {
|
|
idx := len(inputs)
|
|
pairIndexOf[gi][ci] = idx
|
|
inputs = append(inputs, structure.MergePairInput{
|
|
Index: idx,
|
|
Existing: groups[gi].Existing.Content,
|
|
Incoming: groups[gi].Candidates[ci].Content,
|
|
})
|
|
}
|
|
}
|
|
if len(inputs) == 0 {
|
|
return groups, nil
|
|
}
|
|
results, err := x.decider.DecideBatch(ctx, inputs)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
byIndex := make(map[int]structure.BatchMergeResult, len(results))
|
|
for _, r := range results {
|
|
byIndex[r.Index] = r
|
|
}
|
|
|
|
for gi := range groups {
|
|
existing := groups[gi].Existing
|
|
var distinct []kccommon.Product
|
|
duplicated := false
|
|
for ci, cand := range groups[gi].Candidates {
|
|
r := byIndex[pairIndexOf[gi][ci]]
|
|
if !r.Duplicated || r.Merged == nil {
|
|
// Judged distinct: keep it as its own new merged row.
|
|
c := cand
|
|
c.Merged = true
|
|
c.DocID = existing.DocID
|
|
distinct = append(distinct, c)
|
|
continue
|
|
}
|
|
replacement, err := x.decider.BuildReplacement(ctx, existing, cand, r.Merged)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
existing = replacement
|
|
duplicated = true
|
|
}
|
|
groups[gi].Merged = existing
|
|
groups[gi].Duplicate = duplicated
|
|
groups[gi].Distinct = distinct
|
|
}
|
|
return groups, nil
|
|
}
|
|
|
|
// noopDeduper performs no LLM merge; it returns the input rows unchanged so
|
|
// the writer still emits dataset-level products (without cross-document merging).
|
|
// Used as a safe fallback when LLM deps are unavailable.
|
|
type noopDeduper struct{}
|
|
|
|
func (noopDeduper) Dedup(_ context.Context, rows []kccommon.Product) ([]kccommon.Product, error) {
|
|
return rows, nil
|
|
}
|
|
|
|
// Decide never merges: without an LLM judge every incoming product is kept as a
|
|
// distinct merged row (matches the noop fallback's "no cross-document merge").
|
|
func (noopDeduper) Decide(_ context.Context, _, incoming kccommon.Product, _ float64) (kccommon.Product, bool, error) {
|
|
return kccommon.Product{}, false, nil
|
|
}
|
|
|
|
// DecideBatch never merges: every candidate becomes its own new merged row.
|
|
func (noopDeduper) DecideBatch(_ context.Context, groups []MergeGroup) ([]MergeGroup, error) {
|
|
for gi := range groups {
|
|
existing := groups[gi].Existing
|
|
var distinct []kccommon.Product
|
|
for _, cand := range groups[gi].Candidates {
|
|
c := cand
|
|
c.Merged = true
|
|
c.DocID = existing.DocID
|
|
distinct = append(distinct, c)
|
|
}
|
|
groups[gi].Merged = existing
|
|
groups[gi].Duplicate = false
|
|
groups[gi].Distinct = distinct
|
|
}
|
|
return groups, nil
|
|
}
|
|
|
|
// NewNoopDeduper builds the fallback deduper.
|
|
func NewNoopDeduper() Deduper { return noopDeduper{} }
|