Ecosystem/ai-gateway
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'songquanpeng:main' into main

Browse Source
This commit is contained in:
Miniers 2023-08-02 09:27:41 +08:00 committed by GitHub
commit 8a887cbfee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
controller/relay-zhipu.go
View File

@ -194,8 +194,8 @@ func zhipuStreamHandler(c *gin.Context, resp *http.Response) (*OpenAIErrorWithSt
if atEOF && len(data) == 0 { if atEOF && len(data) == 0 {
return 0, nil, nil return 0, nil, nil
} }
if i := strings.Index(string(data), "\n"); i >= 0 { if i := strings.Index(string(data), "\n\n"); i >= 0 && strings.Index(string(data), ":") >= 0 {
return i + 1, data[0:i], nil return i + 2, data[0:i], nil
} }
if atEOF { if atEOF {
return len(data), data, nil return len(data), data, nil
@ -208,14 +208,19 @@ func zhipuStreamHandler(c *gin.Context, resp *http.Response) (*OpenAIErrorWithSt
go func() { go func() {
for scanner.Scan() { for scanner.Scan() {
data := scanner.Text() data := scanner.Text()
data = strings.Trim(data, "\"") lines := strings.Split(data, "\n")
if len(data) < 5 { // ignore blank line or wrong format for i, line := range lines {
if len(line) < 5 {
continue continue
} }
if data[:5] == "data:" { if line[:5] == "data:" {
dataChan <- data[5:] dataChan <- line[5:]
} else if data[:5] == "meta:" { if i != len(lines)-1 {
metaChan <- data[5:] dataChan <- "\n"
}
} else if line[:5] == "meta:" {
metaChan <- line[5:]
}
} }
} }
stopChan <- true stopChan <- true