mirror of
https://github.com/RooVetGit/Roo-Code.git
synced 2026-09-05 08:10:14 +00:00
Merge e6713b07ca into 7adbfec2a4
This commit is contained in:
commit
6e5415ed82
4 changed files with 16 additions and 4 deletions
|
|
@ -632,7 +632,7 @@ describe("OpenAiHandler", () => {
|
|||
],
|
||||
stream: true,
|
||||
stream_options: { include_usage: true },
|
||||
temperature: 0,
|
||||
temperature: undefined,
|
||||
tools: undefined,
|
||||
tool_choice: undefined,
|
||||
parallel_tool_calls: true,
|
||||
|
|
|
|||
|
|
@ -154,7 +154,8 @@ export class OpenAiHandler extends BaseProvider implements SingleCompletionHandl
|
|||
|
||||
const requestOptions: OpenAI.Chat.Completions.ChatCompletionCreateParamsStreaming = {
|
||||
model: modelId,
|
||||
temperature: this.options.modelTemperature ?? (deepseekReasoner ? DEEP_SEEK_DEFAULT_TEMPERATURE : 0),
|
||||
temperature:
|
||||
this.options.modelTemperature ?? (deepseekReasoner ? DEEP_SEEK_DEFAULT_TEMPERATURE : undefined),
|
||||
messages: convertedMessages,
|
||||
stream: true as const,
|
||||
...(isGrokXAI ? {} : { stream_options: { include_usage: true } }),
|
||||
|
|
@ -287,7 +288,7 @@ export class OpenAiHandler extends BaseProvider implements SingleCompletionHandl
|
|||
modelId: id,
|
||||
model: info,
|
||||
settings: this.options,
|
||||
defaultTemperature: 0,
|
||||
defaultTemperature: undefined,
|
||||
})
|
||||
return { id, info, ...params }
|
||||
}
|
||||
|
|
|
|||
|
|
@ -123,6 +123,17 @@ describe("getModelParams", () => {
|
|||
expect(result.temperature).toBe(0.3)
|
||||
})
|
||||
|
||||
it("should return undefined temperature when defaultTemperature is undefined and no user/model temperature", () => {
|
||||
const result = getModelParams({
|
||||
...openaiParams,
|
||||
settings: {},
|
||||
model: baseModel,
|
||||
defaultTemperature: undefined,
|
||||
})
|
||||
|
||||
expect(result.temperature).toBeUndefined()
|
||||
})
|
||||
|
||||
it("should use model maxTokens when available", () => {
|
||||
const model: ModelInfo = {
|
||||
...baseModel,
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ type GetModelParamsOptions<T extends Format> = {
|
|||
modelId: string
|
||||
model: ModelInfo
|
||||
settings: ProviderSettings
|
||||
defaultTemperature: number
|
||||
defaultTemperature: number | undefined
|
||||
}
|
||||
|
||||
type BaseModelParams = {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue