langchain-agentx-python 0.4.5__tar.gz → 0.4.7__tar.gz

{langchain-agentx-python-0.4.5/langchain_agentx_python.egg-info → langchain-agentx-python-0.4.7}/PKG-INFO

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

{langchain-agentx-python-0.4.5 → langchain-agentx-python-0.4.7}/langchain_agentx/__init__.py

@@ -11,7 +11,7 @@ from langchain_agentx import create_loop_agent
 ```
 """
 
-__version__ = "0.4.5"
+__version__ = "0.4.7"
 
 from .loop import (  # noqa: F401
     create_loop_agent,

{langchain-agentx-python-0.4.5 → langchain-agentx-python-0.4.7}/langchain_agentx/loop/subagent/__init__.py

@@ -18,7 +18,6 @@ from langchain_agentx.loop.subagent.async_runner import (
     register_background_agent,
     run_async_agent_lifecycle,
 )
-from langchain_agentx.loop.subagent.progress import SubagentProgressEvent
 from langchain_agentx.loop.subagent.runner import (
     BackgroundLaunchedResult,
     _run_coroutine_sync,
@@ -37,7 +36,6 @@ __all__ = [
     "SubagentResult",
     "create_subagent_context",
     "cleanup_subagent_context",
-    "SubagentProgressEvent",
     "run_subagent",
     "run_subagent_with_background_signal",
     "BackgroundLaunchedResult",

{langchain-agentx-python-0.4.5 → langchain-agentx-python-0.4.7}/langchain_agentx/loop/subagent/async_runner.py

@@ -78,7 +78,6 @@ def register_background_agent(
     model: Any | None,
     output_dir: str,
     description: str,
-    on_progress: Callable[[Any], None] | None = None,
     parent_ctx: Any | None = None,
 ) -> BackgroundAgentHandle:
     """注册并启动后台子 Agent。"""
@@ -94,7 +93,6 @@ def register_background_agent(
                     ctx=ctx,
                     loader=loader,
                     model=model,
-                    on_progress=on_progress,
                 )
                 with open(output_file, "w", encoding="utf-8") as fp:
                     fp.write(result.content)

{langchain-agentx-python-0.4.5 → langchain-agentx-python-0.4.7}/langchain_agentx/loop/subagent/context.py

@@ -54,6 +54,7 @@ class SubagentContext:
     parent_tool_call_id: str | None = None  # 触发本子 Agent 的 tool_call_id
     parent_conversation_session_id: str | None = None
     enable_trace: bool = True
+    runnable_config: Any = None  # 父 graph 的 runnable_config，用于子 graph 事件自动冒泡到父 graph
     isolation: str = "none"
     worktree_dir: str | None = None
     workspace_root: str = ""
@@ -209,6 +210,7 @@ def create_subagent_context(
         agent_home=str(parent_agent_home),
         cwd=effective_cwd,
         capabilities=getattr(parent_ctx, "capabilities", None),
+        runnable_config=getattr(parent_ctx, "runnable_config", None),
     )
 
 

{langchain-agentx-python-0.4.5 → langchain-agentx-python-0.4.7}/langchain_agentx/loop/subagent/orchestrator.py

@@ -11,11 +11,8 @@ CC 对照：src/tools/AgentTool/AgentTool.tsx call() 中 runAgent / registerAsyn
 
 from __future__ import annotations
 
-import asyncio
-import inspect
 import logging
 import os
-import time
 import uuid
 from pathlib import Path
 from typing import TYPE_CHECKING, Any
@@ -47,44 +44,6 @@ if TYPE_CHECKING:
 
 logger = logging.getLogger(__name__)
 
-def _make_progress_handler(
-    subagent_type: str,
-    started_at: float,
-    parent_tool_use_id: str | None = None,
-    tool_progress_callback: Any = None,
-):
-    """构造 on_progress 回调（事件冒泡 + 可选的 CLI 提示）。
-
-    Args:
-        subagent_type: 子 agent 类型
-        started_at: 开始时间戳
-        parent_tool_use_id: 父级 tool_use_id，用于事件冒泡（CC 对齐）
-        tool_progress_callback: 父级的工具进度回调（异步路径用于 adispatch_custom_event）
-
-    事件流向：
-        同步路径: 子 agent 事件 → tool_progress_callback（Channel B）→ CLI 处理
-        异步路径: 子 agent 事件 → tool_progress_callback → adispatch_custom_event（Channel A）
-    """
-    def _on_progress(event: Any) -> None:
-
-        # 设置 parent_tool_use_id（如果事件支持）
-        if hasattr(event, "parent_tool_use_id") and event.parent_tool_use_id is None:
-            object.__setattr__(event, "parent_tool_use_id", parent_tool_use_id)
-
-        # 事件冒泡：转发到 tool_progress_callback
-        # - 同步路径：转发到 CLI 的 tool_progress_callback（Channel B）
-        # - 异步路径：转发到 _bubble_progress → adispatch_custom_event（Channel A）
-        if tool_progress_callback is not None and callable(tool_progress_callback):
-            try:
-                result = tool_progress_callback(event)
-                # 支持异步回调
-                if inspect.iscoroutine(result):
-                    asyncio.create_task(result)
-            except Exception:
-                logger.debug("tool_progress_callback failed", exc_info=True)
-
-    return _on_progress
-
 
 class SubagentOrchestrator:
     """子代理启动编排器。
@@ -181,16 +140,6 @@ class SubagentOrchestrator:
             # agent_id 由 RuntimeContextFactory 派生，同步到 subagent_ctx
             subagent_ctx.agent_id = child_agent_id
 
-            # 获取 parent_tool_use_id 用于事件冒泡（CC 对齐）
-            parent_tool_use_id = getattr(ctx, "tool_call_id", None)
-            tool_progress_callback = getattr(ctx, "tool_progress_callback", None)
-
-            _on_progress = _make_progress_handler(
-                inp.subagent_type or "general-purpose",
-                time.monotonic(),
-                parent_tool_use_id=parent_tool_use_id,
-                tool_progress_callback=tool_progress_callback,
-            )
             os.makedirs(output_dir, exist_ok=True)
 
             if is_async:
@@ -200,7 +149,6 @@ class SubagentOrchestrator:
                     loader=child_loader,
                     model=runtime_ctx.model,
                     description=inp.description,
-                    on_progress=_on_progress,
                     parent_ctx=ctx,
                     output_dir=output_dir,
                 )
@@ -212,7 +160,6 @@ class SubagentOrchestrator:
                     loader=child_loader,
                     model=runtime_ctx.model,
                     description=inp.description,
-                    on_progress=_on_progress,
                     parent_ctx=ctx,
                     background_signal=background_signal,
                     allowed_tool_names=allowed_tool_names,
@@ -237,7 +184,6 @@ class SubagentOrchestrator:
                     subagent_ctx=subagent_ctx,
                     loader=child_loader,
                     model=runtime_ctx.model,
-                    on_progress=_on_progress,
                     allowed_tool_names=allowed_tool_names,
                 )
 
@@ -258,19 +204,12 @@ class SubagentOrchestrator:
         inp: "AgentToolInput",
         ctx: "ToolExecutionContext",
         subagent_config: "SubagentConfig",
-        on_progress: Any | None = None,
     ) -> "AgentToolOutput":
-        """异步执行子代理（支持实时事件冒泡）。
-
-        与 invoke_subagent 的区别：
-        - on_progress 回调支持异步（用于 adispatch_custom_event）
-        - 不通过 _run_coroutine_sync，直接在异步上下文执行
-        - 保留同步 invoke 路径用于兼容（非 ToolNode 场景）
+        """异步执行子代理。
 
-        CC 对照：AgentTool.tsx call() 中 onProgress 回调
+        子 graph 事件通过 config 自动冒泡到父 graph，无需手动回调。
         """
         from langchain_agentx.tools.agent.models import AgentToolOutput
-        from langchain_agentx.loop.subagent.async_runner import run_async_agent_lifecycle
 
         log = self._build_logger(ctx)
         child_agent_id = str(uuid.uuid4())
@@ -333,15 +272,6 @@ class SubagentOrchestrator:
             )
             subagent_ctx.agent_id = child_agent_id
 
-            parent_tool_use_id = getattr(ctx, "tool_call_id", None)
-
-            # 构造异步进度回调
-            _on_progress = _make_progress_handler(
-                inp.subagent_type or "general-purpose",
-                time.monotonic(),
-                parent_tool_use_id=parent_tool_use_id,
-                tool_progress_callback=on_progress,  # 使用传入的异步回调
-            )
             os.makedirs(output_dir, exist_ok=True)
 
             if is_async:
@@ -351,7 +281,6 @@ class SubagentOrchestrator:
                     loader=child_loader,
                     model=runtime_ctx.model,
                     description=inp.description,
-                    on_progress=_on_progress,
                     parent_ctx=ctx,
                     output_dir=output_dir,
                 )
@@ -361,7 +290,6 @@ class SubagentOrchestrator:
                 ctx=subagent_ctx,
                 loader=child_loader,
                 model=runtime_ctx.model,
-                on_progress=_on_progress,
                 allowed_tool_names=allowed_tool_names,
             )
 
@@ -426,7 +354,6 @@ class SubagentOrchestrator:
         loader: Any,
         model: Any,
         description: str | None,
-        on_progress: Any,
         parent_ctx: "ToolExecutionContext",
         output_dir: str,
     ) -> Any:
@@ -436,7 +363,6 @@ class SubagentOrchestrator:
             model=model,
             output_dir=output_dir,
             description=description,
-            on_progress=on_progress,
             parent_ctx=parent_ctx,
         )
 
@@ -448,7 +374,6 @@ class SubagentOrchestrator:
         loader: Any,
         model: Any,
         description: str | None,
-        on_progress: Any,
         parent_ctx: "ToolExecutionContext",
         output_dir: str,
     ) -> Any:
@@ -457,7 +382,6 @@ class SubagentOrchestrator:
             loader=loader,
             model=model,
             description=description,
-            on_progress=on_progress,
             parent_ctx=parent_ctx,
             output_dir=output_dir,
         )
@@ -479,16 +403,12 @@ class SubagentOrchestrator:
         loader: Any,
         model: Any,
         description: str | None,
-        on_progress: Any,
         parent_ctx: "ToolExecutionContext",
         output_dir: str,
     ) -> Any:
-        """异步启动子 agent（支持实时进度回调）。
+        """异步启动子 agent。
 
-        与 _launch_async_subagent 的区别：
-        - 使用 register_background_agent 但不等待完成
-        - 返回 async_launched 状态
-        - 进度通过 on_progress 回调实时上报
+        子 graph 事件通过 config 自动冒泡到父 graph。
         """
         handle = self._register_background_agent(
             subagent_ctx=subagent_ctx,
@@ -496,7 +416,6 @@ class SubagentOrchestrator:
             model=model,
             output_dir=output_dir,
             description=description,
-            on_progress=on_progress,
             parent_ctx=parent_ctx,
         )
         return agent_output_cls(
@@ -516,7 +435,6 @@ class SubagentOrchestrator:
         loader: Any,
         model: Any,
         description: str | None,
-        on_progress: Any,
         parent_ctx: "ToolExecutionContext",
         background_signal: Any,
         allowed_tool_names: set[str],
@@ -528,7 +446,6 @@ class SubagentOrchestrator:
                 loader=loader,
                 model=model,
                 description=description,
-                on_progress=on_progress,
                 parent_ctx=parent_ctx,
                 output_dir=output_dir,
             )
@@ -539,7 +456,6 @@ class SubagentOrchestrator:
                 ctx=subagent_ctx,
                 loader=loader,
                 model=model,
-                on_progress=on_progress,
                 background_signal=background_signal,
                 on_background_request=_register_from_signal,
                 allowed_tool_names=allowed_tool_names,
@@ -561,7 +477,6 @@ class SubagentOrchestrator:
         subagent_ctx: Any,
         loader: Any,
         model: Any,
-        on_progress: Any,
         allowed_tool_names: set[str],
     ) -> Any:
         return _run_coroutine_sync(
@@ -569,7 +484,6 @@ class SubagentOrchestrator:
                 ctx=subagent_ctx,
                 loader=loader,
                 model=model,
-                on_progress=on_progress,
                 allowed_tool_names=allowed_tool_names,
             )
         )

{langchain-agentx-python-0.4.5 → langchain-agentx-python-0.4.7}/langchain_agentx/loop/subagent/runner.py

@@ -192,26 +192,45 @@ def _build_graph_input_messages(initial_messages: list[Any]) -> list[Any]:
 
 
 async def _emit_progress(
-    on_progress: Any,
+    ctx: SubagentContext,
     event: SubagentProgressEvent,
 ) -> None:
-    """发射进度事件（支持异步回调）。
+    """发射子 Agent 进度事件到父 graph。
 
-    如果 on_progress 是异步函数，则使用 await 调用；
-    否则使用同步调用。这允许子 Agent 进度事件通过
-    adispatch_custom_event 实时冒泡到主 graph。
+    通过 adispatch_custom_event 将子 agent 事件冒泡到父 graph 的 astream_events 流。
+    父 graph 的 config 通过 ctx.runnable_config 传递（在 _collect_subagent_events 中合并）。
     """
-    if on_progress:
-        result = on_progress(event)
-        if inspect.iscoroutine(result):
-            await result
+    from langchain_core.callbacks import adispatch_custom_event
+
+    parent_config = getattr(ctx, "runnable_config", None)
+    if parent_config is None:
+        return
+
+    try:
+        await adispatch_custom_event(
+            name="tool_progress",
+            data={
+                "tool_name": event.tool_name or "Agent",
+                "tool_call_id": ctx.parent_tool_call_id,
+                "agent_id": event.agent_id,
+                "phase": event.type,
+                "data": {
+                    "subagent_type": event.subagent_type,
+                    "summary": event.summary,
+                    "step": event.step,
+                    "parent_tool_use_id": event.parent_tool_use_id,
+                },
+            },
+            config=parent_config,
+        )
+    except Exception:
+        logger.debug("adispatch_custom_event failed in subagent progress", exc_info=True)
 
 
 async def _handle_tool_start_event(
     *,
     ctx: SubagentContext,
     event: dict[str, Any],
-    on_progress: Any,
     current_step: int,
     trace: SubagentExecutionTrace | None = None,
 ) -> tuple[int, str]:
@@ -235,7 +254,7 @@ async def _handle_tool_start_event(
         trace.add_tool_call(tool_call)
 
     await _emit_progress(
-        on_progress,
+        ctx,
         SubagentProgressEvent(
             type="tool_use",
             subagent_type=ctx.subagent_type,
@@ -287,7 +306,6 @@ async def _handle_tool_end_event(
     event: dict[str, Any],
     data: dict[str, Any],
     transcript: SubagentTranscriptManager,
-    on_progress: Any,
     step: int,
     trace: SubagentExecutionTrace | None = None,
 ) -> None:
@@ -316,7 +334,7 @@ async def _handle_tool_end_event(
     msg_dict = {"role": "tool", "tool_name": tool_name, "content": transcript_text}
     transcript.append(msg_dict)
     await _emit_progress(
-        on_progress,
+        ctx,
         SubagentProgressEvent(
             type="tool_result",
             subagent_type=ctx.subagent_type,
@@ -332,7 +350,6 @@ async def _handle_chat_model_end_event(
     *,
     ctx: SubagentContext,
     data: dict[str, Any],
-    on_progress: Any,
     collected_assistant_messages: list[Any],
     total_steps: int,
 ) -> int:
@@ -343,7 +360,7 @@ async def _handle_chat_model_end_event(
     if not has_tool_calls:
         total_steps += 1
         await _emit_progress(
-            on_progress,
+            ctx,
             SubagentProgressEvent(
                 type="model_step",
                 subagent_type=ctx.subagent_type,
@@ -379,7 +396,6 @@ async def _collect_subagent_events(
     graph_input: dict[str, Any],
     run_tags: list[str],
     transcript: SubagentTranscriptManager,
-    on_progress: Any,
     trace: SubagentExecutionTrace,
 ) -> _EventCollectionResult:
     collected_assistant_messages: list[Any] = []
@@ -389,10 +405,21 @@ async def _collect_subagent_events(
     last_tool_name = ""
     child_run_id: str | None = None
     tool_step = 0
+
+    # 构建子 graph config：合并父 runnable_config 使事件自动冒泡
+    config = {"tags": run_tags, "recursion_limit": 9999}
+    parent_runnable_config = getattr(ctx, "runnable_config", None)
+    if parent_runnable_config is not None:
+        if isinstance(parent_runnable_config, dict):
+            # 合并父 config 的 configurable 字段，使子 graph 事件冒泡到父 graph
+            configurable = parent_runnable_config.get("configurable", {})
+            if configurable:
+                config["configurable"] = configurable
+
     try:
         async for event in graph.astream_events(
             graph_input,
-            config={"tags": run_tags, "recursion_limit": 9999},
+            config=config,
             version="v2",
         ):
             event_name = event.get("event", "")
@@ -401,7 +428,6 @@ async def _collect_subagent_events(
                 tool_step, last_tool_name = await _handle_tool_start_event(
                     ctx=ctx,
                     event=event,
-                    on_progress=on_progress,
                     current_step=tool_step,
                     trace=trace,
                 )
@@ -411,7 +437,6 @@ async def _collect_subagent_events(
                     event=event,
                     data=data,
                     transcript=transcript,
-                    on_progress=on_progress,
                     step=tool_step,
                     trace=trace,
                 )
@@ -419,7 +444,6 @@ async def _collect_subagent_events(
                 total_steps = await _handle_chat_model_end_event(
                     ctx=ctx,
                     data=data,
-                    on_progress=on_progress,
                     collected_assistant_messages=collected_assistant_messages,
                     total_steps=total_steps,
                 )
@@ -455,7 +479,6 @@ async def _build_subagent_result(
     collected: _EventCollectionResult,
     transcript: SubagentTranscriptManager,
     allowed_tool_names: set[str] | None,
-    on_progress: Any,
     trace: SubagentExecutionTrace,
 ) -> SubagentResult:
     content = _extract_final_content(collected.collected_assistant_messages, allowed_tool_names)
@@ -473,7 +496,7 @@ async def _build_subagent_result(
     # 更新 trace 的 terminal_reason
     trace.terminal_reason = collected.terminal_reason
     await _emit_progress(
-        on_progress,
+        ctx,
         SubagentProgressEvent(
             type="completed",
             subagent_type=ctx.subagent_type,
@@ -499,7 +522,6 @@ async def run_subagent(
     ctx: SubagentContext,
     loader: Any,
     model: Any | None = None,
-    on_progress: Any = None,
     allowed_tool_names: set[str] | None = None,
 ) -> SubagentResult:
     """运行子 Agent（plain/fork 同步路径）。
@@ -508,7 +530,6 @@ async def run_subagent(
         ctx: 子 Agent 执行上下文
         loader: 子会话 ToolRuntimeLoader
         model: 语言模型（str 或 BaseChatModel），None 时继承 ctx.model
-        on_progress: 进度回调（Channel B），每个工具调用步骤触发（支持异步）
         allowed_tool_names: 工具白名单，用于识别 XML 退化格式（如 <Read>...</Read>）
 
     Returns:
@@ -542,7 +563,6 @@ async def run_subagent(
             graph_input=graph_input,
             run_tags=run_tags,
             transcript=transcript,
-            on_progress=on_progress,
             trace=trace,
         )
         return await _build_subagent_result(
@@ -550,7 +570,6 @@ async def run_subagent(
             collected=collected,
             transcript=transcript,
             allowed_tool_names=allowed_tool_names,
-            on_progress=on_progress,
             trace=trace,
         )
 
@@ -563,14 +582,13 @@ async def run_subagent_with_background_signal(
     ctx: SubagentContext,
     loader: Any,
     model: Any | None = None,
-    on_progress: Any = None,
     background_signal: asyncio.Event | None = None,
     on_background_request: Callable[[SubagentContext], str] | None = None,
     allowed_tool_names: set[str] | None = None,
 ) -> SubagentResult | BackgroundLaunchedResult:
     """同步执行中监听后台化信号（CC Promise.race 语义）。"""
     agent_task = asyncio.create_task(
-        run_subagent(ctx=ctx, loader=loader, model=model, on_progress=on_progress, allowed_tool_names=allowed_tool_names)
+        run_subagent(ctx=ctx, loader=loader, model=model, allowed_tool_names=allowed_tool_names)
     )
     if background_signal is None:
         return await agent_task

{langchain-agentx-python-0.4.5 → langchain-agentx-python-0.4.7}/langchain_agentx/observability/events/langchain_agentx_event_adapter.py

@@ -68,6 +68,7 @@ class LangchainAgentEventType(Enum):
     TOOL_CALL = "tool-call"
     TOOL_RESULT = "tool-result"
     TOOL_ERROR = "tool-error"
+    TOOL_PROGRESS = "tool-progress"
 
     # 步骤/循环
     START_STEP = "start-step"
@@ -1079,12 +1080,25 @@ class LangGraphToLangchainAgentEventAdapter:
     async def _handle_custom_event(
         self, event: Dict[str, Any]
     ) -> AsyncGenerator[LangchainAgentEvent, None]:
-        """处理 on_custom_event（子 Agent 事件冒泡）。
+        """处理 on_custom_event（工具/子 Agent 进度事件冒泡）。
 
-        当子 Agent 通过 adispatch_custom_event 发射进度事件时，
-        这些事件会通过主 graph 的 astream_events 流冒泡上来。
+        当工具通过 ctx.emit_progress() 或子 Agent 通过 adispatch_custom_event
+        发射进度事件时，这些事件会通过主 graph 的 astream_events 流冒泡上来。
 
-        事件格式：
+        事件格式（tool_progress，主 agent 工具）：
+        {
+            "event": "on_custom_event",
+            "name": "tool_progress",
+            "data": {
+                "tool_name": str,
+                "tool_call_id": str,
+                "agent_id": str,
+                "phase": str,  # 如 "running", "query_update", "search_results_received"
+                "data": dict,  # 工具特定的业务数据
+            }
+        }
+
+        事件格式（subagent_progress，子 agent 事件）：
         {
             "event": "on_custom_event",
             "name": "subagent_progress",
@@ -1103,6 +1117,28 @@ class LangGraphToLangchainAgentEventAdapter:
             return
 
         event_name = event.get("name", "")
+
+        # 处理主 agent 的工具进度事件（Bash、WebSearch 等）
+        if event_name == "tool_progress":
+            data = event.get("data", {})
+            if not isinstance(data, dict):
+                return
+
+            yield self._event(
+                event_type=LangchainAgentEventType.TOOL_PROGRESS,
+                data={
+                    "tool_name": data.get("tool_name", ""),
+                    "tool_call_id": data.get("tool_call_id", ""),
+                    "agent_id": data.get("agent_id", ""),
+                    "phase": data.get("phase", ""),
+                    "data": data.get("data", {}),
+                },
+                step_index=self.state.step_index,
+                tool_name=data.get("tool_name"),
+            )
+            return
+
+        # 处理子 agent 事件（兼容旧的 subagent_progress）
         if event_name != "subagent_progress":
             return
 

{langchain-agentx-python-0.4.5 → langchain-agentx-python-0.4.7}/langchain_agentx/tool_runtime/adapter.py

@@ -202,10 +202,6 @@ class LangChainAdapter:
         if "network_access_allowed" in configurable:
             network_access_allowed = bool(configurable.get("network_access_allowed"))
 
-        tool_progress_callback: Any | None = configurable.get("tool_progress_callback")
-        if tool_progress_callback is None and loop_config is not None:
-            tool_progress_callback = getattr(loop_config, "tool_progress_callback", None)
-
         # 保留原始 RunnableConfig 用于 adispatch_custom_event（子 Agent 事件冒泡）
         # 只在 config 非空时传递，避免工具层直接访问 LangGraph 内部字段
         runnable_config_to_pass: Any | None = None
@@ -245,7 +241,6 @@ class LangChainAdapter:
             question_preview_format=question_preview_format,
             capabilities=capabilities,
             network_access_allowed=network_access_allowed,
-            tool_progress_callback=tool_progress_callback,
             runnable_config=runnable_config_to_pass,
         )