This commit is contained in:
77
app/agent.py
77
app/agent.py
@@ -10,10 +10,11 @@ checkpointers and recorders are chosen, from settings and the provider bundle.
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import dataclasses
|
||||
import uuid
|
||||
from collections.abc import AsyncIterator, Mapping, Sequence
|
||||
from contextlib import asynccontextmanager
|
||||
from dataclasses import dataclass
|
||||
from dataclasses import dataclass, field
|
||||
from pathlib import Path
|
||||
from typing import Any
|
||||
|
||||
@@ -22,16 +23,31 @@ from langgraph.checkpoint.base import BaseCheckpointSaver
|
||||
from langgraph.types import Command
|
||||
|
||||
from app.adk.roles import load_roles
|
||||
from app.adk.runtime import AgentRuntime, RoleSpec, RunLimiter, ToolFactory
|
||||
from app.adk.runtime import (
|
||||
AgentRuntime,
|
||||
Decider,
|
||||
NoDecider,
|
||||
RoleSpec,
|
||||
RunLimiter,
|
||||
ToolFactory,
|
||||
)
|
||||
from app.checkpointing import open_checkpointer
|
||||
from app.config import Settings
|
||||
from app.customer_case import record_intent
|
||||
from app.nodes.router import (
|
||||
REPLY_WRITER,
|
||||
OrchestratorPolicy,
|
||||
Router,
|
||||
RuntimeReplyWriter,
|
||||
Thresholds,
|
||||
)
|
||||
from app.providers import ProviderBundle, load_provider
|
||||
from app.recorder import DatabaseRecorder, ExecutionRecorder
|
||||
from app.skills.agent_skills import skill_version
|
||||
from app.states.execution_state import check_customer_case
|
||||
from app.states.ledger import Ledger
|
||||
from app.tools.execution import ORCHESTRATOR
|
||||
from app.tools.jev import JevDecider, JevLimits
|
||||
from app.tools.local import TerraformRunner, local_tools
|
||||
from app.tools.mcp import McpCatalog, auth_from_config
|
||||
from app.tools.toolkit import make_tool_factory
|
||||
@@ -67,6 +83,7 @@ class ExecutionEngine:
|
||||
tool_factory: ToolFactory | None = None,
|
||||
limiter: RunLimiter | None = None,
|
||||
skill_versions: Mapping[str, str] | None = None,
|
||||
orchestrator: OrchestratorPolicy | None = None,
|
||||
) -> None:
|
||||
required = {
|
||||
ORCHESTRATOR,
|
||||
@@ -86,6 +103,7 @@ class ExecutionEngine:
|
||||
tool_factory=tool_factory,
|
||||
limiter=limiter,
|
||||
skill_versions=skill_versions,
|
||||
orchestrator=orchestrator,
|
||||
).compile(checkpointer=checkpointer)
|
||||
|
||||
async def start(
|
||||
@@ -136,6 +154,11 @@ class ExecutionEngine:
|
||||
"working": {},
|
||||
"pending_permission": None,
|
||||
"prompt": None,
|
||||
"last_reply": None,
|
||||
"pending_change": None,
|
||||
"awaiting_gap_decision": False,
|
||||
"validation_settled": 0,
|
||||
"decisions": [],
|
||||
"outcomes": [],
|
||||
"refusals": [],
|
||||
"outcomes_applied": 0,
|
||||
@@ -203,6 +226,27 @@ class Assembly:
|
||||
bundle: ProviderBundle
|
||||
roles: dict[str, RoleSpec]
|
||||
mcp_gaps: dict[str, str]
|
||||
decider: Decider = field(default_factory=NoDecider)
|
||||
|
||||
|
||||
def open_decider(settings: Settings) -> Decider:
|
||||
"""The Jev client when a key is configured; otherwise a decider that always
|
||||
sends its caller to the fallback."""
|
||||
if not settings.TYPESAFE_API_KEY:
|
||||
return NoDecider()
|
||||
return JevDecider(
|
||||
api_key=settings.TYPESAFE_API_KEY,
|
||||
base_url=settings.TYPESAFE_BASE_URL,
|
||||
model=settings.TYPESAFE_DEFAULT_MODEL,
|
||||
limits=dataclasses.replace(
|
||||
JevLimits(),
|
||||
request_timeout=settings.JEV_TIMEOUT_SECONDS,
|
||||
requests_per_second=settings.JEV_REQUESTS_PER_SECOND,
|
||||
max_in_flight=settings.JEV_MAX_IN_FLIGHT,
|
||||
budget_calls=settings.JEV_BUDGET_CALLS,
|
||||
budget_tokens=settings.JEV_BUDGET_TOKENS,
|
||||
),
|
||||
)
|
||||
|
||||
|
||||
@asynccontextmanager
|
||||
@@ -242,6 +286,7 @@ async def open_assembly(
|
||||
binary=settings.TERRAFORM_BINARY,
|
||||
timeout_seconds=settings.TERRAFORM_TIMEOUT_SECONDS,
|
||||
plugin_cache_dir=settings.terraform_plugin_cache(),
|
||||
providers=bundle.terraform_providers,
|
||||
)
|
||||
offered = [name for names in bundle.tools.values() for name in names]
|
||||
# One cap for Specialists and the pillar advisors they fan out to.
|
||||
@@ -250,11 +295,30 @@ async def open_assembly(
|
||||
runtime,
|
||||
roles,
|
||||
bundle.pillar_skills,
|
||||
local_tools=local_tools(offered, runner),
|
||||
local_tools=lambda working_copy: local_tools(offered, runner, working_copy),
|
||||
catalog=catalog,
|
||||
limiter=limiter,
|
||||
)
|
||||
|
||||
decider = open_decider(settings)
|
||||
orchestrator: OrchestratorPolicy | None = None
|
||||
if settings.ORCHESTRATOR == "router":
|
||||
# The Orchestrator routes: Jev reads, the playbook decides, and a model only
|
||||
# writes what the user reads. With no Jev key the playbook runs on its rules.
|
||||
orchestrator = Router(
|
||||
decider,
|
||||
RuntimeReplyWriter(runtime, roles[REPLY_WRITER]),
|
||||
Thresholds(
|
||||
act=settings.JEV_ACT_THRESHOLD,
|
||||
close=settings.JEV_CLOSE_THRESHOLD,
|
||||
confidence=settings.JEV_CONFIDENCE_THRESHOLD,
|
||||
),
|
||||
)
|
||||
elif settings.ORCHESTRATOR != "model":
|
||||
raise ValueError(
|
||||
f"ORCHESTRATOR must be router or model, not {settings.ORCHESTRATOR!r}"
|
||||
)
|
||||
|
||||
async with open_checkpointer(settings) as checkpointer:
|
||||
engine = ExecutionEngine(
|
||||
runtime=runtime,
|
||||
@@ -269,5 +333,10 @@ async def open_assembly(
|
||||
skill_versions={
|
||||
name: skill_version(meta.path) for name, meta in bundle.skills.items()
|
||||
},
|
||||
orchestrator=orchestrator,
|
||||
)
|
||||
yield Assembly(engine, bundle, roles, dict(catalog.gaps))
|
||||
try:
|
||||
yield Assembly(engine, bundle, roles, dict(catalog.gaps), decider)
|
||||
finally:
|
||||
if isinstance(decider, JevDecider):
|
||||
await decider.aclose()
|
||||
|
||||
Reference in New Issue
Block a user