github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-09 00:48:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(models): dedupe set default model updates

Browse Source
This commit is contained in:
Peter Steinberger
2026-02-16 00:43:15 +00:00
parent dece9e8b07
commit cb46ea037f
3 changed files with 35 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/commands/models/set-image.ts
View File

@@ -1,34 +1,10 @@
import type { RuntimeEnv } from "../../runtime.js"; import type { RuntimeEnv } from "../../runtime.js";
import { logConfigUpdated } from "../../config/logging.js"; import { logConfigUpdated } from "../../config/logging.js";
import { import { applyDefaultModelPrimaryUpdate, updateConfig } from "./shared.js";
mergePrimaryFallbackConfig,
type PrimaryFallbackConfig,
resolveModelTarget,
updateConfig,
} from "./shared.js";
export async function modelsSetImageCommand(modelRaw: string, runtime: RuntimeEnv) { export async function modelsSetImageCommand(modelRaw: string, runtime: RuntimeEnv) {
const updated = await updateConfig((cfg) => { const updated = await updateConfig((cfg) => {
const resolved = resolveModelTarget({ raw: modelRaw, cfg }); return applyDefaultModelPrimaryUpdate({ cfg, modelRaw, field: "imageModel" });
const key = `${resolved.provider}/${resolved.model}`;
const nextModels = { ...cfg.agents?.defaults?.models };
if (!nextModels[key]) {
nextModels[key] = {};
}
return {
...cfg,
agents: {
...cfg.agents,
defaults: {
...cfg.agents?.defaults,
imageModel: mergePrimaryFallbackConfig(
cfg.agents?.defaults?.imageModel as unknown as PrimaryFallbackConfig | undefined,
{ primary: key },
),
models: nextModels,
},
},
};
}); });
logConfigUpdated(runtime); logConfigUpdated(runtime);

28
src/commands/models/set.ts
View File

@@ -1,34 +1,10 @@
import type { RuntimeEnv } from "../../runtime.js"; import type { RuntimeEnv } from "../../runtime.js";
import { logConfigUpdated } from "../../config/logging.js"; import { logConfigUpdated } from "../../config/logging.js";
import { import { applyDefaultModelPrimaryUpdate, updateConfig } from "./shared.js";
mergePrimaryFallbackConfig,
type PrimaryFallbackConfig,
resolveModelTarget,
updateConfig,
} from "./shared.js";
export async function modelsSetCommand(modelRaw: string, runtime: RuntimeEnv) { export async function modelsSetCommand(modelRaw: string, runtime: RuntimeEnv) {
const updated = await updateConfig((cfg) => { const updated = await updateConfig((cfg) => {
const resolved = resolveModelTarget({ raw: modelRaw, cfg }); return applyDefaultModelPrimaryUpdate({ cfg, modelRaw, field: "model" });
const key = `${resolved.provider}/${resolved.model}`;
const nextModels = { ...cfg.agents?.defaults?.models };
if (!nextModels[key]) {
nextModels[key] = {};
}
return {
...cfg,
agents: {
...cfg.agents,
defaults: {
...cfg.agents?.defaults,
model: mergePrimaryFallbackConfig(
cfg.agents?.defaults?.model as unknown as PrimaryFallbackConfig | undefined,
{ primary: key },
),
models: nextModels,
},
},
};
}); });
logConfigUpdated(runtime); logConfigUpdated(runtime);

31
src/commands/models/shared.ts
View File

@@ -169,6 +169,37 @@ export function mergePrimaryFallbackConfig(
return next; return next;
} }
export function applyDefaultModelPrimaryUpdate(params: {
cfg: OpenClawConfig;
modelRaw: string;
field: "model" | "imageModel";
}): OpenClawConfig {
const resolved = resolveModelTarget({ raw: params.modelRaw, cfg: params.cfg });
const key = `${resolved.provider}/${resolved.model}`;
const nextModels = { ...params.cfg.agents?.defaults?.models };
if (!nextModels[key]) {
nextModels[key] = {};
}
const defaults = params.cfg.agents?.defaults ?? {};
const existing = (defaults as Record<string, unknown>)[params.field] as
| PrimaryFallbackConfig
| undefined;
return {
...params.cfg,
agents: {
...params.cfg.agents,
defaults: {
...defaults,
[params.field]: mergePrimaryFallbackConfig(existing, { primary: key }),
models: nextModels,
},
},
};
}
export { modelKey }; export { modelKey };
export { DEFAULT_MODEL, DEFAULT_PROVIDER }; export { DEFAULT_MODEL, DEFAULT_PROVIDER };