Skip to content

feat(openai): add stream-to-nonstream chat handling #4447

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fred913 wants to merge 10 commits into
base: main
Choose a base branch
from
+1,119 −195
Open

feat(openai): add stream-to-nonstream chat handling #4447

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4ee6bee
feat(openai): add stream-to-nonstream chat handling
fred913 Apr 24, 2026
c67ecf7
Merge git+ssh://github.com/fred913/new-api
fred913 Apr 24, 2026
d704da8
Fix stream fallback usage accounting
fred913 Apr 25, 2026
4debfcb
fix(openai): unify responses stream accumulation logic
fred913 Apr 25, 2026
c5288f2
fix openai stream aggregation postprocessing
fred913 Apr 28, 2026
97371f7
fix responses stream usage fallback
fred913 Apr 28, 2026
e89a0ae
Merge remote-tracking branch 'upstream/main'
fred913 Apr 28, 2026
2d8ab75
fix(openai): return error for empty upstream choices
fred913 Apr 28, 2026
597b453
fix: reject empty responses chat streams
fred913 Apr 28, 2026
56361e3
fix: map responses terminal finish reasons
fred913 Apr 28, 2026
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
13 changes: 7 additions & 6 deletions dto/channel_settings.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
package dto

type ChannelSettings struct {
ForceFormat bool `json:"force_format,omitempty"`
ThinkingToContent bool `json:"thinking_to_content,omitempty"`
Proxy string `json:"proxy"`
PassThroughBodyEnabled bool `json:"pass_through_body_enabled,omitempty"`
SystemPrompt string `json:"system_prompt,omitempty"`
SystemPromptOverride bool `json:"system_prompt_override,omitempty"`
ForceFormat bool `json:"force_format,omitempty"`
ThinkingToContent bool `json:"thinking_to_content,omitempty"`
Proxy string `json:"proxy"`
PassThroughBodyEnabled bool `json:"pass_through_body_enabled,omitempty"`
NonStreamUpstreamStream bool `json:"non_stream_upstream_stream,omitempty"`
SystemPrompt string `json:"system_prompt,omitempty"`
SystemPromptOverride bool `json:"system_prompt_override,omitempty"`
}

type VertexKeyType string
Expand Down
6 changes: 5 additions & 1 deletion relay/channel/openai/adaptor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,11 @@ func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, info *relaycom
usage, err = OaiResponsesCompactionHandler(c, resp)
default:
if info.IsStream {
usage, err = OaiStreamHandler(c, info, resp)
if info.UpstreamStreamForNonStream && info.RelayMode == relayconstant.RelayModeChatCompletions {
usage, err = OaiStreamToNonStreamHandler(c, info, resp)
} else {
usage, err = OaiStreamHandler(c, info, resp)
}
} else {
usage, err = OpenaiHandler(c, info, resp)
}
Expand Down
Loading