feat(dashboard): model test-all with connection selector, usage by provider, combo enable toggle and showOnlyComboModels setting
- provider detail: Test All Models button runs every model (built-in + custom) with an optional connection selector; failed models can be disabled in bulk - bulk selected-model test now runs all connections in parallel (Promise.all) - usage overview: new 'Usage by Provider' table view (default) and a Provider column in Recent Requests; byProvider now tracks lastUsed - combos: per-combo enable/disable toggle; disabled combos are skipped by the routing engine (getComboModels/getComboModelsFromData) and model listing - settings: 'Only show combo models' toggle filters ModelSelectModal and the /v1/models response to models present in enabled combos
This commit is contained in:
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -3,71 +3,92 @@ import { getAdapter } from "../driver.js";
|
||||
import { parseJson, stringifyJson } from "../helpers/jsonCol.js";
|
||||
|
||||
function rowToCombo(row) {
|
||||
if (!row) return null;
|
||||
return {
|
||||
id: row.id,
|
||||
name: row.name,
|
||||
kind: row.kind,
|
||||
models: parseJson(row.models, []),
|
||||
createdAt: row.createdAt,
|
||||
updatedAt: row.updatedAt,
|
||||
};
|
||||
if (!row) return null;
|
||||
return {
|
||||
id: row.id,
|
||||
name: row.name,
|
||||
kind: row.kind,
|
||||
models: parseJson(row.models, []),
|
||||
enabled: row.enabled === 1 || row.enabled === true,
|
||||
createdAt: row.createdAt,
|
||||
updatedAt: row.updatedAt,
|
||||
};
|
||||
}
|
||||
|
||||
export async function getCombos() {
|
||||
const db = await getAdapter();
|
||||
const rows = db.all(`SELECT * FROM combos ORDER BY createdAt ASC`);
|
||||
return rows.map(rowToCombo);
|
||||
const db = await getAdapter();
|
||||
const rows = db.all(`SELECT * FROM combos ORDER BY createdAt ASC`);
|
||||
return rows.map(rowToCombo);
|
||||
}
|
||||
|
||||
export async function getComboById(id) {
|
||||
const db = await getAdapter();
|
||||
const row = db.get(`SELECT * FROM combos WHERE id = ?`, [id]);
|
||||
return rowToCombo(row);
|
||||
const db = await getAdapter();
|
||||
const row = db.get(`SELECT * FROM combos WHERE id = ?`, [id]);
|
||||
return rowToCombo(row);
|
||||
}
|
||||
|
||||
export async function getComboByName(name) {
|
||||
const db = await getAdapter();
|
||||
const row = db.get(`SELECT * FROM combos WHERE name = ?`, [name]);
|
||||
return rowToCombo(row);
|
||||
const db = await getAdapter();
|
||||
const row = db.get(`SELECT * FROM combos WHERE name = ?`, [name]);
|
||||
return rowToCombo(row);
|
||||
}
|
||||
|
||||
export async function createCombo(data) {
|
||||
const db = await getAdapter();
|
||||
const now = new Date().toISOString();
|
||||
const combo = {
|
||||
id: uuidv4(),
|
||||
name: data.name,
|
||||
kind: data.kind || null,
|
||||
models: data.models || [],
|
||||
createdAt: now,
|
||||
updatedAt: now,
|
||||
};
|
||||
db.run(
|
||||
`INSERT INTO combos(id, name, kind, models, createdAt, updatedAt) VALUES(?, ?, ?, ?, ?, ?)`,
|
||||
[combo.id, combo.name, combo.kind, stringifyJson(combo.models), combo.createdAt, combo.updatedAt]
|
||||
);
|
||||
return combo;
|
||||
const db = await getAdapter();
|
||||
const now = new Date().toISOString();
|
||||
const combo = {
|
||||
id: uuidv4(),
|
||||
name: data.name,
|
||||
kind: data.kind || null,
|
||||
models: data.models || [],
|
||||
enabled: data.enabled !== false,
|
||||
createdAt: now,
|
||||
updatedAt: now,
|
||||
};
|
||||
db.run(
|
||||
`INSERT INTO combos(id, name, kind, models, enabled, createdAt, updatedAt) VALUES(?, ?, ?, ?, ?, ?, ?)`,
|
||||
[
|
||||
combo.id,
|
||||
combo.name,
|
||||
combo.kind,
|
||||
stringifyJson(combo.models),
|
||||
combo.enabled !== false ? 1 : 0,
|
||||
combo.createdAt,
|
||||
combo.updatedAt,
|
||||
],
|
||||
);
|
||||
return combo;
|
||||
}
|
||||
|
||||
export async function updateCombo(id, data) {
|
||||
const db = await getAdapter();
|
||||
let result = null;
|
||||
db.transaction(() => {
|
||||
const row = db.get(`SELECT * FROM combos WHERE id = ?`, [id]);
|
||||
if (!row) return;
|
||||
const merged = { ...rowToCombo(row), ...data, updatedAt: new Date().toISOString() };
|
||||
db.run(
|
||||
`UPDATE combos SET name = ?, kind = ?, models = ?, updatedAt = ? WHERE id = ?`,
|
||||
[merged.name, merged.kind, stringifyJson(merged.models || []), merged.updatedAt, id]
|
||||
);
|
||||
result = merged;
|
||||
});
|
||||
return result;
|
||||
const db = await getAdapter();
|
||||
let result = null;
|
||||
db.transaction(() => {
|
||||
const row = db.get(`SELECT * FROM combos WHERE id = ?`, [id]);
|
||||
if (!row) return;
|
||||
const merged = {
|
||||
...rowToCombo(row),
|
||||
...data,
|
||||
updatedAt: new Date().toISOString(),
|
||||
};
|
||||
db.run(
|
||||
`UPDATE combos SET name = ?, kind = ?, models = ?, enabled = ?, updatedAt = ? WHERE id = ?`,
|
||||
[
|
||||
merged.name,
|
||||
merged.kind,
|
||||
stringifyJson(merged.models || []),
|
||||
merged.enabled ? 1 : 0,
|
||||
merged.updatedAt,
|
||||
id,
|
||||
],
|
||||
);
|
||||
result = merged;
|
||||
});
|
||||
return result;
|
||||
}
|
||||
|
||||
export async function deleteCombo(id) {
|
||||
const db = await getAdapter();
|
||||
const res = db.run(`DELETE FROM combos WHERE id = ?`, [id]);
|
||||
return (res?.changes ?? 0) > 0;
|
||||
const db = await getAdapter();
|
||||
const res = db.run(`DELETE FROM combos WHERE id = ?`, [id]);
|
||||
return (res?.changes ?? 0) > 0;
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -19,143 +19,144 @@ PRAGMA busy_timeout = 5000;
|
||||
// auto-add missing tables/columns/indexes after versioned migrations.
|
||||
// For destructive changes (drop/rename/type-change), write a migration file.
|
||||
export const TABLES = {
|
||||
_meta: {
|
||||
columns: {
|
||||
key: "TEXT PRIMARY KEY",
|
||||
value: "TEXT NOT NULL",
|
||||
},
|
||||
},
|
||||
settings: {
|
||||
columns: {
|
||||
id: "INTEGER PRIMARY KEY CHECK (id = 1)",
|
||||
data: "TEXT NOT NULL",
|
||||
},
|
||||
},
|
||||
providerConnections: {
|
||||
columns: {
|
||||
id: "TEXT PRIMARY KEY",
|
||||
provider: "TEXT NOT NULL",
|
||||
authType: "TEXT NOT NULL",
|
||||
name: "TEXT",
|
||||
email: "TEXT",
|
||||
priority: "INTEGER",
|
||||
isActive: "INTEGER DEFAULT 1",
|
||||
data: "TEXT NOT NULL",
|
||||
createdAt: "TEXT NOT NULL",
|
||||
updatedAt: "TEXT NOT NULL",
|
||||
},
|
||||
indexes: [
|
||||
"CREATE INDEX IF NOT EXISTS idx_pc_provider ON providerConnections(provider)",
|
||||
"CREATE INDEX IF NOT EXISTS idx_pc_provider_active ON providerConnections(provider, isActive)",
|
||||
"CREATE INDEX IF NOT EXISTS idx_pc_priority ON providerConnections(provider, priority)",
|
||||
],
|
||||
},
|
||||
providerNodes: {
|
||||
columns: {
|
||||
id: "TEXT PRIMARY KEY",
|
||||
type: "TEXT",
|
||||
name: "TEXT",
|
||||
data: "TEXT NOT NULL",
|
||||
createdAt: "TEXT NOT NULL",
|
||||
updatedAt: "TEXT NOT NULL",
|
||||
},
|
||||
indexes: ["CREATE INDEX IF NOT EXISTS idx_pn_type ON providerNodes(type)"],
|
||||
},
|
||||
proxyPools: {
|
||||
columns: {
|
||||
id: "TEXT PRIMARY KEY",
|
||||
isActive: "INTEGER DEFAULT 1",
|
||||
testStatus: "TEXT",
|
||||
data: "TEXT NOT NULL",
|
||||
createdAt: "TEXT NOT NULL",
|
||||
updatedAt: "TEXT NOT NULL",
|
||||
},
|
||||
indexes: [
|
||||
"CREATE INDEX IF NOT EXISTS idx_pp_active ON proxyPools(isActive)",
|
||||
"CREATE INDEX IF NOT EXISTS idx_pp_status ON proxyPools(testStatus)",
|
||||
],
|
||||
},
|
||||
apiKeys: {
|
||||
columns: {
|
||||
id: "TEXT PRIMARY KEY",
|
||||
key: "TEXT UNIQUE NOT NULL",
|
||||
name: "TEXT",
|
||||
machineId: "TEXT",
|
||||
isActive: "INTEGER DEFAULT 1",
|
||||
createdAt: "TEXT NOT NULL",
|
||||
},
|
||||
indexes: ["CREATE INDEX IF NOT EXISTS idx_ak_key ON apiKeys(key)"],
|
||||
},
|
||||
combos: {
|
||||
columns: {
|
||||
id: "TEXT PRIMARY KEY",
|
||||
name: "TEXT UNIQUE NOT NULL",
|
||||
kind: "TEXT",
|
||||
models: "TEXT NOT NULL",
|
||||
createdAt: "TEXT NOT NULL",
|
||||
updatedAt: "TEXT NOT NULL",
|
||||
},
|
||||
indexes: ["CREATE INDEX IF NOT EXISTS idx_combo_name ON combos(name)"],
|
||||
},
|
||||
kv: {
|
||||
columns: {
|
||||
scope: "TEXT NOT NULL",
|
||||
key: "TEXT NOT NULL",
|
||||
value: "TEXT NOT NULL",
|
||||
},
|
||||
primaryKey: "PRIMARY KEY (scope, key)",
|
||||
indexes: ["CREATE INDEX IF NOT EXISTS idx_kv_scope ON kv(scope)"],
|
||||
},
|
||||
usageHistory: {
|
||||
columns: {
|
||||
id: "INTEGER PRIMARY KEY AUTOINCREMENT",
|
||||
timestamp: "TEXT NOT NULL",
|
||||
provider: "TEXT",
|
||||
model: "TEXT",
|
||||
connectionId: "TEXT",
|
||||
apiKey: "TEXT",
|
||||
endpoint: "TEXT",
|
||||
promptTokens: "INTEGER DEFAULT 0",
|
||||
completionTokens: "INTEGER DEFAULT 0",
|
||||
cost: "REAL DEFAULT 0",
|
||||
status: "TEXT",
|
||||
tokens: "TEXT",
|
||||
meta: "TEXT",
|
||||
},
|
||||
indexes: [
|
||||
"CREATE INDEX IF NOT EXISTS idx_uh_ts ON usageHistory(timestamp DESC)",
|
||||
"CREATE INDEX IF NOT EXISTS idx_uh_provider ON usageHistory(provider)",
|
||||
"CREATE INDEX IF NOT EXISTS idx_uh_model ON usageHistory(model)",
|
||||
"CREATE INDEX IF NOT EXISTS idx_uh_conn ON usageHistory(connectionId)",
|
||||
],
|
||||
},
|
||||
usageDaily: {
|
||||
columns: {
|
||||
dateKey: "TEXT PRIMARY KEY",
|
||||
data: "TEXT NOT NULL",
|
||||
},
|
||||
},
|
||||
requestDetails: {
|
||||
columns: {
|
||||
id: "TEXT PRIMARY KEY",
|
||||
timestamp: "TEXT NOT NULL",
|
||||
provider: "TEXT",
|
||||
model: "TEXT",
|
||||
connectionId: "TEXT",
|
||||
status: "TEXT",
|
||||
data: "TEXT NOT NULL",
|
||||
},
|
||||
indexes: [
|
||||
"CREATE INDEX IF NOT EXISTS idx_rd_ts ON requestDetails(timestamp DESC)",
|
||||
"CREATE INDEX IF NOT EXISTS idx_rd_provider ON requestDetails(provider)",
|
||||
"CREATE INDEX IF NOT EXISTS idx_rd_model ON requestDetails(model)",
|
||||
"CREATE INDEX IF NOT EXISTS idx_rd_conn ON requestDetails(connectionId)",
|
||||
],
|
||||
},
|
||||
_meta: {
|
||||
columns: {
|
||||
key: "TEXT PRIMARY KEY",
|
||||
value: "TEXT NOT NULL",
|
||||
},
|
||||
},
|
||||
settings: {
|
||||
columns: {
|
||||
id: "INTEGER PRIMARY KEY CHECK (id = 1)",
|
||||
data: "TEXT NOT NULL",
|
||||
},
|
||||
},
|
||||
providerConnections: {
|
||||
columns: {
|
||||
id: "TEXT PRIMARY KEY",
|
||||
provider: "TEXT NOT NULL",
|
||||
authType: "TEXT NOT NULL",
|
||||
name: "TEXT",
|
||||
email: "TEXT",
|
||||
priority: "INTEGER",
|
||||
isActive: "INTEGER DEFAULT 1",
|
||||
data: "TEXT NOT NULL",
|
||||
createdAt: "TEXT NOT NULL",
|
||||
updatedAt: "TEXT NOT NULL",
|
||||
},
|
||||
indexes: [
|
||||
"CREATE INDEX IF NOT EXISTS idx_pc_provider ON providerConnections(provider)",
|
||||
"CREATE INDEX IF NOT EXISTS idx_pc_provider_active ON providerConnections(provider, isActive)",
|
||||
"CREATE INDEX IF NOT EXISTS idx_pc_priority ON providerConnections(provider, priority)",
|
||||
],
|
||||
},
|
||||
providerNodes: {
|
||||
columns: {
|
||||
id: "TEXT PRIMARY KEY",
|
||||
type: "TEXT",
|
||||
name: "TEXT",
|
||||
data: "TEXT NOT NULL",
|
||||
createdAt: "TEXT NOT NULL",
|
||||
updatedAt: "TEXT NOT NULL",
|
||||
},
|
||||
indexes: ["CREATE INDEX IF NOT EXISTS idx_pn_type ON providerNodes(type)"],
|
||||
},
|
||||
proxyPools: {
|
||||
columns: {
|
||||
id: "TEXT PRIMARY KEY",
|
||||
isActive: "INTEGER DEFAULT 1",
|
||||
testStatus: "TEXT",
|
||||
data: "TEXT NOT NULL",
|
||||
createdAt: "TEXT NOT NULL",
|
||||
updatedAt: "TEXT NOT NULL",
|
||||
},
|
||||
indexes: [
|
||||
"CREATE INDEX IF NOT EXISTS idx_pp_active ON proxyPools(isActive)",
|
||||
"CREATE INDEX IF NOT EXISTS idx_pp_status ON proxyPools(testStatus)",
|
||||
],
|
||||
},
|
||||
apiKeys: {
|
||||
columns: {
|
||||
id: "TEXT PRIMARY KEY",
|
||||
key: "TEXT UNIQUE NOT NULL",
|
||||
name: "TEXT",
|
||||
machineId: "TEXT",
|
||||
isActive: "INTEGER DEFAULT 1",
|
||||
createdAt: "TEXT NOT NULL",
|
||||
},
|
||||
indexes: ["CREATE INDEX IF NOT EXISTS idx_ak_key ON apiKeys(key)"],
|
||||
},
|
||||
combos: {
|
||||
columns: {
|
||||
id: "TEXT PRIMARY KEY",
|
||||
name: "TEXT UNIQUE NOT NULL",
|
||||
kind: "TEXT",
|
||||
models: "TEXT NOT NULL",
|
||||
enabled: "INTEGER NOT NULL DEFAULT 1",
|
||||
createdAt: "TEXT NOT NULL",
|
||||
updatedAt: "TEXT NOT NULL",
|
||||
},
|
||||
indexes: ["CREATE INDEX IF NOT EXISTS idx_combo_name ON combos(name)"],
|
||||
},
|
||||
kv: {
|
||||
columns: {
|
||||
scope: "TEXT NOT NULL",
|
||||
key: "TEXT NOT NULL",
|
||||
value: "TEXT NOT NULL",
|
||||
},
|
||||
primaryKey: "PRIMARY KEY (scope, key)",
|
||||
indexes: ["CREATE INDEX IF NOT EXISTS idx_kv_scope ON kv(scope)"],
|
||||
},
|
||||
usageHistory: {
|
||||
columns: {
|
||||
id: "INTEGER PRIMARY KEY AUTOINCREMENT",
|
||||
timestamp: "TEXT NOT NULL",
|
||||
provider: "TEXT",
|
||||
model: "TEXT",
|
||||
connectionId: "TEXT",
|
||||
apiKey: "TEXT",
|
||||
endpoint: "TEXT",
|
||||
promptTokens: "INTEGER DEFAULT 0",
|
||||
completionTokens: "INTEGER DEFAULT 0",
|
||||
cost: "REAL DEFAULT 0",
|
||||
status: "TEXT",
|
||||
tokens: "TEXT",
|
||||
meta: "TEXT",
|
||||
},
|
||||
indexes: [
|
||||
"CREATE INDEX IF NOT EXISTS idx_uh_ts ON usageHistory(timestamp DESC)",
|
||||
"CREATE INDEX IF NOT EXISTS idx_uh_provider ON usageHistory(provider)",
|
||||
"CREATE INDEX IF NOT EXISTS idx_uh_model ON usageHistory(model)",
|
||||
"CREATE INDEX IF NOT EXISTS idx_uh_conn ON usageHistory(connectionId)",
|
||||
],
|
||||
},
|
||||
usageDaily: {
|
||||
columns: {
|
||||
dateKey: "TEXT PRIMARY KEY",
|
||||
data: "TEXT NOT NULL",
|
||||
},
|
||||
},
|
||||
requestDetails: {
|
||||
columns: {
|
||||
id: "TEXT PRIMARY KEY",
|
||||
timestamp: "TEXT NOT NULL",
|
||||
provider: "TEXT",
|
||||
model: "TEXT",
|
||||
connectionId: "TEXT",
|
||||
status: "TEXT",
|
||||
data: "TEXT NOT NULL",
|
||||
},
|
||||
indexes: [
|
||||
"CREATE INDEX IF NOT EXISTS idx_rd_ts ON requestDetails(timestamp DESC)",
|
||||
"CREATE INDEX IF NOT EXISTS idx_rd_provider ON requestDetails(provider)",
|
||||
"CREATE INDEX IF NOT EXISTS idx_rd_model ON requestDetails(model)",
|
||||
"CREATE INDEX IF NOT EXISTS idx_rd_conn ON requestDetails(connectionId)",
|
||||
],
|
||||
},
|
||||
};
|
||||
|
||||
export function buildCreateTableSql(name, def) {
|
||||
const cols = Object.entries(def.columns).map(([k, v]) => `${k} ${v}`);
|
||||
if (def.primaryKey) cols.push(def.primaryKey);
|
||||
return `CREATE TABLE IF NOT EXISTS ${name} (${cols.join(", ")})`;
|
||||
const cols = Object.entries(def.columns).map(([k, v]) => `${k} ${v}`);
|
||||
if (def.primaryKey) cols.push(def.primaryKey);
|
||||
return `CREATE TABLE IF NOT EXISTS ${name} (${cols.join(", ")})`;
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,81 +1,103 @@
|
||||
// Re-export from open-sse with localDb integration
|
||||
import { getModelAliases, getComboByName, getProviderNodes } from "@/lib/localDb";
|
||||
import { parseModel as parseModelCore, resolveModelAliasFromMap, getModelInfoCore } from "open-sse/services/model.js";
|
||||
import {
|
||||
getModelAliases,
|
||||
getComboByName,
|
||||
getProviderNodes,
|
||||
} from "@/lib/localDb";
|
||||
import {
|
||||
parseModel as parseModelCore,
|
||||
resolveModelAliasFromMap,
|
||||
getModelInfoCore,
|
||||
} from "open-sse/services/model.js";
|
||||
import REGISTRY from "open-sse/providers/registry/index.js";
|
||||
|
||||
// Local provider alias overrides (HMR-friendly, applied on top of open-sse map)
|
||||
const LOCAL_PROVIDER_ALIASES = {
|
||||
xmtp: "xiaomi-tokenplan",
|
||||
"xiaomi-tokenplan": "xiaomi-tokenplan",
|
||||
xmtp: "xiaomi-tokenplan",
|
||||
"xiaomi-tokenplan": "xiaomi-tokenplan",
|
||||
};
|
||||
|
||||
const RESERVED_PROVIDER_PREFIXES = new Set(Object.keys(LOCAL_PROVIDER_ALIASES));
|
||||
for (const entry of REGISTRY) {
|
||||
RESERVED_PROVIDER_PREFIXES.add(entry.id);
|
||||
if (entry.alias) RESERVED_PROVIDER_PREFIXES.add(entry.alias);
|
||||
for (const alias of entry.aliases || []) RESERVED_PROVIDER_PREFIXES.add(alias);
|
||||
RESERVED_PROVIDER_PREFIXES.add(entry.id);
|
||||
if (entry.alias) RESERVED_PROVIDER_PREFIXES.add(entry.alias);
|
||||
for (const alias of entry.aliases || [])
|
||||
RESERVED_PROVIDER_PREFIXES.add(alias);
|
||||
}
|
||||
|
||||
export function parseModel(modelStr) {
|
||||
const parsed = parseModelCore(modelStr);
|
||||
if (parsed?.providerAlias && LOCAL_PROVIDER_ALIASES[parsed.providerAlias]) {
|
||||
return { ...parsed, provider: LOCAL_PROVIDER_ALIASES[parsed.providerAlias] };
|
||||
}
|
||||
return parsed;
|
||||
const parsed = parseModelCore(modelStr);
|
||||
if (parsed?.providerAlias && LOCAL_PROVIDER_ALIASES[parsed.providerAlias]) {
|
||||
return {
|
||||
...parsed,
|
||||
provider: LOCAL_PROVIDER_ALIASES[parsed.providerAlias],
|
||||
};
|
||||
}
|
||||
return parsed;
|
||||
}
|
||||
|
||||
/**
|
||||
* Resolve model alias from localDb
|
||||
*/
|
||||
export async function resolveModelAlias(alias) {
|
||||
const aliases = await getModelAliases();
|
||||
return resolveModelAliasFromMap(alias, aliases);
|
||||
const aliases = await getModelAliases();
|
||||
return resolveModelAliasFromMap(alias, aliases);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get full model info (parse or resolve)
|
||||
*/
|
||||
export async function getModelInfo(modelStr) {
|
||||
const parsed = parseModel(modelStr);
|
||||
const parsed = parseModel(modelStr);
|
||||
|
||||
if (!parsed.isAlias) {
|
||||
// Provider-node prefixes are user-defined. They must not override built-in
|
||||
// provider ids/aliases such as `cf`, `cloudflare-ai`, `openai`, or `hf`.
|
||||
if (!RESERVED_PROVIDER_PREFIXES.has(parsed.providerAlias)) {
|
||||
const openaiNodes = await getProviderNodes({ type: "openai-compatible" });
|
||||
const matchedOpenAI = openaiNodes.find((node) => node.prefix === parsed.providerAlias);
|
||||
if (matchedOpenAI) {
|
||||
return { provider: matchedOpenAI.id, model: parsed.model };
|
||||
}
|
||||
if (!parsed.isAlias) {
|
||||
// Provider-node prefixes are user-defined. They must not override built-in
|
||||
// provider ids/aliases such as `cf`, `cloudflare-ai`, `openai`, or `hf`.
|
||||
if (!RESERVED_PROVIDER_PREFIXES.has(parsed.providerAlias)) {
|
||||
const openaiNodes = await getProviderNodes({ type: "openai-compatible" });
|
||||
const matchedOpenAI = openaiNodes.find(
|
||||
(node) => node.prefix === parsed.providerAlias,
|
||||
);
|
||||
if (matchedOpenAI) {
|
||||
return { provider: matchedOpenAI.id, model: parsed.model };
|
||||
}
|
||||
|
||||
const anthropicNodes = await getProviderNodes({ type: "anthropic-compatible" });
|
||||
const matchedAnthropic = anthropicNodes.find((node) => node.prefix === parsed.providerAlias);
|
||||
if (matchedAnthropic) {
|
||||
return { provider: matchedAnthropic.id, model: parsed.model };
|
||||
}
|
||||
const anthropicNodes = await getProviderNodes({
|
||||
type: "anthropic-compatible",
|
||||
});
|
||||
const matchedAnthropic = anthropicNodes.find(
|
||||
(node) => node.prefix === parsed.providerAlias,
|
||||
);
|
||||
if (matchedAnthropic) {
|
||||
return { provider: matchedAnthropic.id, model: parsed.model };
|
||||
}
|
||||
|
||||
const embeddingNodes = await getProviderNodes({ type: "custom-embedding" });
|
||||
const matchedEmbedding = embeddingNodes.find((node) => node.prefix === parsed.providerAlias);
|
||||
if (matchedEmbedding) {
|
||||
return { provider: matchedEmbedding.id, model: parsed.model };
|
||||
}
|
||||
}
|
||||
return {
|
||||
provider: parsed.provider,
|
||||
model: parsed.model
|
||||
};
|
||||
}
|
||||
const embeddingNodes = await getProviderNodes({
|
||||
type: "custom-embedding",
|
||||
});
|
||||
const matchedEmbedding = embeddingNodes.find(
|
||||
(node) => node.prefix === parsed.providerAlias,
|
||||
);
|
||||
if (matchedEmbedding) {
|
||||
return { provider: matchedEmbedding.id, model: parsed.model };
|
||||
}
|
||||
}
|
||||
return {
|
||||
provider: parsed.provider,
|
||||
model: parsed.model,
|
||||
};
|
||||
}
|
||||
|
||||
// Check if this is a combo name before resolving as alias
|
||||
// This prevents combo names from being incorrectly routed to providers
|
||||
const combo = await getComboByName(parsed.model);
|
||||
if (combo) {
|
||||
// Return null provider to signal this should be handled as combo
|
||||
// The caller (handleChat) will detect this and handle it as combo
|
||||
return { provider: null, model: parsed.model };
|
||||
}
|
||||
// Check if this is a combo name before resolving as alias
|
||||
// This prevents combo names from being incorrectly routed to providers
|
||||
const combo = await getComboByName(parsed.model);
|
||||
if (combo && combo.enabled !== false) {
|
||||
// Return null provider to signal this should be handled as combo
|
||||
// The caller (handleChat) will detect this and handle it as combo
|
||||
return { provider: null, model: parsed.model };
|
||||
}
|
||||
|
||||
return getModelInfoCore(modelStr, getModelAliases);
|
||||
return getModelInfoCore(modelStr, getModelAliases);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -83,12 +105,17 @@ export async function getModelInfo(modelStr) {
|
||||
* @returns {Promise<string[]|null>} Array of models or null if not a combo
|
||||
*/
|
||||
export async function getComboModels(modelStr) {
|
||||
// Only check if it's not in provider/model format
|
||||
if (modelStr.includes("/")) return null;
|
||||
// Only check if it's not in provider/model format
|
||||
if (modelStr.includes("/")) return null;
|
||||
|
||||
const combo = await getComboByName(modelStr);
|
||||
if (combo && combo.models && combo.models.length > 0) {
|
||||
return combo.models;
|
||||
}
|
||||
return null;
|
||||
const combo = await getComboByName(modelStr);
|
||||
if (
|
||||
combo &&
|
||||
combo.enabled !== false &&
|
||||
combo.models &&
|
||||
combo.models.length > 0
|
||||
) {
|
||||
return combo.models;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user