Skip to content

fix: use system role for OpenAI Compatible provider when streaming is disabled #8216

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

Merged
mrubens merged 5 commits into from
Nov 6, 2025
Merged

fix: use system role for OpenAI Compatible provider when streaming is disabled #8216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7bfafe3
fix: use system role for OpenAI Compatible provider when streaming is…
roomote Sep 22, 2025
9d154de
docs(openai): clarify non-streaming path comment and rationale for sy…
roomote Oct 20, 2025
74164ee
Remove redundant inline comment in non-streaming branch
daniel-lxs Oct 21, 2025
05f9afd
Remove unnecessary comment block in non-streaming branch
daniel-lxs Oct 21, 2025
795f0e9
refactor: reorder system message creation for clarity in OpenAiHandler
daniel-lxs Oct 21, 2025
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
2 changes: 1 addition & 1 deletion src/api/providers/__tests__/openai.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ describe("OpenAiHandler", () => {
{
model: azureOptions.openAiModelId,
messages: [
{ role: "user", content: systemPrompt },
{ role: "system", content: systemPrompt },
{ role: "user", content: "Hello!" },
],
},
Expand Down
16 changes: 5 additions & 11 deletions src/api/providers/openai.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,12 @@ export class OpenAiHandler extends BaseProvider implements SingleCompletionHandl
return
}

if (this.options.openAiStreamingEnabled ?? true) {
let systemMessage: OpenAI.Chat.ChatCompletionSystemMessageParam = {
role: "system",
content: systemPrompt,
}
let systemMessage: OpenAI.Chat.ChatCompletionSystemMessageParam = {
role: "system",
content: systemPrompt,
}

if (this.options.openAiStreamingEnabled ?? true) {
let convertedMessages

if (deepseekReasoner) {
Expand Down Expand Up @@ -218,12 +218,6 @@ export class OpenAiHandler extends BaseProvider implements SingleCompletionHandl
yield this.processUsageMetrics(lastUsage, modelInfo)
}
} else {
// o1 for instance doesnt support streaming, non-1 temp, or system prompt
const systemMessage: OpenAI.Chat.ChatCompletionUserMessageParam = {
role: "user",
content: systemPrompt,
}

const requestOptions: OpenAI.Chat.Completions.ChatCompletionCreateParamsNonStreaming = {
model: modelId,
messages: deepseekReasoner
Expand Down
Loading