mirror of
https://github.com/DayuanJiang/next-ai-draw-io.git
synced 2026-09-02 01:20:23 +08:00
* feat: add file-based admin settings panel at /admin
Settings saved in the panel are written to data/settings.json and
overlaid onto process.env, taking precedence over environment
variables and applying immediately without restart. Enable by setting
ADMIN_PASSWORD; on serverless platforms without persistent disk the
panel degrades to read-only.
* polish: admin panel UI improvements
- Provider logos in credential rows (shared ProviderLogo component,
extracted from model-config-dialog)
- Scroll-spy active state in the sidebar nav
- Green success state in the save bar that clears after a few seconds
- Wider content column (max-w-6xl) for less wasted space on desktop
* polish: admin panel section toggles and reorder
- Move Quota & Rate Limits to the end of the settings page
- Add enable switches to Observability and Quota sections; default off
with fields grayed out, auto-on when any field is already configured
* polish: make section enable switch more visible
Wrap the switch in a labeled pill ('Enabled'/'Disabled') with border
and background so the off state is clearly visible.
* refactor: derive admin registry from PROVIDER_INFO, simplify page state
- Provider options, labels, and base-URL placeholders now come from
PROVIDER_INFO instead of hand-copied lists (fixes SiliconFlow .com/.cn
placeholder drift; panel names now match the model-config dialog)
- Replace free-text subgroup strings + SUBGROUP_PROVIDERS reverse map
with a typed provider field on SettingDef
- Precompute SETTINGS_BY_GROUP and PROVIDER_SUBGROUPS at module level
- Merge justSaved into saveMessage, drop unused mainRef, hoist
fetchSettings out of the component, dedupe savedText logic
- Serialize from SETTINGS_REGISTRY directly; json validators in a map
instead of a hardcoded key check
- Make allowPrivateUrls a function so ALLOW_PRIVATE_URLS edits in the
admin panel apply without restart
* feat: graphical model management in admin panel
Replace the provider credential fields and raw AI_MODELS_CONFIG JSON
textarea with a Models section mirroring the in-app model settings UI:
provider instance list with logos, credential fields per provider type,
model add/remove with suggestions, per-model connectivity test, and a
default-provider star.
On save the server derives everything the runtime needs into
settings.json: credential env vars (with _2 suffixes for multiple
instances of one provider), AI_MODELS_CONFIG, and AI_PROVIDER/AI_MODEL
for the default. Secrets round-trip as masked markers and are never
sent back to the browser. The general settings registry now only
covers non-provider settings (generation, access, features,
observability, quota).
* fix: allow testing unsaved providers in admin panel
The test button previously looked up credentials by providerId in the
saved settings, so testing a newly added (unsaved) provider failed with
'Unknown provider or model'. The test endpoint now accepts the client's
current provider state; newly typed secrets are used as-is and masked
markers are resolved against the stored values, so testing works both
before and after saving.
* fix: merge env AI_MODELS_CONFIG with admin panel providers
Previously, saving in the admin panel wrote a complete AI_MODELS_CONFIG
into settings.json, which (by overlay precedence) replaced any config
from .env or ai-models.json — admins lost their env-configured models.
The panel no longer writes AI_MODELS_CONFIG. Instead its providers are
merged with the env baseline at read time in loadRawServerModelsConfig,
and panel credentials go to ADMIN_-prefixed env vars wired up via
apiKeyEnv/baseUrlEnv so they never shadow standard vars. Env-based
providers now appear read-only in the panel, name clashes are rejected,
and a panel default overrides the env default. data/ is now gitignored.
* fix: block global-credential providers already managed via env
Bedrock, Vertex AI, and Ollama credentials live in fixed env vars with
no apiKeyEnv redirection, so a panel instance of one of these would
silently override the credentials that env-configured models rely on.
The API now rejects saving such a provider when the env config already
uses that type, and the Add Provider dropdown disables it with a
'managed via env' note.
* fix: address admin panel review findings
- Security: test-model no longer resolves a stored secret when the
request's baseUrl/provider differs from the stored entry, closing a
path where a tampered baseUrl could exfiltrate a saved key
- Save failures are now visible: the save bar shows the error in red
(was masked by the persistent 'Unsaved changes' text), and per-field
validation errors from the settings API are surfaced under each field
- The Observability/Quota enable switch is now real: toggling off stages
deletion of the group's saved values, and the toggle no longer snaps
back to Enabled after saving
- Env provider's default star is hidden when a panel provider is the
active default (no more double star)
- Clearing a credential field reverts to the stored value instead of
silently deleting it; an explicit X button removes a stored secret
- Form inputs are disabled during an in-flight save
* refactor(admin): split 1549-line admin page into focused modules
Extract admin-shared.ts (types + fetch helper), setting-field.tsx
(registry-driven fields), and models-section.tsx (provider/model
manager) from page.tsx. Pure mechanical move, no behavior change.
* feat(admin): share credential fields with user dialog and localize panel
Extract ProviderCredentialsFields (display name + per-provider
credential inputs) used by both the user ModelConfigDialog and the
admin Models panel; secret input passed via renderSecret (plaintext
vs masked), test button via footer slot. Add full i18n for the admin
panel across en/zh/ja/zh-Hant, reusing modelConfig.* for shared parts.
* fix(admin): address Copilot review findings
- Reflect built-in defaults for boolean settings (ALLOW_PRIVATE_URLS
defaults on) and allow clearing a saved boolean back to default,
so the SSRF toggle matches actual runtime behavior.
- Harden JSON loading: filter settings values to strings only, and
schema-validate stored ADMIN_PROVIDERS entries, dropping malformed
ones instead of letting them reach runtime code.
- Set beforeunload returnValue so the unsaved-changes prompt shows in
all browsers; reject non-finite numbers in settings validation.
- Fix README/CN/JA docs that claimed the panel auto-generates
AI_MODELS_CONFIG (providers are merged at read time, not written).
- Add unit tests for corrupted-file value filtering and provider
schema validation.
* docs: move admin panel details to dedicated docs/{en,cn,ja}/admin-panel.md
The READMEs now carry a short blurb + link, matching the existing
per-topic docs (docker.md, ai-providers.md, ...). Removes the ~22-line
inline section and the duplicated data/settings.json mentions.
* fix(admin): address follow-up Copilot findings on the prior fixes
- loadAdminProviders now validates against a stored-shape schema where
secrets are plain strings, so a hand-edited ADMIN_PROVIDERS holding an
{isSet} marker is dropped instead of later crashing maskSecret().
- loadSettings guards against array values (typeof [] === 'object'),
which would otherwise overlay numeric keys onto process.env.
- Admin SecretInput uses the bare id so the shared component's
<Label htmlFor> stays associated (only one ProviderDetail mounts).
- Add tests: marker-secret rejection, array-values guard, bedrock
multi-secret round-trip.
190 lines
6.3 KiB
TypeScript
190 lines
6.3 KiB
TypeScript
import fs from "fs/promises"
|
|
import path from "path"
|
|
import { z } from "zod"
|
|
import type { ProviderName } from "@/lib/types/model-config"
|
|
import { PROVIDER_INFO } from "@/lib/types/model-config"
|
|
|
|
export const ProviderNameSchema: z.ZodType<ProviderName> = z
|
|
.string()
|
|
.refine((val): val is ProviderName => val in PROVIDER_INFO, {
|
|
message: "Invalid provider name",
|
|
})
|
|
|
|
export 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 ServerProviderConfig = z.infer<typeof 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"
|
|
*/
|
|
function slugify(name: string): string {
|
|
return name
|
|
.toLowerCase()
|
|
.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")
|
|
}
|
|
|
|
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") {
|
|
return null
|
|
}
|
|
console.error(
|
|
"[server-model-config] Failed to load ai-models.json:",
|
|
err,
|
|
)
|
|
return null
|
|
}
|
|
}
|
|
|
|
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[] = []
|
|
|
|
for (const p of cfg.providers) {
|
|
const providerLabel =
|
|
p.name || PROVIDER_INFO[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}`
|
|
|
|
// 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
|
|
}
|