Skip to content

RAGFlow is an agent-native database: a Retrieval-Augmented Generation (RAG) engine that grew into context infrastructure.

refa: route chat calls through ChatModel (#20441)

buua436dd8f57048f43
diff --git a/internal/entity/models/types.go b/internal/entity/models/types.go
index 310f2d8524..431d15ec0e 100644
--- a/internal/entity/models/types.go
+++ b/internal/entity/models/types.go
@@ -523,6 +523,30 @@ func NewChatModel(driver ModelDriver, modelName *string, apiConfig *APIConfig) *
}
}
+// ChatWithMessages sends a non-streaming chat request through the model wrapper.
+func (m *ChatModel) ChatWithMessages(ctx context.Context, messages []Message, config *ChatConfig, usage *common.ModelUsage) (*ChatResponse, error) {
+ if m == nil || m.ModelDriver == nil {
+ return nil, errors.New("chat model: driver is nil")
+ }
+ modelName := ""
+ if m.ModelName != nil {
+ modelName = *m.ModelName
+ }
+ return m.ModelDriver.ChatWithMessages(ctx, modelName, messages, m.APIConfig, config, usage)
+}
+
+// ChatStreamlyWithSender streams chat deltas through sender.
+func (m *ChatModel) ChatStreamlyWithSender(ctx context.Context, messages []Message, config *ChatConfig, usage *common.ModelUsage, sender func(*string, *string) error) error {
+ if m == nil || m.ModelDriver == nil {
+ return errors.New("chat model: driver is nil")
+ }
+ modelName := ""
+ if m.ModelName != nil {
+ modelName = *m.ModelName
+ }
+ return m.ModelDriver.ChatStreamlyWithSender(ctx, modelName, messages, m.APIConfig, config, usage, sender)
+}
+
// BindTools registers tools for the ChatModel to call.
// Mirrors Python's Base.bind_tools() in rag/llm/chat_model.py.
func (cm *ChatModel) BindTools(session ToolCallSession, tools interface{}) {
diff --git a/internal/ingestion/component/media_dispatch.go b/internal/ingestion/component/media_dispatch.go
index cada98751d..db55fcf74b 100644
--- a/internal/ingestion/component/media_dispatch.go
+++ b/internal/ingestion/component/media_dispatch.go
@@ -236,7 +236,8 @@ func describeImage(
},
}}
vision := true
- resp, err := driver.ChatWithMessages(ctx, modelName, messages, apiConfig, &modelModule.ChatConfig{Vision: &vision}, nil)
+ chatModel := modelModule.NewChatModel(driver, &modelName, apiConfig)
+ resp, err := chatModel.ChatWithMessages(ctx, messages, &modelModule.ChatConfig{Vision: &vision}, nil)
if err != nil {
return "", []string{fmt.Sprintf("image VLM enhancement failed: %v", err)}
}
diff --git a/internal/ingestion/component/pdf_vision_dispatch.go b/internal/ingestion/component/pdf_vision_dispatch.go
index 65bec8a2f2..6bc1a4833a 100644
--- a/internal/ingestion/component/pdf_vision_dispatch.go
+++ b/internal/ingestion/component/pdf_vision_dispatch.go
@@ -942,7 +942,8 @@ func defaultPDFVisionChatInvoker(
apiConfig *modelModule.APIConfig,
) (*modelModule.ChatResponse, error) {
vision := true
- return driver.ChatWithMessages(ctx, modelName, messages, apiConfig, &modelModule.ChatConfig{Vision: &vision}, nil)
+ chatModel := modelModule.NewChatModel(driver, &modelName, apiConfig)
+ return chatModel.ChatWithMessages(ctx, messages, &modelModule.ChatConfig{Vision: &vision}, nil)
}
func loadPDFVisionPrompt(name string) (string, error) {
diff --git a/internal/ingestion/component/vision_enhancement.go b/internal/ingestion/component/vision_enhancement.go
index 3f7011b83b..44ed51060e 100644
--- a/internal/ingestion/component/vision_enhancement.go
+++ b/internal/ingestion/component/vision_enhancement.go
@@ -468,5 +468,6 @@ func defaultVisionChatInvoker(
thinking := false
config.Thinking = &thinking
}
- return driver.ChatWithMessages(chatCtx, modelName, messages, apiConfig, config, nil)
+ chatModel := modelModule.NewChatModel(driver, &modelName, apiConfig)
+ return chatModel.ChatWithMessages(chatCtx, messages, config, nil)
}
diff --git a/internal/service/chat_pipeline.go b/internal/service/chat_pipeline.go
index 2e0f987f41..2a00f80348 100644
--- a/internal/service/chat_pipeline.go
+++ b/internal/service/chat_pipeline.go
@@ -1364,8 +1364,8 @@ func (s *ChatPipelineService) AsyncChat(
return nil
})
} else {
- driverErr = chatDriver.ModelDriver.ChatStreamlyWithSender(
- ctx, *chatDriver.ModelName, chatMessages, chatDriver.APIConfig, chatCfg, nil,
+ driverErr = chatDriver.ChatStreamlyWithSender(
+ ctx, chatMessages, chatCfg, nil,
func(answer *string, reason *string) error {
if reason != nil && *reason != "" {
if thinkState.EnterReasoning() {
@@ -1495,9 +1495,7 @@ func (s *ChatPipelineService) AsyncChat(
if chatDriver.ToolConfig != nil {
answer, _, err = chatDriver.ChatWithTools(ctx, prompt+prompt4citation, chatMessages, chatCfg)
} else {
- resp, respErr := chatDriver.ModelDriver.ChatWithMessages(
- ctx, *chatDriver.ModelName, chatMessages, chatDriver.APIConfig, chatCfg, nil,
- )
+ resp, respErr := chatDriver.ChatWithMessages(ctx, chatMessages, chatCfg, nil)
if respErr != nil {
err = respErr
} else if resp != nil && resp.Answer != nil {
@@ -1708,8 +1706,8 @@ func (s *ChatPipelineService) AsyncChatSolo(
chatCfg := BuildChatConfig(chat, config)
timer.Enter(common.PhaseGenerateAnswer)
- driverErr := chatModel.ModelDriver.ChatStreamlyWithSender(
- ctx, *chatModel.ModelName, chatMessages, chatModel.APIConfig, chatCfg, nil,
+ driverErr := chatModel.ChatStreamlyWithSender(
+ ctx, chatMessages, chatCfg, nil,
func(answer *string, reason *string) error {
if reason != nil && *reason != "" {
if thinkState.EnterReasoning() {
@@ -1834,9 +1832,7 @@ func (s *ChatPipelineService) AsyncChatSolo(
// Non-streaming: one-shot call.
chatCfg := BuildChatConfig(chat, config)
timer.Enter(common.PhaseGenerateAnswer)
- resp, err := chatModel.ModelDriver.ChatWithMessages(
- ctx, *chatModel.ModelName, chatMessages, chatModel.APIConfig, chatCfg, nil,
- )
+ resp, err := chatModel.ChatWithMessages(ctx, chatMessages, chatCfg, nil)
timer.Exit(common.PhaseGenerateAnswer)
if err != nil {
out <- AsyncChatResult{
@@ -4318,17 +4314,11 @@ func chatForSQL(
cfg := &modelModule.ChatConfig{
Temperature: &tempLow,
}
- modelName := ""
- if chatModel.ModelName != nil {
- modelName = *chatModel.ModelName
- }
msgs := []modelModule.Message{
modelModule.Message{Role: "system", Content: sysPrompt},
modelModule.Message{Role: "user", Content: userPrompt},
}
- resp, err := chatModel.ModelDriver.ChatWithMessages(
- ctx, modelName, msgs, chatModel.APIConfig, cfg, nil,
- )
+ resp, err := chatModel.ChatWithMessages(ctx, msgs, cfg, nil)
if err != nil {
return "", err
}
diff --git a/internal/service/deep_researcher.go b/internal/service/deep_researcher.go
index 5137f4813f..24e36d8cce 100644
--- a/internal/service/deep_researcher.go
+++ b/internal/service/deep_researcher.go
@@ -668,17 +668,11 @@ func (dr *DeepResearcher) chatOnce(
if dr.ChatModel == nil || dr.ChatModel.ModelDriver == nil {
return "", fmt.Errorf("DeepResearcher: no chat model configured")
}
- modelName := ""
- if dr.ChatModel.ModelName != nil {
- modelName = *dr.ChatModel.ModelName
- }
msgs := []modelModule.Message{
modelModule.Message{Role: "system", Content: systemPrompt},
modelModule.Message{Role: "user", Content: userPrompt},
}
- resp, err := dr.ChatModel.ModelDriver.ChatWithMessages(
- ctx, modelName, msgs, dr.ChatModel.APIConfig, cfg, nil,
- )
+ resp, err := dr.ChatModel.ChatWithMessages(ctx, msgs, cfg, nil)
if err != nil {
return "", err
}
diff --git a/internal/service/generator.go b/internal/service/generator.go
index 6665493b30..5eee580b7f 100644
--- a/internal/service/generator.go
+++ b/internal/service/generator.go
@@ -89,7 +89,7 @@ func KeywordExtraction(ctx context.Context, chatModel *modelModule.ChatModel, co
}
// Call LLM using ChatModel
- response, err := chatModel.ModelDriver.ChatWithMessages(ctx, *chatModel.ModelName, messages, chatModel.APIConfig, modelConfig, nil)
+ response, err := chatModel.ChatWithMessages(ctx, messages, modelConfig, nil)
if err != nil {
return "", fmt.Errorf("failed to extract keywords: %w", err)
}
@@ -192,7 +192,7 @@ func CrossLanguages(ctx context.Context, tenantID string, llmID string, query st
}
// Call LLM using ChatModel
- response, err := chatModel.ModelDriver.ChatWithMessages(ctx, *chatModel.ModelName, messages, chatModel.APIConfig, modelConfig, nil)
+ response, err := chatModel.ChatWithMessages(ctx, messages, modelConfig, nil)
if err != nil {
return query, fmt.Errorf("failed to translate question: %w", err)
}
@@ -348,17 +348,11 @@ func FullQuestion(
}
system := buf.String()
- modelName := ""
- if chatModel.ModelName != nil {
- modelName = *chatModel.ModelName
- }
msgs := []modelModule.Message{
{Role: "system", Content: system},
{Role: "user", Content: "Output: "},
}
- resp, err := chatModel.ModelDriver.ChatWithMessages(
- ctx, modelName, msgs, chatModel.APIConfig, nil, nil,
- )
+ resp, err := chatModel.ChatWithMessages(ctx, msgs, nil, nil)
if err != nil {
return fallbackToLatestUser(messages), err
}
diff --git a/internal/service/graph/retrieval.go b/internal/service/graph/retrieval.go
index 5abffb56ad..bf6510f98d 100644
--- a/internal/service/graph/retrieval.go
+++ b/internal/service/graph/retrieval.go
@@ -245,7 +245,7 @@ func queryRewrite(ctx context.Context, chatModel *modelModule.ChatModel, questio
{Role: "system", Content: prompt},
{Role: "user", Content: "Output:"},
}
- response, err := chatModel.ModelDriver.ChatWithMessages(ctx, *chatModel.ModelName, messages, chatModel.APIConfig, nil, nil)
+ response, err := chatModel.ChatWithMessages(ctx, messages, nil, nil)
if err == nil && response != nil && response.Answer != nil {
result, parseErr := common.ParseQueryRewriteResponse(*response.Answer)
if parseErr == nil && result != nil {
diff --git a/internal/service/memory_extractor.go b/internal/service/memory_extractor.go
index 6f5c328b0d..8253e644a0 100644
--- a/internal/service/memory_extractor.go
+++ b/internal/service/memory_extractor.go
@@ -504,7 +504,7 @@ func (s *MemoryMessageService) extractByLLM(ctx context.Context, mem *CreateMemo
_ = s.updateTaskProgress(ctx, taskID, 0.15, "Prepared prompts and LLM.")
temperature := mem.Temperature
- resp, err := chatModel.ModelDriver.ChatWithMessages(ctx, target.ModelName, messages, target.APIConfig, &models.ChatConfig{Temperature: &temperature}, nil)
+ resp, err := chatModel.ChatWithMessages(ctx, messages, &models.ChatConfig{Temperature: &temperature}, nil)
if err != nil {
return nil, fmt.Errorf("%w: chat model: %w", errMemoryChatCall, err)
}
diff --git a/internal/service/metadata_filter.go b/internal/service/metadata_filter.go
index 993f3d06b6..b3f37c17fe 100644
--- a/internal/service/metadata_filter.go
+++ b/internal/service/metadata_filter.go
@@ -205,7 +205,7 @@ func GenMetaFilter(ctx context.Context, chatModel *modelModule.ChatModel, metaDa
}
// Call LLM using ChatModel
- response, err := chatModel.ModelDriver.ChatWithMessages(ctx, *chatModel.ModelName, messages, chatModel.APIConfig, nil, nil)
+ response, err := chatModel.ChatWithMessages(ctx, messages, nil, nil)
if err != nil {
common.Warn("ChatWithMessages failed for GenMetaFilter",
zap.String("model",
diff --git a/internal/service/model_call.go b/internal/service/model_call.go
index 453728a5a7..080c44e848 100644
--- a/internal/service/model_call.go
+++ b/internal/service/model_call.go
@@ -78,8 +78,8 @@ func (s *ModelCallService) ChatToModelWithMessages(ctx context.Context, modelRef
}
populateModelUsage(usage, target, tenantID, userID)
- modelName := target.ModelName
- response, err := target.Driver.ChatWithMessages(ctx, modelName, messages, target.APIConfig, config, usage)
+ chatModel := modelModule.NewChatModel(target.Driver, &target.ModelName, target.APIConfig)
+ response, err := chatModel.ChatWithMessages(ctx, messages, config, usage)
if err != nil {
return nil, common.CodeServerError, err
}
@@ -108,8 +108,8 @@ func (s *ModelCallService) ChatToModelStreamWithSender(ctx context.Context, mode
}
populateModelUsage(usage, target, tenantID, userID)
- modelName := target.ModelName
- if err := target.Driver.ChatStreamlyWithSender(ctx, modelName, messages, target.APIConfig, config, usage, sender); err != nil {
+ chatModel := modelModule.NewChatModel(target.Driver, &target.ModelName, target.APIConfig)
+ if err := chatModel.ChatStreamlyWithSender(ctx, messages, config, usage, sender); err != nil {
return common.CodeServerError, err
}
return common.CodeSuccess, nil
diff --git a/internal/service/model_chat.go b/internal/service/model_chat.go
index b3b197a826..298f63fa22 100644
--- a/internal/service/model_chat.go
+++ b/internal/service/model_chat.go
@@ -40,7 +40,8 @@ func (m *ModelProviderService) Chat(ctx context.Context, tenantID, modelID strin
if err != nil {
return nil, err
}
- return target.Driver.ChatWithMessages(ctx, target.ModelName, messages, target.APIConfig, config, nil)
+ chatModel := modelModule.NewChatModel(target.Driver, &target.ModelName, target.APIConfig)
+ return chatModel.ChatWithMessages(ctx, messages, config, nil)
}
func (m *ModelProviderService) ChatStream(ctx context.Context, tenantID, modelID string, messages []modelModule.Message, config *modelModule.ChatConfig) (<-chan string, <-chan error, error) {
@@ -59,7 +60,7 @@ func chatStreamWithContext(ctx context.Context, chatModel *modelModule.ChatModel
go func() {
defer close(ch)
defer close(errCh)
- if err := chatModel.ModelDriver.ChatStreamlyWithSender(ctx, *chatModel.ModelName, messages, chatModel.APIConfig, config, nil,
+ if err := chatModel.ChatStreamlyWithSender(ctx, messages, config, nil,
func(delta *string, _ *string) error {
if delta == nil {
return nil
diff --git a/internal/service/model_service.go b/internal/service/model_service.go
index d8cd576212..c47e76d5e9 100644
--- a/internal/service/model_service.go
+++ b/internal/service/model_service.go
@@ -949,7 +949,8 @@ func verifyProviderModel(ctx context.Context, driver modelModule.ModelDriver, pr
switch mtLower {
case "chat", "vision":
msg := []modelModule.Message{{Role: "user", Content: "Hi"}}
- _, err = driver.ChatWithMessages(ctx, modelName, msg, apiConfig, nil, nil)
+ chatModel := modelModule.NewChatModel(driver, &modelName, apiConfig)
+ _, err = chatModel.ChatWithMessages(ctx, msg, nil, nil)
case "embedding":
// Provider discovery can return models without catalog limits. Apply
// the strict validator whenever the model has the metadata required
diff --git a/internal/service/toc_enhancer.go b/internal/service/toc_enhancer.go
index 641d976c4c..b7f72b937c 100644
--- a/internal/service/toc_enhancer.go
+++ b/internal/service/toc_enhancer.go
@@ -475,13 +475,7 @@ func (e *TOCEnhancer) scoreEntries(ctx context.Context, entries []tocEntry, limi
{Role: "system", Content: tocRelevanceSystemPrompt},
{Role: "user", Content: currentUser},
}
- modelName := ""
- if e.chatModel.ModelName != nil {
- modelName = *e.chatModel.ModelName
- }
- resp, err := e.chatModel.ModelDriver.ChatWithMessages(
- ctx, modelName, msgs, e.chatModel.APIConfig, cfg, nil,
- )
+ resp, err := e.chatModel.ChatWithMessages(ctx, msgs, cfg, nil)
if err != nil {
return nil, err
}