From 5ac681c4813155b083c780046fc29de938ad724a Mon Sep 17 00:00:00 2001 From: ThearchyHelios Date: Mon, 14 Sep 2026 11:01:47 +0800 Subject: [PATCH] =?UTF-8?q?Copilot=20=E6=A8=A1=E5=9E=8B=E5=8F=AF=E7=8B=AC?= =?UTF-8?q?=E7=AB=8B=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 此前 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 可覆盖设置;清空恢复兜底。浏览器实测选择 持久化跨弹窗、浮条显示模型名。 --- backend/app/api/copilot.py | 81 ++++++++++++++++++++++++++++--- frontend/src/api/client.ts | 8 ++- frontend/src/pages/StudioPage.tsx | 47 ++++++++++++++++-- frontend/src/store/studio.ts | 25 +++++++--- 4 files changed, 142 insertions(+), 19 deletions(-) diff --git a/backend/app/api/copilot.py b/backend/app/api/copilot.py index 2573d7b6..f5fc5935 100644 --- a/backend/app/api/copilot.py +++ b/backend/app/api/copilot.py @@ -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 diff --git a/frontend/src/api/client.ts b/frontend/src/api/client.ts index e50d0b62..f64a5117 100644 --- a/frontend/src/api/client.ts +++ b/frontend/src/api/client.ts @@ -199,6 +199,12 @@ 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'), + setModel: (body: { provider?: string | null; model?: string | null }) => + put('/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 { diff --git a/frontend/src/pages/StudioPage.tsx b/frontend/src/pages/StudioPage.tsx index f5bde685..b46f64d5 100644 --- a/frontend/src/pages/StudioPage.tsx +++ b/frontend/src/pages/StudioPage.tsx @@ -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('') + const [effective, setEffective] = useState('') + + // 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 }) ))} +
+ + +
+ 选择会被记住,只影响 Copilot 自己,不改工作流节点上的模型。 + 它要按协议逐行输出操作,指令遵循弱的模型(比如 Mock)生成不出东西。 +
+
+ {!!nodes.length && (