Merge remote-tracking branch 'origin/main'

common/model-ratio.go

@@ -79,6 +79,7 @@ var DefaultModelRatio = map[string]float64{
 	"gemini-1.0-pro-vision-001":    1,
 	"gemini-1.0-pro-vision-001":    1,
 	"gemini-1.0-pro-001":           1,
 	"gemini-1.0-pro-001":           1,
 	"gemini-1.5-pro-latest":        1,
 	"gemini-1.5-pro-latest":        1,
+	"gemini-1.5-flash-latest":      1,
 	"gemini-1.0-pro-latest":        1,
 	"gemini-1.0-pro-latest":        1,
 	"gemini-1.0-pro-vision-latest": 1,
 	"gemini-1.0-pro-vision-latest": 1,
 	"gemini-ultra":                 1,
 	"gemini-ultra":                 1,

relay/channel/gemini/adaptor.go

@@ -21,6 +21,7 @@ func (a *Adaptor) Init(info *relaycommon.RelayInfo, request dto.GeneralOpenAIReq
 // 定义一个映射，存储模型名称和对应的版本
 // 定义一个映射，存储模型名称和对应的版本
 var modelVersionMap = map[string]string{
 var modelVersionMap = map[string]string{
     "gemini-1.5-pro-latest": "v1beta",
     "gemini-1.5-pro-latest": "v1beta",
+    "gemini-1.5-flash-latest": "v1beta",
     "gemini-ultra":   "v1beta",
     "gemini-ultra":   "v1beta",
 }
 }
 
 

relay/channel/gemini/constant.go

@@ -5,7 +5,7 @@ const (
 )
 )
 
 
 var ModelList = []string{
 var ModelList = []string{
-	"gemini-1.0-pro-latest", "gemini-1.0-pro-001", "gemini-1.5-pro-latest", "gemini-ultra",
+	"gemini-1.0-pro-latest", "gemini-1.0-pro-001", "gemini-1.5-pro-latest", "gemini-1.5-flash-latest", "gemini-ultra",
 	"gemini-1.0-pro-vision-latest", "gemini-1.0-pro-vision-001",
 	"gemini-1.0-pro-vision-latest", "gemini-1.0-pro-vision-001",
 }
 }
 
 

relay/channel/openai/constant.go

 package openai
 package openai
 
 
 var ModelList = []string{
 var ModelList = []string{
-	"gpt-4o",
 	"gpt-3.5-turbo", "gpt-3.5-turbo-0301", "gpt-3.5-turbo-0613", "gpt-3.5-turbo-1106", "gpt-3.5-turbo-0125",
 	"gpt-3.5-turbo", "gpt-3.5-turbo-0301", "gpt-3.5-turbo-0613", "gpt-3.5-turbo-1106", "gpt-3.5-turbo-0125",
 	"gpt-3.5-turbo-16k", "gpt-3.5-turbo-16k-0613",
 	"gpt-3.5-turbo-16k", "gpt-3.5-turbo-16k-0613",
 	"gpt-3.5-turbo-instruct",
 	"gpt-3.5-turbo-instruct",
 	"gpt-4", "gpt-4-0314", "gpt-4-0613", "gpt-4-1106-preview", "gpt-4-0125-preview",
 	"gpt-4", "gpt-4-0314", "gpt-4-0613", "gpt-4-1106-preview", "gpt-4-0125-preview",
 	"gpt-4-32k", "gpt-4-32k-0314", "gpt-4-32k-0613",
 	"gpt-4-32k", "gpt-4-32k-0314", "gpt-4-32k-0613",
 	"gpt-4-turbo-preview", "gpt-4-turbo", "gpt-4-turbo-2024-04-09",
 	"gpt-4-turbo-preview", "gpt-4-turbo", "gpt-4-turbo-2024-04-09",
-	"gpt-4-vision-preview",
+	"gpt-4-vision-preview",	"gpt-4o",
 	"text-embedding-ada-002", "text-embedding-3-small", "text-embedding-3-large",
 	"text-embedding-ada-002", "text-embedding-3-small", "text-embedding-3-large",
 	"text-curie-001", "text-babbage-001", "text-ada-001", "text-davinci-002", "text-davinci-003",
 	"text-curie-001", "text-babbage-001", "text-ada-001", "text-davinci-002", "text-davinci-003",
 	"text-moderation-latest", "text-moderation-stable",
 	"text-moderation-latest", "text-moderation-stable",