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

fix: remove deprecated gemini model references and update pricing ratios

Browse Source
This commit is contained in:
Laisky.Cai
2025-01-28 04:01:46 +00:00
parent d5fa98f2e0
commit e49bb64ea0
4 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,7 +27,6 @@ func (a *Adaptor) GetRequestURL(meta *meta.Meta) (string, error) {
var defaultVersion string var defaultVersion string
switch meta.ActualModelName { switch meta.ActualModelName {
case "gemini-2.0-flash-exp", case "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":
defaultVersion = "v1beta" defaultVersion = "v1beta"
default: default:

2
relay/adaptor/gemini/constants.go
View File

@@ -7,5 +7,5 @@ var ModelList = []string{
"gemini-1.5-flash", "gemini-1.5-pro", "gemini-1.5-flash", "gemini-1.5-pro",
"text-embedding-004", "aqa", "text-embedding-004", "aqa",
"gemini-2.0-flash-exp", "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",
} }

10
relay/adaptor/vertexai/gemini/adapter.go
View File

@@ -8,18 +8,18 @@ import (
"github.com/songquanpeng/one-api/common/ctxkey" "github.com/songquanpeng/one-api/common/ctxkey"
"github.com/songquanpeng/one-api/relay/adaptor/gemini" "github.com/songquanpeng/one-api/relay/adaptor/gemini"
"github.com/songquanpeng/one-api/relay/adaptor/openai" "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/meta"
"github.com/songquanpeng/one-api/relay/model" "github.com/songquanpeng/one-api/relay/model"
"github.com/songquanpeng/one-api/relay/relaymode"
) )
var ModelList = []string{ var ModelList = []string{
"gemini-pro", "gemini-pro-vision", "gemini-pro", "gemini-pro-vision",
"gemini-1.5-pro-001", "gemini-1.5-flash-001", "gemini-exp-1206",
"gemini-1.5-pro-002", "gemini-1.5-flash-002", "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-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 { type Adaptor struct {

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

@@ -117,15 +117,14 @@ 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": 0.25 * MILLI_USD, // $0.00025 / 1k characters -> $0.001 / 1k tokens
"gemini-1.0-pro": 1, "gemini-1.0-pro": 0.125 * MILLI_USD,
"gemini-1.5-pro": 1, "gemini-1.5-pro": 1.25 * MILLI_USD,
"gemini-1.5-pro-001": 1, "gemini-1.5-pro-001": 1.25 * MILLI_USD,
"gemini-1.5-flash": 1, "gemini-1.5-flash": 0.075 * MILLI_USD,
"gemini-1.5-flash-001": 1, "gemini-1.5-flash-001": 0.075 * MILLI_USD,
"gemini-2.0-flash-exp": 1, "gemini-2.0-flash-exp": 0.075 * MILLI_USD,
"gemini-2.0-flash-thinking-exp": 1, "gemini-2.0-flash-thinking-exp-01-21": 0.075 * MILLI_USD,
"gemini-2.0-flash-thinking-exp-01-21": 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,
@@ -566,7 +565,7 @@ func GetCompletionRatio(name string, channelType int) float64 {
return 3 return 3
} }
if strings.HasPrefix(name, "gemini-") { if strings.HasPrefix(name, "gemini-") {
return 3 return 4
} }
if strings.HasPrefix(name, "deepseek-") { if strings.HasPrefix(name, "deepseek-") {
return 2 return 2