feat(chat): add streaming display for intent/clarification reasoning content

WainWong · WainWong · commit 1947a223ad0b · 2026-01-22T16:43:22.000+08:00
- Support displaying thinking process for intent recognition and clarification
- Add compatibility for 'reasoning' field (Ollama/LMStudio GPT-OSS)
- Improve chat scroll behavior with userScrolledAway flag
diff --git a/backend/apps/ai_model/openai/llm.py b/backend/apps/ai_model/openai/llm.py
@@ -27,8 +27,12 @@ def _convert_delta_to_message_chunk(
     role = cast(str, _dict.get("role"))
     content = cast(str, _dict.get("content") or "")
     additional_kwargs: dict = {}
-    if 'reasoning_content' in _dict:
-        additional_kwargs['reasoning_content'] = _dict.get('reasoning_content')
+    # 兼容 reasoning_content (DeepSeek等) 和 reasoning (Ollama/LMStudio GPT-OSS) 两种字段
+    reasoning_content = _dict.get('reasoning_content')
+    if not reasoning_content:
+        reasoning_content = _dict.get('reasoning')
+    if reasoning_content:
+        additional_kwargs['reasoning_content'] = reasoning_content
     if _dict.get("function_call"):
         function_call = dict(_dict["function_call"])
         if "name" in function_call and function_call["name"] is None:
diff --git a/backend/apps/chat/curd/chat.py b/backend/apps/chat/curd/chat.py
@@ -276,6 +276,8 @@ def get_chat_with_records(session: SessionDep, chart_id: int, current_user: Curr
     chart_alias_log = aliased(ChatLog)
     analysis_alias_log = aliased(ChatLog)
     predict_alias_log = aliased(ChatLog)
+    intent_alias_log = aliased(ChatLog)
+    clarify_alias_log = aliased(ChatLog)
 
     stmt = (select(ChatRecord.id, ChatRecord.chat_id, ChatRecord.create_time, ChatRecord.finish_time,
                    ChatRecord.question, ChatRecord.sql_answer, ChatRecord.sql,
@@ -287,7 +289,9 @@ def get_chat_with_records(session: SessionDep, chart_id: int, current_user: Curr
                    sql_alias_log.reasoning_content.label('sql_reasoning_content'),
                    chart_alias_log.reasoning_content.label('chart_reasoning_content'),
                    analysis_alias_log.reasoning_content.label('analysis_reasoning_content'),
-                   predict_alias_log.reasoning_content.label('predict_reasoning_content')
+                   predict_alias_log.reasoning_content.label('predict_reasoning_content'),
+                   intent_alias_log.reasoning_content.label('intent_reasoning_content'),
+                   clarify_alias_log.reasoning_content.label('clarify_reasoning_content')
                    )
     .outerjoin(sql_alias_log, and_(sql_alias_log.pid == ChatRecord.id,
                                    sql_alias_log.type == TypeEnum.CHAT,
@@ -301,18 +305,50 @@ def get_chat_with_records(session: SessionDep, chart_id: int, current_user: Curr
     .outerjoin(predict_alias_log, and_(predict_alias_log.pid == ChatRecord.id,
                                        predict_alias_log.type == TypeEnum.CHAT,
                                        predict_alias_log.operate == OperationEnum.PREDICT_DATA))
+    .outerjoin(intent_alias_log, and_(intent_alias_log.pid == ChatRecord.id,
+                                      intent_alias_log.type == TypeEnum.CHAT,
+                                      intent_alias_log.operate == OperationEnum.RECOGNIZE_INTENT))
+    .outerjoin(clarify_alias_log, and_(clarify_alias_log.pid == ChatRecord.id,
+                                       clarify_alias_log.type == TypeEnum.CHAT,
+                                       clarify_alias_log.operate == OperationEnum.GENERATE_CLARIFICATION))
     .where(and_(ChatRecord.create_by == current_user.id, ChatRecord.chat_id == chart_id)).order_by(
         ChatRecord.create_time))
     if with_data:
-        stmt = select(ChatRecord.id, ChatRecord.chat_id, ChatRecord.create_time, ChatRecord.finish_time,
+        stmt = (select(ChatRecord.id, ChatRecord.chat_id, ChatRecord.create_time, ChatRecord.finish_time,
                       ChatRecord.question, ChatRecord.sql_answer, ChatRecord.sql,
                       ChatRecord.chart_answer, ChatRecord.chart, ChatRecord.analysis, ChatRecord.predict,
                       ChatRecord.datasource_select_answer, ChatRecord.analysis_record_id, ChatRecord.predict_record_id,
                       ChatRecord.regenerate_record_id,
                       ChatRecord.recommended_question, ChatRecord.first_chat,
-                      ChatRecord.finish, ChatRecord.error, ChatRecord.intent_answer, ChatRecord.data, ChatRecord.predict_data).where(
-            and_(ChatRecord.create_by == current_user.id, ChatRecord.chat_id == chart_id)).order_by(
-            ChatRecord.create_time)
+                      ChatRecord.finish, ChatRecord.error, ChatRecord.intent_answer,
+                      ChatRecord.data, ChatRecord.predict_data,
+                      sql_alias_log.reasoning_content.label('sql_reasoning_content'),
+                      chart_alias_log.reasoning_content.label('chart_reasoning_content'),
+                      analysis_alias_log.reasoning_content.label('analysis_reasoning_content'),
+                      predict_alias_log.reasoning_content.label('predict_reasoning_content'),
+                      intent_alias_log.reasoning_content.label('intent_reasoning_content'),
+                      clarify_alias_log.reasoning_content.label('clarify_reasoning_content')
+                      )
+        .outerjoin(sql_alias_log, and_(sql_alias_log.pid == ChatRecord.id,
+                                       sql_alias_log.type == TypeEnum.CHAT,
+                                       sql_alias_log.operate == OperationEnum.GENERATE_SQL))
+        .outerjoin(chart_alias_log, and_(chart_alias_log.pid == ChatRecord.id,
+                                         chart_alias_log.type == TypeEnum.CHAT,
+                                         chart_alias_log.operate == OperationEnum.GENERATE_CHART))
+        .outerjoin(analysis_alias_log, and_(analysis_alias_log.pid == ChatRecord.id,
+                                            analysis_alias_log.type == TypeEnum.CHAT,
+                                            analysis_alias_log.operate == OperationEnum.ANALYSIS))
+        .outerjoin(predict_alias_log, and_(predict_alias_log.pid == ChatRecord.id,
+                                           predict_alias_log.type == TypeEnum.CHAT,
+                                           predict_alias_log.operate == OperationEnum.PREDICT_DATA))
+        .outerjoin(intent_alias_log, and_(intent_alias_log.pid == ChatRecord.id,
+                                          intent_alias_log.type == TypeEnum.CHAT,
+                                          intent_alias_log.operate == OperationEnum.RECOGNIZE_INTENT))
+        .outerjoin(clarify_alias_log, and_(clarify_alias_log.pid == ChatRecord.id,
+                                           clarify_alias_log.type == TypeEnum.CHAT,
+                                           clarify_alias_log.operate == OperationEnum.GENERATE_CLARIFICATION))
+        .where(and_(ChatRecord.create_by == current_user.id, ChatRecord.chat_id == chart_id)).order_by(
+            ChatRecord.create_time))
 
     result = session.execute(stmt).all()
     record_list: list[ChatRecordResult] = []
@@ -333,6 +369,8 @@ def get_chat_with_records(session: SessionDep, chart_id: int, current_user: Curr
                                  chart_reasoning_content=row.chart_reasoning_content,
                                  analysis_reasoning_content=row.analysis_reasoning_content,
                                  predict_reasoning_content=row.predict_reasoning_content,
+                                 intent_reasoning_content=row.intent_reasoning_content,
+                                 clarify_reasoning_content=row.clarify_reasoning_content,
                                  intent_answer=row.intent_answer,
                                  ))
         else:
@@ -347,6 +385,12 @@ def get_chat_with_records(session: SessionDep, chart_id: int, current_user: Curr
                                  regenerate_record_id=row.regenerate_record_id,
                                  recommended_question=row.recommended_question, first_chat=row.first_chat,
                                  finish=row.finish, error=row.error, data=row.data, predict_data=row.predict_data,
+                                 sql_reasoning_content=row.sql_reasoning_content,
+                                 chart_reasoning_content=row.chart_reasoning_content,
+                                 analysis_reasoning_content=row.analysis_reasoning_content,
+                                 predict_reasoning_content=row.predict_reasoning_content,
+                                 intent_reasoning_content=row.intent_reasoning_content,
+                                 clarify_reasoning_content=row.clarify_reasoning_content,
                                  intent_answer=row.intent_answer,
                                  ))
 
@@ -368,12 +412,32 @@ def get_chat_with_records(session: SessionDep, chart_id: int, current_user: Curr
 def format_record(record: ChatRecordResult):
     _dict = record.model_dump()
 
+    # 处理 sql_answer（SQL 生成思考内容）
+    sql_thinking = ''
     if record.sql_answer and record.sql_answer.strip() != '' and record.sql_answer.strip()[0] == '{' and \
             record.sql_answer.strip()[-1] == '}':
         _obj = orjson.loads(record.sql_answer)
-        _dict['sql_answer'] = _obj.get('reasoning_content')
+        sql_thinking = _obj.get('reasoning_content') or ''
     if record.sql_reasoning_content and record.sql_reasoning_content.strip() != '':
-        _dict['sql_answer'] = record.sql_reasoning_content
+        sql_thinking = record.sql_reasoning_content
+
+    # 处理 intent_answer（意图识别 + 澄清器思考内容）
+    intent_thinking = ''
+    # 先获取意图识别的思考内容
+    if record.intent_reasoning_content and record.intent_reasoning_content.strip() != '':
+        intent_thinking = record.intent_reasoning_content
+    # 追加澄清器的思考内容
+    if record.clarify_reasoning_content and record.clarify_reasoning_content.strip() != '':
+        if intent_thinking:
+            intent_thinking += '\n\n---\n\n'  # 分隔符
+        intent_thinking += record.clarify_reasoning_content
+
+    # 独立展示（不再合并）
+    if sql_thinking:
+        _dict['sql_answer'] = sql_thinking
+    if intent_thinking:
+        _dict['intent_answer'] = intent_thinking
+
     if record.chart_answer and record.chart_answer.strip() != '' and record.chart_answer.strip()[0] == '{' and \
             record.chart_answer.strip()[-1] == '}':
         _obj = orjson.loads(record.chart_answer)
diff --git a/backend/apps/chat/models/chat_model.py b/backend/apps/chat/models/chat_model.py
@@ -153,6 +153,8 @@ class ChatRecordResult(BaseModel):
     chart_reasoning_content: Optional[str] = None
     analysis_reasoning_content: Optional[str] = None
     predict_reasoning_content: Optional[str] = None
+    intent_reasoning_content: Optional[str] = None  # 意图识别思考过程
+    clarify_reasoning_content: Optional[str] = None  # 澄清器思考过程
     # 意图识别结果（JSON 格式存储）
     intent_answer: Optional[str] = None
     intent_response: Optional[str] = None  # 意图识别响应（供前端展示）
diff --git a/backend/apps/chat/task/llm.py b/backend/apps/chat/task/llm.py
@@ -305,11 +305,21 @@ def _handle_intent_recognition(self, session: Session, in_chat: bool) -> Iterato
 
         # 3. LLM 调用
         full_text = ''
+        full_thinking_text = ''
         token_usage = {}
         res = process_stream(self.llm.stream(self.intent_message), token_usage)
         for chunk in res:
             if chunk.get('content'):
                 full_text += chunk.get('content')
+            if chunk.get('reasoning_content'):
+                full_thinking_text += chunk.get('reasoning_content')
+            # 流式输出意图识别思考过程
+            if in_chat and chunk.get('reasoning_content'):
+                yield 'data:' + orjson.dumps({
+                    'content': '',
+                    'reasoning_content': chunk.get('reasoning_content'),
+                    'type': 'intent-result'
+                }).decode() + '\n\n'
 
         # 4. 解析结果 & 记录
         json_str = extract_nested_json(full_text)
@@ -320,6 +330,7 @@ def _handle_intent_recognition(self, session: Session, in_chat: bool) -> Iterato
                 session=session,
                 log=intent_log,
                 full_message=[{'type': msg.type, 'content': msg.content} for msg in self.intent_message],
+                reasoning_content=full_thinking_text,
                 token_usage=token_usage
             )
             self._intent_result = {'rewritten_query': self.chat_question.question}
@@ -333,6 +344,7 @@ def _handle_intent_recognition(self, session: Session, in_chat: bool) -> Iterato
                 session=session,
                 log=intent_log,
                 full_message=[{'type': msg.type, 'content': msg.content} for msg in self.intent_message],
+                reasoning_content=full_thinking_text,
                 token_usage=token_usage
             )
             self._intent_result = {'rewritten_query': self.chat_question.question}
@@ -343,6 +355,7 @@ def _handle_intent_recognition(self, session: Session, in_chat: bool) -> Iterato
             session=session,
             log=intent_log,
             full_message=[{'type': msg.type, 'content': msg.content} for msg in self.intent_message],
+            reasoning_content=full_thinking_text,
             token_usage=token_usage
         )
 
@@ -413,12 +426,30 @@ def _handle_intent_recognition(self, session: Session, in_chat: bool) -> Iterato
         )
 
         # 4. LLM 调用 (澄清器)
+        # 在澄清器思考内容前添加分隔线
+        if in_chat:
+            yield 'data:' + orjson.dumps({
+                'content': '',
+                'reasoning_content': '\n\n---\n\n',
+                'type': 'intent-result'
+            }).decode() + '\n\n'
+
         clarify_text = ""
+        clarify_thinking_text = ""
         clarify_token_usage = {}
         clarify_res = process_stream(self.llm.stream(clarification_msgs), clarify_token_usage)
         for chunk in clarify_res:
             if chunk.get('content'):
                 clarify_text += chunk.get('content')
+            if chunk.get('reasoning_content'):
+                clarify_thinking_text += chunk.get('reasoning_content')
+            # 流式输出澄清器思考过程
+            if in_chat and chunk.get('reasoning_content'):
+                yield 'data:' + orjson.dumps({
+                    'content': '',
+                    'reasoning_content': chunk.get('reasoning_content'),
+                    'type': 'intent-result'
+                }).decode() + '\n\n'
 
         # 解析澄清结果
         clarify_json = extract_nested_json(clarify_text)
@@ -429,6 +460,7 @@ def _handle_intent_recognition(self, session: Session, in_chat: bool) -> Iterato
                 session=session,
                 log=clarify_log,
                 full_message=[{'type': msg.type, 'content': msg.content} for msg in clarification_msgs],
+                reasoning_content=clarify_thinking_text,
                 token_usage=clarify_token_usage
             )
             self._intent_result = {'rewritten_query': self.chat_question.question}
@@ -442,6 +474,7 @@ def _handle_intent_recognition(self, session: Session, in_chat: bool) -> Iterato
                 session=session,
                 log=clarify_log,
                 full_message=[{'type': msg.type, 'content': msg.content} for msg in clarification_msgs],
+                reasoning_content=clarify_thinking_text,
                 token_usage=clarify_token_usage
             )
             self._intent_result = {'rewritten_query': self.chat_question.question}
@@ -453,6 +486,7 @@ def _handle_intent_recognition(self, session: Session, in_chat: bool) -> Iterato
             session=session,
             log=clarify_log,
             full_message=[{'type': msg.type, 'content': msg.content} for msg in clarification_msgs],
+            reasoning_content=clarify_thinking_text,
             token_usage=clarify_token_usage
         )
 
diff --git a/frontend/src/api/chat.ts b/frontend/src/api/chat.ts
@@ -53,6 +53,7 @@ export class ChatRecord {
   predict_record_id?: number
   regenerate_record_id?: number
   intent_response?: string  // 意图识别响应（OTHER/澄清）
+  intent_answer?: string  // 意图识别思考内容
 
   constructor()
   constructor(
@@ -271,6 +272,7 @@ const toChatRecord = (data?: any): ChatRecord | undefined => {
     data.regenerate_record_id
   )
   record.intent_response = data.intent_response
+  record.intent_answer = data.intent_answer
   return record
 }
 const toChatRecordList = (list: any = []): ChatRecord[] => {
diff --git a/frontend/src/views/chat/answer/BaseAnswer.vue b/frontend/src/views/chat/answer/BaseAnswer.vue
@@ -16,7 +16,8 @@ const props = withDefaults(
       | 'chart_answer'
       | 'analysis_thinking'
       | 'predict'
-      | Array<'sql_answer' | 'chart_answer' | 'analysis_thinking' | 'predict'>
+      | 'intent_answer'
+      | Array<'sql_answer' | 'chart_answer' | 'analysis_thinking' | 'predict' | 'intent_answer'>
   }>(),
   {
     loading: false,
@@ -30,7 +31,7 @@ const chatConfig = useChatConfigStore()
 const show = ref<boolean>(false)
 
 const reasoningContent = computed<Array<string>>(() => {
-  const names: Array<'sql_answer' | 'chart_answer' | 'analysis_thinking' | 'predict'> = []
+  const names: Array<'sql_answer' | 'chart_answer' | 'analysis_thinking' | 'predict' | 'intent_answer'> = []
   if (typeof props.reasoningName === 'string') {
     names.push(props.reasoningName)
   } else {
diff --git a/frontend/src/views/chat/answer/ChartAnswer.vue b/frontend/src/views/chat/answer/ChartAnswer.vue
@@ -13,7 +13,7 @@ const props = withDefaults(
     currentChat?: ChatInfo
     message?: ChatMessage
     loading?: boolean
-    reasoningName: 'sql_answer' | 'chart_answer' | Array<'sql_answer' | 'chart_answer'>
+    reasoningName: 'sql_answer' | 'chart_answer' | 'intent_answer' | Array<'sql_answer' | 'chart_answer' | 'intent_answer'>
   }>(),
   {
     recordId: undefined,
@@ -113,6 +113,7 @@ const sendMessage = async () => {
 
     let sql_answer = ''
     let chart_answer = ''
+    let intent_answer = ''
 
     let tempResult = ''
 
@@ -187,6 +188,10 @@ const sendMessage = async () => {
                 currentRecord.error = data.content
                 emits('error')
                 break
+              case 'intent-result':
+                intent_answer += data.reasoning_content
+                _currentChat.value.records[index.value].intent_answer = intent_answer
+                break
               case 'sql-result':
                 sql_answer += data.reasoning_content
                 _currentChat.value.records[index.value].sql_answer = sql_answer
diff --git a/frontend/src/views/chat/index.vue b/frontend/src/views/chat/index.vue
@@ -231,7 +231,7 @@
                     :record-id="message.record?.id"
                     :loading="isTyping"
                     :message="message"
-                    :reasoning-name="['sql_answer', 'chart_answer']"
+                    :reasoning-name="['intent_answer', 'sql_answer', 'chart_answer']"
                     @scroll-bottom="scrollToBottom"
                     @finish="onChartAnswerFinish"
                     @error="onChartAnswerError"
@@ -565,6 +565,8 @@ let scrollTime: any
 let scrollingTime: any
 let scrollTopVal = 0
 let scrolling = false
+let userScrolledAway = false // 用户是否主动滚动离开底部
+
 const scrollBottom = () => {
   if (scrolling) return
   if (!isTyping.value && !getRecommendQuestionsLoading.value) {
@@ -584,22 +586,25 @@ const handleScroll = (val: any) => {
   scrollingTime = setTimeout(() => {
     scrolling = false
   }, 400)
-  if (
-    scrollTopVal + 200 <
-    innerRef.value!.clientHeight - (document.querySelector('.chat-record-list')!.clientHeight - 20)
-  ) {
+
+  const threshold =
+    innerRef.value!.clientHeight -
+    (document.querySelector('.chat-record-list')!.clientHeight - 20)
+  const isNearBottom = scrollTopVal + 50 >= threshold
+
+  // 用户滚动离开底部时，标记并停止自动滚动
+  if (!isNearBottom) {
+    userScrolledAway = true
     clearInterval(scrollTime)
     scrollTime = null
     return
   }
 
-  if (
-    !scrollTime &&
-    isTyping.value &&
-    scrollTopVal + 30 <
-      innerRef.value!.clientHeight -
-        (document.querySelector('.chat-record-list')!.clientHeight - 20)
-  ) {
+  // 用户滚回底部时，重置标记
+  userScrolledAway = false
+
+  // 只有用户在底部、没有主动滚走、且正在输入时才启动自动滚动
+  if (!scrollTime && isTyping.value && !userScrolledAway) {
     scrollTime = setInterval(() => {
       scrollBottom()
     }, 300)

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,7 @@ export class ChatRecord {`
`53`	`53`	`predict_record_id?: number`
`54`	`54`	`regenerate_record_id?: number`
`55`	`55`	`intent_response?: string // 意图识别响应（OTHER/澄清）`
	`56`	`+ intent_answer?: string // 意图识别思考内容`
`56`	`57`
`57`	`58`	`constructor()`
`58`	`59`	`constructor(`
`@@ -271,6 +272,7 @@ const toChatRecord = (data?: any): ChatRecord \| undefined => {`
`271`	`272`	`data.regenerate_record_id`
`272`	`273`	`)`
`273`	`274`	`record.intent_response = data.intent_response`
	`275`	`+ record.intent_answer = data.intent_answer`
`274`	`276`	`return record`
`275`	`277`	`}`
`276`	`278`	`const toChatRecordList = (list: any = []): ChatRecord[] => {`