pi-cliproxyapi-provider 0.4.13 → 0.15.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +42 -4
- package/data/models-dev-fallback.json +1 -1
- package/package.json +7 -2
- package/src/catalog.ts +6 -2
- package/src/commands.ts +42 -5
- package/src/config.ts +144 -3
- package/src/matching.ts +82 -6
- package/src/model-ui.ts +353 -0
- package/src/models-dev.ts +6 -1
- package/src/provider.ts +31 -4
- package/src/settings.ts +41 -5
- package/src/types.ts +19 -0
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "pi-cliproxyapi-provider",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.15.0",
|
|
4
4
|
"description": "Pi provider package for CLIProxyAPI with automatic model discovery and models.dev enrichment.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"license": "MIT",
|
|
@@ -42,7 +42,8 @@
|
|
|
42
42
|
},
|
|
43
43
|
"peerDependencies": {
|
|
44
44
|
"@earendil-works/pi-ai": ">=0.84.0",
|
|
45
|
-
"@earendil-works/pi-coding-agent": ">=0.84.0"
|
|
45
|
+
"@earendil-works/pi-coding-agent": ">=0.84.0",
|
|
46
|
+
"@earendil-works/pi-tui": ">=0.84.0"
|
|
46
47
|
},
|
|
47
48
|
"peerDependenciesMeta": {
|
|
48
49
|
"@earendil-works/pi-coding-agent": {
|
|
@@ -50,11 +51,15 @@
|
|
|
50
51
|
},
|
|
51
52
|
"@earendil-works/pi-ai": {
|
|
52
53
|
"optional": true
|
|
54
|
+
},
|
|
55
|
+
"@earendil-works/pi-tui": {
|
|
56
|
+
"optional": true
|
|
53
57
|
}
|
|
54
58
|
},
|
|
55
59
|
"devDependencies": {
|
|
56
60
|
"@earendil-works/pi-ai": "0.84.1",
|
|
57
61
|
"@earendil-works/pi-coding-agent": "0.84.1",
|
|
62
|
+
"@earendil-works/pi-tui": "0.84.1",
|
|
58
63
|
"typescript": "^5.9.3"
|
|
59
64
|
}
|
|
60
65
|
}
|
package/src/catalog.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { cpaModelsCachePath, discoveryHeaders, modelsDevCachePath } from "./discovery.ts";
|
|
2
2
|
import { readCache, writeCache, type CacheEnvelope } from "./cache.ts";
|
|
3
3
|
import { fetchCpaModels, parseCpaModelsCache, type CpaModel } from "./cpa.ts";
|
|
4
|
-
import { fetchModelsDevCatalog, parseModelsDevCatalog, readBundledModelsDevFallback } from "./models-dev.ts";
|
|
4
|
+
import { fetchModelsDevCatalog, hasSourceProviderMetadata, parseModelsDevCatalog, readBundledModelsDevFallback } from "./models-dev.ts";
|
|
5
5
|
import { buildProviderModels, type BuildProviderModelsResult } from "./provider.ts";
|
|
6
6
|
import type { Gpt56ContextWindowMode } from "./settings.ts";
|
|
7
7
|
import type { CpaProviderConfig, ModelsDevCatalog } from "./types.ts";
|
|
@@ -205,7 +205,9 @@ export class ProviderCatalog {
|
|
|
205
205
|
private async loadMetadata(): Promise<{ data: ModelsDevCatalog; fetchedAt?: number; source: MetadataSource }> {
|
|
206
206
|
if (!this.options.config.modelsDevEnabled) return { data: {}, source: "disabled" };
|
|
207
207
|
const cached = await readCache(modelsDevCachePath(), parseModelsDevCatalog);
|
|
208
|
-
if (cached
|
|
208
|
+
if (cached && hasSourceProviderMetadata(cached.data)) {
|
|
209
|
+
return { data: cached.data, fetchedAt: cached.fetchedAt, source: "cache" };
|
|
210
|
+
}
|
|
209
211
|
return { data: await readBundledModelsDevFallback(this.options.bundledModelsDevPath), source: "bundled" };
|
|
210
212
|
}
|
|
211
213
|
|
|
@@ -228,6 +230,8 @@ export class ProviderCatalog {
|
|
|
228
230
|
metadata,
|
|
229
231
|
this.options.config.modelAliases,
|
|
230
232
|
this.options.gpt56ContextWindow,
|
|
233
|
+
this.options.config.modelOverrides,
|
|
234
|
+
this.options.config.metadataFallbackProvider,
|
|
231
235
|
),
|
|
232
236
|
};
|
|
233
237
|
return this.snapshot;
|
package/src/commands.ts
CHANGED
|
@@ -2,6 +2,8 @@ import type { ExtensionAPI, ExtensionCommandContext } from "@earendil-works/pi-c
|
|
|
2
2
|
import { DEFAULT_CONFIG, loadConfig, globalConfigPath, readConfigFile, writeConfigFile, type ConfigLayer } from "./config.ts";
|
|
3
3
|
import type { ProviderCatalog, CatalogSnapshot, RefreshTarget, SourceRefreshResult } from "./catalog.ts";
|
|
4
4
|
import type { ProviderRuntime } from "./runtime.ts";
|
|
5
|
+
import { openModelInspector, openProviderConfig } from "./model-ui.ts";
|
|
6
|
+
import { loadProviderSettings } from "./settings.ts";
|
|
5
7
|
|
|
6
8
|
function errorText(error: unknown): string {
|
|
7
9
|
return error instanceof Error ? error.message : String(error);
|
|
@@ -43,7 +45,7 @@ function capabilityCount(snapshot: CatalogSnapshot, key: "reasoning" | "image"):
|
|
|
43
45
|
|
|
44
46
|
export async function runConfig(ctx: ExtensionCommandContext): Promise<void> {
|
|
45
47
|
if (!ctx.hasUI) {
|
|
46
|
-
ctx.ui.notify("/cliproxyapi config requires an interactive UI.", "warning");
|
|
48
|
+
ctx.ui.notify("/cliproxyapi config connection requires an interactive UI.", "warning");
|
|
47
49
|
return;
|
|
48
50
|
}
|
|
49
51
|
|
|
@@ -81,6 +83,7 @@ export async function runConfig(ctx: ExtensionCommandContext): Promise<void> {
|
|
|
81
83
|
: false;
|
|
82
84
|
|
|
83
85
|
writeConfigFile(path, {
|
|
86
|
+
...existing,
|
|
84
87
|
providerName: providerNameInput || defaults.providerName,
|
|
85
88
|
baseUrl: baseUrlInput || defaults.baseUrl,
|
|
86
89
|
authRequired,
|
|
@@ -117,8 +120,21 @@ function parseRefreshTarget(value: string | undefined): RefreshTarget | undefine
|
|
|
117
120
|
return undefined;
|
|
118
121
|
}
|
|
119
122
|
|
|
123
|
+
const CLIPROXYAPI_HELP = [
|
|
124
|
+
"CLIProxyAPI provider commands:",
|
|
125
|
+
" /cliproxyapi status Show provider and model-catalog status",
|
|
126
|
+
" /cliproxyapi refresh Refresh CPA models and models.dev metadata",
|
|
127
|
+
" /cliproxyapi refresh models Refresh CPA models only",
|
|
128
|
+
" /cliproxyapi refresh metadata Refresh models.dev metadata only",
|
|
129
|
+
" /cliproxyapi aliases Show unmatched model IDs for alias configuration",
|
|
130
|
+
" /cliproxyapi models Inspect models and set bounded overrides",
|
|
131
|
+
" /cliproxyapi config Configure model behavior and display",
|
|
132
|
+
" /cliproxyapi config connection Configure provider endpoint and auth",
|
|
133
|
+
" /cliproxyapi help Show this help",
|
|
134
|
+
].join("\n");
|
|
135
|
+
|
|
120
136
|
export function cliproxyapiArgumentCompletions(prefix: string): Array<{ value: string; label: string }> {
|
|
121
|
-
return ["config", "status", "refresh", "refresh models", "refresh metadata", "aliases", "help"]
|
|
137
|
+
return ["config", "config connection", "status", "refresh", "refresh models", "refresh metadata", "aliases", "models", "help"]
|
|
122
138
|
.filter((item) => item.startsWith(prefix))
|
|
123
139
|
.map((value) => ({ value, label: value }));
|
|
124
140
|
}
|
|
@@ -130,8 +146,26 @@ export function registerCliproxyapiCommand(pi: ExtensionAPI, runtime?: ProviderR
|
|
|
130
146
|
return cliproxyapiArgumentCompletions(prefix);
|
|
131
147
|
},
|
|
132
148
|
async handler(args, ctx) {
|
|
133
|
-
const
|
|
134
|
-
|
|
149
|
+
const commandArgs = args.trim();
|
|
150
|
+
const [subcommand, option] = commandArgs ? commandArgs.split(/\s+/) : ["help"];
|
|
151
|
+
if (subcommand === "help") {
|
|
152
|
+
ctx.ui.notify(CLIPROXYAPI_HELP, "info");
|
|
153
|
+
return;
|
|
154
|
+
}
|
|
155
|
+
if (subcommand === "config") {
|
|
156
|
+
if (option === "connection") return runConfig(ctx);
|
|
157
|
+
if (option) {
|
|
158
|
+
ctx.ui.notify("Usage: /cliproxyapi config [connection]", "warning");
|
|
159
|
+
return;
|
|
160
|
+
}
|
|
161
|
+
const action = await openProviderConfig(ctx, loadProviderSettings(ctx.cwd), loadConfig(ctx.cwd));
|
|
162
|
+
if (action === "connection") return runConfig(ctx);
|
|
163
|
+
return;
|
|
164
|
+
}
|
|
165
|
+
if (!["status", "refresh", "aliases", "models"].includes(subcommand)) {
|
|
166
|
+
ctx.ui.notify(`${CLIPROXYAPI_HELP}\n\nUnknown command: ${subcommand}`, "warning");
|
|
167
|
+
return;
|
|
168
|
+
}
|
|
135
169
|
if (!runtime || !catalog) {
|
|
136
170
|
ctx.ui.notify("CLIProxyAPI provider is unavailable. Run /cliproxyapi config and reload pi.", "error");
|
|
137
171
|
return;
|
|
@@ -170,7 +204,10 @@ export function registerCliproxyapiCommand(pi: ExtensionAPI, runtime?: ProviderR
|
|
|
170
204
|
ctx.ui.notify(body, snapshot.built.stats.unmatched ? "warning" : "info");
|
|
171
205
|
return;
|
|
172
206
|
}
|
|
173
|
-
|
|
207
|
+
if (subcommand === "models") {
|
|
208
|
+
await openModelInspector(ctx, catalog, config.modelOverrides, loadProviderSettings(ctx.cwd).showStrictMode);
|
|
209
|
+
return;
|
|
210
|
+
}
|
|
174
211
|
},
|
|
175
212
|
});
|
|
176
213
|
}
|
package/src/config.ts
CHANGED
|
@@ -1,10 +1,19 @@
|
|
|
1
1
|
import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
|
|
2
2
|
import { homedir } from "node:os";
|
|
3
3
|
import { dirname, join } from "node:path";
|
|
4
|
-
import type {
|
|
4
|
+
import type {
|
|
5
|
+
CpaProviderConfig,
|
|
6
|
+
ProviderModelOverride,
|
|
7
|
+
ProviderModelOverrideLayer,
|
|
8
|
+
ProviderModelOverrideLayers,
|
|
9
|
+
ProviderModelOverrides,
|
|
10
|
+
} from "./types.ts";
|
|
5
11
|
|
|
6
12
|
export type ConfigLayer = Partial<CpaProviderConfig>;
|
|
7
13
|
|
|
14
|
+
export const CONTEXT_WINDOW_PRESETS = [128000, 272000, 512000, 1000000] as const;
|
|
15
|
+
export const MAX_TOKEN_PRESETS = [4096, 8192, 16384, 32768, 65536, 128000] as const;
|
|
16
|
+
|
|
8
17
|
export const DEFAULT_CONFIG: CpaProviderConfig = {
|
|
9
18
|
providerName: "cpa",
|
|
10
19
|
baseUrl: "http://localhost:8317/v1",
|
|
@@ -12,7 +21,9 @@ export const DEFAULT_CONFIG: CpaProviderConfig = {
|
|
|
12
21
|
authHeader: true,
|
|
13
22
|
headers: {},
|
|
14
23
|
modelsDevEnabled: true,
|
|
24
|
+
metadataFallbackProvider: "openrouter",
|
|
15
25
|
modelAliases: {},
|
|
26
|
+
modelOverrides: {},
|
|
16
27
|
};
|
|
17
28
|
|
|
18
29
|
export function globalConfigPath(): string {
|
|
@@ -39,31 +50,69 @@ export function parseBooleanEnv(value: string | undefined): boolean | undefined
|
|
|
39
50
|
return undefined;
|
|
40
51
|
}
|
|
41
52
|
|
|
53
|
+
function normalizeMetadataFallbackProvider(value: string | null): string | null {
|
|
54
|
+
return value?.trim().toLowerCase() === "none" ? null : value;
|
|
55
|
+
}
|
|
56
|
+
|
|
42
57
|
function normalizeConfig(config: CpaProviderConfig): CpaProviderConfig {
|
|
43
58
|
return {
|
|
44
59
|
...config,
|
|
45
60
|
authHeader: config.authRequired ? config.authHeader : false,
|
|
61
|
+
metadataFallbackProvider: normalizeMetadataFallbackProvider(config.metadataFallbackProvider),
|
|
46
62
|
};
|
|
47
63
|
}
|
|
48
64
|
|
|
49
65
|
function safeProjectConfig(projectConfig?: ConfigLayer): ConfigLayer | undefined {
|
|
50
66
|
if (!projectConfig) return undefined;
|
|
51
67
|
return {
|
|
68
|
+
...(projectConfig.metadataFallbackProvider !== undefined
|
|
69
|
+
? { metadataFallbackProvider: projectConfig.metadataFallbackProvider }
|
|
70
|
+
: {}),
|
|
52
71
|
...(projectConfig.modelAliases !== undefined ? { modelAliases: projectConfig.modelAliases } : {}),
|
|
72
|
+
...(projectConfig.modelOverrides !== undefined ? { modelOverrides: projectConfig.modelOverrides } : {}),
|
|
53
73
|
};
|
|
54
74
|
}
|
|
55
75
|
|
|
76
|
+
function mergeModelOverrides(
|
|
77
|
+
base: ProviderModelOverrides,
|
|
78
|
+
layer: ProviderModelOverrideLayers | undefined,
|
|
79
|
+
): ProviderModelOverrides {
|
|
80
|
+
if (!layer) return base;
|
|
81
|
+
const merged = { ...base };
|
|
82
|
+
for (const [modelId, override] of Object.entries(layer)) {
|
|
83
|
+
const next = { ...merged[modelId] } as ProviderModelOverride;
|
|
84
|
+
for (const field of ["reasoning", "contextWindow", "maxTokens"] as const) {
|
|
85
|
+
const value = override[field];
|
|
86
|
+
if (value === null) delete next[field];
|
|
87
|
+
else if (value !== undefined) (next as Record<string, boolean | number>)[field] = value;
|
|
88
|
+
}
|
|
89
|
+
if (Object.keys(next).length === 0) delete merged[modelId];
|
|
90
|
+
else merged[modelId] = next;
|
|
91
|
+
}
|
|
92
|
+
return merged;
|
|
93
|
+
}
|
|
94
|
+
|
|
56
95
|
function projectConfigLayer(value: unknown, path: string): ConfigLayer {
|
|
57
96
|
if (!value || typeof value !== "object" || Array.isArray(value)) {
|
|
58
97
|
throw new Error(`Project config file must contain a JSON object: ${path}`);
|
|
59
98
|
}
|
|
60
99
|
|
|
61
100
|
const record = value as Record<string, unknown>;
|
|
101
|
+
if (
|
|
102
|
+
record.metadataFallbackProvider !== undefined &&
|
|
103
|
+
record.metadataFallbackProvider !== null &&
|
|
104
|
+
(typeof record.metadataFallbackProvider !== "string" || !record.metadataFallbackProvider.trim())
|
|
105
|
+
) {
|
|
106
|
+
throw new Error(`metadataFallbackProvider must be a non-empty string or null in project config file: ${path}`);
|
|
107
|
+
}
|
|
62
108
|
if (record.modelAliases !== undefined && !isStringMap(record.modelAliases)) {
|
|
63
109
|
throw new Error(`modelAliases must be an object with string values in project config file: ${path}`);
|
|
64
110
|
}
|
|
111
|
+
const modelOverrides = record.modelOverrides === undefined
|
|
112
|
+
? undefined
|
|
113
|
+
: parseModelOverrides(record.modelOverrides, "project");
|
|
65
114
|
|
|
66
|
-
return safeProjectConfig(record as ConfigLayer) ?? {};
|
|
115
|
+
return safeProjectConfig({ ...record, ...(modelOverrides ? { modelOverrides } : {}) } as ConfigLayer) ?? {};
|
|
67
116
|
}
|
|
68
117
|
|
|
69
118
|
function mergeLayer(base: CpaProviderConfig, layer?: ConfigLayer): CpaProviderConfig {
|
|
@@ -73,6 +122,7 @@ function mergeLayer(base: CpaProviderConfig, layer?: ConfigLayer): CpaProviderCo
|
|
|
73
122
|
...layer,
|
|
74
123
|
headers: { ...base.headers, ...(layer.headers ?? {}) },
|
|
75
124
|
modelAliases: { ...base.modelAliases, ...(layer.modelAliases ?? {}) },
|
|
125
|
+
modelOverrides: mergeModelOverrides(base.modelOverrides, layer.modelOverrides),
|
|
76
126
|
};
|
|
77
127
|
}
|
|
78
128
|
|
|
@@ -80,12 +130,14 @@ function envLayer(env: NodeJS.ProcessEnv): ConfigLayer {
|
|
|
80
130
|
const authRequired = parseBooleanEnv(env.CLIPROXYAPI_AUTH_REQUIRED);
|
|
81
131
|
const authHeader = parseBooleanEnv(env.CLIPROXYAPI_AUTH_HEADER);
|
|
82
132
|
const modelsDevEnabled = parseBooleanEnv(env.CLIPROXYAPI_MODELS_DEV_ENABLED);
|
|
133
|
+
const metadataFallbackProvider = env.CLIPROXYAPI_METADATA_FALLBACK_PROVIDER?.trim();
|
|
83
134
|
return {
|
|
84
135
|
...(env.CLIPROXYAPI_BASE_URL ? { baseUrl: env.CLIPROXYAPI_BASE_URL } : {}),
|
|
85
136
|
...(env.CLIPROXYAPI_PROVIDER_NAME ? { providerName: env.CLIPROXYAPI_PROVIDER_NAME } : {}),
|
|
86
137
|
...(authRequired !== undefined ? { authRequired } : {}),
|
|
87
138
|
...(authHeader !== undefined ? { authHeader } : {}),
|
|
88
139
|
...(modelsDevEnabled !== undefined ? { modelsDevEnabled } : {}),
|
|
140
|
+
...(metadataFallbackProvider ? { metadataFallbackProvider } : {}),
|
|
89
141
|
};
|
|
90
142
|
}
|
|
91
143
|
|
|
@@ -105,6 +157,50 @@ function isStringMap(value: unknown): value is Record<string, string> {
|
|
|
105
157
|
&& Object.values(value).every((entry) => typeof entry === "string");
|
|
106
158
|
}
|
|
107
159
|
|
|
160
|
+
function isAllowedPreset(value: unknown, presets: readonly number[]): value is number {
|
|
161
|
+
return typeof value === "number" && presets.includes(value);
|
|
162
|
+
}
|
|
163
|
+
|
|
164
|
+
function parseModelOverrides(value: unknown, scope: string): ProviderModelOverrideLayers {
|
|
165
|
+
if (!value || typeof value !== "object" || Array.isArray(value)) {
|
|
166
|
+
throw new Error(`modelOverrides must be an object in ${scope} config file`);
|
|
167
|
+
}
|
|
168
|
+
|
|
169
|
+
const parsed: ProviderModelOverrideLayers = {};
|
|
170
|
+
for (const [modelId, rawOverride] of Object.entries(value)) {
|
|
171
|
+
if (!modelId.trim()) throw new Error(`modelOverrides keys must be non-empty model IDs in ${scope} config file`);
|
|
172
|
+
if (!rawOverride || typeof rawOverride !== "object" || Array.isArray(rawOverride)) {
|
|
173
|
+
throw new Error(`modelOverrides.${modelId} must be an object in ${scope} config file`);
|
|
174
|
+
}
|
|
175
|
+
|
|
176
|
+
const record = rawOverride as Record<string, unknown>;
|
|
177
|
+
const unknown = Object.keys(record).filter(
|
|
178
|
+
(key) => key !== "reasoning" && key !== "contextWindow" && key !== "maxTokens",
|
|
179
|
+
);
|
|
180
|
+
if (unknown.length > 0) {
|
|
181
|
+
throw new Error(`modelOverrides.${modelId} contains unsupported fields: ${unknown.join(", ")}`);
|
|
182
|
+
}
|
|
183
|
+
const nullable = scope === "project";
|
|
184
|
+
if (record.reasoning !== undefined && typeof record.reasoning !== "boolean" && !(nullable && record.reasoning === null)) {
|
|
185
|
+
throw new Error(`modelOverrides.${modelId}.reasoning must be a boolean${nullable ? " or null" : ""} in ${scope} config file`);
|
|
186
|
+
}
|
|
187
|
+
const presets = { contextWindow: CONTEXT_WINDOW_PRESETS, maxTokens: MAX_TOKEN_PRESETS };
|
|
188
|
+
for (const field of ["contextWindow", "maxTokens"] as const) {
|
|
189
|
+
const value = record[field];
|
|
190
|
+
if (value !== undefined && !isAllowedPreset(value, presets[field]) && !(nullable && value === null)) {
|
|
191
|
+
throw new Error(`modelOverrides.${modelId}.${field} must be one of ${presets[field].join(", ")}${nullable ? " or null" : ""} in ${scope} config file`);
|
|
192
|
+
}
|
|
193
|
+
}
|
|
194
|
+
|
|
195
|
+
parsed[modelId] = {
|
|
196
|
+
...(record.reasoning !== undefined ? { reasoning: record.reasoning as boolean | null } : {}),
|
|
197
|
+
...(record.contextWindow !== undefined ? { contextWindow: record.contextWindow as number | null } : {}),
|
|
198
|
+
...(record.maxTokens !== undefined ? { maxTokens: record.maxTokens as number | null } : {}),
|
|
199
|
+
} satisfies ProviderModelOverrideLayer;
|
|
200
|
+
}
|
|
201
|
+
return parsed;
|
|
202
|
+
}
|
|
203
|
+
|
|
108
204
|
function validateConfigLayer(value: unknown, path: string): ConfigLayer {
|
|
109
205
|
if (!value || typeof value !== "object" || Array.isArray(value)) {
|
|
110
206
|
throw new Error(`Config file must contain a JSON object: ${path}`);
|
|
@@ -117,6 +213,13 @@ function validateConfigLayer(value: unknown, path: string): ConfigLayer {
|
|
|
117
213
|
throw new Error(`${field} must be a string in config file: ${path}`);
|
|
118
214
|
}
|
|
119
215
|
}
|
|
216
|
+
if (
|
|
217
|
+
record.metadataFallbackProvider !== undefined &&
|
|
218
|
+
record.metadataFallbackProvider !== null &&
|
|
219
|
+
(typeof record.metadataFallbackProvider !== "string" || !record.metadataFallbackProvider.trim())
|
|
220
|
+
) {
|
|
221
|
+
throw new Error(`metadataFallbackProvider must be a non-empty string or null in config file: ${path}`);
|
|
222
|
+
}
|
|
120
223
|
|
|
121
224
|
const booleanFields = ["authRequired", "authHeader", "modelsDevEnabled"];
|
|
122
225
|
for (const field of booleanFields) {
|
|
@@ -131,8 +234,11 @@ function validateConfigLayer(value: unknown, path: string): ConfigLayer {
|
|
|
131
234
|
if (record.modelAliases !== undefined && !isStringMap(record.modelAliases)) {
|
|
132
235
|
throw new Error(`modelAliases must be an object with string values in config file: ${path}`);
|
|
133
236
|
}
|
|
237
|
+
const modelOverrides = record.modelOverrides === undefined
|
|
238
|
+
? undefined
|
|
239
|
+
: parseModelOverrides(record.modelOverrides, "global");
|
|
134
240
|
|
|
135
|
-
return record as ConfigLayer;
|
|
241
|
+
return { ...record, ...(modelOverrides ? { modelOverrides } : {}) } as ConfigLayer;
|
|
136
242
|
}
|
|
137
243
|
|
|
138
244
|
export function readConfigFile(path: string): ConfigLayer | undefined {
|
|
@@ -153,3 +259,38 @@ export function writeConfigFile(path: string, config: ConfigLayer): void {
|
|
|
153
259
|
mkdirSync(dirname(path), { recursive: true, mode: 0o700 });
|
|
154
260
|
writeFileSync(path, `${JSON.stringify(config, null, 2)}\n`, { encoding: "utf8", mode: 0o600 });
|
|
155
261
|
}
|
|
262
|
+
|
|
263
|
+
export function loadModelOverrideLayers(cwd: string): {
|
|
264
|
+
global: ProviderModelOverrideLayers;
|
|
265
|
+
project: ProviderModelOverrideLayers;
|
|
266
|
+
} {
|
|
267
|
+
return {
|
|
268
|
+
global: (readConfigFile(globalConfigPath())?.modelOverrides ?? {}) as ProviderModelOverrideLayers,
|
|
269
|
+
project: (readProjectConfigFile(projectConfigPath(cwd))?.modelOverrides ?? {}) as ProviderModelOverrideLayers,
|
|
270
|
+
};
|
|
271
|
+
}
|
|
272
|
+
|
|
273
|
+
export function saveModelOverride(
|
|
274
|
+
cwd: string,
|
|
275
|
+
modelId: string,
|
|
276
|
+
override: ProviderModelOverrideLayer,
|
|
277
|
+
): { path: string; overrides: ProviderModelOverrideLayers } {
|
|
278
|
+
const path = projectConfigPath(cwd);
|
|
279
|
+
let raw: Record<string, unknown> = {};
|
|
280
|
+
if (existsSync(path)) {
|
|
281
|
+
const parsed: unknown = JSON.parse(readFileSync(path, "utf8"));
|
|
282
|
+
if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
|
|
283
|
+
throw new Error(`Config file must contain a JSON object: ${path}`);
|
|
284
|
+
}
|
|
285
|
+
raw = parsed as Record<string, unknown>;
|
|
286
|
+
}
|
|
287
|
+
|
|
288
|
+
const existing = raw.modelOverrides === undefined
|
|
289
|
+
? {}
|
|
290
|
+
: parseModelOverrides(raw.modelOverrides, "project");
|
|
291
|
+
const next = { ...existing };
|
|
292
|
+
if (Object.keys(override).length === 0) delete next[modelId];
|
|
293
|
+
else next[modelId] = override;
|
|
294
|
+
writeConfigFile(path, { ...raw, modelOverrides: next } as ConfigLayer);
|
|
295
|
+
return { path, overrides: next };
|
|
296
|
+
}
|
package/src/matching.ts
CHANGED
|
@@ -16,7 +16,7 @@ const CANONICAL_OWNER_PREFIXES: Record<string, string> = {
|
|
|
16
16
|
cohere: "cohere",
|
|
17
17
|
};
|
|
18
18
|
|
|
19
|
-
export type MetadataMatchMethod = "alias" | "exact" | "owner-prefix" | "suffix" | "normalized-suffix";
|
|
19
|
+
export type MetadataMatchMethod = "alias" | "exact" | "owner-prefix" | "owner-hint" | "suffix" | "normalized-suffix" | "provider-fallback";
|
|
20
20
|
|
|
21
21
|
export interface MetadataMatch {
|
|
22
22
|
metadataId: string;
|
|
@@ -28,15 +28,65 @@ export function normalizeModelName(value: string): string {
|
|
|
28
28
|
return value.toLowerCase().replace(/[^a-z0-9]/g, "");
|
|
29
29
|
}
|
|
30
30
|
|
|
31
|
+
function metadataModelName(metadataId: string, metadata: ModelsDevMetadata): string {
|
|
32
|
+
return metadata.id.split("/").at(-1) ?? metadataId.split("/").at(-1) ?? metadataId;
|
|
33
|
+
}
|
|
34
|
+
|
|
31
35
|
function oneMatch(candidates: string[]): string | undefined {
|
|
32
36
|
const unique = [...new Set(candidates)];
|
|
33
37
|
return unique.length === 1 ? unique[0] : undefined;
|
|
34
38
|
}
|
|
35
39
|
|
|
40
|
+
function identifierTokens(value: string): string[] {
|
|
41
|
+
return value.toLowerCase().split(/[^a-z0-9]+/).filter(Boolean);
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
function containsContiguousTokens(container: string[], sequence: string[]): boolean {
|
|
45
|
+
if (sequence.length === 0 || sequence.length > container.length) return false;
|
|
46
|
+
return container.some((_, start) =>
|
|
47
|
+
start + sequence.length <= container.length &&
|
|
48
|
+
sequence.every((token, offset) => container[start + offset] === token)
|
|
49
|
+
);
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
function sourceProvider(metadataId: string, metadata: ModelsDevMetadata): string {
|
|
53
|
+
// sourceProvider is retained by current catalog snapshots. The prefix fallback
|
|
54
|
+
// keeps older bundled/cache snapshots useful until they are refreshed.
|
|
55
|
+
return metadata.sourceProvider ?? metadataId.split("/")[0] ?? metadataId;
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
function ownerHintMatch(
|
|
59
|
+
owner: string | undefined,
|
|
60
|
+
candidates: string[],
|
|
61
|
+
catalog: ModelsDevCatalog,
|
|
62
|
+
): string | undefined {
|
|
63
|
+
if (!owner) return undefined;
|
|
64
|
+
const ownerTokens = identifierTokens(owner);
|
|
65
|
+
const matches = candidates.flatMap((metadataId) => {
|
|
66
|
+
const metadata = catalog[metadataId];
|
|
67
|
+
if (!metadata) return [];
|
|
68
|
+
const provider = sourceProvider(metadataId, metadata);
|
|
69
|
+
const providerTokens = identifierTokens(provider);
|
|
70
|
+
if (!containsContiguousTokens(ownerTokens, providerTokens)) return [];
|
|
71
|
+
return [{ metadataId, tokenCount: providerTokens.length, characterCount: provider.length }];
|
|
72
|
+
});
|
|
73
|
+
if (matches.length === 0) return undefined;
|
|
74
|
+
|
|
75
|
+
const bestTokenCount = Math.max(...matches.map((match) => match.tokenCount));
|
|
76
|
+
const mostTokens = matches.filter((match) => match.tokenCount === bestTokenCount);
|
|
77
|
+
const bestCharacterCount = Math.max(...mostTokens.map((match) => match.characterCount));
|
|
78
|
+
return oneMatch(
|
|
79
|
+
mostTokens
|
|
80
|
+
.filter((match) => match.characterCount === bestCharacterCount)
|
|
81
|
+
.map((match) => match.metadataId),
|
|
82
|
+
);
|
|
83
|
+
}
|
|
84
|
+
|
|
36
85
|
export function findMetadataMatch(
|
|
37
86
|
cpaModel: Pick<CpaModel, "id" | "owned_by">,
|
|
38
87
|
catalog: ModelsDevCatalog,
|
|
39
88
|
aliases: Record<string, string>,
|
|
89
|
+
fallbackProvider?: string | null,
|
|
40
90
|
): MetadataMatch | undefined {
|
|
41
91
|
const alias = aliases[cpaModel.id];
|
|
42
92
|
if (alias && catalog[alias]) {
|
|
@@ -47,7 +97,20 @@ export function findMetadataMatch(
|
|
|
47
97
|
return { metadataId: cpaModel.id, metadata: catalog[cpaModel.id], method: "exact" };
|
|
48
98
|
}
|
|
49
99
|
|
|
50
|
-
const
|
|
100
|
+
const catalogKeys = Object.keys(catalog);
|
|
101
|
+
const exactMetadataCandidates = catalogKeys.filter((key) => catalog[key]?.id === cpaModel.id);
|
|
102
|
+
const exactMetadataKey = oneMatch(exactMetadataCandidates);
|
|
103
|
+
if (exactMetadataKey) {
|
|
104
|
+
return { metadataId: exactMetadataKey, metadata: catalog[exactMetadataKey], method: "exact" };
|
|
105
|
+
}
|
|
106
|
+
|
|
107
|
+
const suffixCandidates = catalogKeys.filter((key) =>
|
|
108
|
+
metadataModelName(key, catalog[key]) === cpaModel.id
|
|
109
|
+
);
|
|
110
|
+
const normalizedId = normalizeModelName(cpaModel.id);
|
|
111
|
+
const normalizedSuffixCandidates = catalogKeys.filter(
|
|
112
|
+
(key) => normalizeModelName(metadataModelName(key, catalog[key])) === normalizedId,
|
|
113
|
+
);
|
|
51
114
|
const owner = cpaModel.owned_by?.trim().toLowerCase();
|
|
52
115
|
const canonicalOwner = owner ? CANONICAL_OWNER_PREFIXES[owner] : undefined;
|
|
53
116
|
if (canonicalOwner) {
|
|
@@ -57,18 +120,31 @@ export function findMetadataMatch(
|
|
|
57
120
|
}
|
|
58
121
|
}
|
|
59
122
|
|
|
123
|
+
const hintedKey = ownerHintMatch(owner, normalizedSuffixCandidates, catalog);
|
|
124
|
+
if (hintedKey) {
|
|
125
|
+
return { metadataId: hintedKey, metadata: catalog[hintedKey], method: "owner-hint" };
|
|
126
|
+
}
|
|
127
|
+
|
|
60
128
|
const suffixKey = oneMatch(suffixCandidates);
|
|
61
129
|
if (suffixKey) {
|
|
62
130
|
return { metadataId: suffixKey, metadata: catalog[suffixKey], method: "suffix" };
|
|
63
131
|
}
|
|
64
132
|
|
|
65
|
-
const
|
|
66
|
-
const normalizedSuffixKey = oneMatch(
|
|
67
|
-
Object.keys(catalog).filter((key) => normalizeModelName(key.split("/").at(-1) ?? key) === normalizedId),
|
|
68
|
-
);
|
|
133
|
+
const normalizedSuffixKey = oneMatch(normalizedSuffixCandidates);
|
|
69
134
|
if (normalizedSuffixKey) {
|
|
70
135
|
return { metadataId: normalizedSuffixKey, metadata: catalog[normalizedSuffixKey], method: "normalized-suffix" };
|
|
71
136
|
}
|
|
72
137
|
|
|
138
|
+
if (fallbackProvider) {
|
|
139
|
+
const normalizedFallbackProvider = fallbackProvider.trim().toLowerCase();
|
|
140
|
+
const fallbackKey = oneMatch(normalizedSuffixCandidates.filter((metadataId) => {
|
|
141
|
+
const metadata = catalog[metadataId];
|
|
142
|
+
return metadata && sourceProvider(metadataId, metadata).toLowerCase() === normalizedFallbackProvider;
|
|
143
|
+
}));
|
|
144
|
+
if (fallbackKey) {
|
|
145
|
+
return { metadataId: fallbackKey, metadata: catalog[fallbackKey], method: "provider-fallback" };
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
|
|
73
149
|
return undefined;
|
|
74
150
|
}
|