scriptoriumadmin/Roo-Code
1
0
Fork 0
mirror of https://github.com/RooVetGit/Roo-Code.git synced 2026-08-28 05:27:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 58d5f9daa7 into b867ec9145

Browse source
This commit is contained in:
Deleted user 2026-05-27 10:33:31 +08:00 • committed by GitHub
commit b7112ce6e4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/api/providers/__tests__/openai.spec.ts
View file

@ -635,7 +635,6 @@ describe("OpenAiHandler", () => {
temperature: 0,
tools: undefined,
tool_choice: undefined,
parallel_tool_calls: true,
},
{ path: "/models/chat/completions" },
)
@ -684,7 +683,6 @@ describe("OpenAiHandler", () => {
],
tools: undefined,
tool_choice: undefined,
parallel_tool_calls: true,
},
{ path: "/models/chat/completions" },
)

2
src/api/providers/base-openai-compatible-provider.ts
View file

@ -95,7 +95,7 @@ export abstract class BaseOpenAiCompatibleProvider<ModelName extends string>
stream_options: { include_usage: true },
tools: this.convertToolsForOpenAI(metadata?.tools),
tool_choice: metadata?.tool_choice,
parallel_tool_calls: metadata?.parallelToolCalls ?? true,
...(metadata?.parallelToolCalls === true && { parallel_tool_calls: true }),
}
// Add thinking parameter if reasoning is enabled and model supports it

8
src/api/providers/openai.ts
View file

@ -161,7 +161,7 @@ export class OpenAiHandler extends BaseProvider implements SingleCompletionHandl
...(reasoning && reasoning),
tools: this.convertToolsForOpenAI(metadata?.tools),
tool_choice: metadata?.tool_choice,
parallel_tool_calls: metadata?.parallelToolCalls ?? true,
...(metadata?.parallelToolCalls === true && { parallel_tool_calls: true }),
}
// Add max_tokens if needed
@ -229,7 +229,7 @@ export class OpenAiHandler extends BaseProvider implements SingleCompletionHandl
// Tools are always present (minimum ALWAYS_AVAILABLE_TOOLS)
tools: this.convertToolsForOpenAI(metadata?.tools),
tool_choice: metadata?.tool_choice,
parallel_tool_calls: metadata?.parallelToolCalls ?? true,
...(metadata?.parallelToolCalls === true && { parallel_tool_calls: true }),
}
// Add max_tokens if needed
@ -354,7 +354,7 @@ export class OpenAiHandler extends BaseProvider implements SingleCompletionHandl
// Tools are always present (minimum ALWAYS_AVAILABLE_TOOLS)
tools: this.convertToolsForOpenAI(metadata?.tools),
tool_choice: metadata?.tool_choice,
parallel_tool_calls: metadata?.parallelToolCalls ?? true,
...(metadata?.parallelToolCalls === true && { parallel_tool_calls: true }),
}
// O3 family models do not support the deprecated max_tokens parameter
@ -388,7 +388,7 @@ export class OpenAiHandler extends BaseProvider implements SingleCompletionHandl
// Tools are always present (minimum ALWAYS_AVAILABLE_TOOLS)
tools: this.convertToolsForOpenAI(metadata?.tools),
tool_choice: metadata?.tool_choice,
parallel_tool_calls: metadata?.parallelToolCalls ?? true,
...(metadata?.parallelToolCalls === true && { parallel_tool_calls: true }),
}
// O3 family models do not support the deprecated max_tokens parameter