refactor(chat): improve handling of <think> tags in chat messages
- Updated logic to manage <think> and </think> tags in chat message content, ensuring accurate representation of thinking states. - Introduced a new function to handle the closing of thinking events, enhancing clarity and reducing redundancy in event emissions. - Adjusted event handling for reasoning content to support historical message reconstruction, improving user experience during chat interactions.
This commit is contained in:
@@ -700,6 +700,20 @@ func (h *Handler) executeQA(reqCtx *qaRequestContext, mode qaMode, generateTitle
|
||||
// (Agent mode handles completion in the defer block instead)
|
||||
if mode == qaModeNormal {
|
||||
var completionHandled bool
|
||||
|
||||
// Persist reasoning_content into agent_steps so historical reload can
|
||||
// reconstruct the thinking card (same shape as Agent-mode steps).
|
||||
// Accumulate on assistantMessage directly so user-initiated stop also
|
||||
// keeps whatever reasoning had streamed before the cancel.
|
||||
streamCtx.eventBus.On(event.EventAgentThought, func(ctx context.Context, evt event.Event) error {
|
||||
data, ok := evt.Data.(event.AgentThoughtData)
|
||||
if !ok || data.Content == "" {
|
||||
return nil
|
||||
}
|
||||
appendQuickAnswerReasoning(streamCtx.assistantMessage, data.Content)
|
||||
return nil
|
||||
})
|
||||
|
||||
streamCtx.eventBus.On(event.EventAgentFinalAnswer, func(ctx context.Context, evt event.Event) error {
|
||||
data, ok := evt.Data.(event.AgentFinalAnswerData)
|
||||
if !ok {
|
||||
@@ -903,6 +917,22 @@ func (h *Handler) persistLastRequestState(parentCtx context.Context, reqCtx *qaR
|
||||
}
|
||||
}
|
||||
|
||||
// appendQuickAnswerReasoning accumulates streamed reasoning_content from
|
||||
// KnowledgeQA (fast answer) into a single AgentStep for history replay.
|
||||
func appendQuickAnswerReasoning(msg *types.Message, content string) {
|
||||
if content == "" {
|
||||
return
|
||||
}
|
||||
if len(msg.AgentSteps) == 0 {
|
||||
msg.AgentSteps = types.AgentSteps{{
|
||||
Iteration: 0,
|
||||
Timestamp: time.Now(),
|
||||
ToolCalls: make([]types.ToolCall, 0),
|
||||
}}
|
||||
}
|
||||
msg.AgentSteps[0].ReasoningContent += content
|
||||
}
|
||||
|
||||
// completeAssistantMessage marks an assistant message as complete, updates it,
|
||||
// and asynchronously indexes the Q&A pair into the chat history knowledge base.
|
||||
func (h *Handler) completeAssistantMessage(ctx context.Context, assistantMessage *types.Message, userQuery string) {
|
||||
|
||||
Reference in New Issue
Block a user