代码提交

This commit is contained in:
董宏凯 committed 2026-09-06 20:49:35 +08:00
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,