From 64b20a2d87d5f38f3bb7650a3e6639a907f1b149 Mon Sep 17 00:00:00 2001 From: wizardchen Date: Tue, 12 May 2026 20:05:31 +0800 Subject: [PATCH] feat(agent): support dedicated model for query understanding step Quick-answer (RAG) agents can now configure a separate chat model for the query-understanding stage (rewrite + intent classification), decoupling it from the main conversation model so users can route the lightweight rewrite call to a cheaper / faster model. - Add CustomAgentConfig.QueryUnderstandModelID and plumb it through PipelineRequest and ChatManage.Clone. - query_understand plugin prefers QueryUnderstandModelID on the text-only path; falls back to ChatModelID if the configured model cannot be resolved (with a warn log). Multimodal path is unchanged to keep vision-capable model selection intact. - AgentEditorModal exposes a ModelSelector under the existing Query Rewrite block; empty means reuse the main chat model. - Add i18n strings (queryUnderstandModel / placeholder / desc) for zh-CN, en-US, ko-KR, ru-RU. - Extend Go SDK AgentConfig with the new field. --- client/agent_manage.go | 1 + frontend/src/i18n/locales/en-US.ts | 3 +++ frontend/src/i18n/locales/ko-KR.ts | 3 +++ frontend/src/i18n/locales/ru-RU.ts | 3 +++ frontend/src/i18n/locales/zh-CN.ts | 3 +++ frontend/src/views/agent/AgentEditorModal.vue | 19 ++++++++++++++++++ .../service/chat_pipeline/query_understand.go | 20 +++++++++++++++++-- .../application/service/session_qa_helpers.go | 5 +++++ internal/types/chat_manage.go | 5 +++++ internal/types/custom_agent.go | 3 +++ 10 files changed, 63 insertions(+), 2 deletions(-) diff --git a/client/agent_manage.go b/client/agent_manage.go index 1b74bdd1..b5e5f3b4 100644 --- a/client/agent_manage.go +++ b/client/agent_manage.go @@ -59,6 +59,7 @@ type AgentConfig struct { EnableRewrite bool `json:"enable_rewrite,omitempty"` RewritePromptSystem string `json:"rewrite_prompt_system,omitempty"` RewritePromptUser string `json:"rewrite_prompt_user,omitempty"` + QueryUnderstandModelID string `json:"query_understand_model_id,omitempty"` FallbackStrategy string `json:"fallback_strategy,omitempty"` // "fixed" or "model" FallbackResponse string `json:"fallback_response,omitempty"` FallbackPrompt string `json:"fallback_prompt,omitempty"` diff --git a/frontend/src/i18n/locales/en-US.ts b/frontend/src/i18n/locales/en-US.ts index a09f205b..ebae34bf 100755 --- a/frontend/src/i18n/locales/en-US.ts +++ b/frontend/src/i18n/locales/en-US.ts @@ -551,6 +551,8 @@ export default { placeholderCurrentWeek: 'Current weekday (e.g., Monday)', enableQueryExpansion: 'Query Expansion', enableRewrite: 'Query Rewrite', + queryUnderstandModel: 'Query Understand Model', + queryUnderstandModelPlaceholder: 'Leave empty to reuse the main chat model', rewritePromptSystem: 'Rewrite System Prompt', rewritePromptSystemPlaceholder: 'Leave empty to use default prompt', rewritePromptUser: 'Rewrite User Prompt', @@ -3800,6 +3802,7 @@ export default { multiTurn: 'When enabled, historical conversation context will be preserved', historyRounds: 'Number of recent conversation rounds to keep as context', rewrite: 'Automatically rewrite user questions in multi-turn conversations to resolve references and omissions', + queryUnderstandModel: 'Model used for query understanding (rewriting and intent detection). Leave empty to reuse the main chat model.', rewriteSystemPrompt: 'System prompt for question rewriting (leave empty for default)', rewriteUserPrompt: 'User prompt template for question rewriting (leave empty for default)', selectTools: 'Select tools available to the Agent', diff --git a/frontend/src/i18n/locales/ko-KR.ts b/frontend/src/i18n/locales/ko-KR.ts index 8e3ba269..febbb0a9 100755 --- a/frontend/src/i18n/locales/ko-KR.ts +++ b/frontend/src/i18n/locales/ko-KR.ts @@ -1440,6 +1440,8 @@ export default { placeholderCurrentWeek: "현재 주(예: 월요일)", enableQueryExpansion: "쿼리 확장", enableRewrite: "질문 재작성", + queryUnderstandModel: "질문 이해 모델", + queryUnderstandModelPlaceholder: "비워 두면 기본 대화 모델을 사용합니다", rewritePromptSystem: "시스템 프롬프트 다시 작성", rewritePromptSystemPlaceholder: "시스템 기본 프롬프트를 사용하려면 비워 두세요.", rewritePromptUser: "사용자 프롬프트 다시 작성", @@ -3863,6 +3865,7 @@ export default { multiTurn: '활성화하면 대화 기록 컨텍스트가 유지됩니다', historyRounds: '컨텍스트로 유지할 최근 대화 라운드 수', rewrite: '다중 턴 대화에서 사용자 질문을 자동으로 재작성하여 지시대명사 해소 및 생략 보완', + queryUnderstandModel: '질문 이해(재작성과 의도 분류)에 사용할 모델입니다. 비워 두면 기본 대화 모델을 사용합니다.', rewriteSystemPrompt: '질문 재작성용 시스템 프롬프트 (비워두면 기본값 사용)', rewriteUserPrompt: '질문 재작성용 사용자 프롬프트 템플릿 (비워두면 기본값 사용)', selectTools: 'Agent가 사용할 수 있는 도구를 선택하세요', diff --git a/frontend/src/i18n/locales/ru-RU.ts b/frontend/src/i18n/locales/ru-RU.ts index ab733cab..42a81122 100755 --- a/frontend/src/i18n/locales/ru-RU.ts +++ b/frontend/src/i18n/locales/ru-RU.ts @@ -455,6 +455,8 @@ export default { placeholderCurrentWeek: 'Current weekday (e.g., Monday)', enableQueryExpansion: 'Query Expansion', enableRewrite: 'Query Rewrite', + queryUnderstandModel: 'Модель понимания запроса', + queryUnderstandModelPlaceholder: 'Оставьте пустым, чтобы использовать основную модель чата', rewritePromptSystem: 'Rewrite System Prompt', rewritePromptSystemPlaceholder: 'Leave empty to use default prompt', rewritePromptUser: 'Rewrite User Prompt', @@ -3472,6 +3474,7 @@ export default { multiTurn: 'При включении сохраняется контекст истории диалога', historyRounds: 'Количество последних раундов диалога для сохранения в контексте', rewrite: 'Автоматическое перефразирование вопросов в многооборотном диалоге для разрешения ссылок и дополнения', + queryUnderstandModel: 'Модель для понимания запроса (перефразирование и распознавание намерения). Пустое значение — использовать основную модель чата.', rewriteSystemPrompt: 'Системный промпт для перефразирования вопросов (пустое = по умолчанию)', rewriteUserPrompt: 'Шаблон пользовательского промпта для перефразирования (пустое = по умолчанию)', selectTools: 'Выберите инструменты, доступные агенту', diff --git a/frontend/src/i18n/locales/zh-CN.ts b/frontend/src/i18n/locales/zh-CN.ts index 3a94c622..bc26ee0f 100755 --- a/frontend/src/i18n/locales/zh-CN.ts +++ b/frontend/src/i18n/locales/zh-CN.ts @@ -1427,6 +1427,8 @@ export default { placeholderCurrentWeek: "当前星期(如:星期一)", enableQueryExpansion: "查询扩展", enableRewrite: "问题改写", + queryUnderstandModel: "问题理解模型", + queryUnderstandModelPlaceholder: "留空则复用主对话模型", rewritePromptSystem: "改写系统提示词", rewritePromptSystemPlaceholder: "留空使用系统默认提示词", rewritePromptUser: "改写用户提示词", @@ -3796,6 +3798,7 @@ export default { multiTurn: "开启后将保留历史对话上下文", historyRounds: "保留最近几轮对话作为上下文", rewrite: "多轮对话时自动改写用户问题,消解指代和补全省略", + queryUnderstandModel: "用于问题理解(改写与意图识别)的模型,留空则复用主对话模型", rewriteSystemPrompt: "用于问题改写的系统提示词(留空使用默认)", rewriteUserPrompt: "用于问题改写的用户提示词模板(留空使用默认)", selectTools: "选择 Agent 可以使用的工具", diff --git a/frontend/src/views/agent/AgentEditorModal.vue b/frontend/src/views/agent/AgentEditorModal.vue index ae87383b..eb51d476 100644 --- a/frontend/src/views/agent/AgentEditorModal.vue +++ b/frontend/src/views/agent/AgentEditorModal.vue @@ -497,6 +497,24 @@ + +
+
+ +

{{ $t('agentEditor.desc.queryUnderstandModel') }}

+
+
+ +
+
+
@@ -1883,6 +1901,7 @@ const defaultFormData = { // 高级设置(普通模式) enable_query_expansion: true, enable_rewrite: true, + query_understand_model_id: '', rewrite_prompt_system: '', rewrite_prompt_user: '', fallback_strategy: 'model' as 'fixed' | 'model', diff --git a/internal/application/service/chat_pipeline/query_understand.go b/internal/application/service/chat_pipeline/query_understand.go index 805fa49b..cd6596e4 100644 --- a/internal/application/service/chat_pipeline/query_understand.go +++ b/internal/application/service/chat_pipeline/query_understand.go @@ -293,11 +293,27 @@ func (p *PluginQueryUnderstand) selectModel(ctx context.Context, chatManage *typ }) } - m, err := p.modelService.GetChatModel(ctx, chatManage.ChatModelID) + textModelID := chatManage.ChatModelID + if chatManage.QueryUnderstandModelID != "" { + textModelID = chatManage.QueryUnderstandModelID + } + m, err := p.modelService.GetChatModel(ctx, textModelID) if err != nil { + // Fall back to ChatModelID when a dedicated query-understand model was + // configured but cannot be resolved (e.g. deleted / disabled). + if chatManage.QueryUnderstandModelID != "" && textModelID != chatManage.ChatModelID { + pipelineWarn(ctx, "QueryUnderstand", "query_understand_model_fallback", map[string]interface{}{ + "session_id": chatManage.SessionID, + "query_understand_model_id": chatManage.QueryUnderstandModelID, + "error": err.Error(), + }) + if fallback, fbErr := p.modelService.GetChatModel(ctx, chatManage.ChatModelID); fbErr == nil { + return fallback, false + } + } pipelineError(ctx, "QueryUnderstand", "get_model", map[string]interface{}{ "session_id": chatManage.SessionID, - "chat_model_id": chatManage.ChatModelID, + "chat_model_id": textModelID, "error": err.Error(), }) return nil, false diff --git a/internal/application/service/session_qa_helpers.go b/internal/application/service/session_qa_helpers.go index 0240926f..5d167309 100644 --- a/internal/application/service/session_qa_helpers.go +++ b/internal/application/service/session_qa_helpers.go @@ -164,6 +164,11 @@ func (s *sessionService) applyAgentOverridesToChatManage( if customAgent.Config.RewritePromptUser != "" { cm.RewritePromptUser = customAgent.Config.RewritePromptUser } + if customAgent.Config.QueryUnderstandModelID != "" { + cm.QueryUnderstandModelID = customAgent.Config.QueryUnderstandModelID + logger.Infof(ctx, "Using custom agent's query_understand_model_id: %s", + customAgent.Config.QueryUnderstandModelID) + } // Override fallback settings if customAgent.Config.FallbackStrategy != "" { diff --git a/internal/types/chat_manage.go b/internal/types/chat_manage.go index bda4ca64..95a5df88 100644 --- a/internal/types/chat_manage.go +++ b/internal/types/chat_manage.go @@ -36,6 +36,10 @@ type PipelineRequest struct { EnableQueryExpansion bool `json:"enable_query_expansion"` RewritePromptSystem string `json:"rewrite_prompt_system"` RewritePromptUser string `json:"rewrite_prompt_user"` + // QueryUnderstandModelID, when set, overrides the chat model used for + // the query-understanding (rewrite + intent classification) stage only. + // Empty means fall back to ChatModelID. + QueryUnderstandModelID string `json:"query_understand_model_id,omitempty"` // FAQ strategy FAQPriorityEnabled bool `json:"-"` @@ -201,6 +205,7 @@ func (c *ChatManage) Clone() *ChatManage { EnableQueryExpansion: c.EnableQueryExpansion, RewritePromptSystem: c.RewritePromptSystem, RewritePromptUser: c.RewritePromptUser, + QueryUnderstandModelID: c.QueryUnderstandModelID, FAQPriorityEnabled: c.FAQPriorityEnabled, FAQDirectAnswerThreshold: c.FAQDirectAnswerThreshold, FAQScoreBoost: c.FAQScoreBoost, diff --git a/internal/types/custom_agent.go b/internal/types/custom_agent.go index 30ed080f..1b45103e 100644 --- a/internal/types/custom_agent.go +++ b/internal/types/custom_agent.go @@ -223,6 +223,9 @@ type CustomAgentConfig struct { RewritePromptSystem string `yaml:"rewrite_prompt_system" json:"rewrite_prompt_system"` // Rewrite prompt user message template RewritePromptUser string `yaml:"rewrite_prompt_user" json:"rewrite_prompt_user"` + // Dedicated chat model ID for the query-understanding (rewrite + intent) step. + // When empty, the main conversation ModelID is used as a fallback. + QueryUnderstandModelID string `yaml:"query_understand_model_id" json:"query_understand_model_id,omitempty"` // Fallback strategy: "fixed" for fixed response, "model" for model generation FallbackStrategy string `yaml:"fallback_strategy" json:"fallback_strategy"` // Fixed fallback response (when FallbackStrategy is "fixed")