代码提交
This commit is contained in:
1 parent
d93cc62806
commit
ddf83f7728
25 files changed
+4086
-424
No files matched your search
@@ -30,7 +30,11 @@ from app.maf_roundtable.workflow_executors import (
|
||||
ApprovalGateExecutor,
|
||||
CoordinatorExecutor,
|
||||
CrossReviewExecutor,
|
||||
DispatchPreparationTerminalExecutor,
|
||||
DispatchSeatEntryExecutor,
|
||||
FinalizerExecutor,
|
||||
ManagerAnswerExecutor,
|
||||
ManagerDispatchExecutor,
|
||||
PlannerExecutor,
|
||||
RoundtableState,
|
||||
SeatExecutor,
|
||||
@@ -38,7 +42,7 @@ from app.maf_roundtable.workflow_executors import (
|
||||
_agent_capabilities_from_snapshot,
|
||||
generate_final_report,
|
||||
)
|
||||
from app.maf_roundtable.workflow_factory import create_workflow
|
||||
from app.maf_roundtable.workflow_factory import build_manager_dispatch_workflow, create_workflow
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
@@ -93,12 +97,26 @@ class WorkflowRunner:
|
||||
participants = await self._service.store.participants.list_participants(session_id)
|
||||
thread_map = await self._adapter.ensure_threads(session_id, run_id, participants)
|
||||
|
||||
seat_agents = [p["agent_id"] for p in participants if p.get("role") != "manager"]
|
||||
persisted_seat_agents = [
|
||||
p["agent_id"] for p in participants if p.get("role") != "manager"
|
||||
]
|
||||
manager_id = session.get("manager_agent_id")
|
||||
seat_timeout, schema_repair = self._orchestration_settings()
|
||||
task_payload = session.get("task_payload") or {}
|
||||
maf_v2_payload = task_payload.get("maf_v2") if isinstance(task_payload, dict) else {}
|
||||
maf_v2_payload = maf_v2_payload if isinstance(maf_v2_payload, dict) else {}
|
||||
candidate_set = maf_v2_payload.get("candidate_set")
|
||||
candidate_set = candidate_set if isinstance(candidate_set, dict) else {}
|
||||
candidate_seat_agents = list(
|
||||
candidate_set.get("candidate_seat_agent_ids")
|
||||
or maf_v2_payload.get("candidate_seat_agent_ids")
|
||||
or (maf_v2_payload.get("dispatch_plan") or {}).get("candidate_seat_agent_ids")
|
||||
or persisted_seat_agents
|
||||
)
|
||||
if not manager_id:
|
||||
manager_id = candidate_set.get("manager_agent_id") or maf_v2_payload.get(
|
||||
"manager_agent_id"
|
||||
)
|
||||
|
||||
state = RoundtableState(
|
||||
session_id=session_id,
|
||||
@@ -110,17 +128,29 @@ class WorkflowRunner:
|
||||
max_rounds=session.get("max_rounds", 8),
|
||||
write_policy=session.get("write_policy", "confirm_high_risk"),
|
||||
manager_agent_id=manager_id,
|
||||
seat_agent_ids=seat_agents,
|
||||
seat_agent_ids=candidate_seat_agents,
|
||||
thread_map=thread_map,
|
||||
capability_snapshot=session.get("capability_snapshot"),
|
||||
seat_timeout_seconds=seat_timeout,
|
||||
schema_repair_enabled=schema_repair,
|
||||
intent_type=maf_v2_payload.get("intent_type"),
|
||||
dispatch_plan=maf_v2_payload.get("dispatch_plan"),
|
||||
candidate_seat_agent_ids=candidate_seat_agents,
|
||||
dispatch_contract_enabled=bool(
|
||||
maf_v2_payload.get("dispatch_contract_enabled")
|
||||
or candidate_set
|
||||
or maf_v2_payload.get("dispatch_plan") is not None
|
||||
),
|
||||
)
|
||||
|
||||
workflow = self._build_workflow(state)
|
||||
await self._run_workflow(workflow, state)
|
||||
if state.dispatch_contract_enabled:
|
||||
await self._run_manager_dispatch(state)
|
||||
if state.status != "waiting_input":
|
||||
workflow = self._build_workflow(state)
|
||||
await self._run_workflow(workflow, state)
|
||||
else:
|
||||
workflow = self._build_workflow(state)
|
||||
await self._run_workflow(workflow, state)
|
||||
|
||||
# Persist final state. waiting_approval is NOT a terminal state —
|
||||
# it must NOT write finished_at. Only completed/failed/cancelled do.
|
||||
@@ -166,14 +196,106 @@ class WorkflowRunner:
|
||||
except Exception: # noqa: BLE001
|
||||
return 600.0, True
|
||||
|
||||
async def _run_manager_dispatch(self, state: RoundtableState) -> None:
|
||||
"""Freeze the V2 manager decision before constructing seat topology."""
|
||||
if state.is_completed("manager_dispatch"):
|
||||
return
|
||||
workflow = build_manager_dispatch_workflow(
|
||||
manager_dispatch=ManagerDispatchExecutor(self._adapter, state),
|
||||
terminal=DispatchPreparationTerminalExecutor(state),
|
||||
)
|
||||
await self._run_workflow(workflow, state)
|
||||
|
||||
def _build_workflow(self, state: RoundtableState) -> Any:
|
||||
approval_gate = ApprovalGateExecutor(self._adapter, state, self._service)
|
||||
finalizer = FinalizerExecutor(self._adapter, state)
|
||||
waiting_terminal = WaitingTerminalExecutor()
|
||||
|
||||
# New V2 conversations always start at the same constrained manager
|
||||
# dispatch node. The manager preparation workflow finishes before this
|
||||
# method is entered, so topology is selected from the persisted plan,
|
||||
# never from a route default or a model-supplied agent id.
|
||||
if state.dispatch_contract_enabled:
|
||||
manager_answer = ManagerAnswerExecutor(self._adapter, state)
|
||||
plan = state.dispatch_plan or {}
|
||||
execution_mode = str(plan.get("execution_mode") or "")
|
||||
selected_seat_ids = list(state.selected_seat_agent_ids or [])
|
||||
|
||||
if state.intent_type == "clarification" or not execution_mode:
|
||||
raise RuntimeError("V2 manager dispatch did not produce a valid execution plan")
|
||||
|
||||
if execution_mode == "manager_only":
|
||||
return create_workflow(
|
||||
mode="manager_only",
|
||||
manager_answer=manager_answer,
|
||||
seat_executors=[],
|
||||
approval_gate=approval_gate,
|
||||
finalizer=finalizer,
|
||||
waiting_terminal=waiting_terminal,
|
||||
seat_agent_ids=[],
|
||||
)
|
||||
|
||||
if state.mode == "group_chat":
|
||||
coordinator = CoordinatorExecutor(self._adapter, state)
|
||||
return create_workflow(
|
||||
mode="group_chat",
|
||||
coordinator=coordinator,
|
||||
seat_executors=[
|
||||
SeatExecutor(
|
||||
self._adapter,
|
||||
state,
|
||||
agent_id,
|
||||
action_coordinator=self._action_coordinator,
|
||||
)
|
||||
for agent_id in selected_seat_ids
|
||||
],
|
||||
approval_gate=approval_gate,
|
||||
finalizer=finalizer,
|
||||
waiting_terminal=waiting_terminal,
|
||||
seat_agent_ids=selected_seat_ids,
|
||||
)
|
||||
|
||||
state.current_round = max(state.current_round, 1)
|
||||
cross_review = CrossReviewExecutor(self._adapter, state)
|
||||
return create_workflow(
|
||||
mode="structured",
|
||||
planner=DispatchSeatEntryExecutor(state),
|
||||
cross_review=cross_review,
|
||||
seat_executors=[
|
||||
SeatExecutor(
|
||||
self._adapter,
|
||||
state,
|
||||
agent_id,
|
||||
action_coordinator=self._action_coordinator,
|
||||
)
|
||||
for agent_id in selected_seat_ids
|
||||
],
|
||||
approval_gate=approval_gate,
|
||||
finalizer=finalizer,
|
||||
waiting_terminal=waiting_terminal,
|
||||
seat_agent_ids=selected_seat_ids,
|
||||
execution_mode=execution_mode,
|
||||
)
|
||||
|
||||
seat_executors = [
|
||||
SeatExecutor(self._adapter, state, agent_id, action_coordinator=self._action_coordinator)
|
||||
for agent_id in state.seat_agent_ids
|
||||
]
|
||||
approval_gate = ApprovalGateExecutor(self._adapter, state, self._service)
|
||||
finalizer = FinalizerExecutor(self._adapter, state)
|
||||
waiting_terminal = WaitingTerminalExecutor()
|
||||
execution_mode = str(
|
||||
(state.dispatch_plan or {}).get("execution_mode")
|
||||
or ("manager_only" if state.intent_type == "direct_answer" else "parallel")
|
||||
)
|
||||
if execution_mode == "manager_only":
|
||||
manager_answer = ManagerAnswerExecutor(self._adapter, state)
|
||||
return create_workflow(
|
||||
mode="manager_only",
|
||||
manager_answer=manager_answer,
|
||||
seat_executors=[],
|
||||
approval_gate=approval_gate,
|
||||
finalizer=finalizer,
|
||||
waiting_terminal=waiting_terminal,
|
||||
seat_agent_ids=[],
|
||||
)
|
||||
|
||||
if state.mode == "group_chat":
|
||||
coordinator = CoordinatorExecutor(self._adapter, state)
|
||||
@@ -198,6 +320,7 @@ class WorkflowRunner:
|
||||
finalizer=finalizer,
|
||||
waiting_terminal=waiting_terminal,
|
||||
seat_agent_ids=state.seat_agent_ids,
|
||||
execution_mode=execution_mode,
|
||||
)
|
||||
|
||||
async def _persist_checkpoint(self, state: RoundtableState, *, reason: str = "") -> None:
|
||||
@@ -663,8 +786,14 @@ class WorkflowRunner:
|
||||
|
||||
await self._service.store.runs.update_run(run_id, {"status": "running"})
|
||||
try:
|
||||
workflow = self._build_workflow(state)
|
||||
await self._run_workflow(workflow, state)
|
||||
if state.dispatch_contract_enabled:
|
||||
await self._run_manager_dispatch(state)
|
||||
if state.status != "waiting_input":
|
||||
workflow = self._build_workflow(state)
|
||||
await self._run_workflow(workflow, state)
|
||||
else:
|
||||
workflow = self._build_workflow(state)
|
||||
await self._run_workflow(workflow, state)
|
||||
|
||||
latency = int((time.perf_counter() - t0) * 1000)
|
||||
final_status = state.status
|
||||
|
||||
Reference in new issue
Block a user