mirror of
https://github.com/openclaw/openclaw.git
synced 2026-05-08 11:40:43 +00:00
Fixes the session-list plugin metadata hot path by reusing the active workspace-scoped plugin metadata snapshot for manifest model-id normalization and setup CLI backend fallback. Also keeps model-pricing collection on its provided manifest registry and fixes the CI-only hoisted test mock failure. Validated with targeted plugin/gateway/model-selection tests, CI-shaped gateway startup shard, Testbox `pnpm check:changed`, and green PR CI. Thanks @rolandrscheel.
108 lines
3.2 KiB
TypeScript
108 lines
3.2 KiB
TypeScript
import type { PluginManifestRecord } from "../plugins/manifest-registry.js";
|
|
import { normalizeLowercaseStringOrEmpty } from "../shared/string-coerce.js";
|
|
import { modelKey as sharedModelKey, normalizeStaticProviderModelId } from "./model-ref-shared.js";
|
|
import {
|
|
findNormalizedProviderKey,
|
|
findNormalizedProviderValue,
|
|
normalizeProviderId,
|
|
normalizeProviderIdForAuth,
|
|
} from "./provider-id.js";
|
|
import { normalizeProviderModelIdWithRuntime } from "./provider-model-normalization.runtime.js";
|
|
|
|
export type ModelRef = {
|
|
provider: string;
|
|
model: string;
|
|
};
|
|
|
|
export function modelKey(provider: string, model: string) {
|
|
return sharedModelKey(provider, model);
|
|
}
|
|
|
|
export function legacyModelKey(provider: string, model: string): string | null {
|
|
const providerId = provider.trim();
|
|
const modelId = model.trim();
|
|
if (!providerId || !modelId) {
|
|
return null;
|
|
}
|
|
const rawKey = `${providerId}/${modelId}`;
|
|
const canonicalKey = modelKey(providerId, modelId);
|
|
return rawKey === canonicalKey ? null : rawKey;
|
|
}
|
|
|
|
export {
|
|
findNormalizedProviderKey,
|
|
findNormalizedProviderValue,
|
|
normalizeProviderId,
|
|
normalizeProviderIdForAuth,
|
|
};
|
|
|
|
function normalizeProviderModelId(
|
|
provider: string,
|
|
model: string,
|
|
options?: {
|
|
allowManifestNormalization?: boolean;
|
|
allowPluginNormalization?: boolean;
|
|
manifestPlugins?: readonly Pick<PluginManifestRecord, "modelIdNormalization">[];
|
|
},
|
|
): string {
|
|
const staticModelId = normalizeStaticProviderModelId(provider, model, {
|
|
allowManifestNormalization: options?.allowManifestNormalization,
|
|
manifestPlugins: options?.manifestPlugins,
|
|
});
|
|
if (options?.allowPluginNormalization === false) {
|
|
return staticModelId;
|
|
}
|
|
return (
|
|
normalizeProviderModelIdWithRuntime({
|
|
provider,
|
|
context: {
|
|
provider,
|
|
modelId: staticModelId,
|
|
},
|
|
}) ?? staticModelId
|
|
);
|
|
}
|
|
|
|
type ModelRefNormalizeOptions = {
|
|
allowManifestNormalization?: boolean;
|
|
allowPluginNormalization?: boolean;
|
|
manifestPlugins?: readonly Pick<PluginManifestRecord, "modelIdNormalization">[];
|
|
};
|
|
|
|
export function normalizeModelRef(
|
|
provider: string,
|
|
model: string,
|
|
options?: ModelRefNormalizeOptions,
|
|
): ModelRef {
|
|
const normalizedProvider = normalizeProviderId(provider);
|
|
const normalizedModel = normalizeProviderModelId(normalizedProvider, model.trim(), options);
|
|
return { provider: normalizedProvider, model: normalizedModel };
|
|
}
|
|
|
|
type ParseModelRefOptions = ModelRefNormalizeOptions;
|
|
const OPENROUTER_AUTO_COMPAT_ALIAS = "openrouter:auto";
|
|
|
|
export function parseModelRef(
|
|
raw: string,
|
|
defaultProvider: string,
|
|
options?: ParseModelRefOptions,
|
|
): ModelRef | null {
|
|
const trimmed = raw.trim();
|
|
if (!trimmed) {
|
|
return null;
|
|
}
|
|
if (normalizeLowercaseStringOrEmpty(trimmed) === OPENROUTER_AUTO_COMPAT_ALIAS) {
|
|
return normalizeModelRef("openrouter", "auto", options);
|
|
}
|
|
const slash = trimmed.indexOf("/");
|
|
if (slash === -1) {
|
|
return normalizeModelRef(defaultProvider, trimmed, options);
|
|
}
|
|
const providerRaw = trimmed.slice(0, slash).trim();
|
|
const model = trimmed.slice(slash + 1).trim();
|
|
if (!providerRaw || !model) {
|
|
return null;
|
|
}
|
|
return normalizeModelRef(providerRaw, model, options);
|
|
}
|