From e49bb64ea05fb26f43a864b6324eee25b6fbb44e Mon Sep 17 00:00:00 2001 From: "Laisky.Cai" Date: Tue, 28 Jan 2025 04:01:46 +0000 Subject: [PATCH] fix: remove deprecated gemini model references and update pricing ratios --- relay/adaptor/gemini/adaptor.go | 1 - relay/adaptor/gemini/constants.go | 2 +- relay/adaptor/vertexai/gemini/adapter.go | 10 +++++----- relay/billing/ratio/model.go | 19 +++++++++---------- 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/relay/adaptor/gemini/adaptor.go b/relay/adaptor/gemini/adaptor.go index 67a1b72e..9277da77 100644 --- a/relay/adaptor/gemini/adaptor.go +++ b/relay/adaptor/gemini/adaptor.go @@ -27,7 +27,6 @@ func (a *Adaptor) GetRequestURL(meta *meta.Meta) (string, error) { var defaultVersion string switch meta.ActualModelName { case "gemini-2.0-flash-exp", - "gemini-2.0-flash-thinking-exp", "gemini-2.0-flash-thinking-exp-01-21": defaultVersion = "v1beta" default: diff --git a/relay/adaptor/gemini/constants.go b/relay/adaptor/gemini/constants.go index 381d0c12..dabbe436 100644 --- a/relay/adaptor/gemini/constants.go +++ b/relay/adaptor/gemini/constants.go @@ -7,5 +7,5 @@ var ModelList = []string{ "gemini-1.5-flash", "gemini-1.5-pro", "text-embedding-004", "aqa", "gemini-2.0-flash-exp", - "gemini-2.0-flash-thinking-exp", "gemini-2.0-flash-thinking-exp-01-21", + "gemini-2.0-flash-thinking-exp-01-21", } diff --git a/relay/adaptor/vertexai/gemini/adapter.go b/relay/adaptor/vertexai/gemini/adapter.go index 36f983b4..946df93f 100644 --- a/relay/adaptor/vertexai/gemini/adapter.go +++ b/relay/adaptor/vertexai/gemini/adapter.go @@ -8,18 +8,18 @@ import ( "github.com/songquanpeng/one-api/common/ctxkey" "github.com/songquanpeng/one-api/relay/adaptor/gemini" "github.com/songquanpeng/one-api/relay/adaptor/openai" - "github.com/songquanpeng/one-api/relay/relaymode" - "github.com/songquanpeng/one-api/relay/meta" "github.com/songquanpeng/one-api/relay/model" + "github.com/songquanpeng/one-api/relay/relaymode" ) var ModelList = []string{ "gemini-pro", "gemini-pro-vision", - "gemini-1.5-pro-001", "gemini-1.5-flash-001", - "gemini-1.5-pro-002", "gemini-1.5-flash-002", + "gemini-exp-1206", + "gemini-1.5-pro-001", "gemini-1.5-pro-002", + "gemini-1.5-flash-001", "gemini-1.5-flash-002", "gemini-2.0-flash-exp", - "gemini-2.0-flash-thinking-exp", "gemini-2.0-flash-thinking-exp-01-21", + "gemini-2.0-flash-thinking-exp-01-21", } type Adaptor struct { diff --git a/relay/billing/ratio/model.go b/relay/billing/ratio/model.go index 613c4881..cb72b383 100644 --- a/relay/billing/ratio/model.go +++ b/relay/billing/ratio/model.go @@ -117,15 +117,14 @@ var ModelRatio = map[string]float64{ "bge-large-en": 0.002 * RMB, "tao-8k": 0.002 * RMB, // https://ai.google.dev/pricing - "gemini-pro": 1, // $0.00025 / 1k characters -> $0.001 / 1k tokens - "gemini-1.0-pro": 1, - "gemini-1.5-pro": 1, - "gemini-1.5-pro-001": 1, - "gemini-1.5-flash": 1, - "gemini-1.5-flash-001": 1, - "gemini-2.0-flash-exp": 1, - "gemini-2.0-flash-thinking-exp": 1, - "gemini-2.0-flash-thinking-exp-01-21": 1, + "gemini-pro": 0.25 * MILLI_USD, // $0.00025 / 1k characters -> $0.001 / 1k tokens + "gemini-1.0-pro": 0.125 * MILLI_USD, + "gemini-1.5-pro": 1.25 * MILLI_USD, + "gemini-1.5-pro-001": 1.25 * MILLI_USD, + "gemini-1.5-flash": 0.075 * MILLI_USD, + "gemini-1.5-flash-001": 0.075 * MILLI_USD, + "gemini-2.0-flash-exp": 0.075 * MILLI_USD, + "gemini-2.0-flash-thinking-exp-01-21": 0.075 * MILLI_USD, "aqa": 1, // https://open.bigmodel.cn/pricing "glm-4": 0.1 * RMB, @@ -566,7 +565,7 @@ func GetCompletionRatio(name string, channelType int) float64 { return 3 } if strings.HasPrefix(name, "gemini-") { - return 3 + return 4 } if strings.HasPrefix(name, "deepseek-") { return 2