feat(cn): expose upstream display_name as model id, drop key mapping tables
The CN model picker used to translate Qoder's internal keys (qfmodel, qmodel_latest, ...) into hardcoded "friendly" ids (qwen3.6-flash, ...) via a manual mapping table, with the display label hardcoded alongside. Both sides rotted independently of upstream: when Qoder upgraded qfmodel to Qwen3.8-Flash the label stayed "Qwen 3.6 Flash", and new keys (qmodel_38max, q37fmodel) had no entry so their raw key leaked into the picker as the id. The catalog API already returns every key with its display_name, so the mapping table duplicates data the server provides and can only ever be stale. Rework: use the upstream display_name (whitespace-stripped) directly as the pi-visible Model.id, and read the request-time upstream key back from the cached model config at send time. No key<->friendlyId table is needed. - cosy.ts: remove qoderCNFriendlyModels, getQoderCNDirectModel, getQoderCNFriendlyModelInfo, toQoderCNFriendlyModel, prettifyQoderCNModelName. Add toQoderCNModelId(display) = display with whitespace stripped. - models.ts: updateQoderModelsCache now sets CN model id = toQoderCNModelId(display_name); the original key is still stored in configs (keyed by both key and id) and read back via getCachedModelConfig. Simplify the CN fallback in getCachedModelConfig (drop the stale reasoning set). staticCnModels ids/names rewritten to the display_name form. - stream.ts: the upstream key comes from modelConfig.key (the cached entry) instead of a reverse-lookup table; falls back to model.id for the international site, which already uses the key as id. - index.ts: modelsForProvider no longer re-maps CN models through a friendly transform — the cached/static ids are already the display name. Trade-off: a renamed/upgraded model changes its id, so a previously saved default model may no longer resolve after an upstream rename and the user reselects. This is expected: users should learn about new models. This is accepted. Tests updated for the new contract; e2e against the live CN catalog confirms id=Qwen3.8-Flash resolves to send key=qfmodel with no mapping table.
This commit is contained in:
+6
-15
@@ -1,12 +1,6 @@
|
||||
import type { Api, Model, OAuthCredentials } from "@earendil-works/pi-ai";
|
||||
import type { ExtensionAPI, ProviderConfig } from "@earendil-works/pi-coding-agent";
|
||||
import {
|
||||
getQoderBaseUrl,
|
||||
getQoderMode,
|
||||
getQoderUserEmailFallback,
|
||||
isQoderCNMode,
|
||||
toQoderCNFriendlyModel,
|
||||
} from "./cosy.js";
|
||||
import { getQoderBaseUrl, getQoderMode, getQoderUserEmailFallback, isQoderCNMode } from "./cosy.js";
|
||||
import { getCachedModels, isCacheStale, staticCnModels, staticModels, updateQoderModelsCache } from "./models.js";
|
||||
import {
|
||||
autoLoginQoderFromEnvironment,
|
||||
@@ -29,14 +23,11 @@ function modelsForProvider(mode: string, providerID: string): Model<Api>[] {
|
||||
const cached = getCachedModels(mode);
|
||||
const modelsToUse = cached.length > 0 ? cached : isQoderCNMode(mode) ? staticCnModels : staticModels;
|
||||
|
||||
return modelsToUse.map((m) => {
|
||||
const model = isQoderCNMode(mode) ? toQoderCNFriendlyModel(m) : m;
|
||||
return {
|
||||
...model,
|
||||
provider: providerID,
|
||||
baseUrl: getQoderBaseUrl(mode),
|
||||
};
|
||||
}) as unknown as Model<Api>[];
|
||||
return modelsToUse.map((m) => ({
|
||||
...m,
|
||||
provider: providerID,
|
||||
baseUrl: getQoderBaseUrl(mode),
|
||||
})) as unknown as Model<Api>[];
|
||||
}
|
||||
|
||||
function createQoderOAuth(providerID: string, mode: string): OAuthConfigWithUsage {
|
||||
|
||||
Reference in New Issue
Block a user