This commit is contained in:
@@ -34,6 +34,7 @@ from app.adk.runtime import (
|
||||
TurnEnded,
|
||||
)
|
||||
from app.customer_case import close_intent
|
||||
from app.nodes.router import ModelOrchestrator, OrchestratorPolicy, TurnView
|
||||
from app.recorder import ExecutionRecorder
|
||||
from app.states.execution_state import (
|
||||
UNASSIGNED_CASE,
|
||||
@@ -43,13 +44,19 @@ from app.states.execution_state import (
|
||||
)
|
||||
from app.states.ledger import DeliverableStatus, Ledger, LedgerRefusal
|
||||
from app.states.lessons import collect_lesson_candidates, refusal
|
||||
from app.tools import workspace
|
||||
from app.tools.execution import ORCHESTRATOR, OrchestratorToolbox, specialist_tools
|
||||
from app.workflows.chain import VERDICTS_FILE, validation_outcome
|
||||
from app.workflows.chain import (
|
||||
IMPLEMENTATION_FILE,
|
||||
VERDICTS_FILE,
|
||||
unimplementable_checks,
|
||||
validation_outcome,
|
||||
)
|
||||
from app.workflows.deliverables import (
|
||||
DEPENDENCY_GRAPH,
|
||||
PHASE_ORDER,
|
||||
DeliverableKind,
|
||||
inputs_of,
|
||||
dependencies_for,
|
||||
)
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
@@ -90,8 +97,12 @@ def make_execution_nodes(
|
||||
tool_factory: ToolFactory | None = None,
|
||||
limiter: RunLimiter | None = None,
|
||||
skill_versions: Mapping[str, str] | None = None,
|
||||
orchestrator: OrchestratorPolicy | None = None,
|
||||
) -> ExecutionNodes:
|
||||
tool_factory = tool_factory or _no_tools
|
||||
# How an Orchestrator turn is decided. The default drives the tools from the
|
||||
# Orchestrator role on the runtime; the assembly supplies the router (ADR-0007).
|
||||
orchestrator = orchestrator or ModelOrchestrator(runtime, roles[ORCHESTRATOR])
|
||||
|
||||
def close(state: ExecutionState, status: str, *, has_files: bool) -> None:
|
||||
close_intent(
|
||||
@@ -239,19 +250,33 @@ def make_execution_nodes(
|
||||
toolbox = OrchestratorToolbox(ledger, deliverables, pending_questions)
|
||||
refusals = list(state.get("refusals", []))
|
||||
update["refusals"] = refusals
|
||||
task = AgentTask(
|
||||
role=ORCHESTRATOR,
|
||||
prompt="Decide the next step for this Execution using your tools.",
|
||||
view = TurnView(
|
||||
execution_id=state["execution_id"],
|
||||
pre_approved=bool(state.get("pre_approved")),
|
||||
ledger=ledger,
|
||||
deliverables=deliverables,
|
||||
pending_questions=pending_questions,
|
||||
outcomes=outcomes,
|
||||
last_reply=state.get("last_reply"),
|
||||
pending_change=state.get("pending_change"),
|
||||
awaiting_gap_decision=bool(state.get("awaiting_gap_decision")),
|
||||
validation_settled=int(state.get("validation_settled", 0)),
|
||||
context=_orchestrator_context(
|
||||
state, ledger, deliverables, pending_questions, notes
|
||||
),
|
||||
)
|
||||
started = time.monotonic()
|
||||
outcome = await runtime.run(
|
||||
roles[ORCHESTRATOR],
|
||||
task,
|
||||
_noting_refusals(toolbox.tools(), refusals, ORCHESTRATOR, None),
|
||||
decided = await orchestrator.turn(
|
||||
view, _noting_refusals(toolbox.tools(), refusals, ORCHESTRATOR, None)
|
||||
)
|
||||
outcome = decided.outcome
|
||||
update.update(decided.updates)
|
||||
if decided.decisions:
|
||||
# Every decision is kept: what was read, which group applied, what was done.
|
||||
update["decisions"] = [
|
||||
*state.get("decisions", []),
|
||||
*({"turn": turns, **decision} for decision in decided.decisions),
|
||||
]
|
||||
logger.info(
|
||||
"[%s] orchestrator turn %d (%s phase) ended in %.0fs: %s",
|
||||
state["execution_id"],
|
||||
@@ -325,13 +350,22 @@ def make_execution_nodes(
|
||||
role = roles[task_input["role"]]
|
||||
kind = DeliverableKind(task_input["kind"])
|
||||
working: dict[str, Any] = dict(task_input.get("working") or {})
|
||||
upstream = task_input["context"].get("dependencies") or {}
|
||||
source = DEPENDENCY_GRAPH[kind].working_copy
|
||||
if source and source is not kind:
|
||||
# The tools work on the files as they were last submitted.
|
||||
working[workspace.FILES] = dict(
|
||||
upstream.get(source.value, {}).get("attachments", {})
|
||||
)
|
||||
refusals: list[dict[str, Any]] = []
|
||||
tools = _noting_refusals(
|
||||
specialist_tools(
|
||||
kind,
|
||||
extra=tool_factory(role, kind.value, working),
|
||||
allow_cloud_read=task_input["allow_cloud_read"],
|
||||
upstream=task_input["context"].get("dependencies"),
|
||||
upstream=upstream,
|
||||
working=working,
|
||||
library=task_input.get("library"),
|
||||
),
|
||||
refusals,
|
||||
role.name,
|
||||
@@ -388,6 +422,7 @@ def make_execution_nodes(
|
||||
ledger = Ledger.from_dict(state["ledger"])
|
||||
conversation = list(state.get("conversation", []))
|
||||
update: dict[str, Any] = {"prompt": None}
|
||||
said: dict[str, Any] | None = None # what the user said, for the next turn
|
||||
|
||||
if "approval" in prompt:
|
||||
phase = prompt["approval"]["phase"]
|
||||
@@ -405,9 +440,11 @@ def make_execution_nodes(
|
||||
feedback = str(decision.get("feedback", ""))
|
||||
ledger.request_changes(phase_id, feedback, actor="user")
|
||||
text = f"Requested changes to {phase}: {feedback}"
|
||||
said = {"kind": "changes", "phase": phase, "text": feedback}
|
||||
conversation.append({"from": "user", "text": text})
|
||||
else:
|
||||
conversation.append({"from": "user", "text": _reply_text(reply)})
|
||||
said = {"kind": "reply", "text": _reply_text(reply)}
|
||||
elif "permission" in prompt:
|
||||
tier = prompt["permission"]["tier"]
|
||||
permission = reply.get("permission") if isinstance(reply, Mapping) else None
|
||||
@@ -427,6 +464,7 @@ def make_execution_nodes(
|
||||
else:
|
||||
text = _reply_text(reply)
|
||||
conversation.append({"from": "user", "text": text})
|
||||
said = {"kind": "reply", "text": text}
|
||||
answers = {
|
||||
kind: list(items) for kind, items in state.get("answers", {}).items()
|
||||
}
|
||||
@@ -436,6 +474,8 @@ def make_execution_nodes(
|
||||
)
|
||||
update.update(answers=answers, awaiting_questions=[])
|
||||
|
||||
# Only a real user's words are routed; a pre-approved Execution has none.
|
||||
update["last_reply"] = None if state.get("pre_approved") else said
|
||||
update["events_recorded"] = await record_progress(state, ledger)
|
||||
update.update(ledger=ledger.to_dict(), conversation=conversation)
|
||||
return Command(update=update, goto="orchestrator_turn")
|
||||
@@ -523,7 +563,17 @@ def _orchestrator_context(
|
||||
is DeliverableStatus.SUBMITTED
|
||||
else None
|
||||
)
|
||||
code = DeliverableKind.DEPLOYMENT_GUIDANCE
|
||||
return {
|
||||
# Checks the code's author reported cannot be met as written: faults in the
|
||||
# Target architecture, known before any validation.
|
||||
"unimplementable_checks": unimplementable_checks(
|
||||
deliverables.get(code.value, {})
|
||||
.get("attachments", {})
|
||||
.get(IMPLEMENTATION_FILE, "")
|
||||
)
|
||||
if ledger.status(code) is DeliverableStatus.SUBMITTED
|
||||
else [],
|
||||
# The verdict on each Check, once validation is submitted: failed Checks are
|
||||
# faults in the code; the rest are gaps in the Target architecture.
|
||||
"validation": validation_outcome(
|
||||
@@ -565,8 +615,15 @@ def _specialist_input(
|
||||
attempt: int,
|
||||
) -> dict[str, Any]:
|
||||
spec = DEPENDENCY_GRAPH[kind]
|
||||
given = dependencies_for(kind, deliverables)
|
||||
return {
|
||||
"execution_id": state["execution_id"],
|
||||
# The Deliverables given as data files alone, whole, for reading on demand.
|
||||
"library": {
|
||||
name: dict(deliverables[name])
|
||||
for name, deliverable in given.items()
|
||||
if "content" not in deliverable
|
||||
},
|
||||
"role": spec.specialist,
|
||||
"kind": kind.value,
|
||||
"attempt": attempt,
|
||||
@@ -576,13 +633,14 @@ def _specialist_input(
|
||||
"workflow_request": state["workflow_request"],
|
||||
"pre_approved": bool(state.get("pre_approved")),
|
||||
"contract": spec.contract(),
|
||||
"dependencies": {
|
||||
dependency.value: dict(deliverables[dependency.value])
|
||||
for dependency in inputs_of(kind)
|
||||
},
|
||||
"dependencies": given,
|
||||
"feedback": list(ledger.feedback(kind)),
|
||||
"answers": list(state.get("answers", {}).get(kind.value, [])),
|
||||
"draft": dict(drafts[kind.value]) if kind.value in drafts else None,
|
||||
# What the Specialist's own tools already hold from earlier attempts.
|
||||
"working_copy": workspace.summary(
|
||||
state.get("working", {}).get(kind.value, {})
|
||||
),
|
||||
"attempt": attempt,
|
||||
},
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user