From 585674dbf77aa8fc521aa0bf467acf6f51e1adbe Mon Sep 17 00:00:00 2001 From: sijinhui Date: Fri, 21 Feb 2025 22:11:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=9D=E8=AF=95=E4=BC=98=E5=8C=96=E7=8E=B0?= =?UTF-8?q?=E6=9C=89=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91=EF=BC=8C=E5=B9=B6?= =?UTF-8?q?=E9=80=82=E9=85=8D=E5=A4=84=E7=90=86=E5=A4=9A=E4=B8=AA=E7=A9=BA?= =?UTF-8?q?=E6=A0=BC=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- relay/adaptor/openai/main.go | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/relay/adaptor/openai/main.go b/relay/adaptor/openai/main.go index 1fb52c53..793b481a 100644 --- a/relay/adaptor/openai/main.go +++ b/relay/adaptor/openai/main.go @@ -35,23 +35,20 @@ func StreamHandler(c *gin.Context, resp *http.Response, relayMode int) (*model.E doneRendered := false for scanner.Scan() { data := scanner.Text() - // 确保前缀是 "data: {"(冒号后有空格) - if strings.HasPrefix(data, "data:{") { // 检测无空格的情况 - // 替换整个前缀 - data = "data: {" + strings.TrimPrefix(data, "data:{") - } - if len(data) < dataPrefixLength { // ignore blank line or wrong format continue } - if data[:dataPrefixLength] != dataPrefix && data[:dataPrefixLength] != done { - continue - } - if strings.HasPrefix(data[dataPrefixLength:], done) { - render.StringData(c, data) - doneRendered = true - continue - } + if data[:dataPrefixLength] != dataPrefix { + if strings.HasPrefix(data, done) { + render.StringData(c, data) + doneRendered = true + continue + } + continue + } else { + // 这里处理标准的data:开头,标准化为 data: + 单空格格式 + data = dataPrefix + " " + strings.TrimLeft(data[len(dataPrefix):], " ") + } switch relayMode { case relaymode.ChatCompletions: var streamResponse ChatCompletionsStreamResponse