代码提交
This commit is contained in:
1 parent
bf42a48fcc
commit
75f288b241
17 files changed
+65
-69
No files matched your search
@@ -4,23 +4,35 @@ from __future__ import annotations
|
||||
|
||||
import re
|
||||
|
||||
_NODE_RUN_ID_RE = re.compile(r"^(?P<node_id>.+)-attempt(?P<attempt>\d+)$")
|
||||
_NODE_RUN_ID_RE = re.compile(r"^(?P<scope>.+)-attempt(?P<attempt>\d+)$")
|
||||
|
||||
|
||||
def make_node_run_id(node_id: str, attempt: int) -> str:
|
||||
"""Return ``${node_id}-attempt{attempt}``. Random UUIDs are forbidden."""
|
||||
def make_node_run_id(run_id: str, node_id: str, attempt: int) -> str:
|
||||
"""Return ``${run_id}-${node_id}-attempt{attempt}``. Random UUIDs are forbidden.
|
||||
|
||||
The run dimension is part of the id because the node-runs table primary
|
||||
key is ``node_run_id`` alone: without it, two runs reusing the same plan
|
||||
template would collide on ``${node_id}-attempt{n}``.
|
||||
"""
|
||||
|
||||
if not run_id or run_id.strip() != run_id:
|
||||
raise ValueError("run_id must be a non-empty trimmed string")
|
||||
if not node_id or node_id.strip() != node_id:
|
||||
raise ValueError("node_id must be a non-empty trimmed string")
|
||||
if attempt < 1:
|
||||
raise ValueError("attempt must be >= 1")
|
||||
return f"{node_id}-attempt{attempt}"
|
||||
return f"{run_id}-{node_id}-attempt{attempt}"
|
||||
|
||||
|
||||
def parse_node_run_id(node_run_id: str) -> tuple[str, int]:
|
||||
"""Split a canonical node_run_id back into ``(node_id, attempt)``."""
|
||||
"""Split a canonical node_run_id tail back into ``(..., attempt)``.
|
||||
|
||||
The returned first element is the run-scoped node portion
|
||||
(``${run_id}-${node_id}``); callers that need the bare node id should
|
||||
strip the known run prefix themselves.
|
||||
"""
|
||||
|
||||
match = _NODE_RUN_ID_RE.match(node_run_id or "")
|
||||
if match is None:
|
||||
raise ValueError(f"invalid node_run_id: {node_run_id!r}")
|
||||
return match.group("node_id"), int(match.group("attempt"))
|
||||
return match.group("scope"), int(match.group("attempt"))
|
||||
@@ -365,7 +365,7 @@ class TaskLedger:
|
||||
)
|
||||
attempt = int(node.get("attempt") or 0) + 1
|
||||
replacement = {
|
||||
"node_run_id": make_node_run_id(node_id, attempt),
|
||||
"node_run_id": make_node_run_id(run_id, node_id, attempt),
|
||||
"session_id": run["session_id"],
|
||||
"run_id": run_id,
|
||||
"node_id": node_id,
|
||||
@@ -449,7 +449,7 @@ class TaskLedger:
|
||||
nxt = assignment.attempt + 1
|
||||
await self._store.save_node_run(
|
||||
{
|
||||
"node_run_id": make_node_run_id(assignment.node_id, nxt),
|
||||
"node_run_id": make_node_run_id(assignment.run_id, assignment.node_id, nxt),
|
||||
"session_id": assignment.session_id,
|
||||
"run_id": assignment.run_id,
|
||||
"node_id": assignment.node_id,
|
||||
@@ -518,7 +518,7 @@ class TaskLedger:
|
||||
nxt = attempt + 1
|
||||
await self._store.save_node_run(
|
||||
{
|
||||
"node_run_id": make_node_run_id(node_id, nxt),
|
||||
"node_run_id": make_node_run_id(str(run["id"]), node_id, nxt),
|
||||
"session_id": run["session_id"],
|
||||
"run_id": run["id"],
|
||||
"node_id": node_id,
|
||||
@@ -540,7 +540,7 @@ class TaskLedger:
|
||||
session_id=str(run["session_id"]),
|
||||
run_id=str(run["id"]),
|
||||
event_type="node.attempt.created",
|
||||
data={"node_id": node_id, "node_run_id": make_node_run_id(node_id, nxt), "attempt": nxt, "reason": "targeted_rework"},
|
||||
data={"node_id": node_id, "node_run_id": make_node_run_id(str(run["id"]), node_id, nxt), "attempt": nxt, "reason": "targeted_rework"},
|
||||
)
|
||||
return True
|
||||
|
||||
|
||||
@@ -127,7 +127,7 @@ async def _maybe_open_next_attempt(
|
||||
if attempt >= _max_attempts(node, spec):
|
||||
return
|
||||
nxt = attempt + 1
|
||||
node_run_id = make_node_run_id(str(node["node_id"]), nxt)
|
||||
node_run_id = make_node_run_id(str(run["id"]), str(node["node_id"]), nxt)
|
||||
await store.save_node_run(
|
||||
{
|
||||
"node_run_id": node_run_id,
|
||||
|
||||
+2
-2
@@ -236,8 +236,8 @@ class AppearanceSettings(BaseModel):
|
||||
description="Default agent list display mode for users who haven't picked their own (card / list)",
|
||||
)
|
||||
default_layout_mode: Literal["full", "compact"] = Field(
|
||||
default="full",
|
||||
description="Default interface layout for users who haven't picked their own — full (sidebar + header) / compact (hidden)",
|
||||
default="compact",
|
||||
description="Default interface layout for users who haven't picked their own — compact (hidden) / full (sidebar + header)",
|
||||
)
|
||||
compact_shortcut_buttons: list[CompactShortcutButton] = Field(
|
||||
default_factory=_default_compact_shortcut_buttons,
|
||||
|
||||
+8
-2
@@ -55,8 +55,14 @@ def loads_dict(value: Any) -> dict[str, Any]:
|
||||
return {}
|
||||
|
||||
|
||||
def make_node_run_id(node_id: str, attempt: int) -> str:
|
||||
return f"{node_id}-attempt{attempt}"
|
||||
def make_node_run_id(run_id: str, node_id: str, attempt: int) -> str:
|
||||
"""Return ``${run_id}-${node_id}-attempt{attempt}``.
|
||||
|
||||
The node-runs table primary key is ``node_run_id`` alone, so the id must
|
||||
carry the run dimension: two runs sharing a plan template would otherwise
|
||||
collide on the same deterministic ``${node_id}-attempt{n}`` string.
|
||||
"""
|
||||
return f"{run_id}-{node_id}-attempt{attempt}"
|
||||
|
||||
|
||||
def is_terminal_run(status: str) -> bool:
|
||||
|
||||
+1
-1
@@ -494,7 +494,7 @@ class MemoryReportCollaborationStore(ReportCollaborationStore):
|
||||
node_id = str(node.get("id") or "")
|
||||
if not node_id:
|
||||
continue
|
||||
node_run_id = make_node_run_id(node_id, 1)
|
||||
node_run_id = make_node_run_id(run_id, node_id, 1)
|
||||
role_key = str(node.get("role_key") or "")
|
||||
self._node_runs[node_run_id] = {
|
||||
"node_run_id": node_run_id,
|
||||
|
||||
+1
-1
@@ -884,7 +884,7 @@ class SqlReportCollaborationStore(ReportCollaborationStore):
|
||||
snapshot = (role_snapshots or {}).get(role_key)
|
||||
db.add(
|
||||
ReportCollaborationNodeRunRow(
|
||||
node_run_id=make_node_run_id(node_id, 1),
|
||||
node_run_id=make_node_run_id(run_id, node_id, 1),
|
||||
session_id=session_id,
|
||||
run_id=run_id,
|
||||
node_id=node_id,
|
||||
|
||||
@@ -101,10 +101,12 @@ def test_event_envelope_accepts_snake_or_camel_aliases() -> None:
|
||||
|
||||
|
||||
def test_node_run_id_is_deterministic() -> None:
|
||||
assert make_node_run_id("research_brand", 2) == "research_brand-attempt2"
|
||||
assert parse_node_run_id("research_brand-attempt2") == ("research_brand", 2)
|
||||
assert make_node_run_id("rcr_x", "research_brand", 2) == "rcr_x-research_brand-attempt2"
|
||||
assert parse_node_run_id("rcr_x-research_brand-attempt2") == ("rcr_x-research_brand", 2)
|
||||
with pytest.raises(ValueError):
|
||||
make_node_run_id("research_brand", 0)
|
||||
make_node_run_id("rcr_x", "research_brand", 0)
|
||||
with pytest.raises(ValueError):
|
||||
make_node_run_id("", "research_brand", 1)
|
||||
with pytest.raises(ValueError):
|
||||
parse_node_run_id("random-uuid")
|
||||
|
||||
|
||||
@@ -175,7 +175,7 @@ async def test_recovery_preserves_completed_nodes() -> None:
|
||||
write["status"] = "running"
|
||||
await store.save_node_run(write)
|
||||
report = await recover_orphaned_attempts(store, run_id)
|
||||
assert "research-attempt1" in report.preserved_completed
|
||||
assert f"{run_id}-research-attempt1" in report.preserved_completed
|
||||
assert write["node_run_id"] in report.interrupted_node_run_ids
|
||||
latest = {item["node_id"]: item for item in await store.list_node_runs(run_id)}
|
||||
assert latest["research"]["status"] == "completed"
|
||||
|
||||
@@ -71,11 +71,12 @@ def test_completed_reopen_creates_new_attempt_id() -> None:
|
||||
assert can_transition_node("reopened", "queued")
|
||||
with pytest.raises(IllegalNodeTransition):
|
||||
require_transition("completed", "queued")
|
||||
first = make_node_run_id("writer", 1)
|
||||
second = make_node_run_id("writer", 2)
|
||||
assert first == "writer-attempt1"
|
||||
assert second == "writer-attempt2"
|
||||
first = make_node_run_id("rcr_x", "writer", 1)
|
||||
second = make_node_run_id("rcr_x", "writer", 2)
|
||||
assert first == "rcr_x-writer-attempt1"
|
||||
assert second == "rcr_x-writer-attempt2"
|
||||
assert first != second
|
||||
assert make_node_run_id("rcr_y", "writer", 1) != first
|
||||
|
||||
|
||||
def test_planned_is_bootstrap_source() -> None:
|
||||
|
||||
@@ -152,7 +152,7 @@ async def test_waves_researcher_before_writer_and_text_does_not_complete() -> No
|
||||
assert advice[0]["data"]["suggested_next_node_ids"] == ["write"]
|
||||
agents = await store.list_agent_runs(run_id)
|
||||
phases = {item["node_run_id"]: item["phase_id"] for item in agents}
|
||||
assert phases["research-attempt1"] != phases["write-attempt1"]
|
||||
assert phases[f"{run_id}-research-attempt1"] != phases[f"{run_id}-write-attempt1"]
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
|
||||
Reference in new issue
Block a user