power-loop 5.2.0__tar.gz → 5.2.2__tar.gz

{power_loop-5.2.0 → power_loop-5.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: power-loop
-Version: 5.2.0
+Version: 5.2.2
 Summary: Embeddable agent execution kernel — LLM loop, hooks, events, tools, dynamic sub-agents.
 Author-email: zhangran <zhangran24@126.com>
 License: MIT

{power_loop-5.2.0 → power_loop-5.2.2}/power_loop/__init__.py

@@ -15,7 +15,7 @@ Stability tiers
 无版本承诺，可随时变更或删除。
 """
 
-__version__ = "5.2.0"
+__version__ = "5.2.2"
 
 # Public LLM contract (SDK-free) re-exported so callers (e.g. writing llm.* hooks or
 # a custom LLMService) don't reach into the internal vendored transport package (H3.4).

{power_loop-5.2.0 → power_loop-5.2.2}/power_loop/core/pipeline.py

@@ -1420,6 +1420,13 @@ class AgentPipeline:
                 used_todo=used_todo,
             )
             await self.hooks.run_typed_async(HookPoint.ROUND_END, round_end)
+            # Per-round usage row for TOOL rounds too. This was only emitted on the
+            # no-tools paths above, so an agent session (where nearly every round calls
+            # tools) persisted usage for just its final round — a 34-round leaf showed
+            # exactly one usage_rounds row. Totals were never wrong (session_stats bumps
+            # from the run's in-memory aggregate at end-of-send); what was missing is the
+            # per-round breakdown this table exists for.
+            await self._emit_sink(self.sink.on_round_ended, round_idx, usage=usage)
 
             if not used_todo:
                 self.rounds_since_todo += 1

{power_loop-5.2.0 → power_loop-5.2.2}/power_loop/workflow/engine.py

@@ -42,6 +42,7 @@ from power_loop.runtime.structured import StructuredOutputError, parse_structure
 
 from .result import AgentResult, SharedBudget, WorkflowResult
 from .spec import (
+    MAX_BACKOFF_S,
     MAX_FOREACH_ITEMS,
     AgentNode,
     BranchNode,
@@ -152,6 +153,9 @@ async def _usage_for(parent_loop: Any, session_id: str | None) -> dict[str, int]
 #: :class:`WorkflowFileIO` 实现——那部分带语言和产品口径，不该焊进库里。
 FILEREF_RE = re.compile(r"@@FILEREF:([^\[\]@]+)(\[[^\]]*\])?@@")
 
+#: foreach 把当前迭代序号放进 body 的 env（保留键），供 FileIO 端口分配 per-iteration 产出文件。
+ITERATION_ENV_KEY = "__iteration__"
+
 
 class WorkflowFileIO(Protocol):
     """叶子产出文件与文件引用的宿主端口（design/64 §2）。引擎自己不碰文件系统。"""
@@ -392,7 +396,7 @@ class WorkflowEngine:
         if self._file_io is not None:
             try:
                 output_file = node.output_file or self._file_io.output_path(
-                    node.id, iteration=env.get("__iteration__")
+                    node.id, iteration=env.get(ITERATION_ENV_KEY)
                 )
             except Exception:  # noqa: BLE001 — 产出文件是增益,不该让整个叶子起不来
                 logger.debug("file_io.output_path failed for %s", node.id, exc_info=True)
@@ -448,7 +452,9 @@ class WorkflowEngine:
                     except Exception:  # noqa: BLE001 — 归档失败不该毁掉这次重试
                         logger.debug("file_io.before_attempt failed", exc_info=True)
                 if policy is not None and policy.backoff_s > 0:
-                    await asyncio.sleep(policy.backoff_s)
+                    # 第 N 次重试等 backoff_s * factor**(N-1)；factor=1 就是固定间隔。
+                    delay = policy.backoff_s * (policy.backoff_factor ** (attempt - 2))
+                    await asyncio.sleep(min(delay, MAX_BACKOFF_S))
             raw = await self._executor.run_agent(
                 replace(spec, metadata={**spec.metadata, "attempt": attempt}),
                 user_input, parent_loop=self._loop, driver_sid=driver_sid,
@@ -646,8 +652,10 @@ class WorkflowEngine:
         items = self._resolve_items(node)
         sem = asyncio.Semaphore(node.max_concurrency)
 
-        async def one(item: Any) -> AgentResult | None:
-            child_env = {**env, node.as_var: item}
+        async def one(item: Any, index: int) -> AgentResult | None:
+            # ITERATION_ENV_KEY：body 的所有迭代共享同一个 node_id，宿主的 FileIO 端口靠它
+            # 给每次迭代分不同的产出文件——不区分的话 N 个并发迭代会追加进同一个文件，互相搅乱。
+            child_env = {**env, node.as_var: item, ITERATION_ENV_KEY: index}
             if node.parallel:
                 async with sem:
                     return await self._exec(node.body, child_env, driver_sid)
@@ -659,13 +667,13 @@ class WorkflowEngine:
         try:
             if node.parallel:
                 gathered = await self._gather_branches(
-                    [one(it) for it in items], on_error=node.on_error
+                    [one(it, i) for i, it in enumerate(items)], on_error=node.on_error
                 )
             else:
                 gathered = []
-                for it in items:
+                for i, it in enumerate(items):
                     try:
-                        gathered.append(await one(it))
+                        gathered.append(await one(it, i))
                     except Exception as exc:  # noqa: BLE001
                         if node.on_error == "halt":
                             raise

{power_loop-5.2.0 → power_loop-5.2.2}/power_loop/workflow/spec.py

@@ -92,6 +92,9 @@ class WorkflowSpecError(SpecValidationError):
 #: ``empty`` = 完成了但没有正文（模型空转收尾）。
 RETRY_TRIGGERS = frozenset({"failed", "empty"})
 _MAX_ATTEMPTS_CAP = 5
+_MAX_BACKOFF_FACTOR = 10.0
+#: 单次重试等待的封顶秒数。
+MAX_BACKOFF_S = 60.0
 
 
 @dataclass(frozen=True)
@@ -105,7 +108,11 @@ class RetryPolicy:
 
     max_attempts: int = 1
     on: tuple[str, ...] = ("failed", "empty")
+    #: 第一次重试前等多久。第 N 次重试等 ``backoff_s * backoff_factor**(N-1)``，
+    #: 单次等待封顶 :data:`MAX_BACKOFF_S`（等太久等于把整个 run 挂在那儿）。
     backoff_s: float = 0.0
+    #: 1.0 = 固定间隔；2.0 = 指数退避（2s → 4s → 8s）。provider 限流时才真正需要它。
+    backoff_factor: float = 1.0
 
 
 @dataclass(frozen=True)
@@ -346,6 +353,7 @@ def _node_to_dict(node: WorkflowNode) -> dict[str, Any]:
                 "max_attempts": node.retry.max_attempts,
                 "on": list(node.retry.on),
                 "backoff_s": node.retry.backoff_s,
+                "backoff_factor": node.retry.backoff_factor,
             }
         if node.continue_on_error:
             out["continue_on_error"] = True
@@ -719,7 +727,7 @@ def _parse_retry(raw: Any, path: str, problems: list[str]) -> RetryPolicy | None
     if not isinstance(raw, dict):
         problems.append(f"{path}: 'retry' must be an object {{max_attempts, on?, backoff_s?}}")
         return None
-    extra = set(raw) - {"max_attempts", "on", "backoff_s"}
+    extra = set(raw) - {"max_attempts", "on", "backoff_s", "backoff_factor"}
     if extra:
         problems.append(f"{path}.retry: unknown key(s): {sorted(extra)}")
     attempts = raw.get("max_attempts", 1)
@@ -748,7 +756,17 @@ def _parse_retry(raw: Any, path: str, problems: list[str]) -> RetryPolicy | None
     if isinstance(backoff, bool) or not isinstance(backoff, (int, float)) or backoff < 0:
         problems.append(f"{path}.retry: 'backoff_s' must be a number >= 0")
         backoff = 0.0
-    return RetryPolicy(max_attempts=attempts, on=tuple(on_raw), backoff_s=float(backoff))
+    factor = raw.get("backoff_factor", 1.0)
+    if isinstance(factor, bool) or not isinstance(factor, (int, float)) or factor < 1.0:
+        problems.append(f"{path}.retry: 'backoff_factor' must be a number >= 1.0 (1.0 = fixed delay)")
+        factor = 1.0
+    elif factor > _MAX_BACKOFF_FACTOR:
+        problems.append(f"{path}.retry: 'backoff_factor' is capped at {_MAX_BACKOFF_FACTOR}")
+        factor = _MAX_BACKOFF_FACTOR
+    return RetryPolicy(
+        max_attempts=attempts, on=tuple(on_raw), backoff_s=float(backoff),
+        backoff_factor=float(factor),
+    )
 
 
 def _parse_sequence(

{power_loop-5.2.0 → power_loop-5.2.2}/power_loop.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: power-loop
-Version: 5.2.0
+Version: 5.2.2
 Summary: Embeddable agent execution kernel — LLM loop, hooks, events, tools, dynamic sub-agents.
 Author-email: zhangran <zhangran24@126.com>
 License: MIT