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
c176e713
authored
Sep 15, 2025
by
Xyfacai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 非openai 渠道使用 SystemPrompt 设置会panic
parent
6b9c1c3a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
33 additions
and
31 deletions
+33
-31
relay/compatible_handler.go
+33
-31
No files found.
relay/compatible_handler.go
View file @
c176e713
...
@@ -90,41 +90,43 @@ func TextHelper(c *gin.Context, info *relaycommon.RelayInfo) (newAPIError *types
...
@@ -90,41 +90,43 @@ func TextHelper(c *gin.Context, info *relaycommon.RelayInfo) (newAPIError *types
if
info
.
ChannelSetting
.
SystemPrompt
!=
""
{
if
info
.
ChannelSetting
.
SystemPrompt
!=
""
{
// 如果有系统提示,则将其添加到请求中
// 如果有系统提示,则将其添加到请求中
request
:=
convertedRequest
.
(
*
dto
.
GeneralOpenAIRequest
)
request
,
ok
:=
convertedRequest
.
(
*
dto
.
GeneralOpenAIRequest
)
containSystemPrompt
:=
false
if
ok
{
for
_
,
message
:=
range
request
.
Messages
{
containSystemPrompt
:=
false
if
message
.
Role
==
request
.
GetSystemRoleName
()
{
for
_
,
message
:=
range
request
.
Messages
{
containSystemPrompt
=
true
break
}
}
if
!
containSystemPrompt
{
// 如果没有系统提示,则添加系统提示
systemMessage
:=
dto
.
Message
{
Role
:
request
.
GetSystemRoleName
(),
Content
:
info
.
ChannelSetting
.
SystemPrompt
,
}
request
.
Messages
=
append
([]
dto
.
Message
{
systemMessage
},
request
.
Messages
...
)
}
else
if
info
.
ChannelSetting
.
SystemPromptOverride
{
common
.
SetContextKey
(
c
,
constant
.
ContextKeySystemPromptOverride
,
true
)
// 如果有系统提示,且允许覆盖,则拼接到前面
for
i
,
message
:=
range
request
.
Messages
{
if
message
.
Role
==
request
.
GetSystemRoleName
()
{
if
message
.
Role
==
request
.
GetSystemRoleName
()
{
if
message
.
IsStringContent
()
{
containSystemPrompt
=
true
request
.
Messages
[
i
]
.
SetStringContent
(
info
.
ChannelSetting
.
SystemPrompt
+
"
\n
"
+
message
.
StringContent
())
}
else
{
contents
:=
message
.
ParseContent
()
contents
=
append
([]
dto
.
MediaContent
{
{
Type
:
dto
.
ContentTypeText
,
Text
:
info
.
ChannelSetting
.
SystemPrompt
,
},
},
contents
...
)
request
.
Messages
[
i
]
.
Content
=
contents
}
break
break
}
}
}
}
if
!
containSystemPrompt
{
// 如果没有系统提示,则添加系统提示
systemMessage
:=
dto
.
Message
{
Role
:
request
.
GetSystemRoleName
(),
Content
:
info
.
ChannelSetting
.
SystemPrompt
,
}
request
.
Messages
=
append
([]
dto
.
Message
{
systemMessage
},
request
.
Messages
...
)
}
else
if
info
.
ChannelSetting
.
SystemPromptOverride
{
common
.
SetContextKey
(
c
,
constant
.
ContextKeySystemPromptOverride
,
true
)
// 如果有系统提示,且允许覆盖,则拼接到前面
for
i
,
message
:=
range
request
.
Messages
{
if
message
.
Role
==
request
.
GetSystemRoleName
()
{
if
message
.
IsStringContent
()
{
request
.
Messages
[
i
]
.
SetStringContent
(
info
.
ChannelSetting
.
SystemPrompt
+
"
\n
"
+
message
.
StringContent
())
}
else
{
contents
:=
message
.
ParseContent
()
contents
=
append
([]
dto
.
MediaContent
{
{
Type
:
dto
.
ContentTypeText
,
Text
:
info
.
ChannelSetting
.
SystemPrompt
,
},
},
contents
...
)
request
.
Messages
[
i
]
.
Content
=
contents
}
break
}
}
}
}
}
}
}
...
...
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