mirror of
https://github.com/openclaw/openclaw.git
synced 2026-05-06 13:10:43 +00:00
refactor: share model allowlist parsing
This commit is contained in:
@@ -495,14 +495,14 @@ export function buildAllowedModelSetWithFallbacks(params: {
|
||||
|
||||
const allowedKeys = new Set<string>();
|
||||
const syntheticCatalogEntries = new Map<string, ModelCatalogEntry>();
|
||||
for (const raw of rawAllowlist) {
|
||||
const addAllowedModelRef = (raw: string) => {
|
||||
const parsed = parseModelRefWithCompatAlias({
|
||||
cfg: params.cfg,
|
||||
raw,
|
||||
defaultProvider: params.defaultProvider,
|
||||
});
|
||||
if (!parsed) {
|
||||
continue;
|
||||
return;
|
||||
}
|
||||
const key = modelKey(parsed.provider, parsed.model);
|
||||
allowedKeys.add(key);
|
||||
@@ -510,23 +510,14 @@ export function buildAllowedModelSetWithFallbacks(params: {
|
||||
if (!catalogKeys.has(key) && !syntheticCatalogEntries.has(key)) {
|
||||
syntheticCatalogEntries.set(key, buildSyntheticAllowedCatalogEntry({ parsed, metadata }));
|
||||
}
|
||||
};
|
||||
|
||||
for (const raw of rawAllowlist) {
|
||||
addAllowedModelRef(raw);
|
||||
}
|
||||
|
||||
for (const fallback of params.fallbackModels) {
|
||||
const parsed = parseModelRefWithCompatAlias({
|
||||
cfg: params.cfg,
|
||||
raw: fallback,
|
||||
defaultProvider: params.defaultProvider,
|
||||
});
|
||||
if (!parsed) {
|
||||
continue;
|
||||
}
|
||||
const key = modelKey(parsed.provider, parsed.model);
|
||||
allowedKeys.add(key);
|
||||
|
||||
if (!catalogKeys.has(key) && !syntheticCatalogEntries.has(key)) {
|
||||
syntheticCatalogEntries.set(key, buildSyntheticAllowedCatalogEntry({ parsed, metadata }));
|
||||
}
|
||||
addAllowedModelRef(fallback);
|
||||
}
|
||||
|
||||
if (defaultKey) {
|
||||
|
||||
Reference in New Issue
Block a user