Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
104 changes: 104 additions & 0 deletions dto/message_reasoning_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
package dto

import (
"testing"

"github.com/QuantumNous/new-api/common"
"github.com/stretchr/testify/require"
"github.com/tidwall/gjson"
)

// TestMessageReasoningContentPreservesEmptyString verifies that an explicitly
// set empty reasoning_content string survives the JSON round-trip.
//
// This is critical for the request-forwarding path (non-passThrough mode):
// the gateway unmarshals the client request into GeneralOpenAIRequest, then
// re-marshals it before sending upstream. If Message.ReasoningContent were
// `string` + `omitempty` (the old type), the empty string would be silently
// dropped, causing the upstream to never receive the field.
//
// With the fix (`*string` + `omitempty`), nil = absent, &"" = explicit empty.
func TestMessageReasoningContentPreservesEmptyString(t *testing.T) {
raw := []byte(`{
"role": "assistant",
"content": "Hello",
"reasoning_content": "",
"reasoning": ""
}`)

var msg Message
err := common.Unmarshal(raw, &msg)
require.NoError(t, err)

// Pointers must be non-nil: the field was explicitly set to ""
require.NotNil(t, msg.ReasoningContent, "reasoning_content should be non-nil when explicitly set to empty string")
require.NotNil(t, msg.Reasoning, "reasoning should be non-nil when explicitly set to empty string")
require.Equal(t, "", *msg.ReasoningContent)
require.Equal(t, "", *msg.Reasoning)

// Re-marshal — the fields must still be present in the output JSON
encoded, err := common.Marshal(msg)
require.NoError(t, err)

require.True(t, gjson.GetBytes(encoded, "reasoning_content").Exists(),
"reasoning_content should exist in re-marshaled JSON when explicitly set to empty string")
require.True(t, gjson.GetBytes(encoded, "reasoning").Exists(),
"reasoning should exist in re-marshaled JSON when explicitly set to empty string")
require.Equal(t, "", gjson.GetBytes(encoded, "reasoning_content").String())
require.Equal(t, "", gjson.GetBytes(encoded, "reasoning").String())
}

// TestMessageReasoningContentOmitsAbsentField verifies that when
// reasoning_content / reasoning are absent from the input JSON, they remain
// absent after a round-trip (nil pointer → omitted by omitempty).
func TestMessageReasoningContentOmitsAbsentField(t *testing.T) {
raw := []byte(`{
"role": "assistant",
"content": "Hello"
}`)

var msg Message
err := common.Unmarshal(raw, &msg)
require.NoError(t, err)

// Pointers must be nil: the fields were not present in the input
require.Nil(t, msg.ReasoningContent)
require.Nil(t, msg.Reasoning)

// Re-marshal — the fields must NOT appear in the output JSON
encoded, err := common.Marshal(msg)
require.NoError(t, err)

require.False(t, gjson.GetBytes(encoded, "reasoning_content").Exists(),
"reasoning_content should not exist in re-marshaled JSON when absent from input")
require.False(t, gjson.GetBytes(encoded, "reasoning").Exists(),
"reasoning should not exist in re-marshaled JSON when absent from input")
}

// TestMessageGetReasoningContent verifies the GetReasoningContent helper
// method that is used in token-counting code paths.
func TestMessageGetReasoningContent(t *testing.T) {
t.Run("both nil returns empty", func(t *testing.T) {
msg := Message{Role: "assistant"}
require.Equal(t, "", msg.GetReasoningContent())
})

t.Run("ReasoningContent takes priority", func(t *testing.T) {
rc := "thinking..."
r := "should be ignored"
msg := Message{ReasoningContent: &rc, Reasoning: &r}
require.Equal(t, "thinking...", msg.GetReasoningContent())
})

t.Run("falls back to Reasoning when ReasoningContent is nil", func(t *testing.T) {
r := "fallback reasoning"
msg := Message{Reasoning: &r}
require.Equal(t, "fallback reasoning", msg.GetReasoningContent())
})

t.Run("empty string values returned correctly", func(t *testing.T) {
empty := ""
msg := Message{ReasoningContent: &empty}
require.Equal(t, "", msg.GetReasoningContent())
})
}
14 changes: 12 additions & 2 deletions dto/openai_request.go
Original file line number Diff line number Diff line change
Expand Up @@ -279,8 +279,8 @@ type Message struct {
Content any `json:"content"`
Name *string `json:"name,omitempty"`
Prefix *bool `json:"prefix,omitempty"`
ReasoningContent string `json:"reasoning_content,omitempty"`
Reasoning string `json:"reasoning,omitempty"`
ReasoningContent *string `json:"reasoning_content,omitempty"`
Reasoning *string `json:"reasoning,omitempty"`
ToolCalls json.RawMessage `json:"tool_calls,omitempty"`
ToolCallId string `json:"tool_call_id,omitempty"`
parsedContent []MediaContent
Expand Down Expand Up @@ -431,6 +431,16 @@ const (
//ContentTypeAudioUrl = "audio_url"
)

func (m *Message) GetReasoningContent() string {
if m.ReasoningContent == nil && m.Reasoning == nil {
return ""
}
if m.ReasoningContent != nil {
return *m.ReasoningContent
}
return *m.Reasoning
}

func (m *Message) GetPrefix() bool {
if m.Prefix == nil {
return false
Expand Down
6 changes: 4 additions & 2 deletions relay/channel/claude/relay-claude.go
Original file line number Diff line number Diff line change
Expand Up @@ -567,12 +567,14 @@ func ResponseClaude2OpenAI(claudeResponse *dto.ClaudeResponse) *dto.OpenAITextRe
}
choice.SetStringContent(responseText)
if len(responseThinking) > 0 {
choice.ReasoningContent = responseThinking
choice.ReasoningContent = &responseThinking
}
if len(tools) > 0 {
choice.Message.SetToolCalls(tools)
}
choice.Message.ReasoningContent = thinkingContent
if thinkingContent != "" {
choice.Message.ReasoningContent = &thinkingContent
}
fullTextResponse.Model = claudeResponse.Model
choices = append(choices, choice)
fullTextResponse.Choices = choices
Expand Down
2 changes: 1 addition & 1 deletion relay/channel/gemini/relay-gemini.go
Original file line number Diff line number Diff line change
Expand Up @@ -1097,7 +1097,7 @@ func responseGeminiChat2OpenAI(c *gin.Context, response *dto.GeminiChatResponse)
toolCalls = append(toolCalls, *call)
}
} else if part.Thought {
choice.Message.ReasoningContent = part.Text
choice.Message.ReasoningContent = &part.Text
} else {
if part.ExecutableCode != nil {
texts = append(texts, "```"+part.ExecutableCode.Language+"\n"+part.ExecutableCode.Code+"\n```")
Expand Down
2 changes: 1 addition & 1 deletion relay/channel/ollama/stream.go
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ func ollamaChatHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *http.R

msg := dto.Message{Role: "assistant", Content: contentPtr(content)}
if rc := reasoningBuilder.String(); rc != "" {
msg.ReasoningContent = rc
msg.ReasoningContent = &rc
}
full := dto.OpenAITextResponse{
Id: common.GetUUID(),
Expand Down
2 changes: 1 addition & 1 deletion relay/channel/openai/relay-openai.go
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ func OpenaiHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *http.Respo
completionTokens := simpleResponse.Usage.CompletionTokens
if completionTokens == 0 {
for _, choice := range simpleResponse.Choices {
ctkm := service.CountTextToken(choice.Message.StringContent()+choice.Message.ReasoningContent+choice.Message.Reasoning, info.UpstreamModelName)
ctkm := service.CountTextToken(choice.Message.StringContent()+choice.Message.GetReasoningContent(), info.UpstreamModelName)
completionTokens += ctkm
}
}
Expand Down