oadmin/new-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: possible incomplete return of the think field and incorrect occurrences of the reasoning field

Browse Source
This commit is contained in:
Sh1n3zZ
2025-03-06 19:20:29 +08:00
parent b95142bbac
commit 894dce7366
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
relay/channel/openai/relay-openai.go
View File

@@ -43,10 +43,15 @@ func sendStreamData(c *gin.Context, info *relaycommon.RelayInfo, data string, fo
} }
hasThinkingContent := false hasThinkingContent := false
hasContent := false
var thinkingContent strings.Builder
for _, choice := range lastStreamResponse.Choices { for _, choice := range lastStreamResponse.Choices {
if len(choice.Delta.GetReasoningContent()) > 0 { if len(choice.Delta.GetReasoningContent()) > 0 {
hasThinkingContent = true hasThinkingContent = true
break thinkingContent.WriteString(choice.Delta.GetReasoningContent())
}
if len(choice.Delta.GetContentString()) > 0 {
hasContent = true
} }
} }
@@ -55,14 +60,13 @@ func sendStreamData(c *gin.Context, info *relaycommon.RelayInfo, data string, fo
if hasThinkingContent { if hasThinkingContent {
response := lastStreamResponse.Copy() response := lastStreamResponse.Copy()
for i := range response.Choices { for i := range response.Choices {
response.Choices[i].Delta.SetContentString("<think>\n") // send `think` tag with thinking content
response.Choices[i].Delta.SetContentString("<think>\n" + thinkingContent.String())
response.Choices[i].Delta.ReasoningContent = nil response.Choices[i].Delta.ReasoningContent = nil
response.Choices[i].Delta.Reasoning = nil response.Choices[i].Delta.Reasoning = nil
} }
info.ThinkingContentInfo.IsFirstThinkingContent = false info.ThinkingContentInfo.IsFirstThinkingContent = false
return helper.ObjectData(c, response) return helper.ObjectData(c, response)
} else {
return helper.ObjectData(c, lastStreamResponse)
} }
} }
@@ -73,10 +77,10 @@ func sendStreamData(c *gin.Context, info *relaycommon.RelayInfo, data string, fo
// Process each choice // Process each choice
for i, choice := range lastStreamResponse.Choices { for i, choice := range lastStreamResponse.Choices {
// Handle transition from thinking to content // Handle transition from thinking to content
if len(choice.Delta.GetContentString()) > 0 && !info.ThinkingContentInfo.SendLastThinkingContent { if hasContent && !info.ThinkingContentInfo.SendLastThinkingContent {
response := lastStreamResponse.Copy() response := lastStreamResponse.Copy()
for j := range response.Choices { for j := range response.Choices {
response.Choices[j].Delta.SetContentString("\n</think>") response.Choices[j].Delta.SetContentString("\n</think>\n")
response.Choices[j].Delta.ReasoningContent = nil response.Choices[j].Delta.ReasoningContent = nil
response.Choices[j].Delta.Reasoning = nil response.Choices[j].Delta.Reasoning = nil
} }
@@ -89,6 +93,10 @@ func sendStreamData(c *gin.Context, info *relaycommon.RelayInfo, data string, fo
lastStreamResponse.Choices[i].Delta.SetContentString(choice.Delta.GetReasoningContent()) lastStreamResponse.Choices[i].Delta.SetContentString(choice.Delta.GetReasoningContent())
lastStreamResponse.Choices[i].Delta.ReasoningContent = nil lastStreamResponse.Choices[i].Delta.ReasoningContent = nil
lastStreamResponse.Choices[i].Delta.Reasoning = nil lastStreamResponse.Choices[i].Delta.Reasoning = nil
} else if !hasThinkingContent && !hasContent {
// flush thinking content
lastStreamResponse.Choices[i].Delta.ReasoningContent = nil
lastStreamResponse.Choices[i].Delta.Reasoning = nil
} }
} }