vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-04-17 04:01:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: remove redundant model selection conversions

Browse Source
This commit is contained in:
Peter Steinberger
2026-04-10 21:59:55 +01:00
parent afff0716f7
commit a8bb0ab255
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/agents/model-selection.ts
View File

@@ -275,7 +275,7 @@ export function buildConfiguredAllowlistKeys(params: {
const keys = new Set<string>();
for (const raw of rawAllowlist) {
const key = resolveAllowlistModelKey(String(raw ?? ""), params.defaultProvider);
const key = resolveAllowlistModelKey(raw, params.defaultProvider);
if (key) {
keys.add(key);
}
@@ -293,15 +293,14 @@ export function buildModelAliasIndex(params: {
const rawModels = params.cfg.agents?.defaults?.models ?? {};
for (const [keyRaw, entryRaw] of Object.entries(rawModels)) {
const parsed = parseModelRef(String(keyRaw ?? ""), params.defaultProvider, {
const parsed = parseModelRef(keyRaw, params.defaultProvider, {
allowPluginNormalization: params.allowPluginNormalization,
});
if (!parsed) {
continue;
}
const alias =
normalizeOptionalString(String((entryRaw as { alias?: string } | undefined)?.alias ?? "")) ??
"";
normalizeOptionalString((entryRaw as { alias?: string } | undefined)?.alias) ?? "";
if (!alias) {
continue;
}
@@ -333,11 +332,11 @@ function buildModelCatalogMetadata(params: {
const aliasByKey = new Map<string, string>();
const configuredModels = params.cfg.agents?.defaults?.models ?? {};
for (const [rawKey, entryRaw] of Object.entries(configuredModels)) {
const key = resolveAllowlistModelKey(String(rawKey ?? ""), params.defaultProvider);
const key = resolveAllowlistModelKey(rawKey, params.defaultProvider);
if (!key) {
continue;
}
const alias = String((entryRaw as { alias?: string } | undefined)?.alias ?? "").trim();
const alias = ((entryRaw as { alias?: string } | undefined)?.alias ?? "").trim();
if (!alias) {
continue;
}
@@ -604,7 +603,7 @@ export function buildAllowedModelSet(params: {
const allowedKeys = new Set<string>();
const syntheticCatalogEntries = new Map<string, ModelCatalogEntry>();
for (const raw of rawAllowlist) {
const parsed = parseModelRef(String(raw), params.defaultProvider);
const parsed = parseModelRef(raw, params.defaultProvider);
if (!parsed) {
continue;
}
@@ -622,7 +621,7 @@ export function buildAllowedModelSet(params: {
cfg: params.cfg,
agentId: params.agentId,
})) {
const parsed = parseModelRef(String(fallback), params.defaultProvider);
const parsed = parseModelRef(fallback, params.defaultProvider);
if (parsed) {
const key = modelKey(parsed.provider, parsed.model);
allowedKeys.add(key);