Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
phsl
/
new-api
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
da116177
authored
Mar 02, 2026
by
Seefs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: preserve tool_use on malformed tool arguments to keep tool_result pairing valid
parent
4d6f9a94
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
46 additions
and
2 deletions
+46
-2
relay/channel/claude/relay-claude.go
+2
-2
relay/channel/claude/relay_claude_test.go
+44
-0
No files found.
relay/channel/claude/relay-claude.go
View file @
da116177
...
@@ -376,9 +376,9 @@ func RequestOpenAI2ClaudeMessage(c *gin.Context, textRequest dto.GeneralOpenAIRe
...
@@ -376,9 +376,9 @@ func RequestOpenAI2ClaudeMessage(c *gin.Context, textRequest dto.GeneralOpenAIRe
if
message
.
ToolCalls
!=
nil
{
if
message
.
ToolCalls
!=
nil
{
for
_
,
toolCall
:=
range
message
.
ParseToolCalls
()
{
for
_
,
toolCall
:=
range
message
.
ParseToolCalls
()
{
inputObj
:=
make
(
map
[
string
]
any
)
inputObj
:=
make
(
map
[
string
]
any
)
if
err
:=
json
.
Unmarshal
([]
byte
(
toolCall
.
Function
.
Arguments
)
,
&
inputObj
);
err
!=
nil
{
if
err
:=
common
.
UnmarshalJsonStr
(
toolCall
.
Function
.
Arguments
,
&
inputObj
);
err
!=
nil
{
common
.
SysLog
(
"tool call function arguments is not a map[string]any: "
+
fmt
.
Sprintf
(
"%v"
,
toolCall
.
Function
.
Arguments
))
common
.
SysLog
(
"tool call function arguments is not a map[string]any: "
+
fmt
.
Sprintf
(
"%v"
,
toolCall
.
Function
.
Arguments
))
continue
inputObj
=
map
[
string
]
any
{}
}
}
claudeMediaMessages
=
append
(
claudeMediaMessages
,
dto
.
ClaudeMediaMessage
{
claudeMediaMessages
=
append
(
claudeMediaMessages
,
dto
.
ClaudeMediaMessage
{
Type
:
"tool_use"
,
Type
:
"tool_use"
,
...
...
relay/channel/claude/relay_claude_test.go
View file @
da116177
...
@@ -171,3 +171,47 @@ func TestRequestOpenAI2ClaudeMessage_AssistantToolCallWithEmptyContent(t *testin
...
@@ -171,3 +171,47 @@ func TestRequestOpenAI2ClaudeMessage_AssistantToolCallWithEmptyContent(t *testin
assert
.
NotEqual
(
t
,
""
,
*
contentBlocks
[
0
]
.
Text
)
assert
.
NotEqual
(
t
,
""
,
*
contentBlocks
[
0
]
.
Text
)
}
}
}
}
func
TestRequestOpenAI2ClaudeMessage_AssistantToolCallWithMalformedArguments
(
t
*
testing
.
T
)
{
request
:=
dto
.
GeneralOpenAIRequest
{
Model
:
"claude-opus-4-6"
,
Messages
:
[]
dto
.
Message
{
{
Role
:
"user"
,
Content
:
"what time is it"
,
},
},
}
assistantMessage
:=
dto
.
Message
{
Role
:
"assistant"
,
Content
:
""
,
}
assistantMessage
.
SetToolCalls
([]
dto
.
ToolCallRequest
{
{
ID
:
"call_bad_args"
,
Type
:
"function"
,
Function
:
dto
.
FunctionRequest
{
Name
:
"get_current_timestamp"
,
Arguments
:
"{"
,
},
},
})
request
.
Messages
=
append
(
request
.
Messages
,
assistantMessage
)
claudeRequest
,
err
:=
RequestOpenAI2ClaudeMessage
(
nil
,
request
)
require
.
NoError
(
t
,
err
)
require
.
Len
(
t
,
claudeRequest
.
Messages
,
2
)
assistantClaudeMessage
:=
claudeRequest
.
Messages
[
1
]
contentBlocks
,
ok
:=
assistantClaudeMessage
.
Content
.
([]
dto
.
ClaudeMediaMessage
)
require
.
True
(
t
,
ok
)
require
.
Len
(
t
,
contentBlocks
,
1
)
assert
.
Equal
(
t
,
"tool_use"
,
contentBlocks
[
0
]
.
Type
)
assert
.
Equal
(
t
,
"call_bad_args"
,
contentBlocks
[
0
]
.
Id
)
assert
.
Equal
(
t
,
"get_current_timestamp"
,
contentBlocks
[
0
]
.
Name
)
inputObj
,
ok
:=
contentBlocks
[
0
]
.
Input
.
(
map
[
string
]
any
)
require
.
True
(
t
,
ok
)
assert
.
Empty
(
t
,
inputObj
)
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment