mirror of
https://github.com/DayuanJiang/next-ai-draw-io.git
synced 2026-10-13 04:59:51 +08:00
Five reviewers (Fable 5.1, Opus 5.5, Sonnet 5.5, Codex GPT-6 Astra, Codex GPT-6.1 Sol) found no behavior or security regression; this commit applies what they asked for. Settings dialog: the automatic model list fetch only fills the list, which waits behind 'Browse models'; it no longer opens the picker (the modal picker took the focus from whatever the user was typing) and shows no error of its own. One list request per provider at a time, so a click during the automatic fetch sends nothing twice; the baseline that detects freshly entered credentials is taken on every visit of a provider page; SGLang's prefilled local example URL triggers no fetch. Entries saved with Azure's old placeholder URL still count as having no URL. The base URL field of Azure and of the custom preset is labelled required (new dictionary key baseUrlRequired). Smaller code: the PROVIDER_INFO alias is gone (three files and the tests import PROVIDERS), as are three logo values no code read, two unused type re-exports, three unused exports and SINGLE_SYSTEM_PROVIDERS (the chat route reads the record). Renamed for clarity: REQUIRED_KEY_VARS, requiredKeyEnv, configuredUrl, LocalizedText. Seven stale comments rewritten; the custom preset's note shortened. Tests: the matrix gains six override shapes (a Vertex key alone, AWS keys with a session token, headers with a URL, a trusted URL with a key, a key with a server model's URL variable, '/' alone), 5843 rows; the new rows were regenerated on the pre-refactor code and match it. The matrix and the server credential tests clear every variable they read; the admin variable table covers every provider; a test that derived its expectation from the function under test is gone; the singleSystem, listNeedsNoKey, sdkKnowsEndpoint and auto-detection sets are spelled out. Docs: the READMEs say 25 providers and name the OpenAI-compatible preset; the AI_PROVIDER lists are complete; the Azure example URL has its /openai suffix; 'Adding a Provider' names the tests to update.
251 lines
8.6 KiB
TypeScript
251 lines
8.6 KiB
TypeScript
import fs from "fs/promises"
|
|
import path from "path"
|
|
import { z } from "zod"
|
|
import { PROVIDERS, type ProviderName } from "@/lib/providers"
|
|
|
|
export const ProviderNameSchema: z.ZodType<ProviderName> = z
|
|
.string()
|
|
.refine((val): val is ProviderName => Object.hasOwn(PROVIDERS, val), {
|
|
message: "Invalid provider name",
|
|
})
|
|
|
|
const ServerProviderSchema = z.object({
|
|
name: z.string().min(1),
|
|
provider: ProviderNameSchema,
|
|
models: z.array(z.string().min(1)),
|
|
// Optional: custom environment variable name(s) for API key
|
|
// Can be a single string or array of strings for load balancing
|
|
// e.g., "OPENAI_API_KEY_TEAM_A" or ["OPENAI_KEY_1", "OPENAI_KEY_2"]
|
|
apiKeyEnv: z
|
|
.union([z.string().min(1), z.array(z.string().min(1)).min(1)])
|
|
.optional(),
|
|
// Optional: custom environment variable name for base URL
|
|
baseUrlEnv: z.string().min(1).optional(),
|
|
// Optional: mark the first model in this provider as the default
|
|
default: z.boolean().optional(),
|
|
})
|
|
|
|
export const ServerModelsConfigSchema = z.object({
|
|
providers: z.array(ServerProviderSchema),
|
|
})
|
|
|
|
export type ServerModelsConfig = z.infer<typeof ServerModelsConfigSchema>
|
|
|
|
export interface FlattenedServerModel {
|
|
id: string // "server:<slugified-name>:<modelId>" - name ensures uniqueness for multiple API keys per provider
|
|
modelId: string
|
|
provider: ProviderName
|
|
providerLabel: string
|
|
isDefault: boolean
|
|
// Custom env var name(s) for API key (optional)
|
|
// Can be a single string or array of strings for load balancing
|
|
apiKeyEnv?: string | string[]
|
|
baseUrlEnv?: string
|
|
}
|
|
|
|
/**
|
|
* Convert provider name to URL-safe slug for use in model ID
|
|
* e.g., "OpenAI Production" → "openai-production", "主力" → "4e3b-529b"
|
|
* Non-ASCII characters become their hex code point so CJK names stay
|
|
* distinct; the id is sent in HTTP headers, which must be ASCII.
|
|
*/
|
|
export function slugify(name: string): string {
|
|
return name
|
|
.toLowerCase()
|
|
.replace(/[^\p{ASCII}]/gu, (c) => `-${c.codePointAt(0)?.toString(16)}-`)
|
|
.replace(/[^a-z0-9]+/g, "-")
|
|
.replace(/^-|-$/g, "")
|
|
}
|
|
|
|
function getConfigPath(): string {
|
|
const custom = process.env.AI_MODELS_CONFIG_PATH
|
|
if (custom && custom.trim().length > 0) return custom
|
|
return path.join(process.cwd(), "ai-models.json")
|
|
}
|
|
|
|
/**
|
|
* Synthesize a config from a comma-separated AI_MODEL value (Priority 3 fallback).
|
|
* Lets users expose multiple models without authoring AI_MODELS_CONFIG / ai-models.json.
|
|
* Triggers only when AI_MODEL contains a comma AND AI_PROVIDER is set to a known provider.
|
|
*/
|
|
function configFromCommaSeparatedAiModel(): ServerModelsConfig | null {
|
|
const aiModel = process.env.AI_MODEL
|
|
if (!aiModel || !aiModel.includes(",")) return null
|
|
|
|
const aiProvider = process.env.AI_PROVIDER
|
|
if (!aiProvider) {
|
|
console.warn(
|
|
"[server-model-config] AI_MODEL contains commas but AI_PROVIDER is not set; " +
|
|
"skipping multi-model fallback. Set AI_PROVIDER, or use AI_MODELS_CONFIG / ai-models.json.",
|
|
)
|
|
return null
|
|
}
|
|
if (!Object.hasOwn(PROVIDERS, aiProvider)) {
|
|
console.warn(
|
|
`[server-model-config] AI_PROVIDER="${aiProvider}" is not a known provider; skipping multi-model fallback.`,
|
|
)
|
|
return null
|
|
}
|
|
|
|
const models = Array.from(
|
|
new Set(
|
|
aiModel
|
|
.split(",")
|
|
.map((s) => s.trim())
|
|
.filter((s) => s.length > 0),
|
|
),
|
|
)
|
|
if (models.length === 0) return null
|
|
|
|
const providerName = aiProvider as ProviderName
|
|
return {
|
|
providers: [
|
|
{
|
|
name: PROVIDERS[providerName]?.label || providerName,
|
|
provider: providerName,
|
|
models,
|
|
default: true,
|
|
},
|
|
],
|
|
}
|
|
}
|
|
|
|
export async function loadEnvServerModelsConfig(): Promise<ServerModelsConfig | null> {
|
|
// Priority 1: AI_MODELS_CONFIG env var (JSON string) - for cloud deployments
|
|
const envConfig = process.env.AI_MODELS_CONFIG
|
|
if (envConfig && envConfig.trim().length > 0) {
|
|
try {
|
|
const json = JSON.parse(envConfig)
|
|
return ServerModelsConfigSchema.parse(json)
|
|
} catch (err) {
|
|
console.error(
|
|
"[server-model-config] Failed to parse AI_MODELS_CONFIG:",
|
|
err,
|
|
)
|
|
return null
|
|
}
|
|
}
|
|
|
|
// Priority 2: ai-models.json file
|
|
const configPath = getConfigPath()
|
|
try {
|
|
const jsonStr = await fs.readFile(configPath, "utf8")
|
|
const json = JSON.parse(jsonStr)
|
|
return ServerModelsConfigSchema.parse(json)
|
|
} catch (err: any) {
|
|
if (err?.code !== "ENOENT") {
|
|
console.error(
|
|
"[server-model-config] Failed to load ai-models.json:",
|
|
err,
|
|
)
|
|
return null
|
|
}
|
|
}
|
|
|
|
// Priority 3: AI_MODEL with comma-separated values + AI_PROVIDER
|
|
return configFromCommaSeparatedAiModel()
|
|
}
|
|
|
|
export async function loadRawServerModelsConfig(): Promise<ServerModelsConfig | null> {
|
|
const envConfig = await loadEnvServerModelsConfig()
|
|
|
|
// Merge in providers managed via the admin panel (settings.json).
|
|
// Dynamic import to avoid a module-init cycle with lib/admin/providers.
|
|
let adminConfig: ServerModelsConfig | null = null
|
|
try {
|
|
const { adminProvidersToConfig, loadAdminProviders } = await import(
|
|
"./admin/providers"
|
|
)
|
|
const adminProviders = loadAdminProviders()
|
|
if (adminProviders.length > 0) {
|
|
adminConfig = adminProvidersToConfig(adminProviders)
|
|
}
|
|
} catch (err) {
|
|
console.error(
|
|
"[server-model-config] Failed to load admin providers:",
|
|
err,
|
|
)
|
|
}
|
|
|
|
if (!adminConfig || adminConfig.providers.length === 0) return envConfig
|
|
if (!envConfig) return adminConfig
|
|
|
|
// A panel default overrides an env default
|
|
const adminHasDefault = adminConfig.providers.some((p) => p.default)
|
|
const envProviders = adminHasDefault
|
|
? envConfig.providers.map((p) =>
|
|
p.default ? { ...p, default: undefined } : p,
|
|
)
|
|
: envConfig.providers
|
|
return { providers: [...envProviders, ...adminConfig.providers] }
|
|
}
|
|
|
|
export async function loadFlattenedServerModels(): Promise<
|
|
FlattenedServerModel[]
|
|
> {
|
|
const cfg = await loadRawServerModelsConfig()
|
|
if (!cfg) return []
|
|
|
|
const defaultProvider = process.env.AI_PROVIDER as ProviderName | undefined
|
|
const defaultModelId = process.env.AI_MODEL
|
|
|
|
const flattened: FlattenedServerModel[] = []
|
|
const seenIds = new Set<string>()
|
|
|
|
for (const p of cfg.providers) {
|
|
const providerLabel =
|
|
p.name || PROVIDERS[p.provider]?.label || p.provider
|
|
|
|
// Use slugified name for unique ID (supports multiple API keys per provider)
|
|
const nameSlug = slugify(p.name)
|
|
|
|
for (const modelId of p.models) {
|
|
const id = `server:${nameSlug}:${modelId}`
|
|
// Names that differ only in case or punctuation share a slug.
|
|
// A repeated id would always resolve to the first provider's
|
|
// credentials, so drop it instead.
|
|
if (seenIds.has(id)) {
|
|
console.warn(
|
|
`[server-model-config] Skipping duplicate model id "${id}". Provider names must differ in letters or digits.`,
|
|
)
|
|
continue
|
|
}
|
|
seenIds.add(id)
|
|
|
|
// Default model priority:
|
|
// 1. From ai-models.json: first model of provider with default: true
|
|
// 2. From env vars: AI_MODEL matches (legacy behavior)
|
|
const isDefault =
|
|
(p.default === true && modelId === p.models[0]) ||
|
|
(!!defaultModelId &&
|
|
modelId === defaultModelId &&
|
|
(!defaultProvider || defaultProvider === p.provider))
|
|
|
|
flattened.push({
|
|
id,
|
|
modelId,
|
|
provider: p.provider,
|
|
providerLabel,
|
|
isDefault,
|
|
apiKeyEnv: p.apiKeyEnv,
|
|
baseUrlEnv: p.baseUrlEnv,
|
|
})
|
|
}
|
|
}
|
|
|
|
return flattened
|
|
}
|
|
|
|
/**
|
|
* Find a server model by its ID (format: "server:<slugified-name>:<modelId>")
|
|
* Returns the model config including apiKeyEnv/baseUrlEnv if configured
|
|
*/
|
|
export async function findServerModelById(
|
|
modelId: string,
|
|
): Promise<FlattenedServerModel | null> {
|
|
if (!modelId.startsWith("server:")) return null
|
|
|
|
const models = await loadFlattenedServerModels()
|
|
return models.find((m) => m.id === modelId) || null
|
|
}
|