第三步结构化输出优化
This commit is contained in:
1 parent
fca39eeaee
commit
d3880f51b3
10 files changed
+1095
-127
No files matched your search
@@ -57,6 +57,7 @@ from app.gateway.routers import (
|
||||
public_leaderboard,
|
||||
public_scheduled_tasks,
|
||||
recommend,
|
||||
flow_extract,
|
||||
recommended_questions,
|
||||
roundtable_chains,
|
||||
roundtable_draft_shares,
|
||||
@@ -1333,6 +1334,9 @@ This gateway provides custom endpoints for models, MCP configuration, skills, an
|
||||
# Roundtable-planning drafts + recommendation history at /api/roundtable-drafts
|
||||
app.include_router(roundtable_drafts.router)
|
||||
|
||||
# Step3 流程图结构化抽取 + 校验 (SSE) at /api/flow-extract
|
||||
app.include_router(flow_extract.router)
|
||||
|
||||
# Roundtable-planning business chains at /api/roundtable-chains
|
||||
app.include_router(roundtable_chains.router)
|
||||
|
||||
|
||||
@@ -0,0 +1,510 @@
|
||||
"""流程图结构化抽取 + 校验 的 SSE 端点。
|
||||
|
||||
第三步「方案总结」之后,要把报告 / 各席位交付的层级结论抽成一张**流程图**(节点 + 连线)。
|
||||
之前让总结智能体在同一对话线程里顺手吐 ``flow-json`` 很不稳:业务链 ``coordinator_prompt``
|
||||
常写着「输出结构化结论 / 按阶段产出报告」,模型被线程上下文锚定,要么不出 flow-json、要么
|
||||
结构残缺(只剩两三个节点)。
|
||||
|
||||
这里改成**独立的一次性模型调用**(不走 lead_agent / 不带线程历史),两段式:
|
||||
① 抽取(``model.astream``):把报告/席位交付按层级抽成 flow-json,**流式**把过程吐给前端实时显示;
|
||||
② 校验/修复(``model.ainvoke``):把抽取结果连同源材料再过一遍模型,补全漏层、修正连边、
|
||||
去掉阶段/汇总节点,产出干净的 flow-json;后端再做容错解析 + 结构校验,返回最终图数据。
|
||||
|
||||
SSE 帧(``data: {json}\n\n``):
|
||||
- ``{"event":"extract_delta","content":"…"}`` 抽取流式增量(前端把 JSON 实时显示出来)
|
||||
- ``{"event":"extract_done"}`` 抽取结束,进入校验
|
||||
- ``{"event":"validating"}`` 校验中
|
||||
- ``{"event":"final","graph":{title,nodes,edges}}`` 校验后的最终图(前端据此绘制)
|
||||
- ``{"event":"error","detail":"…"}``
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import json
|
||||
import logging
|
||||
import re
|
||||
from collections.abc import AsyncIterator
|
||||
from typing import Any
|
||||
|
||||
from fastapi import APIRouter, Body, Request
|
||||
from fastapi.responses import StreamingResponse
|
||||
from langchain_core.messages import HumanMessage, SystemMessage
|
||||
from pydantic import BaseModel, Field
|
||||
|
||||
from deerflow.models.factory import create_chat_model
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
router = APIRouter(prefix="/api/flow-extract", tags=["flow-extract"])
|
||||
|
||||
|
||||
# ── schemas ──────────────────────────────────────────────────────────────
|
||||
|
||||
|
||||
class SeatDelivery(BaseModel):
|
||||
sender: str = ""
|
||||
content: str = ""
|
||||
|
||||
|
||||
class FlowExtractRequest(BaseModel):
|
||||
# 数据来源:有报告优先用报告,否则用各席位交付。
|
||||
report_md: str | None = Field(default=None)
|
||||
seat_deliveries: list[SeatDelivery] = Field(default_factory=list)
|
||||
# 层级骨架:优先 coordinator_prompt 里写明的层级,否则用 chain_levels。
|
||||
chain_levels: list[str] = Field(default_factory=list)
|
||||
coordinator_prompt: str | None = Field(default=None)
|
||||
model: str | None = Field(default=None)
|
||||
# Phase 2 问答修改:带上当前图 + 用户指令 → 进 edit 模式(按指令改图,其余不变)。
|
||||
current_graph: dict[str, Any] | None = Field(default=None)
|
||||
instruction: str | None = Field(default=None)
|
||||
|
||||
|
||||
# ── flow-json 容错解析(Python 版,对齐前端 lib/flow-graph.ts)──────────────
|
||||
|
||||
_FENCE = "```flow-json"
|
||||
_VALID_TYPES = {"start", "end", "stage", "task", "decision", "risk", "deliverable", "role"}
|
||||
|
||||
|
||||
def _as_str(v: Any) -> str:
|
||||
return v.strip() if isinstance(v, str) else ""
|
||||
|
||||
|
||||
def _loose_nodes(body: str) -> list[dict[str, Any]]:
|
||||
"""正则逐字段抽取节点(strict json.loads 失败时回退)。容忍裸换行 / 尾逗号。"""
|
||||
# 取 "nodes" 后的 [ ... ](到与之配对的 ] 或文本结尾)。
|
||||
key = body.find('"nodes"')
|
||||
if key < 0:
|
||||
return []
|
||||
arr = body.find("[", key)
|
||||
if arr < 0:
|
||||
return []
|
||||
# 平衡括号切出每个顶层 {…}
|
||||
slices: list[str] = []
|
||||
depth = 0
|
||||
start = -1
|
||||
in_str = False
|
||||
esc = False
|
||||
for i in range(arr + 1, len(body)):
|
||||
ch = body[i]
|
||||
if in_str:
|
||||
if esc:
|
||||
esc = False
|
||||
elif ch == "\\":
|
||||
esc = True
|
||||
elif ch == '"':
|
||||
in_str = False
|
||||
continue
|
||||
if ch == '"':
|
||||
in_str = True
|
||||
elif ch == "{":
|
||||
if depth == 0:
|
||||
start = i
|
||||
depth += 1
|
||||
elif ch == "}":
|
||||
depth -= 1
|
||||
if depth == 0 and start >= 0:
|
||||
slices.append(body[start : i + 1])
|
||||
start = -1
|
||||
elif ch == "]" and depth == 0:
|
||||
break
|
||||
out: list[dict[str, Any]] = []
|
||||
for sl in slices:
|
||||
out.append(_loose_one(sl))
|
||||
return out
|
||||
|
||||
|
||||
def _loose_edges(body: str) -> list[dict[str, Any]]:
|
||||
"""非法 JSON 回退路径下,从顶层 `"edges":[ {from,to,label} … ]` 容错抽边。"""
|
||||
key = body.find('"edges"')
|
||||
if key < 0:
|
||||
return []
|
||||
arr = body.find("[", key)
|
||||
if arr < 0:
|
||||
return []
|
||||
depth = 0
|
||||
start = -1
|
||||
in_str = False
|
||||
esc = False
|
||||
slices: list[str] = []
|
||||
for i in range(arr + 1, len(body)):
|
||||
ch = body[i]
|
||||
if in_str:
|
||||
if esc:
|
||||
esc = False
|
||||
elif ch == "\\":
|
||||
esc = True
|
||||
elif ch == '"':
|
||||
in_str = False
|
||||
continue
|
||||
if ch == '"':
|
||||
in_str = True
|
||||
elif ch == "{":
|
||||
if depth == 0:
|
||||
start = i
|
||||
depth += 1
|
||||
elif ch == "}":
|
||||
depth -= 1
|
||||
if depth == 0 and start >= 0:
|
||||
slices.append(body[start : i + 1])
|
||||
start = -1
|
||||
elif ch == "]" and depth == 0:
|
||||
break
|
||||
|
||||
def pick(slice_: str, *keys: str) -> str:
|
||||
for k in keys:
|
||||
m = re.search(r'"' + k + r'"\s*:\s*"([^"]*)"', slice_)
|
||||
if m:
|
||||
return m.group(1)
|
||||
return ""
|
||||
|
||||
out: list[dict[str, Any]] = []
|
||||
for sl in slices:
|
||||
frm = pick(sl, "from", "source")
|
||||
to = pick(sl, "to", "target")
|
||||
if frm and to:
|
||||
e: dict[str, Any] = {"from": frm, "to": to}
|
||||
lbl = pick(sl, "label")
|
||||
if lbl:
|
||||
e["label"] = lbl
|
||||
out.append(e)
|
||||
return out
|
||||
|
||||
|
||||
def _loose_one(slice_: str) -> dict[str, Any]:
|
||||
def pick(*keys: str) -> str | None:
|
||||
for k in keys:
|
||||
m = re.search(r'"' + k + r'"\s*:\s*"((?:\\.|[^"\\])*)"', slice_)
|
||||
if m:
|
||||
raw = m.group(1)
|
||||
try:
|
||||
return json.loads('"' + raw.replace("\n", "\\n").replace("\r", "") + '"')
|
||||
except Exception: # noqa: BLE001
|
||||
return raw.replace("\\n", "\n").replace('\\"', '"')
|
||||
return None
|
||||
|
||||
obj: dict[str, Any] = {}
|
||||
for k, dst in (("id", "id"), ("type", "type"), ("detail", "detail")):
|
||||
v = pick(k)
|
||||
if v:
|
||||
obj[dst] = v
|
||||
label = pick("label", "name")
|
||||
if label:
|
||||
obj["label"] = label
|
||||
group = pick("group", "level", "tier", "layer")
|
||||
if group:
|
||||
obj["group"] = group
|
||||
fm = re.search(r'"(?:from|prev)"\s*:\s*\[([\s\S]*?)\]', slice_)
|
||||
if fm:
|
||||
inner = fm.group(1)
|
||||
ids: list[Any] = [{"id": x} for x in re.findall(r'\{[^{}]*?"id"\s*:\s*"([^"]+)"[^{}]*?\}', inner)]
|
||||
if not ids:
|
||||
ids = re.findall(r'"([^"]+)"', inner)
|
||||
if ids:
|
||||
obj["from"] = ids
|
||||
return obj
|
||||
|
||||
|
||||
def _norm_node(raw: dict[str, Any]) -> dict[str, Any] | None:
|
||||
nid = _as_str(raw.get("id"))
|
||||
label = _as_str(raw.get("label")) or _as_str(raw.get("name"))
|
||||
if not nid or not label:
|
||||
return None
|
||||
rtype = _as_str(raw.get("type")).lower()
|
||||
ntype = rtype if rtype in _VALID_TYPES else "task"
|
||||
node: dict[str, Any] = {"id": nid, "label": label, "type": ntype}
|
||||
detail = _as_str(raw.get("detail")) or _as_str(raw.get("description"))
|
||||
if detail:
|
||||
node["detail"] = detail
|
||||
group = _as_str(raw.get("group")) or _as_str(raw.get("level")) or _as_str(raw.get("tier")) or _as_str(raw.get("layer"))
|
||||
if group:
|
||||
node["group"] = group
|
||||
return node
|
||||
|
||||
|
||||
def _edges_from(raw: dict[str, Any], nid: str) -> list[dict[str, Any]]:
|
||||
frm = raw.get("from") or raw.get("prev")
|
||||
if not isinstance(frm, list):
|
||||
return []
|
||||
out: list[dict[str, Any]] = []
|
||||
for e in frm:
|
||||
if isinstance(e, str) and e.strip():
|
||||
out.append({"from": e.strip(), "to": nid})
|
||||
elif isinstance(e, dict):
|
||||
fid = _as_str(e.get("id")) or _as_str(e.get("from"))
|
||||
if fid:
|
||||
edge = {"from": fid, "to": nid}
|
||||
lbl = _as_str(e.get("label"))
|
||||
if lbl:
|
||||
edge["label"] = lbl
|
||||
out.append(edge)
|
||||
return out
|
||||
|
||||
|
||||
def parse_flow_graph(text: str) -> dict[str, Any] | None:
|
||||
"""从(可能带 fence / 非法 JSON 的)文本里解析出 ``{title, nodes, edges}``。无节点→None。"""
|
||||
start = text.rfind(_FENCE)
|
||||
body = text[start + len(_FENCE) :] if start >= 0 else text
|
||||
close = body.find("```")
|
||||
if close >= 0:
|
||||
body = body[:close]
|
||||
body = body.strip()
|
||||
|
||||
title = ""
|
||||
nodes_raw: list[dict[str, Any]] = []
|
||||
obj: Any = None
|
||||
for candidate in (body, re.sub(r",(\s*[}\]])", r"\1", body)): # 原文 + 去尾逗号
|
||||
try:
|
||||
obj = json.loads(candidate)
|
||||
break
|
||||
except Exception: # noqa: BLE001
|
||||
obj = None
|
||||
if isinstance(obj, dict):
|
||||
title = _as_str(obj.get("title"))
|
||||
raw_list = obj.get("nodes")
|
||||
nodes_raw = raw_list if isinstance(raw_list, list) else []
|
||||
else:
|
||||
m = re.search(r'"title"\s*:\s*"([^"]*)"', body)
|
||||
if m:
|
||||
title = m.group(1)
|
||||
nodes_raw = _loose_nodes(body)
|
||||
|
||||
nodes: list[dict[str, Any]] = []
|
||||
edges: list[dict[str, Any]] = []
|
||||
seen: set[str] = set()
|
||||
for raw in nodes_raw:
|
||||
if not isinstance(raw, dict):
|
||||
continue
|
||||
node = _norm_node(raw)
|
||||
if not node or node["id"] in seen:
|
||||
continue
|
||||
seen.add(node["id"])
|
||||
nodes.append(node)
|
||||
edges.extend(_edges_from(raw, node["id"]))
|
||||
if not nodes:
|
||||
return None
|
||||
|
||||
# 兼容**独立 `edges` 数组**:模型可能把连线写成节点上的 `from`,也可能写成顶层
|
||||
# `edges:[{from,to,label}]`(或 source/target 别名)。后者若不处理,节点全无连线(bug)。
|
||||
raw_edges: Any = obj.get("edges") if isinstance(obj, dict) else None
|
||||
if not isinstance(raw_edges, list):
|
||||
raw_edges = _loose_edges(body)
|
||||
for e in raw_edges or []:
|
||||
if not isinstance(e, dict):
|
||||
continue
|
||||
frm = _as_str(e.get("from")) or _as_str(e.get("source"))
|
||||
to = _as_str(e.get("to")) or _as_str(e.get("target"))
|
||||
if not frm or not to:
|
||||
continue
|
||||
edge: dict[str, Any] = {"from": frm, "to": to}
|
||||
lbl = _as_str(e.get("label"))
|
||||
if lbl:
|
||||
edge["label"] = lbl
|
||||
edges.append(edge)
|
||||
# 只保留两端都存在的边 + 去重。
|
||||
valid_edges: list[dict[str, Any]] = []
|
||||
keys: set[str] = set()
|
||||
for e in edges:
|
||||
if e["from"] not in seen or e["to"] not in seen or e["from"] == e["to"]:
|
||||
continue
|
||||
k = f'{e["from"]}->{e["to"]}'
|
||||
if k in keys:
|
||||
continue
|
||||
keys.add(k)
|
||||
valid_edges.append(e)
|
||||
return {"title": title, "nodes": nodes, "edges": valid_edges}
|
||||
|
||||
|
||||
# ── prompts ────────────────────────────────────────────────────────────────
|
||||
|
||||
_SHAPE = (
|
||||
"flow-json 严格用下面这个形状(一个 JSON 对象,nodes 是节点数组;示例仅示意结构、勿照抄内容):\n"
|
||||
"```flow-json\n"
|
||||
'{"title":"流程图标题","nodes":[\n'
|
||||
' {"id":"n1","label":"任务简短名","type":"start","group":"任务","detail":"任务目标"},\n'
|
||||
' {"id":"n2","label":"目的核心短语","type":"task","group":"目的","detail":"名称+理由要点(2-4句,单行)","from":["n1"]},\n'
|
||||
' {"id":"n3","label":"行为体核心短语","type":"role","group":"行为体","detail":"名称+理由要点","from":["n2"]}\n'
|
||||
"]}\n"
|
||||
"```\n"
|
||||
"字段:id(n1/n2…唯一)、label(≤12字,节点标题)、type(start/end/stage/task/decision/risk/deliverable/role 之一,仅决定配色)、"
|
||||
"group(该节点所在层级名称,如 任务/目的/行为体/预期行为/驱动因素/叙事,必填)、"
|
||||
"detail(该条目名称+理由要点,约2-4句,**写成一行**不要内含换行)、"
|
||||
"from(前驱节点 id 列表,只引用前面已出现的节点)。"
|
||||
)
|
||||
|
||||
_STRUCTURE = (
|
||||
"【画法·严格遵守】"
|
||||
"① 根节点 n1=本次任务本身(报告/任务总览里的任务名称),label 用任务简短名,group 填「任务」,不要用「任务」泛称当 label;"
|
||||
"② 从第二层起按层级逐层展开:每层在报告/交付里通常列了多条具体条目(如 目的层有 目的1/2/3、行为体层有各自对应行为体,后面还有 预期行为·驱动因素、叙事…),"
|
||||
"把每一条具体条目各画成一个节点,不要把整层合并成一个笼统节点;"
|
||||
"③ 每个节点 group 填它所在层级名称(取自报告里该层级真实名称);"
|
||||
"④ 连边严格按报告里的对应关系串成分支:根任务→各目的;每个目的→它对应的行为体;每个行为体→对应的预期行为·驱动因素→对应的叙事……每组各成一条自上而下的分支(有几组就几条,组间不混连);"
|
||||
"⑤ 务必把每层每一条都输出成节点、不要漏层、不要只输出开头一两个节点就停(典型约13-16个节点);"
|
||||
"⑥ 只画这些层级实体节点,不要把『综合分析/核心洞察/执行路线/建议/结论』及『阶段①②③④』等汇总段落/阶段名画成节点。"
|
||||
)
|
||||
|
||||
|
||||
def _material(req: FlowExtractRequest) -> str:
|
||||
report = (req.report_md or "").strip()
|
||||
if report:
|
||||
return "===== 方案总结报告全文(数据来源,逐条抽取,勿改写)=====\n" + report + "\n===== 报告结束 ====="
|
||||
seats = [s for s in req.seat_deliveries if (s.content or "").strip()]
|
||||
if seats:
|
||||
body = "\n\n".join(f"## 席位{i + 1}:{s.sender or '(未具名席位)'}\n{s.content.strip()}" for i, s in enumerate(seats))
|
||||
return "===== 各席位交付产物(数据来源,逐条抽取,勿改写)=====\n" + body + "\n===== 交付结束 ====="
|
||||
return ""
|
||||
|
||||
|
||||
def _hierarchy_hint(req: FlowExtractRequest) -> str:
|
||||
if (req.coordinator_prompt or "").strip():
|
||||
return "层级顺序优先采用下面「业务链总控编排提示」里写明的层级链(如它写的 任务→目的→行为体→…):\n" + req.coordinator_prompt.strip()
|
||||
levels = [s.strip() for s in req.chain_levels if s.strip()]
|
||||
if levels:
|
||||
return "层级顺序(自上而下):任务 → " + " → ".join(levels) + "。"
|
||||
return "层级顺序:以「任务」为根,按报告/交付的逻辑结构合理分层展开。"
|
||||
|
||||
|
||||
def _extract_messages(req: FlowExtractRequest) -> list[Any]:
|
||||
sys = (
|
||||
"你是「流程图结构化抽取器」。你的唯一产物是一张流程图的 flow-json 数据(节点+连线),"
|
||||
"不是文字报告、不是章节、不是结论清单。只输出一个 ```flow-json 代码块,不要写任何其它正文。全程简体中文。\n"
|
||||
+ _SHAPE
|
||||
+ "\n"
|
||||
+ _STRUCTURE
|
||||
)
|
||||
user = _material(req) + "\n\n" + _hierarchy_hint(req) + "\n\n请据此输出一个完整的 ```flow-json 代码块。"
|
||||
return [SystemMessage(content=sys), HumanMessage(content=user)]
|
||||
|
||||
|
||||
def _edit_messages(req: FlowExtractRequest) -> list[Any]:
|
||||
"""Phase 2 问答修改:按用户指令改当前流程图(增/删/改节点或连线),其余保持不变。"""
|
||||
cur = json.dumps(req.current_graph or {}, ensure_ascii=False)
|
||||
sys = (
|
||||
"你是「流程图编辑器」。下面给你 当前流程图(flow-json) + 数据来源 + 用户的修改指令。"
|
||||
"请**按用户指令修改流程图**(可增/删/改节点、改连线、改 label/group/detail),"
|
||||
"**未被指令涉及的部分保持原样**,输出**修改后的完整 flow-json**(只输出一个 ```flow-json 代码块,不要解释)。"
|
||||
"节点 id 尽量沿用原有的;删节点要同时去掉与它相关的连线。全程简体中文。\n"
|
||||
+ _SHAPE
|
||||
)
|
||||
user = (
|
||||
_material(req)
|
||||
+ "\n\n===== 当前流程图(flow-json,待按指令修改)=====\n"
|
||||
+ cur
|
||||
+ "\n===== 当前流程图结束 =====\n\n用户修改指令:\n"
|
||||
+ (req.instruction or "").strip()
|
||||
)
|
||||
return [SystemMessage(content=sys), HumanMessage(content=user)]
|
||||
|
||||
|
||||
def _validate_messages(req: FlowExtractRequest, extracted: str) -> list[Any]:
|
||||
sys = (
|
||||
"你是「流程图校验修复器」。下面给你 数据来源 和 一份已抽取的 flow-json。"
|
||||
"请对照数据来源校验并修复这份 flow-json,输出**修复后**的完整 flow-json(只输出一个 ```flow-json 代码块,不要解释)。\n"
|
||||
"校验要点:① 根节点是任务本身(group=任务);② 每个层级的每一条具体条目都在(没漏层、没漏条目);"
|
||||
"③ 连边按对应关系成分支、无悬空边、根可达;④ 每个节点都有 group(层级名),label≤12字,detail 为单行的名称+理由要点;"
|
||||
"⑤ 没有『综合分析/执行路线/结论』及『阶段编号』这类无关节点。发现问题就改对,没问题就原样规范化输出。\n"
|
||||
+ _SHAPE
|
||||
)
|
||||
user = _material(req) + "\n\n===== 已抽取的 flow-json(待校验修复)=====\n" + extracted + "\n===== 待校验结束 ====="
|
||||
return [SystemMessage(content=sys), HumanMessage(content=user)]
|
||||
|
||||
|
||||
# ── endpoint ─────────────────────────────────────────────────────────────
|
||||
|
||||
|
||||
def _frame(data: dict[str, Any]) -> str:
|
||||
return f"data: {json.dumps(data, ensure_ascii=False, default=str)}\n\n"
|
||||
|
||||
|
||||
def _chunk_parts(chunk: Any) -> tuple[str, str]:
|
||||
"""从流式 chunk 取 (正文增量, 思考增量)。思考走 additional_kwargs.reasoning_content
|
||||
(DeepSeek/兼容 OpenAI 推理模型的单列字段),正文走 content。"""
|
||||
content = chunk.content if isinstance(getattr(chunk, "content", None), str) else ""
|
||||
ak = getattr(chunk, "additional_kwargs", None) or {}
|
||||
reasoning = ""
|
||||
if isinstance(ak, dict):
|
||||
r = ak.get("reasoning_content") or ak.get("reasoning")
|
||||
if isinstance(r, str):
|
||||
reasoning = r
|
||||
return content, reasoning
|
||||
|
||||
|
||||
@router.post("/stream")
|
||||
async def extract_flow_stream(request: Request, payload: FlowExtractRequest = Body(...)) -> StreamingResponse:
|
||||
"""流式抽取流程图 JSON + 流式校验修复(抽取/校验过程含思考都实时吐前端)→ 返回最终结构化图。"""
|
||||
|
||||
async def gen() -> AsyncIterator[str]:
|
||||
try:
|
||||
# 带 instruction + current_graph → Phase 2 问答修改(按指令改当前图);否则首次抽取。
|
||||
is_edit = bool((payload.instruction or "").strip()) and payload.current_graph is not None
|
||||
if not _material(payload).strip() and not is_edit:
|
||||
yield _frame({"event": "error", "detail": "缺少数据来源(报告或各席位交付均为空)"})
|
||||
return
|
||||
|
||||
# ① 抽取 / 编辑(正文 + 思考(reasoning) 拼成 `<think>…</think>正文` 增量逐帧吐,前端实时显示)
|
||||
round1_messages = _edit_messages(payload) if is_edit else _extract_messages(payload)
|
||||
model = create_chat_model(name=payload.model or None, thinking_enabled=True)
|
||||
extracted = ""
|
||||
think_open = False
|
||||
async for chunk in model.astream(round1_messages):
|
||||
c, r = _chunk_parts(chunk)
|
||||
out = ""
|
||||
if r:
|
||||
if not think_open:
|
||||
out += "<think>"
|
||||
think_open = True
|
||||
out += r
|
||||
if c:
|
||||
if think_open:
|
||||
out += "</think>"
|
||||
think_open = False
|
||||
out += c
|
||||
extracted += c
|
||||
if out:
|
||||
yield _frame({"event": "extract_delta", "content": out})
|
||||
if think_open:
|
||||
yield _frame({"event": "extract_delta", "content": "</think>"})
|
||||
yield _frame({"event": "extract_done"})
|
||||
|
||||
# ② 校验 / 修复(同样流式 + 思考实时显示)
|
||||
yield _frame({"event": "validating"})
|
||||
validated = ""
|
||||
graph: dict[str, Any] | None = None
|
||||
try:
|
||||
vmodel = create_chat_model(name=payload.model or None, thinking_enabled=True)
|
||||
think_open = False
|
||||
async for chunk in vmodel.astream(_validate_messages(payload, extracted)):
|
||||
c, r = _chunk_parts(chunk)
|
||||
out = ""
|
||||
if r:
|
||||
if not think_open:
|
||||
out += "<think>"
|
||||
think_open = True
|
||||
out += r
|
||||
if c:
|
||||
if think_open:
|
||||
out += "</think>"
|
||||
think_open = False
|
||||
out += c
|
||||
validated += c
|
||||
if out:
|
||||
yield _frame({"event": "validate_delta", "content": out})
|
||||
if think_open:
|
||||
yield _frame({"event": "validate_delta", "content": "</think>"})
|
||||
graph = parse_flow_graph(validated)
|
||||
except Exception: # noqa: BLE001 — 校验失败不致命,回退抽取结果
|
||||
logger.warning("flow-extract validation failed, fall back to extraction", exc_info=True)
|
||||
graph = None
|
||||
if graph is None:
|
||||
graph = parse_flow_graph(extracted)
|
||||
if graph is None:
|
||||
yield _frame({"event": "error", "detail": "未能从模型输出解析出流程图节点"})
|
||||
return
|
||||
yield _frame({"event": "final", "graph": graph})
|
||||
except Exception as exc: # noqa: BLE001
|
||||
logger.exception("flow-extract stream failed")
|
||||
yield _frame({"event": "error", "detail": str(exc)})
|
||||
|
||||
return StreamingResponse(
|
||||
gen(),
|
||||
media_type="text/event-stream",
|
||||
headers={"Cache-Control": "no-cache", "X-Accel-Buffering": "no", "Connection": "keep-alive"},
|
||||
)
|
||||
@@ -10,18 +10,18 @@ gateway:
|
||||
port: 8001
|
||||
|
||||
models:
|
||||
# - name: deepseek-chat
|
||||
# display_name: DeepSeek Chat
|
||||
# use: langchain_openai:ChatOpenAI
|
||||
# model: deepseek-chat
|
||||
# api_key: sk-e1c22b7931dc446f8b67e57878edd105
|
||||
# base_url: https://api.deepseek.com
|
||||
# request_timeout: 600.0
|
||||
# max_retries: 2
|
||||
# max_tokens: 4096
|
||||
# temperature: 1.0
|
||||
# supports_vision: false
|
||||
# supports_thinking: true
|
||||
- name: deepseek-chat
|
||||
display_name: DeepSeek Chat
|
||||
use: langchain_openai:ChatOpenAI
|
||||
model: deepseek-chat
|
||||
api_key: sk-35345154983047aba9e12faa86c5f62c
|
||||
base_url: https://api.deepseek.com
|
||||
request_timeout: 600.0
|
||||
max_retries: 2
|
||||
max_tokens: 4096
|
||||
temperature: 1.0
|
||||
supports_vision: false
|
||||
supports_thinking: true
|
||||
|
||||
# - name: zai-org/GLM-5-FP8
|
||||
# display_name: zai-org/GLM-5-FP8
|
||||
|
||||
Reference in new issue
Block a user