xinyin025/one-api
1
0
Fork 0
mirror of https://github.com/songquanpeng/one-api.git synced 2025-11-14 04:13:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'songquanpeng' into sync_upstream

Browse Source
This commit is contained in:
Martial BE
2023-12-25 11:23:28 +08:00
parent be613883a1 f44fbe3fe7
commit 47b72b850f
24 changed files with 251 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
providers/baidu/chat.go
View File

@@ -88,13 +88,15 @@ func (p *BaiduProvider) ChatAction(request *types.ChatCompletionRequest, isModel
}
if request.Stream {
usage, errWithCode = p.sendStreamRequest(req)
usage, errWithCode = p.sendStreamRequest(req, request.Model)
if errWithCode != nil {
return
}
} else {
baiduChatRequest := &BaiduChatResponse{}
baiduChatRequest := &BaiduChatResponse{
Model: request.Model,
}
errWithCode = p.SendRequest(req, baiduChatRequest, false)
if errWithCode != nil {
return
@@ -117,13 +119,13 @@ func (p *BaiduProvider) streamResponseBaidu2OpenAI(baiduResponse *BaiduChatStrea
ID: baiduResponse.Id,
Object: "chat.completion.chunk",
Created: baiduResponse.Created,
Model: "ernie-bot",
Model: baiduResponse.Model,
Choices: []types.ChatCompletionStreamChoice{choice},
}
return &response
}
func (p *BaiduProvider) sendStreamRequest(req *http.Request) (usage *types.Usage, errWithCode *types.OpenAIErrorWithStatusCode) {
func (p *BaiduProvider) sendStreamRequest(req *http.Request, model string) (usage *types.Usage, errWithCode *types.OpenAIErrorWithStatusCode) {
defer req.Body.Close()
usage = &types.Usage{}
@@ -180,6 +182,7 @@ func (p *BaiduProvider) sendStreamRequest(req *http.Request) (usage *types.Usage
usage.PromptTokens = baiduResponse.Usage.PromptTokens
usage.CompletionTokens = baiduResponse.Usage.TotalTokens - baiduResponse.Usage.PromptTokens
}
baiduResponse.Model = model
response := p.streamResponseBaidu2OpenAI(&baiduResponse)
jsonResponse, err := json.Marshal(response)
if err != nil {