From 024cdb08df37290eee2380e235951fc610258740 Mon Sep 17 00:00:00 2001 From: CalciumIon <1808837298@qq.com> Date: Wed, 11 Dec 2024 21:39:41 +0800 Subject: [PATCH] feat: Update model lists and enhance model retrieval in Adaptor - Refactored ModelList in the gemini constant to include new models and remove outdated ones. - Modified the GetModelList function in the Adaptor to consolidate model lists from multiple sources, ensuring a comprehensive and updated list is returned. - Commented out deprecated models in the vertex constants for clarity and future reference. --- relay/channel/gemini/constant.go | 6 +++--- relay/channel/vertex/adaptor.go | 15 ++++++++++++++- relay/channel/vertex/constants.go | 10 +++++----- 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/relay/channel/gemini/constant.go b/relay/channel/gemini/constant.go index 5f189f3f..dd4ee71c 100644 --- a/relay/channel/gemini/constant.go +++ b/relay/channel/gemini/constant.go @@ -5,9 +5,9 @@ const ( ) var ModelList = []string{ - "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.5-pro-exp-0827", "gemini-1.5-flash-exp-0827", - "gemini-exp-1114", + "gemini-1.5-pro-latest", "gemini-1.5-flash-latest", "gemini-ultra", + "gemini-1.5-pro-exp-0827", "gemini-1.5-flash-exp-0827", + "gemini-exp-1114", "gemini-exp-1206", } var ChannelName = "google gemini" diff --git a/relay/channel/vertex/adaptor.go b/relay/channel/vertex/adaptor.go index c9c9a307..1b41730d 100644 --- a/relay/channel/vertex/adaptor.go +++ b/relay/channel/vertex/adaptor.go @@ -176,7 +176,20 @@ func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, info *relaycom } func (a *Adaptor) GetModelList() []string { - return ModelList + var modelList []string + for i, s := range ModelList { + modelList = append(modelList, s) + ModelList[i] = s + } + for i, s := range claude.ModelList { + modelList = append(modelList, s) + claude.ModelList[i] = s + } + for i, s := range gemini.ModelList { + modelList = append(modelList, s) + gemini.ModelList[i] = s + } + return modelList } func (a *Adaptor) GetChannelName() string { diff --git a/relay/channel/vertex/constants.go b/relay/channel/vertex/constants.go index 6a31a865..c39e23d1 100644 --- a/relay/channel/vertex/constants.go +++ b/relay/channel/vertex/constants.go @@ -1,13 +1,13 @@ package vertex var ModelList = []string{ - "claude-3-sonnet-20240229", - "claude-3-opus-20240229", - "claude-3-haiku-20240307", - "claude-3-5-sonnet-20240620", + //"claude-3-sonnet-20240229", + //"claude-3-opus-20240229", + //"claude-3-haiku-20240307", + //"claude-3-5-sonnet-20240620", //"gemini-1.5-pro-latest", "gemini-1.5-flash-latest", - "gemini-1.5-pro-001", "gemini-1.5-flash-001", "gemini-pro", "gemini-pro-vision", + //"gemini-1.5-pro-001", "gemini-1.5-flash-001", "gemini-pro", "gemini-pro-vision", "meta/llama3-405b-instruct-maas", }