github/openclaw
1
1
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-02-19 18:39:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

refactor(models): dedupe fallback key parsing

Browse Source
This commit is contained in:
Peter Steinberger
2026-02-15 16:24:30 +00:00
parent 9203a2fdb1
commit d4c7b0505f
3 changed files with 24 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/commands/models/fallbacks.ts
View File

@@ -7,6 +7,7 @@ import {
ensureFlagCompatibility,
modelKey,
resolveModelTarget,
resolveModelKeysFromEntries,
updateConfig,
} from "./shared.js";
@@ -47,21 +48,8 @@ export async function modelsFallbacksAddCommand(modelRaw: string, runtime: Runti
if (!nextModels[targetKey]) {
nextModels[targetKey] = {};
}
const aliasIndex = buildModelAliasIndex({
cfg,
defaultProvider: DEFAULT_PROVIDER,
});
const existing = cfg.agents?.defaults?.model?.fallbacks ?? [];
const existingKeys = existing
.map((entry) =>
resolveModelRefFromString({
raw: String(entry ?? ""),
defaultProvider: DEFAULT_PROVIDER,
aliasIndex,
}),
)
.filter((entry): entry is NonNullable<typeof entry> => Boolean(entry))
.map((entry) => modelKey(entry.ref.provider, entry.ref.model));
const existingKeys = resolveModelKeysFromEntries({ cfg, entries: existing });
if (existingKeys.includes(targetKey)) {
return cfg;

16
src/commands/models/image-fallbacks.ts
View File

@@ -7,6 +7,7 @@ import {
ensureFlagCompatibility,
modelKey,
resolveModelTarget,
resolveModelKeysFromEntries,
updateConfig,
} from "./shared.js";
@@ -47,21 +48,8 @@ export async function modelsImageFallbacksAddCommand(modelRaw: string, runtime:
if (!nextModels[targetKey]) {
nextModels[targetKey] = {};
}
const aliasIndex = buildModelAliasIndex({
cfg,
defaultProvider: DEFAULT_PROVIDER,
});
const existing = cfg.agents?.defaults?.imageModel?.fallbacks ?? [];
const existingKeys = existing
.map((entry) =>
resolveModelRefFromString({
raw: String(entry ?? ""),
defaultProvider: DEFAULT_PROVIDER,
aliasIndex,
}),
)
.filter((entry): entry is NonNullable<typeof entry> => Boolean(entry))
.map((entry) => modelKey(entry.ref.provider, entry.ref.model));
const existingKeys = resolveModelKeysFromEntries({ cfg, entries: existing });
if (existingKeys.includes(targetKey)) {
return cfg;

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

@@ -91,6 +91,26 @@ export function resolveModelTarget(params: { raw: string; cfg: OpenClawConfig })
return resolved.ref;
}
export function resolveModelKeysFromEntries(params: {
cfg: OpenClawConfig;
entries: readonly unknown[];
}): string[] {
const aliasIndex = buildModelAliasIndex({
cfg: params.cfg,
defaultProvider: DEFAULT_PROVIDER,
});
return params.entries
.map((entry) =>
resolveModelRefFromString({
raw: String(entry ?? ""),
defaultProvider: DEFAULT_PROVIDER,
aliasIndex,
}),
)
.filter((entry): entry is NonNullable<typeof entry> => Boolean(entry))
.map((entry) => modelKey(entry.ref.provider, entry.ref.model));
}
export function buildAllowlistSet(cfg: OpenClawConfig): Set<string> {
const allowed = new Set<string>();
const models = cfg.agents?.defaults?.models ?? {};