Ecosystem/ai-gateway
5
0
Fork 0
Code Issues Pull Requests 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
No known key found for this signature in database
GPG Key ID: D06C32DF0EDB9084
8 changed files with 32 additions and 12 deletions
Show Stats 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 return
} }
usage.PromptTokens = promptTokens usage = &types.Usage{
usage.CompletionTokens = common.CountTokenText(responseText, request.Model) PromptTokens: promptTokens,
CompletionTokens: common.CountTokenText(responseText, request.Model),
}
usage.TotalTokens = promptTokens + usage.CompletionTokens usage.TotalTokens = promptTokens + usage.CompletionTokens
} else { } else {

6
providers/gemini/chat.go
View File

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

2
providers/providers.go
View File

@ -13,6 +13,7 @@ import (
"one-api/providers/base" "one-api/providers/base"
"one-api/providers/claude" "one-api/providers/claude"
"one-api/providers/closeai" "one-api/providers/closeai"
"one-api/providers/gemini"
"one-api/providers/openai" "one-api/providers/openai"
"one-api/providers/openaisb" "one-api/providers/openaisb"
"one-api/providers/palm" "one-api/providers/palm"
@ -49,6 +50,7 @@ func init() {
providerFactories[common.ChannelTypeAIGC2D] = aigc2d.Aigc2dProviderFactory{} providerFactories[common.ChannelTypeAIGC2D] = aigc2d.Aigc2dProviderFactory{}
providerFactories[common.ChannelTypeAPI2GPT] = api2gpt.Api2gptProviderFactory{} providerFactories[common.ChannelTypeAPI2GPT] = api2gpt.Api2gptProviderFactory{}
providerFactories[common.ChannelTypeAzureSpeech] = azurespeech.AzureSpeechProviderFactory{} 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 return
} }
usage.PromptTokens = promptTokens usage = &types.Usage{
usage.CompletionTokens = common.CountTokenText(responseText, request.Model) PromptTokens: promptTokens,
CompletionTokens: common.CountTokenText(responseText, request.Model),
}
usage.TotalTokens = promptTokens + usage.CompletionTokens usage.TotalTokens = promptTokens + usage.CompletionTokens
} else { } else {

4
web/src/views/Channel/component/EditModal.js
View File

@ -70,13 +70,13 @@ const EditModal = ({ open, channelId, onCancel, onOk }) => {
const initChannel = (typeValue) => { const initChannel = (typeValue) => {
if (typeConfig[typeValue]?.inputLabel) { if (typeConfig[typeValue]?.inputLabel) {
setInputLabel({ ...inputLabel, ...typeConfig[typeValue].inputLabel }); setInputLabel({ ...defaultConfig.inputLabel, ...typeConfig[typeValue].inputLabel });
} else { } else {
setInputLabel(defaultConfig.inputLabel); setInputLabel(defaultConfig.inputLabel);
} }
if (typeConfig[typeValue]?.prompt) { if (typeConfig[typeValue]?.prompt) {
setInputPrompt({ ...inputPrompt, ...typeConfig[typeValue].prompt }); setInputPrompt({ ...defaultConfig.prompt, ...typeConfig[typeValue].prompt });
} else { } else {
setInputPrompt(defaultConfig.prompt); setInputPrompt(defaultConfig.prompt);
} }

12
web/src/views/Channel/type/Config.js
View File

@ -78,11 +78,15 @@ const typeConfig = {
} }
}, },
18: { 18: {
inputLabel: {
other: '版本号'
},
input: { input: {
models: ['SparkDesk'] models: ['SparkDesk']
}, },
prompt: { prompt: {
key: '按照如下格式输入：APPID|APISecret|APIKey' key: '按照如下格式输入：APPID|APISecret|APIKey',
other: '请输入版本号，例如：v3.1'
} }
}, },
19: { 19: {
@ -104,8 +108,14 @@ const typeConfig = {
} }
}, },
25: { 25: {
inputLabel: {
other: '版本号'
},
input: { input: {
models: ['gemini-pro'] models: ['gemini-pro']
},
prompt: {
other: '请输入版本号，例如：v1'
} }
} }
}; };