From b58838ce90679709bd93bbb0445c1eacdf661f67 Mon Sep 17 00:00:00 2001 From: JustSong Date: Sat, 12 Aug 2023 11:03:47 +0800 Subject: [PATCH] refactor: use a global stop finish reason --- controller/relay-baidu.go | 3 +-- controller/relay-palm.go | 3 +-- controller/relay-utils.go | 2 ++ controller/relay-xunfei.go | 3 +-- controller/relay-zhipu.go | 3 +-- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/controller/relay-baidu.go b/controller/relay-baidu.go index afb5f300..664bbd11 100644 --- a/controller/relay-baidu.go +++ b/controller/relay-baidu.go @@ -121,8 +121,7 @@ func streamResponseBaidu2OpenAI(baiduResponse *BaiduChatStreamResponse) *ChatCom var choice ChatCompletionsStreamResponseChoice choice.Delta.Content = baiduResponse.Result if baiduResponse.IsEnd { - finishReason := "stop" - choice.FinishReason = &finishReason + choice.FinishReason = &stopFinishReason } response := ChatCompletionsStreamResponse{ Id: baiduResponse.Id, diff --git a/controller/relay-palm.go b/controller/relay-palm.go index eeee4002..0053c9b8 100644 --- a/controller/relay-palm.go +++ b/controller/relay-palm.go @@ -94,8 +94,7 @@ func streamResponsePaLM2OpenAI(palmResponse *PaLMChatResponse) *ChatCompletionsS if len(palmResponse.Candidates) > 0 { choice.Delta.Content = palmResponse.Candidates[0].Content } - finishReason := "stop" - choice.FinishReason = &finishReason + choice.FinishReason = &stopFinishReason var response ChatCompletionsStreamResponse response.Object = "chat.completion.chunk" response.Model = "palm2" diff --git a/controller/relay-utils.go b/controller/relay-utils.go index 2133d8be..3695e119 100644 --- a/controller/relay-utils.go +++ b/controller/relay-utils.go @@ -6,6 +6,8 @@ import ( "one-api/common" ) +var stopFinishReason = "stop" + var tokenEncoderMap = map[string]*tiktoken.Tiktoken{} func getTokenEncoder(model string) *tiktoken.Tiktoken { diff --git a/controller/relay-xunfei.go b/controller/relay-xunfei.go index 8e31b7fd..48472456 100644 --- a/controller/relay-xunfei.go +++ b/controller/relay-xunfei.go @@ -139,8 +139,7 @@ func streamResponseXunfei2OpenAI(xunfeiResponse *XunfeiChatResponse) *ChatComple var choice ChatCompletionsStreamResponseChoice choice.Delta.Content = xunfeiResponse.Payload.Choices.Text[0].Content if xunfeiResponse.Payload.Choices.Status == 2 { - finishReason := "stop" - choice.FinishReason = &finishReason + choice.FinishReason = &stopFinishReason } response := ChatCompletionsStreamResponse{ Object: "chat.completion.chunk", diff --git a/controller/relay-zhipu.go b/controller/relay-zhipu.go index 85cc4e71..b125f1e7 100644 --- a/controller/relay-zhipu.go +++ b/controller/relay-zhipu.go @@ -175,8 +175,7 @@ func streamResponseZhipu2OpenAI(zhipuResponse string) *ChatCompletionsStreamResp func streamMetaResponseZhipu2OpenAI(zhipuResponse *ZhipuStreamMetaResponse) (*ChatCompletionsStreamResponse, *Usage) { var choice ChatCompletionsStreamResponseChoice choice.Delta.Content = "" - finishReason := "stop" - choice.FinishReason = &finishReason + choice.FinishReason = &stopFinishReason response := ChatCompletionsStreamResponse{ Id: zhipuResponse.RequestId, Object: "chat.completion.chunk",