From c5a271dec4b85eb641d3b6f7b6b42ae7ee8b911a Mon Sep 17 00:00:00 2001 From: wood Date: Tue, 7 Nov 2023 16:47:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=B0=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/model-ratio.go | 9 +++++++++ controller/model.go | 27 +++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/common/model-ratio.go b/common/model-ratio.go index 8f4be8c3..6935c480 100644 --- a/common/model-ratio.go +++ b/common/model-ratio.go @@ -16,12 +16,15 @@ var ModelRatio = map[string]float64{ "gpt-4": 15, "gpt-4-0314": 15, "gpt-4-0613": 15, + "gpt-4-1106-preview": 5, + "gpt-4-1106-vision-preview": 5, "gpt-4-32k": 30, "gpt-4-32k-0314": 30, "gpt-4-32k-0613": 30, "gpt-3.5-turbo": 0.75, // $0.0015 / 1K tokens "gpt-3.5-turbo-0301": 0.75, "gpt-3.5-turbo-0613": 0.75, + "gpt-3.5-turbo-1106": 0.5, "gpt-3.5-turbo-16k": 1.5, // $0.003 / 1K tokens "gpt-3.5-turbo-16k-0613": 1.5, "gpt-3.5-turbo-instruct": 0.75, // $0.0015 / 1K tokens @@ -87,9 +90,15 @@ func GetModelRatio(name string) float64 { } func GetCompletionRatio(name string) float64 { + if strings.HasPrefix(name, "gpt-3.5-turbo-1106") { + return 2 + } if strings.HasPrefix(name, "gpt-3.5") { return 1.333333 } + if strings.HasPrefix(name, "gpt-4-1106") { + return 3 + } if strings.HasPrefix(name, "gpt-4") { return 2 } diff --git a/controller/model.go b/controller/model.go index 2a7dc538..f15cf68b 100644 --- a/controller/model.go +++ b/controller/model.go @@ -99,6 +99,15 @@ func init() { Root: "gpt-3.5-turbo-0613", Parent: nil, }, + { + Id: "gpt-3.5-turbo-1106", + Object: "model", + Created: 1677649963, + OwnedBy: "openai", + Permission: permission, + Root: "gpt-3.5-turbo-1106", + Parent: nil, + }, { Id: "gpt-3.5-turbo-16k", Object: "model", @@ -153,6 +162,24 @@ func init() { Root: "gpt-4-0613", Parent: nil, }, + { + Id: "gpt-4-1106-preview", + Object: "model", + Created: 1677649963, + OwnedBy: "openai", + Permission: permission, + Root: "gpt-4-1106-preview", + Parent: nil, + }, + { + Id: "gpt-4-1106-vision-preview", + Object: "model", + Created: 1677649963, + OwnedBy: "openai", + Permission: permission, + Root: "gpt-4-1106-vision-preview", + Parent: nil, + }, { Id: "gpt-4-32k", Object: "model",