langchain-agentx-python 2.3.8__py3-none-any.whl → 2.3.9__py3-none-any.whl

langchain_agentx/__init__.py

@@ -11,7 +11,7 @@ from langchain_agentx import create_loop_agent
 ```
 """
 
-__version__ = "2.3.8"
+__version__ = "2.3.9"
 
 from .mcp.call import McpToolCaller
 from .mcp.client_manager import McpClientManager, McpConnectedClient

langchain_agentx/loop/loop_abort.py

@@ -45,11 +45,23 @@ class LoopAbortSignal(Exception):
 
 
 def is_cancel_requested() -> bool:
-    """当前 RunContext 是否已请求取消（无 context 则为 False）。"""
+    """当前或祖先 RunContext 是否已请求取消（无 context 则为 False）。
+
+    祖先链：nested Parallelization ctx 下 leaf 可读到 L0 ``cancel_requested``。
+    """
     from .run_context import get_run_context
 
     ctx = get_run_context()
-    return ctx is not None and bool(ctx.cancel_requested)
+    seen: set[int] = set()
+    while ctx is not None:
+        ident = id(ctx)
+        if ident in seen:
+            break
+        seen.add(ident)
+        if bool(ctx.cancel_requested):
+            return True
+        ctx = ctx.parent
+    return False
 
 
 def abort_signal_for_phase(

langchain_agentx/loop/run_context.py

@@ -12,6 +12,7 @@ run_context.py — Workflow/Agent 结构化并发上下文（parent → child ca
     asyncio 为主；thread 仅 bounded join（无法强制中断 LLM）；anyio/trio 不保证 context 传播。
     P1：reset 失败时在仍可见 owner 的 derived logical context 内 force-clear；
     宿主 detached ingest 用 create_task_with_copied_context / run_context_scope。
+    nested Parallelization：child_contexts + 递归 cancel_tree；W4 可用 use_cancel_authority。
 """
 
 from __future__ import annotations
@@ -41,6 +42,10 @@ class RunContext:
     root_task: asyncio.Task
     child_tasks: set[asyncio.Task] = field(default_factory=set)
     child_threads: set[threading.Thread] = field(default_factory=set)
+    # nested Parallelization/Chaining 再 install 时登记；cancel_tree 先深取消其 child_tasks。
+    # 用 list：RunContext 含 set/Task 不可哈希，不能放 set。
+    child_contexts: list["RunContext"] = field(default_factory=list, repr=False)
+    parent: Optional["RunContext"] = field(default=None, repr=False, compare=False)
     cancel_requested: bool = False
     # D-EVT-6：宿主在 cancel_tree / killAll 时写入；finish 投影读取；缺省 unknown。
     # 取值：escape | workflow_stop | kill_agents | unknown；禁止从「是否有后台」猜测。
@@ -52,10 +57,42 @@ class RunContext:
     def register_child_thread(self, thread: threading.Thread) -> None:
         self.child_threads.add(thread)
 
-    async def cancel_tree(self, timeout: float = 10.0) -> None:
+    def register_child_context(self, child: "RunContext") -> None:
+        """登记 nested RunContext（install_run_context(parent=…)）。"""
+        if all(existing is not child for existing in self.child_contexts):
+            self.child_contexts.append(child)
+        child.parent = self
+
+    def cancel_authority(self) -> "RunContext":
+        """取消权威：最外层 RunContext（宿主 Stop / cancel_tree 目标）。"""
+        node: RunContext = self
+        seen: set[int] = set()
+        while node.parent is not None:
+            ident = id(node)
+            if ident in seen:
+                break
+            seen.add(ident)
+            node = node.parent
+        return node
+
+    def _mark_cancel_requested(self, *, source: str | None) -> None:
+        """本层 + 全部 nested 写入 cancel_requested（协作闸可立即看到）。"""
         self.cancel_requested = True
+        if source is not None and self.cancel_source is None:
+            self.cancel_source = source
+        for nested in list(self.child_contexts):
+            nested._mark_cancel_requested(source=source or self.cancel_source)
+
+    async def cancel_tree(self, timeout: float = 10.0) -> None:
+        """取消本层 child_tasks，并递归 nested child_contexts（W4 / leaf producer）。"""
+        self._mark_cancel_requested(source=self.cancel_source)
         deadline = time.monotonic() + timeout
 
+        # 深取消：先砍 nested 内 W4 producer，再 cancel 本层（含 nested.root_task）。
+        for nested in list(self.child_contexts):
+            remaining = max(0.0, deadline - time.monotonic())
+            await nested.cancel_tree(timeout=remaining)
+
         for child in list(self.child_tasks):
             child.cancel()
         if self.child_tasks:
@@ -128,6 +165,7 @@ def install_run_context(
         ctx = RunContext(root_task=current)
     if parent is not None:
         parent.register_child(ctx.root_task)
+        parent.register_child_context(ctx)
     token = _current_run_context.set(ctx)
     return ctx, token
 
@@ -205,15 +243,32 @@ async def drive_async_iterator_in_current_task(
         yield item
 
 
+def resolve_cancel_authority(
+    ctx: RunContext | None = None,
+) -> RunContext | None:
+    """解析取消权威 ctx；缺省取当前 ContextVar 的 outermost。"""
+    current = ctx if ctx is not None else get_run_context()
+    if current is None:
+        return None
+    return current.cancel_authority()
+
+
 def register_spawned_task(
     task: asyncio.Task,
     *,
     owner: RunContext | None = None,
+    use_cancel_authority: bool = False,
 ) -> None:
-    """将 spawn 出的 asyncio task 注册到 RunContext（无 context 时 no-op）。"""
+    """将 spawn 出的 asyncio task 注册到 RunContext（无 context 时 no-op）。
+
+    ``use_cancel_authority=True``：挂到 outermost（Workflow W4），避免仅挂在
+    nested Parallelization ctx 上导致 L0 ``cancel_tree`` 砍不到 producer。
+    """
     ctx = owner if owner is not None else get_run_context()
     if ctx is None:
         return
+    if use_cancel_authority:
+        ctx = ctx.cancel_authority()
     try:
         owner_loop = ctx.root_task.get_loop()
         task_loop = task.get_loop()
@@ -249,5 +304,6 @@ __all__ = [
     "register_spawned_task",
     "register_spawned_thread",
     "reset_run_context",
+    "resolve_cancel_authority",
     "run_context_scope",
 ]

langchain_agentx/workflow/execution.py

@@ -445,7 +445,9 @@ class WorkflowAgentLoopExecutor:
                 await queue.put(None)
 
         task = asyncio.create_task(_producer())
-        register_spawned_task(task)
+        # W4：挂到 cancel authority（outermost），避免 Parallelization nested
+        # install 后 L0.cancel_tree 只看见 nested.root、砍不到 leaf producer。
+        register_spawned_task(task, use_cancel_authority=True)
         try:
             while True:
                 event = await queue.get()

{langchain_agentx_python-2.3.8.dist-info → langchain_agentx_python-2.3.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: langchain-agentx-python
-Version: 2.3.8
+Version: 2.3.9
 Summary: LangChain/LangGraph-based agent utilities for CodeBaseX.
 Author-email: GoodMood2008 <GoodMood2008@users.noreply.github.com>
 License: Apache License

{langchain_agentx_python-2.3.8.dist-info → langchain_agentx_python-2.3.9.dist-info}/RECORD

@@ -1,4 +1,4 @@
-langchain_agentx/__init__.py,sha256=gtvKFAWnCZTzCzgO9-k_SOm0i5QAt-QQKXfYx8noXtw,2014
+langchain_agentx/__init__.py,sha256=P6NRAff0z_tvGxr7Vw8SjC7iBM818Lx6SXrGH9p_dvE,2014
 langchain_agentx/command/__init__.py,sha256=Ej260S5uFQcmEtGZQG_NH7BYjHoStrpBLtGUsBTxyZk,631
 langchain_agentx/command/allowed_tools.py,sha256=TVA0VM8rm98H-QbLK_GRiX5RhEAZFxKawliMi4kk96A,3359
 langchain_agentx/command/context.py,sha256=DIGOGPBw5UGDBm0WNNJlKx1h_9rCRmcdROv4DT61Qug,731
@@ -28,9 +28,9 @@ langchain_agentx/health/models.py,sha256=lHwdvn0w-qs-c8mI6I3nlnoCk8--y7gADj7C9u7
 langchain_agentx/health/preflight.py,sha256=wGysAnhT-jR1LfyjdaX9diO573Zzt5Z1M3vxDbpdcK0,5612
 langchain_agentx/loop/__init__.py,sha256=JoFPFrlllvGCYFEk2RUuqq9AfUIdLVSNbrRdTRy6g_I,1428
 langchain_agentx/loop/benchmark_frozen_config.py,sha256=YI4IaDVMBOEucF36F2oNv5mw1TqMG_rm_LJSpKAnFWM,13942
-langchain_agentx/loop/loop_abort.py,sha256=cKlHxZh0u7-drCVqEiRtzkO270MHw6grJuZ1NpKoGfo,3250
+langchain_agentx/loop/loop_abort.py,sha256=wFlvCLjE9Avs83_8hqmUq0DlP58LSjtxOge-g1K4oPQ,3547
 langchain_agentx/loop/message_contract.py,sha256=Twl83TneU2PRdxgGRBxs6S9_ovRT6cb5WeCUzd6oJnE,2196
-langchain_agentx/loop/run_context.py,sha256=dhNiLhvqD_QYacGMA0B5P3wWpSe3O6wU_XcVEzb86Z4,8303
+langchain_agentx/loop/run_context.py,sha256=CRzbzuQziFmjvTTgZ6ctKLGyvzsuqq_oDr9zhLOhFik,10940
 langchain_agentx/loop/config/__init__.py,sha256=0pf3Mml7LZpQ1C3_AtROFQClrBQegaGCG4YCTfSr9v8,1137
 langchain_agentx/loop/config/agent_config.py,sha256=tOnAHFor6dkle3FvUOVx0YsmiYVTH11UrWSyTmOLV0c,3100
 langchain_agentx/loop/config/compaction_config.py,sha256=MmXqY47-9nPDhdXvnU92Xp0XeaZ605ErQwX9d2emEkM,1176
@@ -778,7 +778,7 @@ langchain_agentx/workflow/catalog_registry.py,sha256=tYUny5FkHwQU-RRUxOdxaJhiRV_
 langchain_agentx/workflow/dag.py,sha256=Y1IR1IwnM79Xuev6HZnOvAE3Q23MRnA9lu4vg2Cie48,4469
 langchain_agentx/workflow/display_enricher.py,sha256=2HJ4xJI8H4hwBoWHAi6D_LwE-dcbZD_pafnS7DMDYZ4,6147
 langchain_agentx/workflow/display_resolver.py,sha256=hEaljqprjubG82zeqLOEeQ32AMAxaZwvwaLq3v-yt3c,10119
-langchain_agentx/workflow/execution.py,sha256=iCEkPgLkaoEM4cB6o7KAqIaBpFuY5HtGGISMNm0tr4A,18954
+langchain_agentx/workflow/execution.py,sha256=1exCcD1zxZ8vSx4js6ygnJ4xXAnK1UwT8rpIAYAfxxc,19155
 langchain_agentx/workflow/loop_factory.py,sha256=hCShf_gDnesW2A9JspaUY3upp3NCIguII_wRiXnSIUM,3954
 langchain_agentx/workflow/memory_drain_registry.py,sha256=Xm_ytbB-BbRIu3-h-KhptsCsmmueOiNZePUuG1hk8zk,1681
 langchain_agentx/workflow/memory_session_policy.py,sha256=2FI0ZbAA6MnxJexnLYLadQpiqipPQwVnUrTWgl55A74,3333
@@ -837,8 +837,8 @@ langchain_agentx/workspace/root_grant_manager.py,sha256=W3gy8HTevbERbXqIgRcjzOXO
 langchain_agentx/workspace/tool_boundary.py,sha256=UDwX6swpSLsx9HNkYuuRRiV5o7ZZG_Bru2Yn0c5kNX8,5724
 langchain_agentx/workspace/validators.py,sha256=tQt-6TOcL8Fw7Ig5ebA9S7vGWh1rby920eFW6x8Tk9E,1439
 langchain_agentx/workspace/view.py,sha256=PGasqTaqhlD03SXXazHuw4RHfV681AIdlsYqL70pEjc,4774
-langchain_agentx_python-2.3.8.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-langchain_agentx_python-2.3.8.dist-info/METADATA,sha256=LQpK-C85dJ_lAdk9w7weRSeVJKKWJzEnBuDdytblGEY,23971
-langchain_agentx_python-2.3.8.dist-info/WHEEL,sha256=51RkbunBAw4BWsgaQWTpPhg4Diwp3c9P5iaLk67Hdtg,92
-langchain_agentx_python-2.3.8.dist-info/top_level.txt,sha256=Ge284pniNt8xea0OLk2o9o32GqVpDhOYk20fwE-0xxA,17
-langchain_agentx_python-2.3.8.dist-info/RECORD,,
+langchain_agentx_python-2.3.9.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+langchain_agentx_python-2.3.9.dist-info/METADATA,sha256=pwTUN5gZ5zW2jrl7nwOYxD53dZUKhEEkZu19bdqS7Ew,23971
+langchain_agentx_python-2.3.9.dist-info/WHEEL,sha256=51RkbunBAw4BWsgaQWTpPhg4Diwp3c9P5iaLk67Hdtg,92
+langchain_agentx_python-2.3.9.dist-info/top_level.txt,sha256=Ge284pniNt8xea0OLk2o9o32GqVpDhOYk20fwE-0xxA,17
+langchain_agentx_python-2.3.9.dist-info/RECORD,,