Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions bridge_integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -871,10 +871,25 @@ func TestErrorHandling(t *testing.T) {
return aibridge.NewRequestBridge(t.Context(), []aibridge.Provider{aibridge.NewOpenAIProvider(cfg(addr, apiKey))}, logger, client, srvProxyMgr)
},
responseHandlerFn: func(streaming bool, resp *http.Response) {
body, err := io.ReadAll(resp.Body)
require.NoError(t, err)
if streaming {
// Server responds first with 200 OK then starts streaming.
require.Equal(t, http.StatusOK, resp.StatusCode)

t.Log(body)
sp := aibridge.NewSSEParser()
require.NoError(t, sp.Parse(resp.Body))
// OpenAI sends all events under the same type.
messageEvents := sp.MessageEvents()
require.NotEmpty(t, messageEvents)

errEvent := sp.MessageEvents()[len(sp.MessageEvents())-2] // Last event is termination marker ("[DONE]").
require.NotEmpty(t, errEvent)
require.Contains(t, errEvent.Data, "The server had an error while processing your request. Sorry about that!")
} else {
require.Equal(t, resp.StatusCode, http.StatusInternalServerError)
body, err := io.ReadAll(resp.Body)
require.NoError(t, err)
require.Contains(t, string(body), "The server had an error while processing your request. Sorry about that")
}
},
},
}
Expand Down
2 changes: 1 addition & 1 deletion intercept_openai_chat_streaming.go
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ func (i *OpenAIStreamingChatInterception) ProcessRequest(w http.ResponseWriter,
// We can't reflect an error back if there's a connection error or the request context was canceled.
} else if oaiErr := getOpenAIErrorResponse(streamErr); oaiErr != nil {
logger.Warn(ctx, "openai stream error", slog.Error(streamErr))
interceptionErr = fmt.Errorf("stream error: %w", oaiErr)
interceptionErr = oaiErr
} else {
logger.Warn(ctx, "unknown error", slog.Error(streamErr))
// Unfortunately, the OpenAI SDK does not support parsing errors received in the stream
Expand Down