xinyin025/one-api
1
0
Fork 0
mirror of https://github.com/songquanpeng/one-api.git synced 2025-09-18 01:26:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: update default version handling for Gemini models and improve billing ratio formatting

Browse Source
This commit is contained in:
Laisky.Cai 2024-12-22 02:32:46 +00:00
parent c4afcc8337
commit cf04ab9564
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
relay/adaptor/gemini/adaptor.go
View File

@ -24,10 +24,13 @@ func (a *Adaptor) Init(meta *meta.Meta) {
} }
func (a *Adaptor) GetRequestURL(meta *meta.Meta) (string, error) { func (a *Adaptor) GetRequestURL(meta *meta.Meta) (string, error) {
defaultVersion := config.GeminiVersion var defaultVersion string
// gemini-2.0-flash-exp and gemini-2.0-flash-thinking-exp use v1beta switch meta.ActualModelName {
if meta.ActualModelName == "gemini-2.0-flash-exp" || meta.ActualModelName == "gemini-2.0-flash-thinking-exp" { case "gemini-2.0-flash-exp",
"gemini-2.0-flash-thinking-exp":
defaultVersion = "v1beta" defaultVersion = "v1beta"
default:
defaultVersion = config.GeminiVersion
} }
version := helper.AssignOrDefault(meta.Config.APIVersion, defaultVersion) version := helper.AssignOrDefault(meta.Config.APIVersion, defaultVersion)

16
relay/billing/ratio/model.go
View File

@ -110,15 +110,15 @@ var ModelRatio = map[string]float64{
"bge-large-en": 0.002 * RMB, "bge-large-en": 0.002 * RMB,
"tao-8k": 0.002 * RMB, "tao-8k": 0.002 * RMB,
// https://ai.google.dev/pricing // https://ai.google.dev/pricing
"gemini-pro": 1, // $0.00025 / 1k characters -> $0.001 / 1k tokens "gemini-pro": 1, // $0.00025 / 1k characters -> $0.001 / 1k tokens
"gemini-1.0-pro": 1, "gemini-1.0-pro": 1,
"gemini-1.5-pro": 1, "gemini-1.5-pro": 1,
"gemini-1.5-pro-001": 1, "gemini-1.5-pro-001": 1,
"gemini-1.5-flash": 1, "gemini-1.5-flash": 1,
"gemini-1.5-flash-001": 1, "gemini-1.5-flash-001": 1,
"gemini-2.0-flash-exp": 1, "gemini-2.0-flash-exp": 1,
"gemini-2.0-flash-thinking-exp": 1, "gemini-2.0-flash-thinking-exp": 1,
"aqa": 1, "aqa": 1,
// https://open.bigmodel.cn/pricing // https://open.bigmodel.cn/pricing
"glm-4": 0.1 * RMB, "glm-4": 0.1 * RMB,
"glm-4v": 0.1 * RMB, "glm-4v": 0.1 * RMB,