refactor(models): dedupe set default model updates
This commit is contained in:
@@ -1,34 +1,10 @@
|
||||
import type { RuntimeEnv } from "../../runtime.js";
|
||||
import { logConfigUpdated } from "../../config/logging.js";
|
||||
import {
|
||||
mergePrimaryFallbackConfig,
|
||||
type PrimaryFallbackConfig,
|
||||
resolveModelTarget,
|
||||
updateConfig,
|
||||
} from "./shared.js";
|
||||
import { applyDefaultModelPrimaryUpdate, updateConfig } from "./shared.js";
|
||||
|
||||
export async function modelsSetImageCommand(modelRaw: string, runtime: RuntimeEnv) {
|
||||
const updated = await updateConfig((cfg) => {
|
||||
const resolved = resolveModelTarget({ raw: modelRaw, cfg });
|
||||
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,
|
||||
},
|
||||
},
|
||||
};
|
||||
return applyDefaultModelPrimaryUpdate({ cfg, modelRaw, field: "imageModel" });
|
||||
});
|
||||
|
||||
logConfigUpdated(runtime);
|
||||
|
||||
@@ -1,34 +1,10 @@
|
||||
import type { RuntimeEnv } from "../../runtime.js";
|
||||
import { logConfigUpdated } from "../../config/logging.js";
|
||||
import {
|
||||
mergePrimaryFallbackConfig,
|
||||
type PrimaryFallbackConfig,
|
||||
resolveModelTarget,
|
||||
updateConfig,
|
||||
} from "./shared.js";
|
||||
import { applyDefaultModelPrimaryUpdate, updateConfig } from "./shared.js";
|
||||
|
||||
export async function modelsSetCommand(modelRaw: string, runtime: RuntimeEnv) {
|
||||
const updated = await updateConfig((cfg) => {
|
||||
const resolved = resolveModelTarget({ raw: modelRaw, cfg });
|
||||
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,
|
||||
},
|
||||
},
|
||||
};
|
||||
return applyDefaultModelPrimaryUpdate({ cfg, modelRaw, field: "model" });
|
||||
});
|
||||
|
||||
logConfigUpdated(runtime);
|
||||
|
||||
@@ -169,6 +169,37 @@ export function mergePrimaryFallbackConfig(
|
||||
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 { DEFAULT_MODEL, DEFAULT_PROVIDER };
|
||||
|
||||
|
||||
Reference in New Issue
Block a user