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

fix: json issue

Browse Source
This commit is contained in:
ckt1031 2023-08-20 01:24:59 +08:00
parent 9d15776712
commit d5dfacd8a6
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
controller/channel-test.go
View File

@ -111,18 +111,17 @@ func testChannel(channel *model.Channel, request ChatRequest) (error, *OpenAIErr
if !strings.HasPrefix(data, "data:") { if !strings.HasPrefix(data, "data:") {
continue continue
} }
data = data[6:] data = strings.TrimPrefix(data, "data:")
if !strings.HasPrefix(data, "[DONE]") { if !strings.HasPrefix(data, "[DONE]") {
var streamResponse ChatCompletionsStreamResponse var streamResponse ChatCompletionsStreamResponse
err := json.Unmarshal([]byte(data), &streamResponse) err := json.Unmarshal([]byte(data), &streamResponse)
if err != nil { if err == nil {
return err, nil
}
for _, choice := range streamResponse.Choices { for _, choice := range streamResponse.Choices {
responseText += choice.Delta.Content responseText += choice.Delta.Content
} }
} }
} }
}
if responseText == "" { if responseText == "" {
return errors.New("Empty response"), nil return errors.New("Empty response"), nil

9
controller/relay-openai.go
View File

@ -57,19 +57,18 @@ func openaiStreamHandler(c *gin.Context, resp *http.Response, relayMode int) (*O
} }
} }
dataChan <- data dataChan <- data
data = data[6:] data = strings.TrimPrefix(data, "data:")
if !strings.HasPrefix(data, "[DONE]") { if !strings.HasPrefix(data, "[DONE]") {
switch relayMode { switch relayMode {
case RelayModeChatCompletions: case RelayModeChatCompletions:
var streamResponse ChatCompletionsStreamResponse var streamResponse ChatCompletionsStreamResponse
err := json.Unmarshal([]byte(data), &streamResponse) err := json.Unmarshal([]byte(data), &streamResponse)
if err != nil { if err == nil {
common.SysError("error unmarshalling stream response: " + err.Error())
continue // just ignore the error
}
for _, choice := range streamResponse.Choices { for _, choice := range streamResponse.Choices {
responseText += choice.Delta.Content responseText += choice.Delta.Content
} }
continue // just ignore the error
}
case RelayModeCompletions: case RelayModeCompletions:
var streamResponse CompletionsStreamResponse var streamResponse CompletionsStreamResponse
err := json.Unmarshal([]byte(data), &streamResponse) err := json.Unmarshal([]byte(data), &streamResponse)