mirror of
https://github.com/openclaw/openclaw.git
synced 2026-05-06 08:40:44 +00:00
fix: avoid plugin normalization in status model refs
This commit is contained in:
@@ -77,6 +77,7 @@ export function resolvePersistedOverrideModelRef(params: {
|
||||
defaultProvider: string;
|
||||
overrideProvider?: string;
|
||||
overrideModel?: string;
|
||||
allowPluginNormalization?: boolean;
|
||||
}): ModelRef | null {
|
||||
const defaultProvider = params.defaultProvider.trim();
|
||||
const overrideProvider = params.overrideProvider?.trim();
|
||||
@@ -86,7 +87,9 @@ export function resolvePersistedOverrideModelRef(params: {
|
||||
}
|
||||
const encodedOverride = overrideProvider ? `${overrideProvider}/${overrideModel}` : overrideModel;
|
||||
return (
|
||||
parseModelRef(encodedOverride, defaultProvider) ?? {
|
||||
parseModelRef(encodedOverride, defaultProvider, {
|
||||
allowPluginNormalization: params.allowPluginNormalization,
|
||||
}) ?? {
|
||||
provider: overrideProvider || defaultProvider,
|
||||
model: overrideModel,
|
||||
}
|
||||
@@ -103,6 +106,7 @@ export function resolvePersistedModelRef(params: {
|
||||
runtimeModel?: string;
|
||||
overrideProvider?: string;
|
||||
overrideModel?: string;
|
||||
allowPluginNormalization?: boolean;
|
||||
}): ModelRef | null {
|
||||
const defaultProvider = params.defaultProvider.trim();
|
||||
const runtimeProvider = params.runtimeProvider?.trim();
|
||||
@@ -112,7 +116,9 @@ export function resolvePersistedModelRef(params: {
|
||||
return { provider: runtimeProvider, model: runtimeModel };
|
||||
}
|
||||
return (
|
||||
parseModelRef(runtimeModel, defaultProvider) ?? {
|
||||
parseModelRef(runtimeModel, defaultProvider, {
|
||||
allowPluginNormalization: params.allowPluginNormalization,
|
||||
}) ?? {
|
||||
provider: defaultProvider,
|
||||
model: runtimeModel,
|
||||
}
|
||||
@@ -122,6 +128,7 @@ export function resolvePersistedModelRef(params: {
|
||||
defaultProvider,
|
||||
overrideProvider: params.overrideProvider,
|
||||
overrideModel: params.overrideModel,
|
||||
allowPluginNormalization: params.allowPluginNormalization,
|
||||
});
|
||||
}
|
||||
|
||||
@@ -136,11 +143,13 @@ export function resolvePersistedSelectedModelRef(params: {
|
||||
runtimeModel?: string;
|
||||
overrideProvider?: string;
|
||||
overrideModel?: string;
|
||||
allowPluginNormalization?: boolean;
|
||||
}): ModelRef | null {
|
||||
const override = resolvePersistedOverrideModelRef({
|
||||
defaultProvider: params.defaultProvider,
|
||||
overrideProvider: params.overrideProvider,
|
||||
overrideModel: params.overrideModel,
|
||||
allowPluginNormalization: params.allowPluginNormalization,
|
||||
});
|
||||
if (override) {
|
||||
return override;
|
||||
@@ -149,6 +158,7 @@ export function resolvePersistedSelectedModelRef(params: {
|
||||
defaultProvider: params.defaultProvider,
|
||||
runtimeProvider: params.runtimeProvider,
|
||||
runtimeModel: params.runtimeModel,
|
||||
allowPluginNormalization: params.allowPluginNormalization,
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -158,6 +158,7 @@ function resolveSessionModelRef(
|
||||
runtimeModel: entry?.model,
|
||||
overrideProvider: entry?.providerOverride,
|
||||
overrideModel: entry?.modelOverride,
|
||||
allowPluginNormalization: false,
|
||||
}) ?? resolved
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user