Skip to content

Commit 1ba0150

Browse files
roomote[bot]roomotedaniel-lxs
authored
fix: use system role for OpenAI Compatible provider when streaming is disabled (#8216)
Co-authored-by: Roo Code <[email protected]> Co-authored-by: daniel-lxs <[email protected]>
1 parent eedc264 commit 1ba0150

File tree

2 files changed

+6
-12
lines changed

2 files changed

+6
-12
lines changed

src/api/providers/__tests__/openai.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ describe("OpenAiHandler", () => {
494494
{
495495
model: azureOptions.openAiModelId,
496496
messages: [
497-
{ role: "user", content: systemPrompt },
497+
{ role: "system", content: systemPrompt },
498498
{ role: "user", content: "Hello!" },
499499
],
500500
},

src/api/providers/openai.ts

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,12 @@ export class OpenAiHandler extends BaseProvider implements SingleCompletionHandl
9999
return
100100
}
101101

102-
if (this.options.openAiStreamingEnabled ?? true) {
103-
let systemMessage: OpenAI.Chat.ChatCompletionSystemMessageParam = {
104-
role: "system",
105-
content: systemPrompt,
106-
}
102+
let systemMessage: OpenAI.Chat.ChatCompletionSystemMessageParam = {
103+
role: "system",
104+
content: systemPrompt,
105+
}
107106

107+
if (this.options.openAiStreamingEnabled ?? true) {
108108
let convertedMessages
109109

110110
if (deepseekReasoner) {
@@ -218,12 +218,6 @@ export class OpenAiHandler extends BaseProvider implements SingleCompletionHandl
218218
yield this.processUsageMetrics(lastUsage, modelInfo)
219219
}
220220
} else {
221-
// o1 for instance doesnt support streaming, non-1 temp, or system prompt
222-
const systemMessage: OpenAI.Chat.ChatCompletionUserMessageParam = {
223-
role: "user",
224-
content: systemPrompt,
225-
}
226-
227221
const requestOptions: OpenAI.Chat.Completions.ChatCompletionCreateParamsNonStreaming = {
228222
model: modelId,
229223
messages: deepseekReasoner

0 commit comments

Comments
 (0)