pi-cliproxyapi-provider 0.4.12 → 0.4.14
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 +37 -3
- package/data/models-dev-fallback.json +1 -1
- package/package.json +7 -2
- package/src/catalog.ts +1 -0
- package/src/commands.ts +42 -5
- package/src/config.ts +119 -3
- package/src/model-ui.ts +353 -0
- package/src/provider.ts +27 -3
- package/src/settings.ts +41 -5
- package/src/types.ts +16 -0
package/src/provider.ts
CHANGED
|
@@ -3,7 +3,13 @@ import { findMetadataMatch, type MetadataMatchMethod } from "./matching.ts";
|
|
|
3
3
|
import { getModelApiOverride, isGpt56Model, type ModelApiContext } from "./model-api.ts";
|
|
4
4
|
import { getModelCapabilityOverrides } from "./model-capabilities.ts";
|
|
5
5
|
import type { Gpt56ContextWindowMode } from "./settings.ts";
|
|
6
|
-
import type {
|
|
6
|
+
import type {
|
|
7
|
+
InputModality,
|
|
8
|
+
ModelsDevCatalog,
|
|
9
|
+
ModelsDevMetadata,
|
|
10
|
+
ProviderModelConfigLike,
|
|
11
|
+
ProviderModelOverrides,
|
|
12
|
+
} from "./types.ts";
|
|
7
13
|
|
|
8
14
|
export const GPT_5_6_CANONICAL_CONTEXT_WINDOW = 272000;
|
|
9
15
|
|
|
@@ -125,6 +131,20 @@ function emptyMatchMethods(): Record<MetadataMatchMethod, number> {
|
|
|
125
131
|
};
|
|
126
132
|
}
|
|
127
133
|
|
|
134
|
+
function applyModelOverride(
|
|
135
|
+
model: ProviderModelConfigLike,
|
|
136
|
+
overrides: ProviderModelOverrides,
|
|
137
|
+
): ProviderModelConfigLike {
|
|
138
|
+
const override = overrides[model.id];
|
|
139
|
+
if (!override) return model;
|
|
140
|
+
return {
|
|
141
|
+
...model,
|
|
142
|
+
...(override.reasoning !== undefined ? { reasoning: override.reasoning } : {}),
|
|
143
|
+
...(override.contextWindow !== undefined ? { contextWindow: override.contextWindow } : {}),
|
|
144
|
+
...(override.maxTokens !== undefined ? { maxTokens: override.maxTokens } : {}),
|
|
145
|
+
};
|
|
146
|
+
}
|
|
147
|
+
|
|
128
148
|
export function buildUnavailableProviderModels(id = "login-required"): ProviderModelConfigLike[] {
|
|
129
149
|
return [{ id, name: id, ...cloneModelDefaults() }];
|
|
130
150
|
}
|
|
@@ -134,6 +154,7 @@ export function buildProviderModels(
|
|
|
134
154
|
catalog: ModelsDevCatalog,
|
|
135
155
|
aliases: Record<string, string>,
|
|
136
156
|
gpt56ContextWindow: Gpt56ContextWindowMode = "canonical",
|
|
157
|
+
overrides: ProviderModelOverrides = {},
|
|
137
158
|
): BuildProviderModelsResult {
|
|
138
159
|
const matchMethods = emptyMatchMethods();
|
|
139
160
|
const unmatchedModelIds: string[] = [];
|
|
@@ -143,12 +164,15 @@ export function buildProviderModels(
|
|
|
143
164
|
const match = findMetadataMatch(cpaModel, catalog, aliases);
|
|
144
165
|
if (!match) {
|
|
145
166
|
unmatchedModelIds.push(cpaModel.id);
|
|
146
|
-
return defaultModel(cpaModel, gpt56ContextWindow);
|
|
167
|
+
return applyModelOverride(defaultModel(cpaModel, gpt56ContextWindow), overrides);
|
|
147
168
|
}
|
|
148
169
|
|
|
149
170
|
enriched += 1;
|
|
150
171
|
matchMethods[match.method] += 1;
|
|
151
|
-
return
|
|
172
|
+
return applyModelOverride(
|
|
173
|
+
modelFromMetadata(cpaModel, match.metadata, gpt56ContextWindow),
|
|
174
|
+
overrides,
|
|
175
|
+
);
|
|
152
176
|
});
|
|
153
177
|
|
|
154
178
|
return {
|
package/src/settings.ts
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
|
-
import { SettingsManager } from "@earendil-works/pi-coding-agent";
|
|
1
|
+
import { CONFIG_DIR_NAME, getAgentDir, SettingsManager } from "@earendil-works/pi-coding-agent";
|
|
2
|
+
import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
|
|
3
|
+
import { dirname, join } from "node:path";
|
|
2
4
|
|
|
3
5
|
export const PROVIDER_SETTINGS_NAMESPACE = "pi-cliproxyapi-provider";
|
|
4
6
|
|
|
@@ -6,10 +8,12 @@ export type Gpt56ContextWindowMode = "canonical" | "full";
|
|
|
6
8
|
|
|
7
9
|
export interface ProviderSettings {
|
|
8
10
|
gpt56ContextWindow: Gpt56ContextWindowMode;
|
|
11
|
+
showStrictMode: boolean;
|
|
9
12
|
}
|
|
10
13
|
|
|
11
14
|
export const DEFAULT_PROVIDER_SETTINGS: ProviderSettings = {
|
|
12
15
|
gpt56ContextWindow: "canonical",
|
|
16
|
+
showStrictMode: false,
|
|
13
17
|
};
|
|
14
18
|
|
|
15
19
|
function parseSettingsLayer(settings: unknown, scope: string): Partial<ProviderSettings> {
|
|
@@ -20,14 +24,20 @@ function parseSettingsLayer(settings: unknown, scope: string): Partial<ProviderS
|
|
|
20
24
|
throw new Error(`${PROVIDER_SETTINGS_NAMESPACE} must be an object in ${scope} settings.json`);
|
|
21
25
|
}
|
|
22
26
|
|
|
23
|
-
const
|
|
24
|
-
|
|
25
|
-
if (
|
|
27
|
+
const record = namespace as Record<string, unknown>;
|
|
28
|
+
const gpt56ContextWindow = record.gpt56ContextWindow;
|
|
29
|
+
if (gpt56ContextWindow !== undefined && gpt56ContextWindow !== "canonical" && gpt56ContextWindow !== "full") {
|
|
26
30
|
throw new Error(
|
|
27
31
|
`${PROVIDER_SETTINGS_NAMESPACE}.gpt56ContextWindow must be "canonical" or "full" in ${scope} settings.json`,
|
|
28
32
|
);
|
|
29
33
|
}
|
|
30
|
-
|
|
34
|
+
if (record.showStrictMode !== undefined && typeof record.showStrictMode !== "boolean") {
|
|
35
|
+
throw new Error(`${PROVIDER_SETTINGS_NAMESPACE}.showStrictMode must be a boolean in ${scope} settings.json`);
|
|
36
|
+
}
|
|
37
|
+
return {
|
|
38
|
+
...(gpt56ContextWindow !== undefined ? { gpt56ContextWindow } : {}),
|
|
39
|
+
...(record.showStrictMode !== undefined ? { showStrictMode: record.showStrictMode } : {}),
|
|
40
|
+
};
|
|
31
41
|
}
|
|
32
42
|
|
|
33
43
|
export function loadProviderSettings(cwd: string, agentDir?: string): ProviderSettings {
|
|
@@ -38,3 +48,29 @@ export function loadProviderSettings(cwd: string, agentDir?: string): ProviderSe
|
|
|
38
48
|
...parseSettingsLayer(manager.getProjectSettings(), "project"),
|
|
39
49
|
};
|
|
40
50
|
}
|
|
51
|
+
|
|
52
|
+
function settingsPath(cwd: string): string {
|
|
53
|
+
const projectPath = join(cwd, CONFIG_DIR_NAME, "settings.json");
|
|
54
|
+
return existsSync(projectPath) ? projectPath : join(getAgentDir(), "settings.json");
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
export function saveProviderSettings(cwd: string, patch: Partial<ProviderSettings>): string {
|
|
58
|
+
const path = settingsPath(cwd);
|
|
59
|
+
let root: Record<string, unknown> = {};
|
|
60
|
+
if (existsSync(path)) {
|
|
61
|
+
const parsed: unknown = JSON.parse(readFileSync(path, "utf8"));
|
|
62
|
+
if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
|
|
63
|
+
throw new Error(`Settings file must contain a JSON object: ${path}`);
|
|
64
|
+
}
|
|
65
|
+
root = parsed as Record<string, unknown>;
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
const existing = parseSettingsLayer(root, path);
|
|
69
|
+
const next = { ...existing, ...patch };
|
|
70
|
+
mkdirSync(dirname(path), { recursive: true, mode: 0o700 });
|
|
71
|
+
writeFileSync(path, `${JSON.stringify({ ...root, [PROVIDER_SETTINGS_NAMESPACE]: next }, null, 2)}\n`, {
|
|
72
|
+
encoding: "utf8",
|
|
73
|
+
mode: 0o600,
|
|
74
|
+
});
|
|
75
|
+
return path;
|
|
76
|
+
}
|
package/src/types.ts
CHANGED
|
@@ -3,6 +3,21 @@ import type { ProviderModelConfig } from "@earendil-works/pi-coding-agent";
|
|
|
3
3
|
|
|
4
4
|
export type InputModality = "text" | "image";
|
|
5
5
|
|
|
6
|
+
export interface ProviderModelOverride {
|
|
7
|
+
reasoning?: boolean;
|
|
8
|
+
contextWindow?: number;
|
|
9
|
+
maxTokens?: number;
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
export interface ProviderModelOverrideLayer {
|
|
13
|
+
reasoning?: boolean | null;
|
|
14
|
+
contextWindow?: number | null;
|
|
15
|
+
maxTokens?: number | null;
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
export type ProviderModelOverrides = Record<string, ProviderModelOverride>;
|
|
19
|
+
export type ProviderModelOverrideLayers = Record<string, ProviderModelOverrideLayer>;
|
|
20
|
+
|
|
6
21
|
export interface CpaProviderConfig {
|
|
7
22
|
providerName: string;
|
|
8
23
|
baseUrl: string;
|
|
@@ -11,6 +26,7 @@ export interface CpaProviderConfig {
|
|
|
11
26
|
headers: Record<string, string>;
|
|
12
27
|
modelsDevEnabled: boolean;
|
|
13
28
|
modelAliases: Record<string, string>;
|
|
29
|
+
modelOverrides: ProviderModelOverrides;
|
|
14
30
|
}
|
|
15
31
|
|
|
16
32
|
export interface ModelsDevMetadata {
|