diff --git a/frontend/src/api/client.ts b/frontend/src/api/client.ts index 8a2ee0e1..43d0995f 100644 --- a/frontend/src/api/client.ts +++ b/frontend/src/api/client.ts @@ -91,6 +91,19 @@ export interface ProviderTest { [key: string]: any } +/** + * 助手当前用哪个模型(GET / PUT /api/copilot/model)。provider、model 是存着的设定;存的接入不存在、已停用(或只存了 + * 模型名、提供它的接入已停用)时实际什么都用不了:effective_* 为空,error 是和生成时报的同一句。老后端不给 error + */ +export interface CopilotModel { + configured: boolean + provider: string | null + model: string | null + effective_provider: string | null + effective_model: string | null + error?: string | null +} + /** 还没保存的模型接入配置。带 id 表示在编辑已有的那个,api_key 留空沿用已存的 */ export interface ProviderDraft { id?: string @@ -718,12 +731,9 @@ export const api = { layout: (graph: GraphSpec) => post('/copilot/layout', { graph }), fromRun: (runId: string, name?: string) => post('/copilot/from-run', { run_id: runId, name }), - getModel: () => get<{ - configured: boolean; provider: string | null; model: string | null - effective_provider: string | null; effective_model: string | null - }>('/copilot/model'), + getModel: () => get('/copilot/model'), setModel: (body: { provider?: string | null; model?: string | null }) => - put('/copilot/model', body), + put('/copilot/model', body), /** 跑完之后复核一次。干净的运行后端直接返回 verdict='ok',不调模型 */ review: (body: { run_id: string; question: string }) => post('/copilot/review', body), diff --git a/frontend/src/canvas/Inspector.tsx b/frontend/src/canvas/Inspector.tsx index 9d0bc736..1802f6ea 100644 --- a/frontend/src/canvas/Inspector.tsx +++ b/frontend/src/canvas/Inspector.tsx @@ -7,15 +7,15 @@ import { NODE_DEFS, syntaxOf, type FieldDef, type FieldSyntax, type NodeDef } fr import { fieldOfIssue, isCaseKeyIssue, unboundToolOf, withToolBound, type FieldRef } from './issues' import { hintOf } from './shortcuts' import { isActivePhase } from '../run/trace' -import { EDIT_LOCK_TEXT, useEditLock, useStudio } from '../store/studio' +import { EDIT_LOCK_TEXT, toGraph, useEditLock, useStudio } from '../store/studio' import { datasourceTools, modelOptions, providerOfModel, useCatalog, useDatasources } from '../store/catalog' import { api } from '../api/client' import { IconButton, JsonInput, Modal, isComposing, useRadioGroup } from '../components/ui' import { formatShortcut } from '../lib/keys' -import { JUDGE_FIELD_LABEL, JUDGE_ON_UNSUPPORTED_HINT, JUDGE_ON_UNSUPPORTED_LABEL, JUDGE_SETTING_TEXT, MERGE_TEXT, CATALOG_UI_TEXT, NODE_TYPE_LABEL, SUBGRAPH_UPGRADE_HELP, judgeByModelText, upgradeNewerText } from '../lib/terms' +import { JUDGE_FIELD_LABEL, JUDGE_ON_UNSUPPORTED_HINT, JUDGE_ON_UNSUPPORTED_LABEL, JUDGE_SETTING_TEXT, MERGE_TEXT, CATALOG_UI_TEXT, NODE_TYPE_LABEL, PROVIDER_REF_TEXT, SUBGRAPH_UPGRADE_HELP, judgeByModelText, upgradeNewerText } from '../lib/terms' import { TemplateText } from './TemplateText' import { MERGE_ALIAS, isQueryNode, mergeAlias } from './mergeInputs' -import type { NodeType, ValidationIssue, WorkflowVersion } from '../types' +import type { NodeType, Provider, ValidationIssue, WorkflowVersion } from '../types' /** 检查器里一条落到字段上的问题 */ type FieldIssue = ValidationIssue & { at: FieldRef | null } @@ -544,11 +544,30 @@ function SyntaxBadge({ syntax }: { syntax: FieldSyntax }) { ) } +/** + * 模型一栏留空时执行用什么:节点点名了接入(没写就是全图默认点名的,同后端 NodeContext.cfg 和 schema 那条「没有指定模型」) + * 时是那个接入的默认模型。那个接入不存在、已停用时空选项说状态、下面不写说明:检查器顶上另有接入那条问题,这里再说 + * 「使用它的默认模型」就和它矛盾。全图默认不在节点里,从 toGraph 带回去的那一份读。接入表还没取回来时不判状态 + */ +function modelDefault(config: Record, providers: Provider[]): { blank: string; named: string | null; ok: boolean } { + let value = config.provider + if (value == null || value === '') value = toGraph([], []).defaults?.provider + const named = typeof value === 'string' && value.trim() ? value.trim() : null + // 认法同后端 named_provider:名称或 id,名称两边的空白不算 + const found = named ? providers.find((p) => p.id === named || p.name === named || p.name.trim() === named) : undefined + const state = !named || !providers.length || found?.enabled ? 'ok' : found ? 'disabled' : 'missing' + return { blank: PROVIDER_REF_TEXT.modelBlank(named, state), named, ok: state === 'ok' } +} + function Field({ field, nodeId, value, config, issues, onChange }: { field: FieldDef; nodeId: string; value: any; config: Record issues: FieldIssue[]; onChange: (v: any) => void }) { const id = `f-${nodeId}-${field.key}` + // 模型一栏的说明跟着点名的接入走(modelDefault):节点定义里那句只适用于没点名接入的时候 + const providers = useCatalog((s) => (field.type === 'model' ? s.providers : NO_ROWS)) + const model = field.type === 'model' ? modelDefault(config, providers) : null + const help = !model?.named ? field.help : model.ok ? PROVIDER_REF_TEXT.modelHelp(model.named) : undefined const syntax = syntaxOf(field) const composite = field.type === 'cases' || field.type === 'agents' || field.type === 'ioFields' || field.type === 'metricsList' || field.type === 'caliberFrom' || field.type === 'judge' @@ -590,8 +609,8 @@ function Field({ field, nodeId, value, config, issues, onChange }: { - {field.help && field.type !== 'switch' && ( -
{field.help}
+ {help && field.type !== 'switch' && ( +
{help}
)} {off &&
{off}
} {!!own.length && ( @@ -705,7 +724,7 @@ function FieldInput({ field, id, nodeId, syntax, value, config, invalid, describ const groups = [...new Set(options.map((o) => o.group))] return ( set({ enabled: e.target.checked })} /> - 启用停用后,该接入的模型不会出现在节点的模型下拉列表中 + 启用{PROVIDER_REF_TEXT.enabledHint} {blocked &&

还缺:{missing.join('、')}

} @@ -803,13 +803,18 @@ function PrefsTab() { const collectionMissing = !collectionNames.includes(cur.collection) /** * 接入那一格下面的报错:服务端按这一项拒收的话照它的整句;否则存着(或选着)的接入不存在、已停用时说清这一项会怎样。 - * 只在接入表取到了时判「不存在」:表还没取回来,什么都找不到 + * 只在接入表取到了时判「不存在」:表还没取回来,什么都找不到。labels 是这一组接入、模型两栏的叫法:名字恰好是某个 + * 启用接入的模型时(多半是把模型名填进了接入一栏)补一句怎么用它,同服务端保存时那句,免得照「启用」去启用那条旧接入 */ - const providerError = (field: string, name: string, found: Provider | undefined, broken: string): string | undefined => { + const providerError = (field: string, name: string, found: Provider | undefined, broken: string, + labels: { provider: string; model: string }): string | undefined => { if (fieldError?.field === field) return fieldError.message if (!name || !providers.length) return undefined - if (!found) return `${PROVIDER_REF_TEXT.missing(name)}:${broken}` - return found.enabled ? undefined : `${PROVIDER_REF_TEXT.disabled(name)}:${broken}` + if (found?.enabled) return undefined + const state = found ? PROVIDER_REF_TEXT.disabled(name) : PROVIDER_REF_TEXT.missing(name) + const owner = providerOfModel(providers, name) + const note = owner?.enabled ? `。${PROVIDER_REF_TEXT.modelNote(name, owner.provider.name, labels.model, labels.provider)}` : '' + return `${state}:${broken}${note}` } // 门控模型留空时后端的挑法(resolve_provider):第一个启用的真实接入,没有就第一个启用的 const enabledProviders = providers.filter((p) => p.enabled) @@ -817,13 +822,15 @@ function PrefsTab() { const gateProvider = cur.gateProvider ? providers.find((p) => p.name === cur.gateProvider) : defaultProvider const gateProviderMissing = !!cur.gateProvider && providers.length > 0 && !gateProvider // 点名的接入不存在、已停用都调不了(停用的以前照常调用,现在运行时照实报错):两种都在这一格下面说 - const gateProviderError = providerError('run.tool_gate_provider', cur.gateProvider, gateProvider, PROVIDER_REF_TEXT.gateBroken) + const gateProviderError = providerError('run.tool_gate_provider', cur.gateProvider, gateProvider, PROVIDER_REF_TEXT.gateBroken, + TOOL_GATE_TEXT) const gateModels = (gateProvider?.models ?? []).map((m) => m.id) // 裁判模型的接入:接入和模型都留空时后端依次用 Copilot 的模型、默认接入(judge_model_spec)。只填了模型时 // 这一级写了就整组用这一级,按模型名找接入(resolve_provider)——不再跟随 Copilot,留空那一项不能还叫「跟随 Copilot」 const judgeProvider = cur.judgeProvider ? providers.find((p) => p.name === cur.judgeProvider) : undefined const judgeProviderMissing = !!cur.judgeProvider && providers.length > 0 && !judgeProvider - const judgeProviderError = providerError('judge.provider', cur.judgeProvider, judgeProvider, PROVIDER_REF_TEXT.judgeBroken) + const judgeProviderError = providerError('judge.provider', cur.judgeProvider, judgeProvider, PROVIDER_REF_TEXT.judgeBroken, + JUDGE_SETTING_TEXT) const judgeModelName = cur.judgeModel.trim() const judgeByModel = !cur.judgeProvider && !!judgeModelName // 裁判模型没有单独配置(接入、模型都留空):后端依次用助手的模型、默认接入 diff --git a/frontend/src/pages/VerifySettings.tsx b/frontend/src/pages/VerifySettings.tsx index 52cbbfe8..aef875f1 100644 --- a/frontend/src/pages/VerifySettings.tsx +++ b/frontend/src/pages/VerifySettings.tsx @@ -164,9 +164,13 @@ export function VerifySection({ cur, errors, onEdit, refresh }: { const provider = cur.provider ? providers.find((p) => p.name === cur.provider) : undefined const providerMissing = !!cur.provider && providers.length > 0 && !provider // 点名停用的接入以前照常调用,现在核查时照实报「已停用」、记缺口:和「不存在」一样在这一格下面说。服务端按这一项 - // 拒收时(errors.provider,设置页从 422 的 field 落过来)照它的整句 - const providerError = errors.provider ?? (providerMissing ? S.providerGone(cur.provider) - : provider && !provider.enabled ? `${PROVIDER_REF_TEXT.disabled(cur.provider)}:${PROVIDER_REF_TEXT.verifyBroken}` : undefined) + // 拒收时(errors.provider,设置页从 422 的 field 落过来)照它的整句。名字恰好是某个启用接入的模型时补一句怎么用它 + //(同设置页门控、裁判两组,和服务端保存时那句一致) + const providerTrap = provider?.enabled === false || providerMissing ? providerOfModel(providers, cur.provider) : undefined + const providerNote = providerTrap?.enabled ? `。${PROVIDER_REF_TEXT.modelNote(cur.provider, providerTrap.provider.name, T.model, T.provider)}` : '' + const providerError = errors.provider ?? (providerMissing ? `${S.providerGone(cur.provider)}${providerNote}` + : provider && !provider.enabled + ? `${PROVIDER_REF_TEXT.disabled(cur.provider)}:${PROVIDER_REF_TEXT.verifyBroken}${providerNote}` : undefined) const modelName = cur.model.trim() const byModel = !cur.provider && !!modelName const notSet = !cur.provider && !modelName diff --git a/frontend/src/run/Composer.tsx b/frontend/src/run/Composer.tsx index 12ea24ec..09986f61 100644 --- a/frontend/src/run/Composer.tsx +++ b/frontend/src/run/Composer.tsx @@ -1,14 +1,18 @@ import { useEffect, useMemo, useRef, useState, type CSSProperties, type ReactNode, type RefObject } from 'react' import { AlertCircle, ArrowUp, CornerDownRight, Database, Settings2, Sparkles, Square, Wrench } from 'lucide-react' import clsx from 'clsx' -import { api } from '../api/client' +import { api, type CopilotModel } from '../api/client' import { useCatalog, useDatasources, modelOptions } from '../store/catalog' import { EDIT_LOCK_TEXT, useEditLock, useStudio } from '../store/studio' import { isComposing, Spinner, TechDetails, useRadioGroup } from '../components/ui' import { formatShortcut } from '../lib/keys' +import { ASSISTANT_MODEL_TEXT as MT } from '../lib/terms' import type { DataSource } from '../types' import { COPILOT_PHASE_TEXT } from './decode' +/** 「助手使用的模型」下拉里代表「存着的设定」的那一项的值(模型 id 不会是它) */ +const SAVED = '\u0000saved' + /** * Copilot 的输入。 * @@ -39,17 +43,19 @@ export function Composer({ hero, onFocusChange }: { const lock = useEditLock() const [text, setText] = useState('') const [opts, setOpts] = useState(false) - const [model, setModel] = useState('') - const [effective, setEffective] = useState('') + // 存着的助手模型设定(GET /api/copilot/model):接入、模型、实际会用的模型、用不了时的原因 + const [saved, setSaved] = useState(null) const [useBase, setUseBase] = useState(true) const ref = useRef(null) + // 挂上时取一次;每次展开「助手使用的模型」再取一次:接入可能刚在设置里启用、停用或改了名 useEffect(() => { - void api.copilot.getModel().then((m) => { - setModel(m.model ?? '') - setEffective(m.effective_model ?? '') - }).catch(() => undefined) - }, []) + if (!opts && saved) return + let alive = true + void api.copilot.getModel().then((m) => { if (alive) setSaved(m) }).catch(() => undefined) + return () => { alive = false } + // eslint-disable-next-line react-hooks/exhaustive-deps + }, [opts]) // 工具栏的 Copilot 按钮把焦点甩过来 useEffect(() => { @@ -63,18 +69,28 @@ export function Composer({ hero, onFocusChange }: { if (hero) ref.current?.focus() }, [hero]) + const options = modelOptions(providers) + const groups = [...new Set(options.map((o) => o.group))] + // 存着的设定下拉里列不出来:点名了接入(下拉只选模型,选了会清掉接入),或者模型不在可选列表中。照实列成一项并选中 + // 它——否则下拉停在「跟随默认」,看着一切正常,接入失效了也看不出来,再选「跟随默认」不算改动、清不掉存着的接入 + const custom = !!saved && (!!saved.provider || (!!saved.model && !options.some((o) => o.value === saved.model))) + const model = custom ? SAVED : saved?.model ?? '' + const broken = saved?.error || null + const pickModel = (value: string) => { - setModel(value) - void api.copilot.setModel({ model: value || null }) - .then((m) => setEffective(m.effective_model ?? '')) - .catch(() => undefined) + if (value === SAVED) return + // 先按选的显示;存的是 provider 置空、只写模型(跟随默认时两项都空),回来的是服务端认下的样子 + setSaved((s) => ({ configured: !!value, provider: null, model: value || null, effective_provider: null, + effective_model: value || s?.effective_model || null, error: null })) + void api.copilot.setModel({ model: value || null }).then(setSaved).catch(() => undefined) } const send = (override?: string) => { const q = (override ?? text).trim() if (!q || copilot.active) return - // 被正式运行拦下时(store 已经弹过提示)什么都没开始:这句话留在框里,结束后直接再发 - if (!runCopilot(q, useBase && nodes.length > 0, model || undefined)) return + // 被正式运行拦下时(store 已经弹过提示)什么都没开始:这句话留在框里,结束后直接再发。 + // 存着的设定列不出来时不带模型:服务端按存着的整组取(带了模型就会绕过存着的接入,和这里说的对不上) + if (!runCopilot(q, useBase && nodes.length > 0, model && model !== SAVED ? model : undefined)) return setText('') // 从头生成是一次性的:新图一落到画布上,下一句多半是在它上面改。停在「从头生成」 // 的话,下一句又把刚生成的图整张换掉(撤销找得回,但人得先发现) @@ -82,8 +98,6 @@ export function Composer({ hero, onFocusChange }: { } const mode = useRadioGroup(MODES, useBase ? 'base' : 'fresh', (m) => setUseBase(m === 'base')) - const options = modelOptions(providers) - const groups = [...new Set(options.map((o) => o.group))] const examples = hero ? exampleFor(nodes.length, sources) : [] return ( @@ -136,14 +150,17 @@ export function Composer({ hero, onFocusChange }: { leading={ <> {/* 两种方式并排摆出来,选中的那个就是这一句会怎么做。以前是一个 10px 的字, 点一下就翻成另一个词,看不出它是开关,更看不出另一头是什么。从头生成 @@ -169,9 +186,12 @@ export function Composer({ hero, onFocusChange }: { {opts && (
- - pickModel(e.target.value)} + aria-invalid={broken ? true : undefined} aria-describedby={broken ? 'copilot-model-error' : undefined}> + {/* 「当前」只在跟随默认、用得了的时候写:存着的设定列成单独一项时,这一项说的是选它以后会用哪个 */} + + {custom && } {groups.map((g) => ( {options.filter((o) => o.group === g).map((o) => ( @@ -180,10 +200,11 @@ export function Composer({ hero, onFocusChange }: { ))} -
- 仅影响助手,不改变节点使用的模型。助手需要严格按格式输出, - 指令遵循能力较弱的模型可能无法生成工作流。 -
+ {broken && ( + + )} +
{MT.note}
)} diff --git a/scripts/check-manage.mjs b/scripts/check-manage.mjs index 54bdceed..4d721b02 100644 --- a/scripts/check-manage.mjs +++ b/scripts/check-manage.mjs @@ -607,7 +607,8 @@ await section('设置 · 点名的接入已停用或不存在', async () => { judge: { ...(stored.judge ?? {}), provider: 'demo-off', model: null }, verify: { ...(stored.verify ?? {}), provider: 'demo-off', model: null }, } - const REFUSED = '「门控模型 · 接入」填写的模型接入「demo-main」已停用。请在「设置 → 模型接入」中启用它,或换一个接入;留空表示使用默认接入的默认模型' + // 服务端的说法(api/settings._provider_problem):下拉框里选的写「指定的」,不另讲留空是什么意思(空选项写着) + const REFUSED = '「门控模型 · 接入」指定的模型接入「demo-main」已停用。请在「设置 → 模型接入」中启用它,或换一个接入' let refuse = true const { page, sent, errors, close } = await open('/settings/prefs', { handlers: [ @@ -653,6 +654,52 @@ await section('设置 · 点名的接入已停用或不存在', async () => { await close() }) +await section('设置 · 停用接入的后果写全;接入名恰好是模型名时说清怎么用这个模型', async () => { + // 停用一个接入以后,点名它(或只写了它的模型)的节点和设置在运行时报错(K1):卡片上「已停用」的悬停说明、编辑框里 + // 「启用」旁的说明都要写到这一层,不只是「下拉里看不到」。停用的接入恰好叫 big-model,而 big-model 是启用的 demo-main + // 提供的模型:设置页三格下面补一句这是哪个接入的模型、在哪一栏用它,和服务端保存时 422 的那句一致。接入表、设置都是假的 + const PROVIDERS = [ + { id: 'check-trap-p1', name: 'demo-main', kind: 'openai', base_url: 'https://example.com/v1', default_model: 'big-model', + models: [{ id: 'big-model' }], enabled: true, extra: {}, api_key_masked: '', has_key: true }, + { id: 'check-trap-p2', name: 'big-model', kind: 'openai', base_url: 'https://example.com/v1', default_model: 'old-model', + models: [{ id: 'old-model' }], enabled: false, extra: {}, api_key_masked: '', has_key: true }, + ] + const EFFECT = '该接入的模型不再出现在下拉列表中;指定该接入或其模型的节点和设置将无法调用,运行时报错' + const cards = await open('/settings/providers', { handlers: [[/^GET \/providers$/, json(PROVIDERS)]] }) + const chip = cards.page.locator('[data-provider="big-model"] .chip', { hasText: '已停用' }) + check('卡片上「已停用」:悬停写明点名它的地方运行时报错', await chip.getAttribute('title').catch(() => '') === `已停用:${EFFECT}`, + await chip.getAttribute('title').catch(() => '')) + await cards.page.locator('[data-provider="big-model"]').getByRole('button', { name: '编辑' }).click() + const enabledHint = await cards.page.locator('[data-provider-enabled-hint]').innerText().catch(() => '') + check('编辑框「启用」旁:不只说下拉里看不到,也说运行时报错', enabledHint === `停用后,${EFFECT}`, enabledHint) + await shot(cards.page, 'provider-enabled-hint') + check('没有运行时报错', cards.errors.length === 0, cards.errors[0] ?? '') + await cards.close() + + let stored = await get('/settings') + stored = { + ...stored, + run: { ...(stored.run ?? {}), tool_gate_provider: 'big-model', tool_gate_model: null }, + judge: { ...(stored.judge ?? {}), provider: 'big-model', model: null }, + verify: { ...(stored.verify ?? {}), provider: 'big-model', model: null }, + } + const { page, errors, close } = await open('/settings/prefs', { + handlers: [[/^GET \/settings$/, (route) => json(stored)(route)], [/^GET \/providers$/, json(PROVIDERS)]], + }) + const said = async (id) => page.locator(`#${id}-error`).innerText().catch(() => '') + const note = (model, provider) => `「big-model」是接入「demo-main」的模型:如需使用该模型,请在「${model}」中填写,「${provider}」留空或选择「demo-main」` + check('门控模型:先说停用了、会怎样,再补一句这是 demo-main 的模型、在哪一栏用它', + await said('pref-gate-provider') === `模型接入「big-model」已停用:门控模型无法调用,所有工具调用将转为人工审批。${note('门控模型 · 模型', '门控模型 · 接入')}`, + await said('pref-gate-provider')) + check('证据裁判:同样补这一句,写裁判那两栏的叫法', (await said('pref-judge-provider')).endsWith(`。${note('裁判模型 · 模型', '裁判模型 · 接入')}`), + await said('pref-judge-provider')) + check('核查模型:同样补这一句,写核查那两栏的叫法', (await said('pref-verify-provider')).endsWith(`。${note('核查模型 · 模型', '核查模型 · 接入')}`), + await said('pref-verify-provider')) + await shot(page, 'prefs-provider-named-like-model') + check('没有运行时报错', errors.length === 0, errors[0] ?? '') + await close() +}) + await section('设置 · 智能体护栏', async () => { // 默认步数、token 预算、金额预算(后端 engine/guards.py)。预算留空 = 不限,存 null let stored = await get('/settings') diff --git a/scripts/check-publish.mjs b/scripts/check-publish.mjs index af00b6b5..e68819ae 100644 --- a/scripts/check-publish.mjs +++ b/scripts/check-publish.mjs @@ -199,6 +199,20 @@ const PROV_MODEL = { ], edges: chain('in', 'look', 'team', 'done'), } +/** + * 一处给不出修复(K1b):协作节点点名的接入不存在,成员「研究员」跟随节点的接入、自己只写了停用的 demo-off 提供的模型—— + * 节点换成哪家、去掉接入,研究员都落不稳,这一处没有修复,提示也不指到发布前检查;成员「分析师」自己点名的接入不存在, + * 改用 demo-main 落得稳,有修复。两条同编号、同节点:前一条不能借后一条的修复 + */ +const PROV_NOFIX = { + nodes: [ + node('in', 'input', 0, '入口', { fields: [{ name: 'week', required: true }] }), + node('team', 'supervisor', 240, '协作', { goal: '复核', provider: 'demo-old', + agents: [{ name: '分析师', provider: 'demo-old', tools: [] }, { name: '研究员', model: 'tiny-1', tools: [] }] }), + node('done', 'output', 480, '成果', { fields: [{ name: 'report', value: '{{ last_message }}' }] }), + ], + edges: chain('in', 'team', 'done'), +} const PROVIDERS = [ { id: 'pv-main', name: 'demo-main', kind: 'openai_compatible', base_url: 'https://example.com/v1', default_model: 'big-model', models: [{ id: 'big-model' }], enabled: true, extra: {}, api_key_masked: '', has_key: true }, @@ -226,6 +240,7 @@ const FAKES = { 'pf-prov': wf('pf-prov', '__publish_check_provider__', PROV), 'pf-provok': wf('pf-provok', '__publish_check_provider_ok__', PROV_OK), 'pf-provmodel': wf('pf-provmodel', '__publish_check_provider_model__', PROV_MODEL), + 'pf-provnofix': wf('pf-provnofix', '__publish_check_provider_nofix__', PROV_NOFIX), } const clone = (x) => JSON.parse(JSON.stringify(x)) @@ -234,11 +249,12 @@ const who = (n) => `「${n.data.label}」` const metricOptions = (m) => m.data.config.metrics.map((x) => ({ value: x.id, label: `${x.name}(${x.id})`, hint: `口径卡「${m.data.label}」` })) /** - * 伪造的点名接入检查,形状照后端 engine/provider_refs.py 与 autofix._plan_provider:一处一条问题(字段 provider、 + * 伪造的点名接入检查,形状照后端 engine/provider_refs.py 与 autofix.provider_choice:一处一条问题(字段 provider、 * agents[i].provider),门禁里是 error、带一条要人选的修复(id 是 code:节点:字段);画布校验里是 warning、没有修复。 - * 候选照后端按执行时的取法算去掉、换掉以后落到哪里(只覆盖这两张图用到的情形,图里没有全图默认):节点去掉接入落到 + * 候选照后端按执行时的取法算去掉、换掉以后落到哪里(只覆盖这几张图用到的情形,图里没有全图默认):节点去掉接入落到 * 第一个可用的接入;成员去掉接入跟随节点自己的接入,那个接入停用了就不给这一项;落到的接入不提供同一处写着的模型时 - * 模型一并去掉(_drops 记哪几个候选要去掉,应用时用,前端收不到) + * 模型一并去掉(_drops 记哪几个候选要去掉,应用时用,前端收不到)。协作节点换掉、去掉接入时,跟着它的成员自己写着 + * 没有启用接入提供的模型,一个候选都落不稳:没有修复,提示不写「或在「发布前检查」中改用其他接入」 */ function providerLint(graph, providers, level) { const issues = [] @@ -261,26 +277,29 @@ function providerLint(graph, providers, level) { const code = p ? 'provider.disabled' : 'provider.missing' const id = `${code}:${r.n.id}:${r.field}` const gate = level === 'error' - issues.push({ level, node_id: r.n.id, field: r.field, code, fix: gate ? id : null, - message: `${r.who}指定的模型接入「${r.name}」${p ? '已停用' : '不存在'}。请在「设置 → 模型接入」中${p ? '启用它' : '核对名称'},` - + '或在「发布前检查」中改用其他接入' }) - if (!gate) continue const model = r.holder.model const options = [] const drops = [] const up = r.team && r.n.data.config.provider ? providers.find((x) => x.name === r.n.data.config.provider) : enabled[0] - if (up?.enabled) { + const stuck = !r.team && (r.n.data.config.agents ?? []).some((a) => !a.provider && a.model && !enabled.some((x) => serves(x, a.model))) + if (up?.enabled && !stuck) { const drop = !!model && !serves(up, model) if (drop) drops.push('') options.push({ value: '', label: '不指定接入', hint: `去掉这一处指定的接入${drop ? `和模型「${model}」` : ''},执行时改用` + (r.team && r.n.data.config.provider ? `${r.team}指定的接入「${up.name}」` : `第一个可用的模型接入「${up.name}」`) }) } - for (const x of enabled) { + for (const x of stuck ? [] : enabled) { const drop = !!model && !serves(x, model) if (drop) drops.push(x.name) options.push({ value: x.name, label: x.name, hint: drop ? `不提供模型「${model}」,将改用它的默认模型「${x.default_model}」` : null }) } - fixes.push({ id, code, node_id: r.n.id, field: r.field, kind: 'choice', label: `选择${r.who}改用的模型接入`, options, _drops: drops }) + const fixable = options.length > 0 + issues.push({ level, node_id: r.n.id, field: r.field, code, fix: gate && fixable ? id : null, + message: `${r.who}指定的模型接入「${r.name}」${p ? '已停用' : '不存在'}。请在「设置 → 模型接入」中${p ? '启用它' : '核对名称'}` + + (fixable ? ',或在「发布前检查」中改用其他接入' : '') }) + if (gate && fixable) { + fixes.push({ id, code, node_id: r.n.id, field: r.field, kind: 'choice', label: `选择${r.who}改用的模型接入`, options, _drops: drops }) + } } // 哪一级都没写接入、只写了模型:按模型名找,只有停用的接入提供它时同样是问题,落在写模型的那一处。修复是「不指定 // 模型」(落到第一个可用的接入)或改用一个启用的接入(写在模型旁边,模型去掉) @@ -619,7 +638,7 @@ async function open({ id = 'pf-hard', width = 1440, height = 900, backend = 'new const state = { checks: [], autofixes: [], patches: [], publishes: [], upgrades: [], version: FAKES[id].version, graph: clone(FAKES[id].graph), save, backend, upgrade, validate: 'ok', validates: 0, deleted: [] } // 点名接入、只写了模型的那几张图:接入表伪造,校验、门禁、修复都按它现算 - const providers = ['pf-prov', 'pf-provok', 'pf-provmodel'].includes(id) ? clone(PROVIDERS) : null + const providers = ['pf-prov', 'pf-provok', 'pf-provmodel', 'pf-provnofix'].includes(id) ? clone(PROVIDERS) : null state.providers = providers await page.route(/\/api\//, (route) => { @@ -1721,6 +1740,25 @@ await section('点名的模型接入:一处一行、各有一组要人选的 check('没有运行时报错', errors.length === 0, errors.join(' | ')) }) +await section('点名的模型接入:给不出修复的那一处不借同节点别处的修复,提示也不指到发布前检查', async () => { + const { page, errors } = await open({ id: 'pf-provnofix' }) + await openDialog(page) + await waitFor(page, async () => (await dialog(page).locator('[data-preflight-issue^="provider."]').count()) === 2) + const rows = dialog(page).locator('[data-preflight-issue^="provider."]') + const own = rows.nth(0) + const member = rows.nth(1) + const ownText = await own.innerText().catch(() => '') + check('协作节点自己的接入:一行,没有修复(选项、预览按钮都没有)', await own.locator('[data-fix-choice]').count() === 0 + && await own.getAttribute('data-fix-kind') === null, ownText.replace(/\s+/g, ' ').slice(0, 100)) + check('……提示只说去设置里核对,不指到发布前检查', ownText.includes('指定的模型接入「demo-old」不存在。请在「设置 → 模型接入」中核对名称') + && !ownText.includes('发布前检查'), ownText.replace(/\s+/g, ' ').slice(0, 120)) + check('成员「分析师」那一处:自己的修复画在自己这一行', await member.locator('[data-fix-choice="provider.missing:team:agents[0].provider"]').count() === 1 + && (await member.innerText()).includes('或在「发布前检查」中改用其他接入')) + check('整个弹窗里只有这一组接入的修复', await dialog(page).locator('[data-fix-choice^="provider."]').count() === 1) + await shoot(page, 'publish-provider-nofix', dialog(page)) + check('没有运行时报错', errors.length === 0, errors.join(' | ')) +}) + await section('点名的模型接入:问题面板写「模型接入」,不露键名', async () => { const { page, errors } = await open({ id: 'pf-prov' }) await page.locator('.react-flow__pane').click({ position: { x: 30, y: 30 } }) diff --git a/scripts/check-studio.mjs b/scripts/check-studio.mjs index ec295233..21ae0a50 100644 --- a/scripts/check-studio.mjs +++ b/scripts/check-studio.mjs @@ -2607,6 +2607,194 @@ await section('合并查询:节点库认得、卡片摘要、检查器从上 await ctx.close() }) +// ================================================================ 点名的模型接入(K1b) +// 接入表、画布校验、助手的模型设定都是伪造的(一家启用、一家停用,名字都是通用名)。校验按伪造的接入表现算,形状照 +// 后端:点名的接入不存在、已停用给接入那一条(provider.*);点名的接入好好的、没写模型给「将使用接入「X」的默认模型」; +// 接入那一条在时不再给「没有指定模型」(provider_refs.quiet_unset_model) +const MODEL_PROVIDERS = [ + { id: 'pv-main', name: 'demo-main', kind: 'openai_compatible', base_url: 'https://example.com/v1', default_model: 'big-model', + models: [{ id: 'big-model' }, { id: 'small-model' }], enabled: true, extra: {}, api_key_masked: '', has_key: true }, + { id: 'pv-off', name: 'demo-off', kind: 'openai_compatible', base_url: 'https://example.com/v1', default_model: 'tiny-1', + models: [{ id: 'tiny-1' }], enabled: false, extra: {}, api_key_masked: '', has_key: true }, +] +const MODEL_GRAPH = { + nodes: [ + node('start', 'input', 0, 300, '输入', { fields: [{ name: 'q', required: true }] }), + node('named', 'llm', 300, 60, '点名接入', { prompt: '{{ input.q }}', provider: 'demo-main' }), + node('gone', 'llm', 300, 220, '接入已删', { prompt: '{{ input.q }}', provider: 'demo-gone' }), + node('off', 'agent', 300, 380, '接入已停用', { prompt: '{{ input.q }}', provider: 'demo-off' }), + node('plain', 'llm', 300, 540, '没点名', { prompt: '{{ input.q }}' }), + node('done', 'output', 640, 300, '成果', { fields: [{ name: 'a', value: '{{ last_message }}' }] }), + ], + edges: [edge('start', 'named'), edge('start', 'gone'), edge('start', 'off'), edge('start', 'plain'), + edge('named', 'done'), edge('gone', 'done'), edge('off', 'done'), edge('plain', 'done')], +} +/** 伪造的画布校验:只管模型这一栏和点名的接入 */ +const modelLint = (graph) => { + const issues = [] + for (const n of graph.nodes ?? []) { + if (!['llm', 'agent'].includes(n.type)) continue + const c = n.data?.config ?? {} + const named = (c.provider || graph.defaults?.provider || '').trim() + const p = MODEL_PROVIDERS.find((x) => x.name === named) + const own = c.provider ? n.id : null + if (named && !p?.enabled) { + issues.push({ level: 'warning', node_id: own, field: own ? 'provider' : 'defaults.provider', code: p ? 'provider.disabled' : 'provider.missing', + message: `「${n.data.label}」指定的模型接入「${named}」${p ? '已停用' : '不存在'}。请在「设置 → 模型接入」中${p ? '启用它' : '核对名称'}` }) + continue + } + if (!c.model) { + issues.push({ level: 'warning', node_id: n.id, field: 'model', code: 'model.unset', + message: named ? `没有指定模型,将使用接入「${named}」的默认模型` : '没有指定模型,将使用默认模型' }) + } + } + return { ok: true, issues } +} +const ASSISTANT_BROKEN = '助手使用的模型接入「demo-gone」不存在。请在「设置 → 模型接入」中核对名称,或在「编排」页助手栏的「助手使用的模型」中重新选择' + +await section('点名的模型接入:检查器模型一栏说清留空用哪个接入;助手栏照实显示存着的设定、能重新选「跟随默认」', async () => { + FAKES['st-model'] = wf('st-model', { name: '__studio_check_model__', graph: MODEL_GRAPH, version: 1 }) + FAKES['st-modeldef'] = wf('st-modeldef', { name: '__studio_check_model_defaults__', graph: { ...MODEL_GRAPH, defaults: { provider: 'demo-main' } }, version: 1 }) + // 助手的模型设定:存着一个已删掉的接入,GET 照后端说明用不了;PUT 记下请求、清掉存着的接入 + const copilot = { saved: { configured: true, provider: 'demo-gone', model: null, effective_provider: null, effective_model: null, error: ASSISTANT_BROKEN }, puts: [] } + const before = async (page) => { + const json = (route, body) => route.fulfill({ status: 200, contentType: 'application/json', body: JSON.stringify(body) }) + await page.route(/\/api\/providers(\?.*)?$/, (route) => (route.request().method() === 'GET' ? json(route, MODEL_PROVIDERS) : route.fallback())) + await page.route(/\/api\/workflows\/validate$/, (route) => json(route, modelLint(route.request().postDataJSON()?.graph ?? {}))) + await page.route(/\/api\/copilot\/model$/, (route) => { + if (route.request().method() === 'PUT') { + copilot.puts.push(route.request().postDataJSON()) + copilot.saved = { configured: false, provider: null, model: null, effective_provider: 'demo-main', effective_model: 'big-model', error: null } + } + return json(route, copilot.saved) + }) + } + try { + const { ctx, page, state, errors } = await open({ path: '/studio/st-model', before, stream: [{ op: 'done', explanation: '好' }] }) + const field = page.locator('[data-inspector-sheet] [data-field="model"]') + const look = async (id) => { + await S(page, (x) => window.__studio.getState().select(x), id) + await field.waitFor({ timeout: 4000 }) + await page.waitForTimeout(150) + return { + blank: (await field.locator('select option[value=""]').innerText()).trim(), + help: await field.locator('[data-field-help]').count() ? (await field.locator('[data-field-help]').innerText()).trim() : null, + text: await field.innerText(), + sheet: await page.locator('[data-inspector-sheet]').innerText(), + } + } + await waitAnalysis(page) + const named = await look('named') + check('点名了启用的接入、没写模型:空选项写「使用接入「demo-main」的默认模型」', named.blank === '默认(使用接入「demo-main」的默认模型)', named.blank) + check('……下面的说明同样写这个接入', named.help === '留空则使用接入「demo-main」的默认模型', named.help) + check('……校验那条也照实写接入', named.text.includes('没有指定模型,将使用接入「demo-main」的默认模型'), named.text.slice(0, 120)) + const gone = await look('gone') + check('点名的接入不存在:空选项说状态,不说「使用」', gone.blank === '默认(模型接入「demo-gone」不存在)', gone.blank) + check('……模型一栏下面不再写说明,也没有「没有指定模型」那条', gone.help === null && !gone.text.includes('没有指定模型'), gone.text.slice(0, 120)) + check('……接入那条问题在检查器顶上', gone.sheet.includes('指定的模型接入「demo-gone」不存在'), gone.sheet.slice(0, 160)) + const off = await look('off') + check('点名的接入已停用:空选项写「已停用」,没有说明', off.blank === '默认(模型接入「demo-off」已停用)' && off.help === null, `${off.blank} · ${off.help}`) + const plain = await look('plain') + check('没点名接入:照旧写第一个可用的模型接入', plain.blank === '默认(使用第一个可用的模型接入)' && plain.help === '留空则使用默认模型接入', + `${plain.blank} · ${plain.help}`) + if (SHOTS) { + await look('gone') + for (const theme of ['dark', 'light']) { + await page.evaluate((t) => document.documentElement.setAttribute('data-theme', t), theme) + await page.waitForTimeout(200) + await page.locator('[data-inspector-sheet]').screenshot({ path: `${SHOTS}/studio-model-inspector-${theme}.png` }) + } + await page.evaluate(() => document.documentElement.setAttribute('data-theme', 'dark')) + } + + // 助手栏:存着的接入失效了,齿轮上有红点;展开后下拉照实停在存着的那一项,下面写原因 + await S(page, () => window.__studio.getState().select(null)) + const gear = page.getByRole('button', { name: '助手使用的模型' }) + await gear.waitFor({ timeout: 4000 }) + await page.waitForFunction(() => !!document.querySelector('[data-copilot-model-broken]'), null, { timeout: 4000 }).catch(() => {}) + check('存着的接入用不了:齿轮上有标记,悬停写明', await page.locator('[data-copilot-model-broken]').count() === 1 + && (await gear.getAttribute('title')) === '助手使用的模型当前无法调用,点击查看原因', await gear.getAttribute('title')) + await gear.click() + const select = page.locator('#copilot-model') + await select.waitFor({ timeout: 3000 }) + const picked = await select.evaluate((el) => el.options[el.selectedIndex]?.textContent ?? '') + check('下拉停在存着的设定上,不显示成「跟随默认」', picked === '模型接入「demo-gone」的默认模型', picked) + check('……「跟随默认」不带「当前」:选它以后用哪个要服务端说了算', (await select.locator('option[value=""]').innerText()).trim() === '跟随默认') + const said = await page.locator('[data-copilot-model-error]').innerText().catch(() => '') + check('下拉下面照实写原因(和发出一句话后报的同一句)', said === ASSISTANT_BROKEN && await select.getAttribute('aria-invalid') === 'true', said) + if (SHOTS) { + for (const theme of ['dark', 'light']) { + await page.evaluate((t) => document.documentElement.setAttribute('data-theme', t), theme) + await page.waitForTimeout(200) + await page.locator('#copilot-model').locator('xpath=ancestor::div[contains(@class, "rounded-lg")][1]') + .screenshot({ path: `${SHOTS}/studio-copilot-model-${theme}.png` }) + } + await page.evaluate(() => document.documentElement.setAttribute('data-theme', 'dark')) + } + // 存着的设定列不出来时发一句话:不带模型,服务端按存着的整组取(带了模型会绕过存着的接入) + const box = page.getByLabel('描述要生成或修改的工作流') + await box.fill('把回答改短一些') + await box.press('Enter') + await until(() => state.bodies.length > 0, 3000) + check('……发出的请求不带模型', state.bodies.length === 1 && !('model' in state.bodies[0] && state.bodies[0].model), JSON.stringify(state.bodies[0] ?? {}).slice(0, 100)) + await page.waitForFunction(() => !window.__studio.getState().copilot.active, null, { timeout: 4000 }).catch(() => {}) + + await select.selectOption('') + await until(() => copilot.puts.length > 0, 3000) + check('重新选「跟随默认」算一次改动:存成不指定接入和模型', copilot.puts.length === 1 && copilot.puts[0].model === null + && !copilot.puts[0].provider, JSON.stringify(copilot.puts)) + await page.waitForFunction(() => !document.querySelector('[data-copilot-model-error]'), null, { timeout: 3000 }).catch(() => {}) + check('……原因和齿轮上的标记一起消失,「跟随默认」写出当前用的模型', await page.locator('[data-copilot-model-error]').count() === 0 + && await page.locator('[data-copilot-model-broken]').count() === 0 + && (await select.locator('option[value=""]').innerText()).trim() === '跟随默认(当前:big-model)') + check('没有运行时报错', errors.length === 0, errors.slice(0, 2).join(' | ')) + await ctx.close() + + // 全图默认点名的接入:没写自己接入的节点跟着它 + const second = await open({ path: '/studio/st-modeldef', before }) + await S(second.page, () => window.__studio.getState().select('plain')) + const defField = second.page.locator('[data-inspector-sheet] [data-field="model"]') + await defField.waitFor({ timeout: 4000 }) + const defBlank = (await defField.locator('select option[value=""]').innerText()).trim() + check('全图默认点名了接入:没写自己接入的节点写「使用接入「demo-main」的默认模型」', defBlank === '默认(使用接入「demo-main」的默认模型)', defBlank) + check('没有运行时报错', second.errors.length === 0, second.errors.slice(0, 2).join(' | ')) + await second.ctx.close() + + // 390 宽:助手栏浮在画布上,展开「助手使用的模型」、原因那一长句照样折行,不把页面撑出横向滚动 + copilot.saved = { configured: true, provider: 'demo-gone', model: null, effective_provider: null, effective_model: null, error: ASSISTANT_BROKEN } + const narrow = await open({ path: '/studio/st-model', before, width: 390, height: 844 }) + await blur(narrow.page) + await narrow.page.keyboard.press('Alt+KeyA') + const narrowGear = narrow.page.getByRole('button', { name: '助手使用的模型' }) + await narrowGear.waitFor({ timeout: 4000 }) + // 编排页在 390 宽时工具栏本身就比视口宽(与这一块无关):比的是展开前后,展开这一块不能再多撑出横向溢出 + const overflow = () => narrow.page.evaluate(() => document.documentElement.scrollWidth - document.documentElement.clientWidth) + const base = await overflow() + await narrowGear.click() + await narrow.page.locator('[data-copilot-model-error]').waitFor({ timeout: 3000 }) + const fit = await narrow.page.evaluate(() => { + const err = document.querySelector('[data-copilot-model-error]').getBoundingClientRect() + const sel = document.getElementById('copilot-model').getBoundingClientRect() + return { over: document.documentElement.scrollWidth - document.documentElement.clientWidth, + right: Math.round(Math.max(err.right, sel.right)), vw: window.innerWidth } + }) + check('390 宽:原因折行显示,下拉和原因都在视口里,展开这一块不多撑出横向溢出', fit.over <= base && fit.right <= fit.vw, + JSON.stringify({ ...fit, base })) + if (SHOTS) { + for (const theme of ['dark', 'light']) { + await narrow.page.evaluate((t) => document.documentElement.setAttribute('data-theme', t), theme) + await narrow.page.waitForTimeout(200) + await narrow.page.screenshot({ path: `${SHOTS}/studio-copilot-model-390-${theme}.png` }) + } + } + check('没有运行时报错', narrow.errors.length === 0, narrow.errors.slice(0, 2).join(' | ')) + await narrow.ctx.close() + } finally { + delete FAKES['st-model'] + delete FAKES['st-modeldef'] + } +}) + check('整个检查没有弹出原生 confirm / prompt', dialogs === 0, `${dialogs} 次`) check('检查没有写库(兜底拦下的写请求)', writes.length === 0, writes.slice(0, 4).join('、'))