Fix a subtle bug: modelDefault doesn’t apply when provider === "auto"
1.Fix bugs when provider === "auto" which can lead model end up get "" 2. Fix to only include remote if you actually have any remote fields. (Is this intentional?)
This commit is contained in:
parent
3b0c80ce24
commit
61136871eb
@ -121,7 +121,9 @@ function mergeConfig(
|
|||||||
const overrideRemote = overrides?.remote;
|
const overrideRemote = overrides?.remote;
|
||||||
const hasRemote = Boolean(defaultRemote || overrideRemote);
|
const hasRemote = Boolean(defaultRemote || overrideRemote);
|
||||||
const includeRemote =
|
const includeRemote =
|
||||||
hasRemote || provider === "openai" || provider === "gemini" || provider === "auto";
|
Boolean(overrideRemote?.baseUrl || overrideRemote?.apiKey || overrideRemote?.headers ||
|
||||||
|
defaultRemote?.baseUrl || defaultRemote?.apiKey || defaultRemote?.headers) ||
|
||||||
|
provider === "openai" || provider === "gemini" || provider === "auto";
|
||||||
const batch = {
|
const batch = {
|
||||||
enabled: overrideRemote?.batch?.enabled ?? defaultRemote?.batch?.enabled ?? true,
|
enabled: overrideRemote?.batch?.enabled ?? defaultRemote?.batch?.enabled ?? true,
|
||||||
wait: overrideRemote?.batch?.wait ?? defaultRemote?.batch?.wait ?? true,
|
wait: overrideRemote?.batch?.wait ?? defaultRemote?.batch?.wait ?? true,
|
||||||
@ -146,7 +148,7 @@ function mergeConfig(
|
|||||||
const modelDefault =
|
const modelDefault =
|
||||||
provider === "gemini"
|
provider === "gemini"
|
||||||
? DEFAULT_GEMINI_MODEL
|
? DEFAULT_GEMINI_MODEL
|
||||||
: provider === "openai"
|
: provider === "openai" || provider === "auto"
|
||||||
? DEFAULT_OPENAI_MODEL
|
? DEFAULT_OPENAI_MODEL
|
||||||
: undefined;
|
: undefined;
|
||||||
const model = overrides?.model ?? defaults?.model ?? modelDefault ?? "";
|
const model = overrides?.model ?? defaults?.model ?? modelDefault ?? "";
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user