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
Unverified
Commit
3cad6b9d
authored
Apr 16, 2026
by
CaIon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(claude): improve handling of empty string content in OpenAI to Claude message conversion
parent
8aaec8b1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
19 additions
and
11 deletions
+19
-11
relay/channel/claude/relay-claude.go
+19
-11
No files found.
relay/channel/claude/relay-claude.go
View file @
3cad6b9d
...
...
@@ -258,7 +258,7 @@ func RequestOpenAI2ClaudeMessage(c *gin.Context, textRequest dto.GeneralOpenAIRe
formatMessages
=
formatMessages
[
:
len
(
formatMessages
)
-
1
]
}
}
if
fmtMessage
.
Content
==
nil
{
if
fmtMessage
.
Content
==
nil
||
(
fmtMessage
.
IsStringContent
()
&&
fmtMessage
.
StringContent
()
==
""
)
{
fmtMessage
.
SetStringContent
(
"..."
)
}
formatMessages
=
append
(
formatMessages
,
fmtMessage
)
...
...
@@ -274,14 +274,16 @@ func RequestOpenAI2ClaudeMessage(c *gin.Context, textRequest dto.GeneralOpenAIRe
if
message
.
Role
==
"system"
{
// 根据Claude API规范,system字段使用数组格式更有通用性
if
message
.
IsStringContent
()
{
systemMessages
=
append
(
systemMessages
,
dto
.
ClaudeMediaMessage
{
Type
:
"text"
,
Text
:
common
.
GetPointer
[
string
](
message
.
StringContent
()),
})
if
text
:=
message
.
StringContent
();
text
!=
""
{
systemMessages
=
append
(
systemMessages
,
dto
.
ClaudeMediaMessage
{
Type
:
"text"
,
Text
:
common
.
GetPointer
[
string
](
text
),
})
}
}
else
{
// 支持复合内容的system消息(虽然不常见,但需要考虑完整性)
for
_
,
ctx
:=
range
message
.
ParseContent
()
{
if
ctx
.
Type
==
"text"
{
if
ctx
.
Type
==
"text"
&&
ctx
.
Text
!=
""
{
systemMessages
=
append
(
systemMessages
,
dto
.
ClaudeMediaMessage
{
Type
:
"text"
,
Text
:
common
.
GetPointer
[
string
](
ctx
.
Text
),
...
...
@@ -339,16 +341,22 @@ func RequestOpenAI2ClaudeMessage(c *gin.Context, textRequest dto.GeneralOpenAIRe
}
}
}
else
if
message
.
IsStringContent
()
&&
message
.
ToolCalls
==
nil
{
claudeMessage
.
Content
=
message
.
StringContent
()
text
:=
message
.
StringContent
()
if
text
==
""
{
text
=
"..."
}
claudeMessage
.
Content
=
text
}
else
{
claudeMediaMessages
:=
make
([]
dto
.
ClaudeMediaMessage
,
0
)
for
_
,
mediaMessage
:=
range
message
.
ParseContent
()
{
switch
mediaMessage
.
Type
{
case
"text"
:
claudeMediaMessages
=
append
(
claudeMediaMessages
,
dto
.
ClaudeMediaMessage
{
Type
:
"text"
,
Text
:
common
.
GetPointer
[
string
](
mediaMessage
.
Text
),
})
if
mediaMessage
.
Text
!=
""
{
claudeMediaMessages
=
append
(
claudeMediaMessages
,
dto
.
ClaudeMediaMessage
{
Type
:
"text"
,
Text
:
common
.
GetPointer
[
string
](
mediaMessage
.
Text
),
})
}
default
:
source
:=
mediaMessage
.
ToFileSource
()
if
source
==
nil
{
...
...
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