fixed multile issues
Some checks failed
validation / verify (push) Failing after 8s

This commit is contained in:
2026-10-07 17:33:36 +01:00
parent 4c4d44ef87
commit 5bb22d984e
76 changed files with 5799 additions and 179 deletions

View File

@@ -238,7 +238,7 @@ class AdkAgentRuntime:
instruction=lambda _context: instructions,
tools=agent_tools,
before_tool_callback=control.before_tool,
generate_content_config=self._content_config(),
generate_content_config=self._content_config(role),
)
runner = Runner(
app_name=APP_NAME,
@@ -293,13 +293,13 @@ class AdkAgentRuntime:
or f"{role.name} ended without calling a tool that ends its turn."
)
def _content_config(self) -> types.GenerateContentConfig | None:
if self._model_timeout_seconds is None:
def _content_config(self, role: RoleSpec) -> types.GenerateContentConfig | None:
# A role whose replies are long is given longer than the default.
seconds = role.model_timeout_seconds or self._model_timeout_seconds
if seconds is None:
return None
return types.GenerateContentConfig(
http_options=types.HttpOptions(
timeout=int(self._model_timeout_seconds * 1000)
)
http_options=types.HttpOptions(timeout=int(seconds * 1000))
)

View File

@@ -15,8 +15,10 @@ from typing import Any
from app.adk.runtime import (
AgentTask,
Answer,
BudgetExhausted,
Outcome,
Question,
RoleSpec,
Stopped,
ToolSpec,
@@ -180,3 +182,27 @@ class FakeAgentRuntime:
RunRecord(role.name, task, tuple(by_name), tuple(results), outcome)
)
return outcome
class FakeDecider:
"""A scripted Decider: answers by question id, or declines so callers fall back.
`answers` maps a question id to an Answer, or to a function of (state, question)
returning one. An id with no entry makes the whole decision unavailable.
"""
def __init__(self, answers: Mapping[str, Any] | None = None) -> None:
self.answers = dict(answers or {})
self.asked: list[tuple[str, dict[str, Question], str]] = []
async def decide(
self, state: str, questions: Mapping[str, Question], *, scope: str = ""
) -> Mapping[str, Answer] | None:
self.asked.append((state, dict(questions), scope))
decided = {}
for name, question in questions.items():
if name not in self.answers:
return None
answer = self.answers[name]
decided[name] = answer(state, question) if callable(answer) else answer
return decided

View File

@@ -16,6 +16,7 @@ from app.workflows.deliverables import DEPENDENCY_GRAPH, DeliverableKind
ORCHESTRATOR = "orchestrator"
PILLAR_ADVISOR = "pillar-advisor"
REPLY_WRITER = "reply-writer"
PARTIALS_DIR = "partials"
_ALLOWED_FIELDS = {"role", "deliverable", "tools", "budget", "includes"}
@@ -34,7 +35,7 @@ def load_roles(
include_preview_mcp: bool = True,
) -> dict[str, RoleSpec]:
specialists = {spec.specialist: kind for kind, spec in DEPENDENCY_GRAPH.items()}
required = {ORCHESTRATOR, PILLAR_ADVISOR, *specialists}
required = {ORCHESTRATOR, PILLAR_ADVISOR, REPLY_WRITER, *specialists}
roles = {}
for path in sorted(agents_dir.glob("*.md")):
@@ -129,4 +130,5 @@ def _load_role(
for server in bundle.mcp_servers_for_role(name, include_preview_mcp)
),
model=bundle.models.for_role(name),
model_timeout_seconds=bundle.models.timeout_for(name),
)

View File

@@ -32,6 +32,8 @@ class RoleSpec:
tools: tuple[str, ...] = () # local tool names, e.g. terraform_validate
mcp_servers: tuple[str, ...] = ()
model: str | None = None
# Seconds one model request may take; None takes the runtime's default.
model_timeout_seconds: float | None = None
@dataclass(frozen=True)
@@ -200,6 +202,59 @@ REJECTION_PREFIXES = (
)
# --- decisions -----------------------------------------------------------------------
@dataclass(frozen=True)
class Question:
"""A closed question about a state. Its answer is typed, never prose.
choice pick one of `options`
score rate against `options`, ordered from lowest to highest
noul yes or no; the answer is the probability that it is yes
"""
kind: str # choice | score | noul
instructions: str
options: tuple[str, ...] = ()
@dataclass(frozen=True)
class Answer:
"""`value` is the chosen option (choice), the level reached (score, as a number
from 0 for the lowest option) or the probability of yes (noul)."""
value: str | float
confidence: float
probabilities: Mapping[str, float] = field(default_factory=dict)
def is_yes(self, threshold: float = 0.5) -> bool:
return isinstance(self.value, (int, float)) and self.value >= threshold
class Decider(Protocol):
"""Answers closed questions about a state (ADR-0007).
Returns None when no decision could be made: the service is not configured,
unreachable, over its budget, or the request is too large. The caller then takes
its fallback; a decider never blocks an Execution. `scope` names what a budget is
counted against, usually the Execution.
"""
async def decide(
self, state: str, questions: Mapping[str, Question], *, scope: str = ""
) -> Mapping[str, Answer] | None: ...
class NoDecider:
"""The decider when none is configured: every caller takes its fallback."""
async def decide(
self, state: str, questions: Mapping[str, Question], *, scope: str = ""
) -> Mapping[str, Answer] | None:
return None
class AgentRuntime(Protocol):
async def run(
self, role: RoleSpec, task: AgentTask, tools: Sequence[ToolSpec]