langchain-agentx-python 1.8.0__tar.gz → 1.8.1__tar.gz

{langchain-agentx-python-1.8.0/langchain_agentx_python.egg-info → langchain-agentx-python-1.8.1}/PKG-INFO

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

{langchain-agentx-python-1.8.0 → langchain-agentx-python-1.8.1}/langchain_agentx/__init__.py

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

{langchain-agentx-python-1.8.0 → langchain-agentx-python-1.8.1}/langchain_agentx/observability/events/workflow_aware_event_adapter.py

@@ -54,28 +54,34 @@ class WorkflowAwareLangGraphEventAdapter:
     async def adapt(
         self, events: AsyncIterator[Dict[str, Any]]
     ) -> AsyncIterator[LangchainAgentEvent]:
-        async for raw_event in events:
-            root_session_id = self._extract_session_id(raw_event)
-            if root_session_id and self._should_update_root_fallback(
-                root_session_id,
-                self.graph_name,
-            ):
-                self._workflow_adapter.set_root_fallback_session_id(root_session_id)
-
-            for workflow_event in self._workflow_adapter.consume(raw_event):
+        try:
+            async for raw_event in events:
+                root_session_id = self._extract_session_id(raw_event)
+                if root_session_id and self._should_update_root_fallback(
+                    root_session_id,
+                    self.graph_name,
+                ):
+                    self._workflow_adapter.set_root_fallback_session_id(root_session_id)
+
+                for workflow_event in self._workflow_adapter.consume(raw_event):
+                    mapped = self._workflow_mapper.map(workflow_event)
+                    if mapped is not None:
+                        yield mapped
+
+                loop_session_id = self._workflow_adapter.resolve_loop_session_id_for_event(raw_event)
+                if loop_session_id:
+                    self._agent_projector.state.session_id = loop_session_id
+                elif root_session_id:
+                    self._agent_projector.state.session_id = root_session_id
+
+                async for agent_event in self._agent_projector.consume(raw_event):
+                    yield agent_event
+        finally:
+            for workflow_event in self._workflow_adapter.finalize():
                 mapped = self._workflow_mapper.map(workflow_event)
                 if mapped is not None:
                     yield mapped
 
-            loop_session_id = self._workflow_adapter.resolve_loop_session_id_for_event(raw_event)
-            if loop_session_id:
-                self._agent_projector.state.session_id = loop_session_id
-            elif root_session_id:
-                self._agent_projector.state.session_id = root_session_id
-
-            async for agent_event in self._agent_projector.consume(raw_event):
-                yield agent_event
-
     def _sync_workflow_session_id(self, raw_event: Dict[str, Any]) -> None:
         """Deprecated: session 同步已内联至 adapt()（先 reconcile stack 再派生 loop session）。"""
         root_session_id = self._extract_session_id(raw_event)

{langchain-agentx-python-1.8.0 → langchain-agentx-python-1.8.1}/langchain_agentx/workflow/event_adapter/adapter.py

@@ -6,6 +6,7 @@ adapter.py — Workflow 事件适配器主控制器
     - 维护 WorkflowAdapterState 状态机
     - 统一事件产出接口
     - 编排嵌套栈对齐（DepthResolver 推断 → WorkflowStack.reconcile_to_depth）
+    - 流结束补发 root workflow-end（P0 closeout finalize）
 
 链路位置：
     - Layer 3: Workflow 事件适配器
@@ -16,6 +17,7 @@ adapter.py — Workflow 事件适配器主控制器
     - 不包含 OrchestratorWorkflow 事件处理（Phase 2+）
 """
 
+import logging
 from typing import Any, Dict, List
 
 from langchain_agentx.workflow.event_adapter.types import (
@@ -41,6 +43,8 @@ from langchain_agentx.workflow.event_adapter.handlers.display_support import (
     stack_pattern,
 )
 
+logger = logging.getLogger(__name__)
+
 
 class WorkflowEventAdapter:
     """Workflow 事件适配器（主控制器）
@@ -174,10 +178,9 @@ class WorkflowEventAdapter:
                     WorkflowEventType.WORKFLOW_END,
                     {"workflow_id": self.workflow_id}
                 ))
-                self.state.pending_starts.pop("workflow", None)
 
         elif event_type == "on_chain_error" and not node and self._stack.current_depth == 0:
-            events.append(self._build_workflow_failed_event(event))
+            events.append(self._build_root_workflow_failed_event(event))
 
         # === Pattern 事件路由（使用 Handler.matches() 方法）===
         if self._stage_handler.matches(node):
@@ -209,35 +212,104 @@ class WorkflowEventAdapter:
             ))
 
         # === 后处理：回填 workflow_path 和其他字段 ===
-        for e in events:
-            if not e.workflow_path:
-                e.workflow_path = self._stack.build_path()
-            # SUBWORKFLOW_END 在 pop 前已绑定子 scope 的 path/depth/parent，不得覆盖
-            if e.event_type != WorkflowEventType.SUBWORKFLOW_END:
-                e.workflow_depth = self._stack.current_depth
-                e.parent_workflow_id = self._stack.parent_workflow_id
-            e.session_id = self._session_router.resolve_session_id(
-                e,
-                root_fallback_session_id=self._root_fallback_session_id,
+        events = self._post_process_workflow_events(events, bind_path_from_stack=True)
+
+        # === 更新 last_seen_node ===
+        if node:
+            self.state.last_seen_node = node
+
+        return events
+
+    def finalize(self) -> List[WorkflowEvent]:
+        """流结束时补发未发出的根 workflow 终态事件（P0 closeout）。"""
+        if not self.state.pending_starts.get("workflow"):
+            return []
+        if self.state.workflow_failed_emitted:
+            self.state.pending_starts.pop("workflow", None)
+            return []
+
+        open_child_identities = self._collect_open_child_structure_identities()
+        if open_child_identities:
+            logger.warning(
+                "workflow closeout forced with open child scopes: workflow_id=%r "
+                "open_identities=%r",
+                self.workflow_id,
+                sorted(open_child_identities),
             )
-            self.state.session_id = e.session_id
+
+        forced_end = WorkflowEvent(
+            event_type=WorkflowEventType.WORKFLOW_END,
+            data={
+                "workflow_id": self.workflow_id,
+                "closeout_forced": True,
+            },
+            workflow_id=self.workflow_id,
+            workflow_path=self.workflow_id,
+            workflow_depth=0,
+            parent_workflow_id=None,
+            session_id=self._root_fallback_session_id,
+        )
+        processed = self._post_process_workflow_events(
+            [forced_end],
+            bind_path_from_stack=False,
+        )
+        if processed:
+            self.state.pending_starts.pop("workflow", None)
+        return processed
+
+    def _post_process_workflow_events(
+        self,
+        events: List[WorkflowEvent],
+        *,
+        bind_path_from_stack: bool,
+    ) -> List[WorkflowEvent]:
+        for event in events:
+            if bind_path_from_stack and not event.workflow_path:
+                event.workflow_path = self._stack.build_path()
+            if bind_path_from_stack and event.event_type != WorkflowEventType.SUBWORKFLOW_END:
+                event.workflow_depth = self._stack.current_depth
+                event.parent_workflow_id = self._stack.parent_workflow_id
+            if event.session_id is None:
+                event.session_id = self._session_router.resolve_session_id(
+                    event,
+                    root_fallback_session_id=self._root_fallback_session_id,
+                )
+            if event.session_id:
+                self.state.session_id = event.session_id
 
         events = self._filter_lifecycle_events(events)
 
-        for e in events:
-            self._enrich_lifecycle_display(e)
+        for event in events:
+            self._enrich_lifecycle_display(event)
 
-        # === 更新序列号 ===
-        for e in events:
+        for event in events:
             self.state.sequence_no += 1
-            e.sequence_no = self.state.sequence_no
-
-        # === 更新 last_seen_node ===
-        if node:
-            self.state.last_seen_node = node
+            event.sequence_no = self.state.sequence_no
 
+        self._record_root_workflow_terminal_state(events)
         return events
 
+    def _record_root_workflow_terminal_state(self, events: List[WorkflowEvent]) -> None:
+        for event in events:
+            if event.workflow_depth != 0 or event.workflow_path != self.workflow_id:
+                continue
+            if event.event_type == WorkflowEventType.WORKFLOW_END:
+                self.state.pending_starts.pop("workflow", None)
+            elif event.event_type == WorkflowEventType.WORKFLOW_FAILED:
+                self.state.workflow_failed_emitted = True
+                self.state.pending_starts.pop("workflow", None)
+
+    def _collect_open_child_structure_identities(self) -> frozenset[str]:
+        open_children: set[str] = set()
+        for identity in self._lifecycle_guard.open_identities:
+            if "|scope:" not in identity:
+                continue
+            owner_path, scope_key = identity.rsplit("|scope:", 1)
+            if owner_path == self.workflow_id and scope_key == self.workflow_id:
+                continue
+            open_children.add(identity)
+        return frozenset(open_children)
+
     def _reconcile_stack_from_event(self, event: Dict[str, Any]) -> List[WorkflowEvent]:
         """编排：推断栈对齐目标 → reconcile → 产出 SUBWORKFLOW_* 事件。"""
         if self._should_skip_reconcile_during_nested_aggregate(event):
@@ -378,15 +450,29 @@ class WorkflowEventAdapter:
             parent_workflow_id=self._stack.parent_workflow_id,
         )
 
-    def _build_workflow_failed_event(self, event: Dict[str, Any]) -> WorkflowEvent:
-        """构建根 workflow 失败事件。
+    def _build_root_workflow_failed_event(self, event: Dict[str, Any]) -> WorkflowEvent:
+        """构建根 workflow 失败事件（强制 root 身份，不依赖脏 stack）。"""
+        metadata = event.get("metadata", {})
+        node = metadata.get("langgraph_node", "")
+        data = event.get("data", {})
 
-        Args:
-            event: LangGraph 错误事件
+        error_info = data.get("error") if isinstance(data, dict) else data
 
-        Returns:
-            WorkflowEvent 实例（event_type = WORKFLOW_FAILED）
-        """
+        return WorkflowEvent(
+            event_type=WorkflowEventType.WORKFLOW_FAILED,
+            data={
+                "error": str(error_info),
+                "error_type": type(error_info).__name__ if isinstance(error_info, Exception) else "WorkflowError",
+                "node": node,
+            },
+            workflow_id=self.workflow_id,
+            workflow_path=self.workflow_id,
+            workflow_depth=0,
+            parent_workflow_id=None,
+        )
+
+    def _build_workflow_failed_event(self, event: Dict[str, Any]) -> WorkflowEvent:
+        """构建 workflow 失败事件（保留 stack 上下文，供局部失败路径使用）。"""
         metadata = event.get("metadata", {})
         node = metadata.get("langgraph_node", "")
         data = event.get("data", {})

{langchain-agentx-python-1.8.0 → langchain-agentx-python-1.8.1}/langchain_agentx/workflow/event_adapter/types.py

@@ -243,6 +243,9 @@ class WorkflowAdapterState:
     # === Stage lifecycle（Doc31-R2-B：禁止 LangGraph unwind 重复 stage-start）===
     finished_stage_lifecycle_keys: set[str] = field(default_factory=set)
 
+    # === Root 终态（P0 closeout：failed 后不再 finalize workflow-end）===
+    workflow_failed_emitted: bool = False
+
     # === 辅助判断 ===
     last_seen_node: str = ""
 

{langchain-agentx-python-1.8.0 → langchain-agentx-python-1.8.1/langchain_agentx_python.egg-info}/PKG-INFO

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

{langchain-agentx-python-1.8.0 → langchain-agentx-python-1.8.1}/pyproject.toml

@@ -4,7 +4,7 @@
 
  [project]
  name = "langchain-agentx-python"
- version = "1.8.0"
+ version = "1.8.1"
  description = "LangChain/LangGraph-based agent utilities for CodeBaseX."
  readme = "README.md"
  requires-python = ">=3.11"