From 73a928f970a7f25f13f2fe3ce6da12d324fea015 Mon Sep 17 00:00:00 2001 From: "Laisky.Cai" Date: Sun, 5 Jan 2025 02:42:37 +0000 Subject: [PATCH] fix: update comments for o1 model handling --- relay/adaptor/openai/adaptor.go | 4 ++-- relay/billing/ratio/model.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/relay/adaptor/openai/adaptor.go b/relay/adaptor/openai/adaptor.go index a1b24321..3e8c6085 100644 --- a/relay/adaptor/openai/adaptor.go +++ b/relay/adaptor/openai/adaptor.go @@ -85,8 +85,8 @@ func (a *Adaptor) ConvertRequest(c *gin.Context, relayMode int, request *model.G request.StreamOptions.IncludeUsage = true } - // o1 do not support system prompt and max_tokens - if strings.HasPrefix(request.Model, "o1-mini") || strings.HasPrefix(request.Model, "o1-preview") { + // o1/o1-mini/o1-preview do not support system prompt and max_tokens + if strings.HasPrefix(request.Model, "o1") { request.MaxTokens = 0 request.Messages = func(raw []model.Message) (filtered []model.Message) { for i := range raw { diff --git a/relay/billing/ratio/model.go b/relay/billing/ratio/model.go index 125dbb9a..a8587ba4 100644 --- a/relay/billing/ratio/model.go +++ b/relay/billing/ratio/model.go @@ -467,7 +467,7 @@ func GetCompletionRatio(name string, channelType int) float64 { } return 2 } - // including o1, o1-preview, o1-mini + // including o1/o1-preview/o1-mini if strings.HasPrefix(name, "o1") { return 4 }