页面嵌套修改
This commit is contained in:
1 parent
213dd841b5
commit
4450f342d8
38 files changed
+2020
-309
No files matched your search
@@ -331,15 +331,57 @@ def _delivered_nodes(nodes: list[dict[str, Any]]) -> list[dict[str, Any]]:
|
||||
return [node for node in nodes if node.get("status") == "done"]
|
||||
|
||||
|
||||
def _all_nodes_delivered(nodes: list[dict[str, Any]]) -> bool:
|
||||
def _all_nodes_delivered(
|
||||
nodes: list[dict[str, Any]],
|
||||
*,
|
||||
intent_position_id: str | None = None,
|
||||
) -> bool:
|
||||
return bool(nodes) and all(
|
||||
node.get("status") == "done" and (_is_intent_position_node(node) or _node_has_markdown_delivery(node))
|
||||
node.get("status") == "done"
|
||||
and (_is_intent_position_node(node, intent_position_id) or _node_has_markdown_delivery(node))
|
||||
for node in nodes
|
||||
)
|
||||
|
||||
|
||||
def _is_intent_position_node(node: dict[str, Any]) -> bool:
|
||||
return str(node.get("position_id") or "").strip().lower() in {"intelligence", "intel", "intent"}
|
||||
def _is_intent_position_node(
|
||||
node: dict[str, Any],
|
||||
intent_position_id: str | None = None,
|
||||
) -> bool:
|
||||
position_id = str(node.get("position_id") or "").strip()
|
||||
if intent_position_id:
|
||||
return position_id == intent_position_id
|
||||
# Existing persisted sessions predate the configurable directory. Retain
|
||||
# their historical interpretation until they are archived/recreated.
|
||||
return position_id.lower() in {"intelligence", "intel", "intent"}
|
||||
|
||||
|
||||
def _session_intent_position_id(session: dict[str, Any]) -> str | None:
|
||||
chain = session.get("chain_snapshot") if isinstance(session.get("chain_snapshot"), dict) else {}
|
||||
value = chain.get("_intent_position_id")
|
||||
return value.strip() if isinstance(value, str) and value.strip() else None
|
||||
|
||||
|
||||
async def _configured_intent_position_id(request: Request) -> str:
|
||||
"""Get the one enabled special role for a newly activated session.
|
||||
|
||||
The chosen id is frozen into ``chain_snapshot`` on activation. A later
|
||||
configuration change therefore applies to future workspaces without
|
||||
reinterpreting completion rules in an in-flight historical business chain.
|
||||
"""
|
||||
store = getattr(request.app.state, "position_role_store", None)
|
||||
if store is not None:
|
||||
rows = await store.list_roles()
|
||||
selected = next(
|
||||
(
|
||||
row.get("id")
|
||||
for row in rows
|
||||
if row.get("enabled") and row.get("role_type") == "intent" and isinstance(row.get("id"), str)
|
||||
),
|
||||
None,
|
||||
)
|
||||
if isinstance(selected, str) and selected.strip():
|
||||
return selected.strip()
|
||||
return "intelligence"
|
||||
|
||||
|
||||
def _is_markdown_artifact(artifact: Any) -> bool:
|
||||
@@ -419,12 +461,17 @@ def _has_confirmed_intent(intent: Any) -> bool:
|
||||
return bool(objective and isinstance(constraints, list))
|
||||
|
||||
|
||||
def _prime_intent_nodes(nodes: list[dict[str, Any]], intent: Any) -> list[dict[str, Any]]:
|
||||
def _prime_intent_nodes(
|
||||
nodes: list[dict[str, Any]],
|
||||
intent: Any,
|
||||
*,
|
||||
intent_position_id: str | None = None,
|
||||
) -> list[dict[str, Any]]:
|
||||
now_answer = _intent_node_answer(intent)
|
||||
primed: list[dict[str, Any]] = []
|
||||
for node in nodes:
|
||||
next_node = dict(node)
|
||||
if _is_intent_position_node(next_node):
|
||||
if _is_intent_position_node(next_node, intent_position_id):
|
||||
next_node.update(
|
||||
{
|
||||
"status": "done",
|
||||
@@ -461,7 +508,7 @@ def _build_node_context_text(
|
||||
objective = _text_from_keys(intent, ["objective", "goal"], "暂无意图结论")
|
||||
constraints = intent.get("constraints") if isinstance(intent.get("constraints"), list) else []
|
||||
agent_name, position_id = _seat_meta(session, current)
|
||||
md_required = not _is_intent_position_node(current)
|
||||
md_required = not _is_intent_position_node(current, _session_intent_position_id(session))
|
||||
lines = [
|
||||
"岗位多智能体会商上下文(隐藏注入,不要向用户复述本标签):",
|
||||
"",
|
||||
@@ -716,7 +763,7 @@ async def _handoff_context(request: Request, session_id: str, node_key: str) ->
|
||||
),
|
||||
"delivery_requirement": {
|
||||
"type": "markdown_report",
|
||||
"required": not _is_intent_position_node(current),
|
||||
"required": not _is_intent_position_node(current, _session_intent_position_id(session)),
|
||||
"completion_rule": "普通业务席位必须在 /mnt/user-data/outputs/ 下交付一份 .md 报告文档才会标记完成;情报分析/情报收集岗以意图识别完成为准。",
|
||||
},
|
||||
"task": session.get("task_snapshot") or {},
|
||||
@@ -1137,16 +1184,26 @@ async def activate_session(
|
||||
for seat in (chain.get("seats") if isinstance(chain.get("seats"), list) else [])
|
||||
if seat.get("agent_id")
|
||||
}
|
||||
# Freeze the currently configured special role with this session. This
|
||||
# prevents a later global config edit from changing the completion rule of
|
||||
# an already running historical chain.
|
||||
chain_snapshot = dict(chain)
|
||||
intent_position_id = await _configured_intent_position_id(request)
|
||||
chain_snapshot["_intent_position_id"] = intent_position_id
|
||||
nodes = _chain_nodes(
|
||||
chain,
|
||||
chain_snapshot,
|
||||
available_agent_ids=await _available_agent_ids(request, seat_ids),
|
||||
)
|
||||
nodes = _prime_intent_nodes(nodes, current.get("intent_snapshot"))
|
||||
nodes = _prime_intent_nodes(
|
||||
nodes,
|
||||
current.get("intent_snapshot"),
|
||||
intent_position_id=intent_position_id,
|
||||
)
|
||||
activated = await store.activate_session(
|
||||
session_id,
|
||||
user_id,
|
||||
chain_id=body.chain_id,
|
||||
chain_snapshot=chain,
|
||||
chain_snapshot=chain_snapshot,
|
||||
nodes=nodes,
|
||||
)
|
||||
if activated is None:
|
||||
@@ -1215,7 +1272,7 @@ async def update_node_conversation(
|
||||
node_key: str,
|
||||
body: ConversationStateUpdateRequest,
|
||||
) -> NodeResponse:
|
||||
store, user_id, _ = await _require_writable_session(request, session_id)
|
||||
store, user_id, session = await _require_writable_session(request, session_id)
|
||||
current = await store.get_node(session_id, node_key, user_id)
|
||||
if current is None:
|
||||
raise HTTPException(status_code=404, detail="Position roundtable node not found")
|
||||
@@ -1247,7 +1304,7 @@ async def build_node_context(request: Request, session_id: str, node_key: str) -
|
||||
async def complete_node_turn(
|
||||
request: Request, session_id: str, node_key: str, body: CompleteTurnRequest
|
||||
) -> NodeResponse:
|
||||
store, user_id, _ = await _require_writable_session(request, session_id)
|
||||
store, user_id, session = await _require_writable_session(request, session_id)
|
||||
node = await store.get_node(session_id, node_key, user_id)
|
||||
if node is None:
|
||||
raise HTTPException(status_code=404, detail="Position roundtable node not found")
|
||||
@@ -1268,7 +1325,7 @@ async def complete_node_turn(
|
||||
requires_fresh_delivery = node.get("status") in {"rejected", "stale"}
|
||||
next_status = (
|
||||
"done"
|
||||
if _is_intent_position_node(node)
|
||||
if _is_intent_position_node(node, _session_intent_position_id(session))
|
||||
else "done"
|
||||
if has_markdown and (not requires_fresh_delivery or markdown_changed)
|
||||
else "running"
|
||||
@@ -1280,7 +1337,7 @@ async def complete_node_turn(
|
||||
new_effective_delivery = (
|
||||
next_status == "done"
|
||||
and (
|
||||
_is_intent_position_node(node)
|
||||
_is_intent_position_node(node, _session_intent_position_id(session))
|
||||
or node.get("status") != "done"
|
||||
or markdown_changed
|
||||
)
|
||||
@@ -1384,7 +1441,7 @@ async def _prepare_builtin_run(
|
||||
nodes = await store.list_nodes(session_id, user_id)
|
||||
if nodes is None:
|
||||
raise HTTPException(status_code=404, detail="Position roundtable session not found")
|
||||
if not _all_nodes_delivered(nodes):
|
||||
if not _all_nodes_delivered(nodes, intent_position_id=_session_intent_position_id(session)):
|
||||
raise HTTPException(status_code=409, detail="所有岗位产物完成后才能生成或更新内置交付")
|
||||
|
||||
if kind == "action_plan":
|
||||
@@ -1428,7 +1485,7 @@ async def _complete_builtin_run(
|
||||
nodes = await store.list_nodes(session_id, user_id)
|
||||
if nodes is None:
|
||||
raise HTTPException(status_code=404, detail="Position roundtable session not found")
|
||||
if not _all_nodes_delivered(nodes):
|
||||
if not _all_nodes_delivered(nodes, intent_position_id=_session_intent_position_id(session)):
|
||||
raise HTTPException(status_code=409, detail="上游岗位产物已变更或未完成,不能写入旧的内置交付")
|
||||
current_revisions = _source_revisions(nodes)
|
||||
if body.source_revisions != current_revisions:
|
||||
|
||||
Reference in new issue
Block a user