mirror of
https://github.com/linux-do/new-api.git
synced 2025-09-18 16:36:37 +08:00
fix: 修正 Unicode 转义序列解析问题,close #63
This commit is contained in:
parent
a0c4e9f10e
commit
1cde58c089
@ -88,17 +88,17 @@ func requestOpenAI2Ali(request GeneralOpenAIRequest) *AliChatRequest {
|
|||||||
message := request.Messages[i]
|
message := request.Messages[i]
|
||||||
if message.Role == "system" {
|
if message.Role == "system" {
|
||||||
messages = append(messages, AliMessage{
|
messages = append(messages, AliMessage{
|
||||||
User: string(message.Content),
|
User: message.StringContent(),
|
||||||
Bot: "Okay",
|
Bot: "Okay",
|
||||||
})
|
})
|
||||||
continue
|
continue
|
||||||
} else {
|
} else {
|
||||||
if i == len(request.Messages)-1 {
|
if i == len(request.Messages)-1 {
|
||||||
prompt = string(message.Content)
|
prompt = message.StringContent()
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
messages = append(messages, AliMessage{
|
messages = append(messages, AliMessage{
|
||||||
User: string(message.Content),
|
User: message.StringContent(),
|
||||||
Bot: string(request.Messages[i+1].Content),
|
Bot: string(request.Messages[i+1].Content),
|
||||||
})
|
})
|
||||||
i++
|
i++
|
||||||
|
@ -89,7 +89,7 @@ func requestOpenAI2Baidu(request GeneralOpenAIRequest) *BaiduChatRequest {
|
|||||||
if message.Role == "system" {
|
if message.Role == "system" {
|
||||||
messages = append(messages, BaiduMessage{
|
messages = append(messages, BaiduMessage{
|
||||||
Role: "user",
|
Role: "user",
|
||||||
Content: string(message.Content),
|
Content: message.StringContent(),
|
||||||
})
|
})
|
||||||
messages = append(messages, BaiduMessage{
|
messages = append(messages, BaiduMessage{
|
||||||
Role: "assistant",
|
Role: "assistant",
|
||||||
@ -98,7 +98,7 @@ func requestOpenAI2Baidu(request GeneralOpenAIRequest) *BaiduChatRequest {
|
|||||||
} else {
|
} else {
|
||||||
messages = append(messages, BaiduMessage{
|
messages = append(messages, BaiduMessage{
|
||||||
Role: message.Role,
|
Role: message.Role,
|
||||||
Content: string(message.Content),
|
Content: message.StringContent(),
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -97,7 +97,7 @@ func requestOpenAI2Gemini(textRequest GeneralOpenAIRequest) *GeminiChatRequest {
|
|||||||
Role: message.Role,
|
Role: message.Role,
|
||||||
Parts: []GeminiPart{
|
Parts: []GeminiPart{
|
||||||
{
|
{
|
||||||
Text: string(message.Content),
|
Text: message.StringContent(),
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
@ -59,7 +59,7 @@ func requestOpenAI2PaLM(textRequest GeneralOpenAIRequest) *PaLMChatRequest {
|
|||||||
}
|
}
|
||||||
for _, message := range textRequest.Messages {
|
for _, message := range textRequest.Messages {
|
||||||
palmMessage := PaLMChatMessage{
|
palmMessage := PaLMChatMessage{
|
||||||
Content: string(message.Content),
|
Content: message.StringContent(),
|
||||||
}
|
}
|
||||||
if message.Role == "user" {
|
if message.Role == "user" {
|
||||||
palmMessage.Author = "0"
|
palmMessage.Author = "0"
|
||||||
|
@ -84,7 +84,7 @@ func requestOpenAI2Tencent(request GeneralOpenAIRequest) *TencentChatRequest {
|
|||||||
if message.Role == "system" {
|
if message.Role == "system" {
|
||||||
messages = append(messages, TencentMessage{
|
messages = append(messages, TencentMessage{
|
||||||
Role: "user",
|
Role: "user",
|
||||||
Content: string(message.Content),
|
Content: message.StringContent(),
|
||||||
})
|
})
|
||||||
messages = append(messages, TencentMessage{
|
messages = append(messages, TencentMessage{
|
||||||
Role: "assistant",
|
Role: "assistant",
|
||||||
@ -93,7 +93,7 @@ func requestOpenAI2Tencent(request GeneralOpenAIRequest) *TencentChatRequest {
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
messages = append(messages, TencentMessage{
|
messages = append(messages, TencentMessage{
|
||||||
Content: string(message.Content),
|
Content: message.StringContent(),
|
||||||
Role: message.Role,
|
Role: message.Role,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
@ -81,7 +81,7 @@ func requestOpenAI2Xunfei(request GeneralOpenAIRequest, xunfeiAppId string, doma
|
|||||||
if message.Role == "system" {
|
if message.Role == "system" {
|
||||||
messages = append(messages, XunfeiMessage{
|
messages = append(messages, XunfeiMessage{
|
||||||
Role: "user",
|
Role: "user",
|
||||||
Content: string(message.Content),
|
Content: message.StringContent(),
|
||||||
})
|
})
|
||||||
messages = append(messages, XunfeiMessage{
|
messages = append(messages, XunfeiMessage{
|
||||||
Role: "assistant",
|
Role: "assistant",
|
||||||
@ -90,7 +90,7 @@ func requestOpenAI2Xunfei(request GeneralOpenAIRequest, xunfeiAppId string, doma
|
|||||||
} else {
|
} else {
|
||||||
messages = append(messages, XunfeiMessage{
|
messages = append(messages, XunfeiMessage{
|
||||||
Role: message.Role,
|
Role: message.Role,
|
||||||
Content: string(message.Content),
|
Content: message.StringContent(),
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -114,7 +114,7 @@ func requestOpenAI2Zhipu(request GeneralOpenAIRequest) *ZhipuRequest {
|
|||||||
if message.Role == "system" {
|
if message.Role == "system" {
|
||||||
messages = append(messages, ZhipuMessage{
|
messages = append(messages, ZhipuMessage{
|
||||||
Role: "system",
|
Role: "system",
|
||||||
Content: string(message.Content),
|
Content: message.StringContent(),
|
||||||
})
|
})
|
||||||
messages = append(messages, ZhipuMessage{
|
messages = append(messages, ZhipuMessage{
|
||||||
Role: "user",
|
Role: "user",
|
||||||
@ -123,7 +123,7 @@ func requestOpenAI2Zhipu(request GeneralOpenAIRequest) *ZhipuRequest {
|
|||||||
} else {
|
} else {
|
||||||
messages = append(messages, ZhipuMessage{
|
messages = append(messages, ZhipuMessage{
|
||||||
Role: message.Role,
|
Role: message.Role,
|
||||||
Content: string(message.Content),
|
Content: message.StringContent(),
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -36,6 +36,14 @@ const (
|
|||||||
ContentTypeImageURL = "image_url"
|
ContentTypeImageURL = "image_url"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
func (m Message) StringContent() string {
|
||||||
|
var stringContent string
|
||||||
|
if err := json.Unmarshal(m.Content, &stringContent); err == nil {
|
||||||
|
return stringContent
|
||||||
|
}
|
||||||
|
return string(m.Content)
|
||||||
|
}
|
||||||
|
|
||||||
func (m Message) ParseContent() []MediaMessage {
|
func (m Message) ParseContent() []MediaMessage {
|
||||||
var contentList []MediaMessage
|
var contentList []MediaMessage
|
||||||
var stringContent string
|
var stringContent string
|
||||||
|
Loading…
Reference in New Issue
Block a user