-
Notifications
You must be signed in to change notification settings - Fork 275
fix(openai): preserve reasoning for local OpenAI-compatible models via R1 toggle #1119
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.
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
base: main
Are you sure you want to change the base?
Changes from all commits
beef72e
f4a69cc
60b1b45
de3725b
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1081,6 +1081,20 @@ describe("OpenAiHandler", () => { | |
| expect(model.id).toBe("") | ||
| expect(model.info).toBeDefined() | ||
| }) | ||
|
|
||
| it("should set preserveReasoning when openAiR1FormatEnabled is on", () => { | ||
| const r1Handler = new OpenAiHandler({ | ||
| ...mockOptions, | ||
| openAiR1FormatEnabled: true, | ||
| }) | ||
| const model = r1Handler.getModel() | ||
| expect(model.info).toEqual({ ...openAiModelInfoSaneDefaults, preserveReasoning: true }) | ||
| }) | ||
|
|
||
| it("should not set preserveReasoning by default", () => { | ||
| const model = handler.getModel() | ||
| expect(model.info.preserveReasoning).toBeUndefined() | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This pins the flag, but the consumer it feeds — |
||
| }) | ||
| }) | ||
|
|
||
| describe("Azure AI Inference Service", () => { | ||
|
|
||
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -303,7 +303,15 @@ export class OpenAiHandler extends BaseProvider implements SingleCompletionHandl | |||||
| settings: { ...this.options, reasoningEffort: info.reasoningEffort }, | ||||||
| defaultTemperature: 0, | ||||||
| }) | ||||||
| return { id, info, ...params } | ||||||
| // Local OpenAI-compatible reasoning models (llama.cpp, LM Studio, Ollama) | ||||||
| // stream reasoning_content, but Roo strips it from the follow-up context | ||||||
| // unless info.preserveReasoning is set. When the user enables the R1 format | ||||||
| // toggle, treat the model as preserving reasoning so the chain is fed back. | ||||||
| return { | ||||||
| id, | ||||||
| info: this.options.openAiR1FormatEnabled ? { ...info, preserveReasoning: true } : info, | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This forces
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Line 95 derives the R1 path from
Suggested change
( |
||||||
| ...params, | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| async completePrompt(prompt: string, options?: CompletePromptOptions): Promise<string> { | ||||||
|
|
||||||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Both new tests leave
openAiCustomModelInfounset, soinfois value-identical to the defaults here — the{ ...info }merge only gets exercised on the defaults path. A case combining custom model info (e.g. a distinctcontextWindow) with the toggle would pin the merge for the llama.cpp / LM Studio / Ollama setups this PR targets. Worth adding?