Merge 85df3c7f0c into da71eaebd2
This commit is contained in:
commit
2cacbd6070
@ -288,7 +288,7 @@ function buildMoonshotProvider(): ProviderConfig {
|
|||||||
id: MOONSHOT_DEFAULT_MODEL_ID,
|
id: MOONSHOT_DEFAULT_MODEL_ID,
|
||||||
name: "Kimi K2.5",
|
name: "Kimi K2.5",
|
||||||
reasoning: false,
|
reasoning: false,
|
||||||
input: ["text"],
|
input: ["text", "image"],
|
||||||
cost: MOONSHOT_DEFAULT_COST,
|
cost: MOONSHOT_DEFAULT_COST,
|
||||||
contextWindow: MOONSHOT_DEFAULT_CONTEXT_WINDOW,
|
contextWindow: MOONSHOT_DEFAULT_CONTEXT_WINDOW,
|
||||||
maxTokens: MOONSHOT_DEFAULT_MAX_TOKENS,
|
maxTokens: MOONSHOT_DEFAULT_MAX_TOKENS,
|
||||||
|
|||||||
@ -29,18 +29,39 @@ function mergeProviderModels(implicit: ProviderConfig, explicit: ProviderConfig)
|
|||||||
const id = (model as { id?: unknown }).id;
|
const id = (model as { id?: unknown }).id;
|
||||||
return typeof id === "string" ? id.trim() : "";
|
return typeof id === "string" ? id.trim() : "";
|
||||||
};
|
};
|
||||||
const seen = new Set(explicitModels.map(getId).filter(Boolean));
|
|
||||||
|
|
||||||
const mergedModels = [
|
// Build a lookup of implicit (code-defined) models by ID so we can
|
||||||
...explicitModels,
|
// refresh stale config-written definitions with up-to-date capability
|
||||||
...implicitModels.filter((model) => {
|
// fields (input, reasoning, contextWindow, maxTokens) while preserving
|
||||||
const id = getId(model);
|
// any user-specific overrides (cost, headers, compat).
|
||||||
if (!id) return false;
|
const implicitById = new Map(
|
||||||
if (seen.has(id)) return false;
|
implicitModels.map((m) => [getId(m), m] as const).filter(([id]) => id),
|
||||||
seen.add(id);
|
);
|
||||||
return true;
|
|
||||||
}),
|
const seen = new Set<string>();
|
||||||
];
|
const mergedModels = explicitModels.map((explicitModel) => {
|
||||||
|
const id = getId(explicitModel);
|
||||||
|
if (id) seen.add(id);
|
||||||
|
const implicitModel = id ? implicitById.get(id) : undefined;
|
||||||
|
if (!implicitModel) return explicitModel;
|
||||||
|
// Merge: code-defined capability fields override stale config values,
|
||||||
|
// while user-specific fields (cost, headers, compat) are preserved.
|
||||||
|
return {
|
||||||
|
...explicitModel,
|
||||||
|
input: implicitModel.input,
|
||||||
|
reasoning: implicitModel.reasoning,
|
||||||
|
contextWindow: implicitModel.contextWindow,
|
||||||
|
maxTokens: implicitModel.maxTokens,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
// Append implicit models whose IDs are not present in the explicit list.
|
||||||
|
for (const model of implicitModels) {
|
||||||
|
const id = getId(model);
|
||||||
|
if (!id || seen.has(id)) continue;
|
||||||
|
seen.add(id);
|
||||||
|
mergedModels.push(model);
|
||||||
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
...implicit,
|
...implicit,
|
||||||
|
|||||||
@ -103,7 +103,7 @@ export const SYNTHETIC_MODEL_CATALOG = [
|
|||||||
id: "hf:moonshotai/Kimi-K2.5",
|
id: "hf:moonshotai/Kimi-K2.5",
|
||||||
name: "Kimi K2.5",
|
name: "Kimi K2.5",
|
||||||
reasoning: true,
|
reasoning: true,
|
||||||
input: ["text"],
|
input: ["text", "image"],
|
||||||
contextWindow: 256000,
|
contextWindow: 256000,
|
||||||
maxTokens: 8192,
|
maxTokens: 8192,
|
||||||
},
|
},
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user