From cf04ab9564c7767f909f32fe5147e9ef7ef5e3b9 Mon Sep 17 00:00:00 2001
From: "Laisky.Cai" <github@laisky.com>
Date: Sun, 22 Dec 2024 02:32:46 +0000
Subject: [PATCH] fix: update default version handling for Gemini models and
 improve billing ratio formatting

---
 relay/adaptor/gemini/adaptor.go |  9 ++++++---
 relay/billing/ratio/model.go    | 16 ++++++++--------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/relay/adaptor/gemini/adaptor.go b/relay/adaptor/gemini/adaptor.go
index f7df87a6..34b273e7 100644
--- a/relay/adaptor/gemini/adaptor.go
+++ b/relay/adaptor/gemini/adaptor.go
@@ -24,10 +24,13 @@ func (a *Adaptor) Init(meta *meta.Meta) {
 }
 
 func (a *Adaptor) GetRequestURL(meta *meta.Meta) (string, error) {
-	defaultVersion := config.GeminiVersion
-	// gemini-2.0-flash-exp and gemini-2.0-flash-thinking-exp use v1beta
-	if meta.ActualModelName == "gemini-2.0-flash-exp" || meta.ActualModelName == "gemini-2.0-flash-thinking-exp" {
+	var defaultVersion string
+	switch meta.ActualModelName {
+	case "gemini-2.0-flash-exp",
+		"gemini-2.0-flash-thinking-exp":
 		defaultVersion = "v1beta"
+	default:
+		defaultVersion = config.GeminiVersion
 	}
 
 	version := helper.AssignOrDefault(meta.Config.APIVersion, defaultVersion)
diff --git a/relay/billing/ratio/model.go b/relay/billing/ratio/model.go
index 3b867867..712c710d 100644
--- a/relay/billing/ratio/model.go
+++ b/relay/billing/ratio/model.go
@@ -110,15 +110,15 @@ 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-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,
-	"aqa":                  1,
+	"aqa":                           1,
 	// https://open.bigmodel.cn/pricing
 	"glm-4":         0.1 * RMB,
 	"glm-4v":        0.1 * RMB,