mirror of
https://github.com/ThearchyHelios/AgentLab.git
synced 2026-11-18 03:12:01 +00:00
Copilot 模型可独立配置
此前 Copilot 的模型是兜底猜的:取第一个非 mock 且启用的 provider 的
默认模型。后端 GenerateIn 一直有 provider/model 字段,但前端从没传过,
于是禁用某个 provider 或调整创建顺序就会让 Copilot 静默换模型。
现在是独立设置(Setting 表 copilot 键),优先级:单次请求显式指定 >
保存的 Copilot 专用模型 > provider 兜底。做成独立设置是因为 Copilot
写的是编排本身,对指令遵循的要求和工作流节点不是一回事。
新增 GET/PUT /api/copilot/model 读写设置,并回报 effective_model
(区分显式配置与兜底);generate / generate-stream / explain 三处
统一走 copilot_model_spec;流首帧发 {op:'model'} 告知实际所用模型,
画布浮条上直接显示,不用猜。
前端 Copilot 弹窗加模型选择器,选择即持久化,下次打开记住;说明里
点明它只影响 Copilot 自己、且指令遵循弱的模型(如 Mock)跑不出结果。
验证:兜底→claude-opus-5;设为 deepseek-chat 后流首帧回报一致;
单次请求传 claude-opus-5 可覆盖设置;清空恢复兜底。浏览器实测选择
持久化跨弹窗、浮条显示模型名。
This commit is contained in:
@@ -95,6 +95,70 @@ class GenerateIn(BaseModel):
|
||||
model: str | None = None
|
||||
|
||||
|
||||
COPILOT_SETTING_KEY = "copilot"
|
||||
|
||||
|
||||
async def copilot_model_spec(
|
||||
session: AsyncSession, payload: GenerateIn, *, max_tokens: int = 8192
|
||||
) -> ModelSpec:
|
||||
"""决定 Copilot 用哪个模型。
|
||||
|
||||
优先级:本次请求显式指定 > 设置里存的 Copilot 专用模型 > provider 兜底。
|
||||
做成独立设置是因为 Copilot 是元任务——它写的是编排本身,对指令遵循的要求
|
||||
和工作流里的节点不是一回事,值得单独选,而不是跟着"第一个启用的 provider"漂。
|
||||
"""
|
||||
from app.db.models import Setting
|
||||
|
||||
provider, model = payload.provider, payload.model
|
||||
if not provider and not model:
|
||||
row = await session.get(Setting, COPILOT_SETTING_KEY)
|
||||
saved = row.value if row else {}
|
||||
provider = saved.get("provider") or None
|
||||
model = saved.get("model") or None
|
||||
return ModelSpec(provider=provider, model=model, max_tokens=max_tokens)
|
||||
|
||||
|
||||
@router.get("/model")
|
||||
async def get_copilot_model(session: AsyncSession = Depends(get_session)) -> dict[str, Any]:
|
||||
"""当前 Copilot 会用哪个模型,以及是显式配的还是兜底来的。"""
|
||||
from app.db.models import Setting
|
||||
from app.providers.factory import resolve_provider
|
||||
|
||||
row = await session.get(Setting, COPILOT_SETTING_KEY)
|
||||
saved = row.value if row else {}
|
||||
configured = bool(saved.get("provider") or saved.get("model"))
|
||||
resolved = await resolve_provider(session, saved.get("provider"), saved.get("model"))
|
||||
return {
|
||||
"configured": configured,
|
||||
"provider": saved.get("provider") or None,
|
||||
"model": saved.get("model") or None,
|
||||
"effective_provider": resolved.name if resolved else None,
|
||||
"effective_model": saved.get("model") or (resolved.default_model if resolved else None),
|
||||
}
|
||||
|
||||
|
||||
class CopilotModelIn(BaseModel):
|
||||
provider: str | None = None
|
||||
model: str | None = None
|
||||
|
||||
|
||||
@router.put("/model")
|
||||
async def set_copilot_model(
|
||||
payload: CopilotModelIn, session: AsyncSession = Depends(get_session)
|
||||
) -> dict[str, Any]:
|
||||
"""设定 Copilot 专用模型。两个字段都留空即恢复兜底。"""
|
||||
from app.db.models import Setting
|
||||
|
||||
value = {"provider": payload.provider or "", "model": payload.model or ""}
|
||||
row = await session.get(Setting, COPILOT_SETTING_KEY)
|
||||
if row:
|
||||
row.value = value
|
||||
else:
|
||||
session.add(Setting(key=COPILOT_SETTING_KEY, value=value))
|
||||
await session.commit()
|
||||
return await get_copilot_model(session)
|
||||
|
||||
|
||||
class GenerateOut(BaseModel):
|
||||
graph: dict[str, Any]
|
||||
explanation: str = ""
|
||||
@@ -172,9 +236,7 @@ async def generate(
|
||||
user = f"请设计一个工作流:{payload.instruction}"
|
||||
|
||||
try:
|
||||
model, _ = await get_chat_model(
|
||||
session, ModelSpec(provider=payload.provider, model=payload.model, max_tokens=8192)
|
||||
)
|
||||
model, _ = await get_chat_model(session, await copilot_model_spec(session, payload))
|
||||
except ProviderNotConfigured as e:
|
||||
raise HTTPException(400, str(e)) from e
|
||||
|
||||
@@ -378,9 +440,8 @@ async def generate_stream(payload: GenerateIn, session: AsyncSession = Depends(g
|
||||
user = f"请设计一个工作流:{payload.instruction}"
|
||||
|
||||
try:
|
||||
model, _ = await get_chat_model(
|
||||
session, ModelSpec(provider=payload.provider, model=payload.model, max_tokens=8192)
|
||||
)
|
||||
spec_ = await copilot_model_spec(session, payload)
|
||||
model, model_id = await get_chat_model(session, spec_)
|
||||
except ProviderNotConfigured as e:
|
||||
raise HTTPException(400, str(e)) from e
|
||||
|
||||
@@ -388,6 +449,7 @@ async def generate_stream(payload: GenerateIn, session: AsyncSession = Depends(g
|
||||
|
||||
async def event_stream():
|
||||
explanation = ""
|
||||
yield f"data: {json.dumps({'op': 'model', 'model': model_id}, ensure_ascii=False)}\n\n"
|
||||
try:
|
||||
async for op in _iter_ops(model, messages):
|
||||
if op.get("op") == "done":
|
||||
@@ -531,7 +593,12 @@ async def explain(
|
||||
"""用大白话讲清楚一张图在干什么。接手别人的编排时很有用。"""
|
||||
try:
|
||||
model, _ = await get_chat_model(
|
||||
session, ModelSpec(provider=payload.provider, model=payload.model, max_tokens=2048)
|
||||
session,
|
||||
await copilot_model_spec(
|
||||
session,
|
||||
GenerateIn(instruction="_", provider=payload.provider, model=payload.model),
|
||||
max_tokens=2048,
|
||||
),
|
||||
)
|
||||
except ProviderNotConfigured as e:
|
||||
raise HTTPException(400, str(e)) from e
|
||||
|
||||
@@ -199,6 +199,12 @@ export const api = {
|
||||
layout: (graph: GraphSpec) => post<GraphSpec>('/copilot/layout', { graph }),
|
||||
fromRun: (runId: string, name?: string) =>
|
||||
post<any>('/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'),
|
||||
setModel: (body: { provider?: string | null; model?: string | null }) =>
|
||||
put<any>('/copilot/model', body),
|
||||
},
|
||||
}
|
||||
|
||||
@@ -207,7 +213,7 @@ export const api = {
|
||||
* 每个操作(add_node / add_edge / …)到达即回调,画布边收边长。
|
||||
*/
|
||||
export function streamCopilot(
|
||||
body: { instruction: string; base_graph?: GraphSpec | null },
|
||||
body: { instruction: string; base_graph?: GraphSpec | null; provider?: string | null; model?: string | null },
|
||||
onOp: (op: any) => void,
|
||||
onEnd: (error?: string) => void,
|
||||
): () => void {
|
||||
|
||||
@@ -9,7 +9,7 @@ import { Inspector } from '../canvas/Inspector'
|
||||
import { Palette } from '../canvas/Palette'
|
||||
import { RunPanel } from '../run/RunPanel'
|
||||
import { useStudio, toGraph } from '../store/studio'
|
||||
import { useCatalog } from '../store/catalog'
|
||||
import { useCatalog, modelOptions } from '../store/catalog'
|
||||
import { Empty, Modal, Spinner, Tabs, useToast } from '../components/ui'
|
||||
import type { Workflow } from '../types'
|
||||
|
||||
@@ -348,16 +348,38 @@ function PublishModal({ workflow, onClose, onDone }: {
|
||||
function CopilotModal({ open, onClose }: { open: boolean; onClose: () => void }) {
|
||||
const nodes = useStudio((s) => s.nodes)
|
||||
const runCopilot = useStudio((s) => s.runCopilot)
|
||||
const providers = useCatalog((s) => s.providers)
|
||||
const [instruction, setInstruction] = useState('')
|
||||
const [useBase, setUseBase] = useState(true)
|
||||
const [model, setModel] = useState<string>('')
|
||||
const [effective, setEffective] = useState<string>('')
|
||||
|
||||
// Copilot 的模型是独立设置:它写的是编排本身,值得和工作流节点分开选
|
||||
useEffect(() => {
|
||||
if (!open) return
|
||||
void api.copilot.getModel().then((m) => {
|
||||
setModel(m.model ?? '')
|
||||
setEffective(m.effective_model ?? '')
|
||||
}).catch(() => undefined)
|
||||
}, [open])
|
||||
|
||||
const pickModel = (value: string) => {
|
||||
setModel(value)
|
||||
// 选了就记住,下次打开还是它
|
||||
void api.copilot.setModel({ model: value || null })
|
||||
.then((m) => setEffective(m.effective_model ?? ''))
|
||||
.catch(() => undefined)
|
||||
}
|
||||
|
||||
// 流式生成:发起后立刻关窗,图在画布上实时长出来,状态见左下角浮条
|
||||
const generate = () => {
|
||||
if (!instruction.trim()) return
|
||||
runCopilot(instruction, useBase && nodes.length > 0)
|
||||
runCopilot(instruction, useBase && nodes.length > 0, model || undefined)
|
||||
onClose()
|
||||
}
|
||||
|
||||
const options = modelOptions(providers)
|
||||
const groups = [...new Set(options.map((o) => o.group))]
|
||||
|
||||
const examples = [
|
||||
'读取用户上传的问题,先查知识库,查到就基于资料回答并标注出处,查不到就联网搜索',
|
||||
'把一段长文本拆成要点,逐条用模型打分,低分的让模型重写一次,最后汇总成表格',
|
||||
@@ -396,6 +418,24 @@ function CopilotModal({ open, onClose }: { open: boolean; onClose: () => void })
|
||||
))}
|
||||
</div>
|
||||
|
||||
<div className="mt-3">
|
||||
<label className="label">Copilot 使用的模型</label>
|
||||
<select className="field" value={model} onChange={(e) => pickModel(e.target.value)}>
|
||||
<option value="">跟随默认 provider{effective ? `(当前:${effective})` : ''}</option>
|
||||
{groups.map((g) => (
|
||||
<optgroup key={g} label={g}>
|
||||
{options.filter((o) => o.group === g).map((o) => (
|
||||
<option key={g + o.value} value={o.value}>{o.label}</option>
|
||||
))}
|
||||
</optgroup>
|
||||
))}
|
||||
</select>
|
||||
<div className="mt-1 text-[10px] leading-snug text-faint">
|
||||
选择会被记住,只影响 Copilot 自己,不改工作流节点上的模型。
|
||||
它要按协议逐行输出操作,指令遵循弱的模型(比如 Mock)生成不出东西。
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{!!nodes.length && (
|
||||
<label className="mt-3 flex items-center gap-2 text-[11.5px]">
|
||||
<input type="checkbox" checked={useBase} onChange={(e) => setUseBase(e.target.checked)}
|
||||
@@ -434,6 +474,7 @@ function CopilotStatusBar() {
|
||||
<Spinner size={13} />
|
||||
<span className="min-w-0 flex-1 truncate text-[11.5px]">
|
||||
<span className="mr-1.5 font-semibold" style={{ color: '#bc8cff' }}>Copilot</span>
|
||||
{copilot.model && <span className="mr-1.5 text-faint">{copilot.model}</span>}
|
||||
{copilot.lastOp}
|
||||
</span>
|
||||
<button className="btn btn-sm" onClick={stopCopilot}>取消</button>
|
||||
|
||||
@@ -78,7 +78,7 @@ interface StudioState {
|
||||
streaming: boolean
|
||||
unsubscribe: (() => void) | null
|
||||
|
||||
copilot: { active: boolean; lastOp: string; explanation: string; error: string }
|
||||
copilot: { active: boolean; lastOp: string; explanation: string; error: string; model: string }
|
||||
copilotNew: string[]
|
||||
cancelCopilot: (() => void) | null
|
||||
|
||||
@@ -98,7 +98,7 @@ interface StudioState {
|
||||
|
||||
startRun: (input: Record<string, any>) => Promise<Run | null>
|
||||
startFormalRun: (input: Record<string, any>) => Promise<Run | null>
|
||||
runCopilot: (instruction: string, useBase: boolean) => void
|
||||
runCopilot: (instruction: string, useBase: boolean, model?: string | null) => void
|
||||
stopCopilot: () => void
|
||||
attachRun: (runId: string) => Promise<void>
|
||||
stopRun: () => Promise<void>
|
||||
@@ -121,7 +121,7 @@ export const useStudio = create<StudioState>((set, get) => ({
|
||||
activeEdges: [],
|
||||
streaming: false,
|
||||
unsubscribe: null,
|
||||
copilot: { active: false, lastOp: '', explanation: '', error: '' },
|
||||
copilot: { active: false, lastOp: '', explanation: '', error: '', model: '' },
|
||||
copilotNew: [],
|
||||
cancelCopilot: null,
|
||||
|
||||
@@ -261,11 +261,11 @@ export const useStudio = create<StudioState>((set, get) => ({
|
||||
}
|
||||
},
|
||||
|
||||
runCopilot: (instruction, useBase) => {
|
||||
runCopilot: (instruction, useBase, model) => {
|
||||
const state = get()
|
||||
state.cancelCopilot?.()
|
||||
set({
|
||||
copilot: { active: true, lastOp: '正在起草…', explanation: '', error: '' },
|
||||
copilot: { active: true, lastOp: '正在起草…', explanation: '', error: '', model: model ?? '' },
|
||||
copilotNew: [],
|
||||
})
|
||||
if (!useBase) set({ nodes: [], edges: [], dirty: true })
|
||||
@@ -283,10 +283,18 @@ export const useStudio = create<StudioState>((set, get) => ({
|
||||
}
|
||||
|
||||
const stop = streamCopilot(
|
||||
{ instruction, base_graph: useBase && state.nodes.length ? toGraph(state.nodes, state.edges) : null },
|
||||
{
|
||||
instruction,
|
||||
base_graph: useBase && state.nodes.length ? toGraph(state.nodes, state.edges) : null,
|
||||
model: model ?? undefined,
|
||||
},
|
||||
(op) => {
|
||||
const s = get()
|
||||
switch (op.op) {
|
||||
case 'model':
|
||||
// 后端首帧告知实际用的模型,浮条上直接显示,不用猜
|
||||
set({ copilot: { ...s.copilot, model: op.model ?? '' } })
|
||||
break
|
||||
case 'plan':
|
||||
set({ copilot: { ...s.copilot, lastOp: op.summary ?? '规划中' } })
|
||||
break
|
||||
@@ -359,14 +367,15 @@ export const useStudio = create<StudioState>((set, get) => ({
|
||||
// 后端排版+校验后的最终图整体落位;高亮集合保留几秒供辨认
|
||||
const { nodes, edges } = toFlow(op.graph)
|
||||
set({ nodes, edges, dirty: true,
|
||||
copilot: { active: false, lastOp: '',
|
||||
copilot: { active: false, lastOp: '', model: get().copilot.model,
|
||||
explanation: op.explanation ?? get().copilot.explanation, error: '' } })
|
||||
void get().validate()
|
||||
setTimeout(() => set({ copilotNew: [] }), 6000)
|
||||
break
|
||||
}
|
||||
case 'error':
|
||||
set({ copilot: { active: false, lastOp: '', explanation: '', error: op.message ?? '生成失败' } })
|
||||
set({ copilot: { active: false, lastOp: '', explanation: '',
|
||||
model: get().copilot.model, error: op.message ?? '生成失败' } })
|
||||
break
|
||||
}
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user