Skip to content

把漏掉的思考内容放回去 #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
highkay wants to merge 2 commits into
base: main
Choose a base branch
from
Open

把漏掉的思考内容放回去 #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8efb5c
feat: expose reasoning content for thinking models
highkay Mar 12, 2026
22996bf
Merge branch 'libaxuan:main' into main
highkay Mar 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions models/models.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,12 @@ type ChatCompletionRequest struct {

// Message 消息结构
type Message struct {
Role string `json:"role" binding:"required"`
Content interface{} `json:"content"`
ToolCalls []ToolCall `json:"tool_calls,omitempty"`
ToolCallID string `json:"tool_call_id,omitempty"`
Name string `json:"name,omitempty"`
Role string `json:"role" binding:"required"`
Content interface{} `json:"content"`
ReasoningContent string `json:"reasoning_content,omitempty"`
ToolCalls []ToolCall `json:"tool_calls,omitempty"`
ToolCallID string `json:"tool_call_id,omitempty"`
Name string `json:"name,omitempty"`
}

// ContentPart 消息内容部分（用于多模态内容）
Expand Down Expand Up @@ -127,9 +128,10 @@ type StreamChoice struct {

// StreamDelta 流式增量数据
type StreamDelta struct {
Role string `json:"role,omitempty"`
Content string `json:"content,omitempty"`
ToolCalls []ToolCallDelta `json:"tool_calls,omitempty"`
Role string `json:"role,omitempty"`
Content string `json:"content,omitempty"`
ReasoningContent string `json:"reasoning_content,omitempty"`
ToolCalls []ToolCallDelta `json:"tool_calls,omitempty"`
}

// ToolCallDelta 流式工具调用增量
Expand Down
10 changes: 10 additions & 0 deletions utils/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,10 @@ func StreamChatCompletion(c *gin.Context, chatGenerator <-chan interface{}, mode
if v.Text != "" {
writeChunk(models.StreamDelta{Content: v.Text}, nil)
}
case models.AssistantEventThinking:
if v.Thinking != "" {
writeChunk(models.StreamDelta{ReasoningContent: v.Thinking}, nil)
}
case models.AssistantEventToolCall:
if v.ToolCall != nil {
writeChunk(models.StreamDelta{
Expand Down Expand Up @@ -195,6 +199,7 @@ func StreamChatCompletion(c *gin.Context, chatGenerator <-chan interface{}, mode
// NonStreamChatCompletion 处理非流式聊天完成
func NonStreamChatCompletion(c *gin.Context, chatGenerator <-chan interface{}, modelName string) {
var fullContent strings.Builder
var fullThinking strings.Builder
var usage models.Usage
toolCalls := make([]models.ToolCall, 0, 2)
finishReason := "stop"
Expand All @@ -221,6 +226,9 @@ func NonStreamChatCompletion(c *gin.Context, chatGenerator <-chan interface{}, m
if fullContent.Len() > 0 || len(toolCalls) == 0 {
message.Content = fullContent.String()
}
if fullThinking.Len() > 0 {
message.ReasoningContent = fullThinking.String()
}
if len(toolCalls) > 0 {
message.ToolCalls = toolCalls
finishReason = "tool_calls"
Expand All @@ -241,6 +249,8 @@ func NonStreamChatCompletion(c *gin.Context, chatGenerator <-chan interface{}, m
switch v.Kind {
case models.AssistantEventText:
fullContent.WriteString(v.Text)
case models.AssistantEventThinking:
fullThinking.WriteString(v.Thinking)
case models.AssistantEventToolCall:
if v.ToolCall != nil {
toolCalls = append(toolCalls, *v.ToolCall)
Expand Down
Loading