Skip to content

Commit 23c4767

Browse files
feat: filter OpenRouter discovery to free models
Co-authored-by: Copilot App <[email protected]>
1 parent 60046f8 commit 23c4767

12 files changed

Lines changed: 115 additions & 18 deletions

File tree

‎gui/src/components/AddProviderModal.tsx‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ export default function AddProviderModal({
7575
const [discoverySource, setDiscoverySource] = useState<"live" | "static" | "">("");
7676
const [discoveredModels, setDiscoveredModels] = useState<Array<{ id: string; contextWindow?: number }>>([]);
7777
const [selectedModels, setSelectedModels] = useState<string[]>([]);
78+
const [openRouterFreeOnly, setOpenRouterFreeOnly] = useState(false);
7879
const discoveryRequestRef = useRef(0);
7980
const discoveryAbortRef = useRef<AbortController | null>(null);
8081
const aliveRef = useRef(true);
@@ -194,6 +195,7 @@ export default function AddProviderModal({
194195
const staticModels = (p.models ?? []).map(id => ({ id }));
195196
setDiscoveredModels(staticModels);
196197
setSelectedModels(staticModels.map(model => model.id));
198+
setOpenRouterFreeOnly(false);
197199
};
198200

199201
const back = () => {
@@ -211,6 +213,7 @@ export default function AddProviderModal({
211213
setDiscoverySource("");
212214
setDiscoveredModels([]);
213215
setSelectedModels([]);
216+
setOpenRouterFreeOnly(false);
214217
};
215218

216219
const providerPostBody = () => {
@@ -221,7 +224,7 @@ export default function AddProviderModal({
221224
return buildProviderPostBody(preset, { ...form, baseUrl: resolvedBaseUrl });
222225
};
223226

224-
const discoverModels = async () => {
227+
const discoverModels = async (freeOnly = openRouterFreeOnly) => {
225228
const postBody = providerPostBody();
226229
if (!postBody || !preset || preset.supportLevel === "reference") return;
227230
const requestId = discoveryRequestRef.current + 1;
@@ -235,7 +238,7 @@ export default function AddProviderModal({
235238
const res = await fetch(`${apiBase}/api/provider-presets/discover`, {
236239
method: "POST",
237240
headers: { "Content-Type": "application/json" },
238-
body: JSON.stringify({ presetId: preset.id, provider: postBody.provider }),
241+
body: JSON.stringify({ presetId: preset.id, provider: postBody.provider, ...(preset.id === "openrouter" ? { freeOnly } : {}) }),
239242
signal: controller.signal,
240243
});
241244
const data = await res.json().catch(() => ({})) as {
@@ -252,7 +255,7 @@ export default function AddProviderModal({
252255
setSelectedModels(models.map(model => model.id));
253256
setDiscoverySource(data.source ?? (preset.discovery === "static" ? "static" : "live"));
254257
if (data.error) setDiscoveryError(data.error);
255-
if (models[0]) setForm(current => current && !current.defaultModel ? { ...current, defaultModel: models[0]!.id } : current);
258+
if (models[0]) setForm(current => current && (freeOnly || !current.defaultModel) ? { ...current, defaultModel: models[0]!.id } : current);
256259
} catch (cause) {
257260
if (requestId !== discoveryRequestRef.current || controller.signal.aborted) return;
258261
setDiscoveryError(cause instanceof Error ? cause.message : t("modal.networkError"));
@@ -662,6 +665,16 @@ export default function AddProviderModal({
662665
{discoveryBusy ? t("modal.discovering") : t("modal.discoverModels")}
663666
</button>
664667
</div>
668+
{preset.id === "openrouter" && (
669+
<label className="provider-model-free-filter">
670+
<input type="checkbox" checked={openRouterFreeOnly} disabled={discoveryBusy} onChange={event => {
671+
const checked = event.target.checked;
672+
setOpenRouterFreeOnly(checked);
673+
void discoverModels(checked);
674+
}} />
675+
{t("modal.openRouterFreeOnly")}
676+
</label>
677+
)}
665678
{discoveryError && <div className="text-label" role="alert" style={{ color: discoverySource === "static" && discoveredModels.length ? "var(--amber)" : "var(--red)" }}>{discoveryError}</div>}
666679
{discoveredModels.length > 0 && (
667680
<div className="provider-model-list" aria-label={t("modal.discoveredModels")}>

‎gui/src/i18n/de.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1024,6 +1024,7 @@ export const de = {
10241024
"modal.modelDiscovery": "Modellsuche",
10251025
"modal.modelDiscoveryHint": "Verfügbare Modelle für diese Einrichtung suchen.",
10261026
"modal.discoverModels": "Modelle suchen",
1027+
"modal.openRouterFreeOnly": "Nur kostenlose OpenRouter-Modelle verwenden",
10271028
"modal.discovering": "Suche läuft…",
10281029
"modal.modelsLive": "Live-Antwort des Anbieters",
10291030
"modal.modelsStatic": "Statischer Katalog",

‎gui/src/i18n/en.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -867,6 +867,7 @@ export const en = {
867867
"modal.modelDiscovery": "Model discovery",
868868
"modal.modelDiscoveryHint": "Find available models for this setup.",
869869
"modal.discoverModels": "Discover models",
870+
"modal.openRouterFreeOnly": "Use free OpenRouter models only",
870871
"modal.discovering": "Discovering…",
871872
"modal.modelsLive": "Live provider response",
872873
"modal.modelsStatic": "Static catalog",

‎gui/src/i18n/ja.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -822,6 +822,7 @@ export const ja: Record<TKey, string> = {
822822
"modal.modelDiscovery": "モデル検出",
823823
"modal.modelDiscoveryHint": "この設定で利用可能なモデルを検索します。",
824824
"modal.discoverModels": "モデルを検出",
825+
"modal.openRouterFreeOnly": "OpenRouter の無料モデルのみを使用",
825826
"modal.discovering": "検出中…",
826827
"modal.modelsLive": "プロバイダーからのライブ応答",
827828
"modal.modelsStatic": "静的カタログ",

‎gui/src/i18n/ko.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1046,6 +1046,7 @@ export const ko: Record<TKey, string> = {
10461046
"modal.modelDiscovery": "모델 검색",
10471047
"modal.modelDiscoveryHint": "이 설정에서 사용 가능한 모델을 찾습니다.",
10481048
"modal.discoverModels": "모델 검색",
1049+
"modal.openRouterFreeOnly": "무료 OpenRouter 모델만 사용",
10491050
"modal.discovering": "검색 중…",
10501051
"modal.modelsLive": "프로바이더 실시간 응답",
10511052
"modal.modelsStatic": "정적 카탈로그",

‎gui/src/i18n/ru.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -867,6 +867,7 @@ export const ru: Record<TKey, string> = {
867867
"modal.modelDiscovery": "Поиск моделей",
868868
"modal.modelDiscoveryHint": "Найдите модели, доступные для этой настройки.",
869869
"modal.discoverModels": "Найти модели",
870+
"modal.openRouterFreeOnly": "Использовать только бесплатные модели OpenRouter",
870871
"modal.discovering": "Поиск…",
871872
"modal.modelsLive": "Ответ провайдера в реальном времени",
872873
"modal.modelsStatic": "Статический каталог",

‎gui/src/i18n/zh.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1046,6 +1046,7 @@ export const zh: Record<TKey, string> = {
10461046
"modal.modelDiscovery": "模型发现",
10471047
"modal.modelDiscoveryHint": "查找此设置可用的模型。",
10481048
"modal.discoverModels": "发现模型",
1049+
"modal.openRouterFreeOnly": "仅使用免费的 OpenRouter 模型",
10491050
"modal.discovering": "正在发现…",
10501051
"modal.modelsLive": "提供商实时响应",
10511052
"modal.modelsStatic": "静态目录",

‎gui/src/styles/provider-catalog.css‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@
8080
.provider-model-discovery-head { display: flex; align-items: center; justify-content: space-between; gap: 10px; }
8181
.provider-model-discovery-head strong { font-size: var(--text-control); }
8282
.provider-model-source { color: var(--muted); font-size: var(--text-label); }
83+
.provider-model-free-filter { display: inline-flex; align-items: center; gap: 7px; width: fit-content; color: var(--text); font-size: var(--text-label); cursor: pointer; }
8384
.provider-model-list { display: grid; max-height: 210px; overflow-y: auto; border: 1px solid var(--border); border-radius: var(--radius-sm); }
8485
.provider-model-row { display: flex; align-items: center; gap: 9px; padding: 8px 10px; font-size: var(--text-label); cursor: pointer; }
8586
.provider-model-row + .provider-model-row { border-top: 1px solid var(--border-soft); }

‎src/codex/catalog/provider-fetch.ts‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,10 @@ export type ProviderModelsApiItem = {
5757
owned_by?: string;
5858
context_length?: number;
5959
max_model_len?: number;
60+
pricing?: {
61+
prompt: string;
62+
completion: string;
63+
};
6064
metadata?: {
6165
capabilities?: Record<string, unknown>;
6266
limits?: Record<string, unknown>;
@@ -100,10 +104,18 @@ export function parseProviderModelsApiItems(value: unknown, allowModelsEnvelope
100104
item.max_context_length,
101105
item.max_model_len,
102106
].find(candidate => typeof candidate === "number" && Number.isFinite(candidate) && candidate > 0) as number | undefined;
107+
const rawPricing = item.pricing !== null && typeof item.pricing === "object" && !Array.isArray(item.pricing)
108+
? item.pricing as Record<string, unknown>
109+
: null;
110+
const pricing = rawPricing && typeof rawPricing.prompt === "string" && rawPricing.prompt.trim()
111+
&& typeof rawPricing.completion === "string" && rawPricing.completion.trim()
112+
? { prompt: rawPricing.prompt, completion: rawPricing.completion }
113+
: undefined;
103114
normalized.push({
104115
id,
105116
...(typeof item.owned_by === "string" ? { owned_by: item.owned_by } : {}),
106117
...(contextLength ? { context_length: contextLength } : {}),
118+
...(pricing ? { pricing } : {}),
107119
...(item.metadata !== null && typeof item.metadata === "object" && !Array.isArray(item.metadata)
108120
? { metadata: item.metadata as ProviderModelsApiItem["metadata"] }
109121
: {}),

‎src/server/management/provider-routes.ts‎

Lines changed: 30 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -409,12 +409,14 @@ export async function handleProviderRoutes(ctx: ManagementContext): Promise<Resp
409409
}
410410

411411
if (url.pathname === "/api/provider-presets/discover" && req.method === "POST") {
412-
let body: { presetId?: unknown; provider?: unknown };
412+
let body: { presetId?: unknown; provider?: unknown; freeOnly?: unknown };
413413
try { body = await req.json(); } catch { return jsonResponse({ error: "invalid JSON body" }, 400); }
414414
const presetId = typeof body.presetId === "string" ? body.presetId.trim() : "";
415415
if (!presetId || !isValidProviderName(presetId)) return jsonResponse({ error: "invalid presetId" }, 400);
416416
const entry = getProviderRegistryEntry(presetId);
417417
if (!entry) return jsonResponse({ error: "unknown provider preset" }, 404);
418+
if (body.freeOnly !== undefined && typeof body.freeOnly !== "boolean") return jsonResponse({ error: "freeOnly must be a boolean" }, 400);
419+
if (body.freeOnly === true && presetId !== "openrouter") return jsonResponse({ error: "freeOnly is only supported for OpenRouter" }, 400);
418420
if (entry.supportLevel === "reference") {
419421
return jsonResponse({ error: "reference-only provider presets cannot be connected automatically" }, 400);
420422
}
@@ -459,11 +461,14 @@ export async function handleProviderRoutes(ctx: ManagementContext): Promise<Resp
459461
id,
460462
...(entry.modelContextWindows?.[id] ? { contextWindow: entry.modelContextWindows[id] } : {}),
461463
}));
464+
const fallbackModels = body.freeOnly === true
465+
? staticModels.filter(model => model.id.endsWith(":free"))
466+
: staticModels;
462467
const destinationError = await providerDestinationResolvedError(presetId, provider);
463468
if (destinationError) return jsonResponse({ error: destinationError }, 400);
464469
if (entry.discovery === "static" || entry.discovery === "unsupported" || entry.liveModels === false) {
465-
return jsonResponse(staticModels.length
466-
? { ok: true, models: staticModels, source: "static", latencyMs: 0 }
470+
return jsonResponse(fallbackModels.length
471+
? { ok: true, models: fallbackModels, source: "static", latencyMs: 0 }
467472
: { ok: false, models: [], source: "static", latencyMs: 0, error: "No static model catalog is available for this preset" });
468473
}
469474
const { resolveModelsAuthToken, buildModelsRequest } = await import("../../oauth");
@@ -477,17 +482,17 @@ export async function handleProviderRoutes(ctx: ManagementContext): Promise<Resp
477482
const latencyMs = Date.now() - started;
478483
if (!response.ok) {
479484
const error = `upstream model discovery returned ${response.status}`;
480-
return jsonResponse(staticModels.length
481-
? { ok: true, models: staticModels, source: "static", latencyMs, error }
485+
return jsonResponse(fallbackModels.length
486+
? { ok: true, models: fallbackModels, source: "static", latencyMs, error }
482487
: { ok: false, models: [], source: "live", latencyMs, error });
483488
}
484489
const allowsModelsEnvelope = (entry.adapter === "google" && (entry.googleMode ?? "ai-studio") === "ai-studio")
485490
|| new URL(request.url).pathname.replace(/\/+$/, "").endsWith("/api/tags");
486491
const rows = parseProviderModelsApiItems(await response.json().catch(() => null), allowsModelsEnvelope);
487492
if (!rows) {
488493
const error = "upstream model discovery returned an unexpected shape";
489-
return jsonResponse(staticModels.length
490-
? { ok: true, models: staticModels, source: "static", latencyMs, error }
494+
return jsonResponse(fallbackModels.length
495+
? { ok: true, models: fallbackModels, source: "static", latencyMs, error }
491496
: { ok: false, models: [], source: "live", latencyMs, error });
492497
}
493498
const uniqueRows = new Map<string, (typeof rows)[number]>();
@@ -496,22 +501,34 @@ export async function handleProviderRoutes(ctx: ManagementContext): Promise<Resp
496501
if (!current || (!current.context_length && row.context_length)) uniqueRows.set(row.id, row);
497502
if (uniqueRows.size >= 2000) break;
498503
}
499-
const models = [...uniqueRows.values()].map(row => ({
504+
const filteredRows = body.freeOnly === true
505+
? [...uniqueRows.values()].filter(row => {
506+
const prompt = Number(row.pricing?.prompt);
507+
const completion = Number(row.pricing?.completion);
508+
return row.pricing !== undefined
509+
&& Number.isFinite(prompt) && prompt >= 0
510+
&& Number.isFinite(completion) && completion >= 0
511+
&& prompt === 0 && completion === 0;
512+
})
513+
: [...uniqueRows.values()];
514+
const models = filteredRows.map(row => ({
500515
id: row.id,
501516
...(row.context_length ? { contextWindow: row.context_length } : {}),
502517
}));
503518
if (models.length === 0) {
504-
const error = "upstream model discovery returned an empty catalog";
505-
return jsonResponse(staticModels.length
506-
? { ok: true, models: staticModels, source: "static", latencyMs, error }
519+
const error = body.freeOnly === true
520+
? "OpenRouter currently reports no free models"
521+
: "upstream model discovery returned an empty catalog";
522+
return jsonResponse(fallbackModels.length
523+
? { ok: true, models: fallbackModels, source: "static", latencyMs, error }
507524
: { ok: false, models: [], source: "live", latencyMs, error });
508525
}
509526
return jsonResponse({ ok: true, models, source: "live", latencyMs });
510527
} catch {
511528
const latencyMs = Date.now() - started;
512529
const error = "model discovery request failed";
513-
return jsonResponse(staticModels.length
514-
? { ok: true, models: staticModels, source: "static", latencyMs, error }
530+
return jsonResponse(fallbackModels.length
531+
? { ok: true, models: fallbackModels, source: "static", latencyMs, error }
515532
: { ok: false, models: [], source: "live", latencyMs, error });
516533
}
517534
}

0 commit comments

Comments
 (0)