From 93c6d765c71f1fdd344597127133421e3d2d99ff Mon Sep 17 00:00:00 2001
From: CalciumIon <1808837298@qq.com>
Date: Wed, 7 Aug 2024 02:49:02 +0800
Subject: [PATCH 1/2] feat: support gpt-4o-2024-08-06

---
 common/model-ratio.go            | 17 +++++++++--------
 relay/channel/openai/constant.go |  2 +-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/common/model-ratio.go b/common/model-ratio.go
index 68b2d65..3bdd5f7 100644
--- a/common/model-ratio.go
+++ b/common/model-ratio.go
@@ -32,13 +32,14 @@ var defaultModelRatio = map[string]float64{
 	"gpt-4-32k":  30,
 	//"gpt-4-32k-0314":               30, //deprecated
 	"gpt-4-32k-0613":            30,
-	"gpt-4-1106-preview":        5,   // $0.01 / 1K tokens
-	"gpt-4-0125-preview":        5,   // $0.01 / 1K tokens
-	"gpt-4-turbo-preview":       5,   // $0.01 / 1K tokens
-	"gpt-4-vision-preview":      5,   // $0.01 / 1K tokens
-	"gpt-4-1106-vision-preview": 5,   // $0.01 / 1K tokens
-	"gpt-4o":                    2.5, // $0.01 / 1K tokens
-	"gpt-4o-2024-05-13":         2.5, // $0.01 / 1K tokens
+	"gpt-4-1106-preview":        5,    // $0.01 / 1K tokens
+	"gpt-4-0125-preview":        5,    // $0.01 / 1K tokens
+	"gpt-4-turbo-preview":       5,    // $0.01 / 1K tokens
+	"gpt-4-vision-preview":      5,    // $0.01 / 1K tokens
+	"gpt-4-1106-vision-preview": 5,    // $0.01 / 1K tokens
+	"gpt-4o":                    2.5,  // $0.01 / 1K tokens
+	"gpt-4o-2024-05-13":         2.5,  // $0.01 / 1K tokens
+	"gpt-4o-2024-08-06":         1.25, // $0.01 / 1K tokens
 	"gpt-4o-mini":               0.075,
 	"gpt-4o-mini-2024-07-18":    0.075,
 	"gpt-4-turbo":               5,    // $0.01 / 1K tokens
@@ -326,7 +327,7 @@ func GetCompletionRatio(name string) float64 {
 			return 3
 		}
 		if strings.HasPrefix(name, "gpt-4o") {
-			if strings.Contains(name, "mini") {
+			if strings.HasPrefix(name, "gpt-4o-mini") || name == "gpt-4o-2024-08-06" {
 				return 4
 			}
 			return 3
diff --git a/relay/channel/openai/constant.go b/relay/channel/openai/constant.go
index 50abc2e..81eb93c 100644
--- a/relay/channel/openai/constant.go
+++ b/relay/channel/openai/constant.go
@@ -8,7 +8,7 @@ var ModelList = []string{
 	"gpt-4-32k", "gpt-4-32k-0613",
 	"gpt-4-turbo-preview", "gpt-4-turbo", "gpt-4-turbo-2024-04-09",
 	"gpt-4-vision-preview",
-	"gpt-4o", "gpt-4o-2024-05-13",
+	"gpt-4o", "gpt-4o-2024-05-13", "gpt-4o-2024-08-06",
 	"gpt-4o-mini", "gpt-4o-mini-2024-07-18",
 	"text-embedding-ada-002", "text-embedding-3-small", "text-embedding-3-large",
 	"text-curie-001", "text-babbage-001", "text-ada-001",

From 4490258104bec2673ca22c0bec391ecb0d02fb97 Mon Sep 17 00:00:00 2001
From: CalciumIon <1808837298@qq.com>
Date: Wed, 7 Aug 2024 02:50:22 +0800
Subject: [PATCH 2/2] fix bug

---
 middleware/auth.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/middleware/auth.go b/middleware/auth.go
index d2c9b3c..f9a5900 100644
--- a/middleware/auth.go
+++ b/middleware/auth.go
@@ -146,7 +146,7 @@ func TokenAuth() func(c *gin.Context) {
 		if token != nil {
 			id := c.GetInt("id")
 			if id == 0 {
-				c.Set("id", token.Id)
+				c.Set("id", token.UserId)
 			}
 		}
 		if err != nil {