mirror of
https://github.com/DayuanJiang/next-ai-draw-io.git
synced 2026-10-12 20:49:53 +08:00
dayuan.jiang
75ffc32a49
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.
91 lines
3.1 KiB
TypeScript
91 lines
3.1 KiB
TypeScript
// What the model settings show about providers: the groups of the provider
|
|
// picker, and how far a provider's setup has come
|
|
|
|
import {
|
|
PROVIDER_NAMES,
|
|
PROVIDERS,
|
|
type ProviderGroup as ProviderGroupId,
|
|
} from "@/lib/providers"
|
|
import type { ProviderConfig, ProviderName } from "@/lib/types/model-config"
|
|
|
|
/** The provider picker's groups, each provider in exactly one, in record order */
|
|
export const PROVIDER_GROUPS: {
|
|
id: ProviderGroupId
|
|
providers: ProviderName[]
|
|
}[] = (["vendors", "aggregators", "cloud", "selfHosted"] as const).map(
|
|
(id) => ({
|
|
id,
|
|
providers: PROVIDER_NAMES.filter((p) => PROVIDERS[p].group === id),
|
|
}),
|
|
)
|
|
|
|
/** Shown when the user has no provider yet */
|
|
export const POPULAR_PROVIDERS: ProviderName[] = [
|
|
"openai",
|
|
"anthropic",
|
|
"google",
|
|
"deepseek",
|
|
"openrouter",
|
|
"qwen",
|
|
]
|
|
|
|
/** The groups with only the providers whose name matches the search */
|
|
export function filterProviderGroups(query: string) {
|
|
const q = query.trim().toLowerCase()
|
|
if (!q) return PROVIDER_GROUPS
|
|
return PROVIDER_GROUPS.map((group) => ({
|
|
...group,
|
|
providers: group.providers.filter(
|
|
(p) =>
|
|
PROVIDERS[p].label.toLowerCase().includes(q) || p.includes(q),
|
|
),
|
|
})).filter((group) => group.providers.length > 0)
|
|
}
|
|
|
|
const LEGACY_AZURE_PLACEHOLDER = "https://your-resource.openai.azure.com/openai"
|
|
|
|
/** The credentials a test or a chat request needs are filled in */
|
|
export function hasCredentials(p: ProviderConfig): boolean {
|
|
const def = PROVIDERS[p.provider]
|
|
switch (def.credential) {
|
|
case "aws":
|
|
return (
|
|
(!!p.apiKey ||
|
|
(!!p.awsAccessKeyId && !!p.awsSecretAccessKey)) &&
|
|
!!p.awsRegion
|
|
)
|
|
case "vertexKey":
|
|
return !!p.vertexApiKey
|
|
case "none":
|
|
case "optionalKey":
|
|
return true
|
|
case "apiKey": {
|
|
// Without a default URL in the record (Azure, custom) the user's
|
|
// own is part of the credentials. Entries saved while Azure still
|
|
// had a placeholder default hold that placeholder; it names no
|
|
// real resource
|
|
const baseUrl =
|
|
p.baseUrl === LEGACY_AZURE_PLACEHOLDER ? "" : p.baseUrl
|
|
return !!p.apiKey && (!!def.defaultBaseUrl || !!baseUrl)
|
|
}
|
|
}
|
|
}
|
|
|
|
export type ProviderStatus =
|
|
| { kind: "error"; count: number }
|
|
| { kind: "incomplete" }
|
|
| { kind: "untested"; count: number }
|
|
| { kind: "ok"; count: number }
|
|
|
|
/** The one thing about a provider that most needs the user's attention */
|
|
export function providerStatus(p: ProviderConfig): ProviderStatus {
|
|
const failed = p.models.filter((m) => m.validated === false).length
|
|
if (failed > 0) return { kind: "error", count: failed }
|
|
if (!hasCredentials(p) || p.models.length === 0) {
|
|
return { kind: "incomplete" }
|
|
}
|
|
const untested = p.models.filter((m) => m.validated !== true).length
|
|
if (untested > 0) return { kind: "untested", count: untested }
|
|
return { kind: "ok", count: p.models.length }
|
|
}
|