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

🐛 fix usage error & web channel edit label error

Browse Source
This commit is contained in:
Martial BE
2023-12-21 16:52:00 +08:00
parent 43d8bedbb4
commit b0fefd6dc5
8 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
providers/claude/chat.go
View File

@@ -100,8 +100,10 @@ func (p *ClaudeProvider) ChatAction(request *types.ChatCompletionRequest, isMode
return
}
usage.PromptTokens = promptTokens
usage.CompletionTokens = common.CountTokenText(responseText, request.Model)
usage = &types.Usage{
PromptTokens: promptTokens,
CompletionTokens: common.CountTokenText(responseText, request.Model),
}
usage.TotalTokens = promptTokens + usage.CompletionTokens
} else {

6
providers/gemini/chat.go
View File

@@ -147,8 +147,10 @@ func (p *GeminiProvider) ChatAction(request *types.ChatCompletionRequest, isMode
return
}
usage.PromptTokens = promptTokens
usage.CompletionTokens = common.CountTokenText(responseText, request.Model)
usage = &types.Usage{
PromptTokens: promptTokens,
CompletionTokens: common.CountTokenText(responseText, request.Model),
}
usage.TotalTokens = promptTokens + usage.CompletionTokens
} else {

2
providers/openai/image_generations.go
View File

@@ -19,7 +19,7 @@ func (c *OpenAIProviderImageResponseResponse) ResponseHandler(resp *http.Respons
func (p *OpenAIProvider) ImageGenerationsAction(request *types.ImageRequest, isModelMapped bool, promptTokens int) (usage *types.Usage, errWithCode *types.OpenAIErrorWithStatusCode) {
if isWithinRange(request.Model, request.N) == false {
if !isWithinRange(request.Model, request.N) {
return nil, common.StringErrorWrapper("n_not_within_range", "n_not_within_range", http.StatusBadRequest)
}

6
providers/palm/chat.go
View File

@@ -92,8 +92,10 @@ func (p *PalmProvider) ChatAction(request *types.ChatCompletionRequest, isModelM
return
}
usage.PromptTokens = promptTokens
usage.CompletionTokens = common.CountTokenText(responseText, request.Model)
usage = &types.Usage{
PromptTokens: promptTokens,
CompletionTokens: common.CountTokenText(responseText, request.Model),
}
usage.TotalTokens = promptTokens + usage.CompletionTokens
} else {

2
providers/providers.go
View File

@@ -13,6 +13,7 @@ import (
"one-api/providers/base"
"one-api/providers/claude"
"one-api/providers/closeai"
"one-api/providers/gemini"
"one-api/providers/openai"
"one-api/providers/openaisb"
"one-api/providers/palm"
@@ -49,6 +50,7 @@ func init() {
providerFactories[common.ChannelTypeAIGC2D] = aigc2d.Aigc2dProviderFactory{}
providerFactories[common.ChannelTypeAPI2GPT] = api2gpt.Api2gptProviderFactory{}
providerFactories[common.ChannelTypeAzureSpeech] = azurespeech.AzureSpeechProviderFactory{}
providerFactories[common.ChannelTypeGemini] = gemini.GeminiProviderFactory{}
}

6
providers/tencent/chat.go
View File

@@ -105,8 +105,10 @@ func (p *TencentProvider) ChatAction(request *types.ChatCompletionRequest, isMod
return
}
usage.PromptTokens = promptTokens
usage.CompletionTokens = common.CountTokenText(responseText, request.Model)
usage = &types.Usage{
PromptTokens: promptTokens,
CompletionTokens: common.CountTokenText(responseText, request.Model),
}
usage.TotalTokens = promptTokens + usage.CompletionTokens
} else {