Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
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
5 changes: 3 additions & 2 deletions dto/claude.go
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,9 @@ type ClaudeMessageSource struct {
}

type ClaudeMessage struct {
Role string `json:"role"`
Content any `json:"content"`
Role string `json:"role"`
Content any `json:"content"`
ReasoningContent json.RawMessage `json:"reasoning_content,omitempty"`
}

func (c *ClaudeMessage) IsStringContent() bool {
Expand Down
11 changes: 10 additions & 1 deletion dto/openai_request.go
Original file line number Diff line number Diff line change
Expand Up @@ -279,14 +279,23 @@ type Message struct {
Content any `json:"content"`
Name *string `json:"name,omitempty"`
Prefix *bool `json:"prefix,omitempty"`
ReasoningContent string `json:"reasoning_content,omitempty"`
ReasoningContent json.RawMessage `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
//parsedStringContent *string
}

func (m *Message) SetReasoningContent(content string) {
encoded, _ := common.Marshal(content)
m.ReasoningContent = encoded
}

func (m *Message) GetReasoningContent() string {
return common.JsonRawMessageToString(m.ReasoningContent)
}

type MediaContent struct {
Type string `json:"type"`
Text string `json:"text,omitempty"`
Expand Down
14 changes: 14 additions & 0 deletions dto/openai_request_zero_value_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,17 @@ func TestOpenAIResponsesRequestPreserveExplicitZeroValues(t *testing.T) {
require.True(t, gjson.GetBytes(encoded, "stream").Exists())
require.True(t, gjson.GetBytes(encoded, "top_p").Exists())
}

func TestOpenAIMessagePreserveReasoningContentRaw(t *testing.T) {
raw := []byte(`{"role":"assistant","content":"","reasoning_content":" "}`)

var message Message
err := common.Unmarshal(raw, &message)
require.NoError(t, err)
require.Equal(t, " ", message.GetReasoningContent())
require.JSONEq(t, `" "`, string(message.ReasoningContent))

encoded, err := common.Marshal(message)
require.NoError(t, err)
require.Equal(t, " ", gjson.GetBytes(encoded, "reasoning_content").String())
}
12 changes: 10 additions & 2 deletions relay/channel/claude/relay-claude.go
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,9 @@ func RequestOpenAI2ClaudeMessage(c *gin.Context, textRequest dto.GeneralOpenAIRe
Role: message.Role,
Content: message.Content,
}
if len(message.ReasoningContent) > 0 {
fmtMessage.ReasoningContent = message.ReasoningContent
}
if message.Role == "tool" {
fmtMessage.ToolCallId = message.ToolCallId
}
Expand Down Expand Up @@ -331,6 +334,9 @@ func RequestOpenAI2ClaudeMessage(c *gin.Context, textRequest dto.GeneralOpenAIRe
claudeMessage := dto.ClaudeMessage{
Role: message.Role,
}
if len(message.ReasoningContent) > 0 {
claudeMessage.ReasoningContent = message.ReasoningContent
}
if message.Role == "tool" {
if len(claudeMessages) > 0 && claudeMessages[len(claudeMessages)-1].Role == "user" {
lastMessage := claudeMessages[len(claudeMessages)-1]
Expand Down Expand Up @@ -567,12 +573,14 @@ func ResponseClaude2OpenAI(claudeResponse *dto.ClaudeResponse) *dto.OpenAITextRe
}
choice.SetStringContent(responseText)
if len(responseThinking) > 0 {
choice.ReasoningContent = responseThinking
choice.Message.SetReasoningContent(responseThinking)
}
if len(tools) > 0 {
choice.Message.SetToolCalls(tools)
}
choice.Message.ReasoningContent = thinkingContent
if len(thinkingContent) > 0 {
choice.Message.SetReasoningContent(thinkingContent)
}
fullTextResponse.Model = claudeResponse.Model
choices = append(choices, choice)
fullTextResponse.Choices = choices
Expand Down
32 changes: 32 additions & 0 deletions relay/channel/claude/relay_claude_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -380,3 +380,35 @@ func TestRequestOpenAI2ClaudeMessage_ConvertsTextFileContentToText(t *testing.T)
require.NotNil(t, content[0].Text)
require.Equal(t, "alpha\nbeta", *content[0].Text)
}

func TestRequestOpenAI2ClaudeMessagePreservesReasoningContent(t *testing.T) {
message := dto.Message{
Role: "assistant",
Content: "",
}
message.SetReasoningContent(" ")
message.SetToolCalls([]dto.ToolCallRequest{
{
ID: "call_123",
Type: "function",
Function: dto.FunctionRequest{
Name: "lookup",
Arguments: `{"query":"moonshot"}`,
},
},
})
request := dto.GeneralOpenAIRequest{
Model: "kimi-k2-thinking",
Messages: []dto.Message{message},
}

claudeRequest, err := RequestOpenAI2ClaudeMessage(nil, request)
require.NoError(t, err)
require.Len(t, claudeRequest.Messages, 2)
require.JSONEq(t, `" "`, string(claudeRequest.Messages[1].ReasoningContent))

content, ok := claudeRequest.Messages[1].Content.([]dto.ClaudeMediaMessage)
require.True(t, ok)
require.NotEmpty(t, content)
require.Equal(t, "tool_use", content[len(content)-1].Type)
}
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.SetReasoningContent(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.SetReasoningContent(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()+choice.Message.Reasoning, info.UpstreamModelName)
completionTokens += ctkm
}
}
Expand Down
3 changes: 3 additions & 0 deletions service/convert.go
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,9 @@ func ClaudeToOpenAIRequest(claudeRequest dto.ClaudeRequest, info *relaycommon.Re
openAIMessage := dto.Message{
Role: claudeMessage.Role,
}
if len(claudeMessage.ReasoningContent) > 0 {
openAIMessage.ReasoningContent = claudeMessage.ReasoningContent
}

//log.Printf("claudeMessage.Content: %v", claudeMessage.Content)
if claudeMessage.IsStringContent() {
Expand Down