langchain-agentx-python 1.6.8__tar.gz → 1.6.9__tar.gz

{langchain-agentx-python-1.6.8/langchain_agentx_python.egg-info → langchain-agentx-python-1.6.9}/PKG-INFO

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

{langchain-agentx-python-1.6.8 → langchain-agentx-python-1.6.9}/langchain_agentx/__init__.py

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

{langchain-agentx-python-1.6.8 → langchain-agentx-python-1.6.9}/langchain_agentx/observability/events/workflow_aware_event_adapter.py

@@ -64,7 +64,7 @@ class WorkflowAwareLangGraphEventAdapter:
                 if mapped is not None:
                     yield mapped
 
-            loop_session_id = self._workflow_adapter.resolve_active_loop_session_id()
+            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:

{langchain-agentx-python-1.6.8 → langchain-agentx-python-1.6.9}/langchain_agentx/workflow/event_adapter/adapter.py

@@ -118,11 +118,18 @@ class WorkflowEventAdapter:
         self.state.session_id = session_id
 
     def resolve_active_loop_session_id(self) -> str | None:
-        """按当前 active scope 派生 agent/loop session_id。"""
+        """按当前 active scope 派生 agent/loop session_id（结构容器兼容路径）。"""
         return self._session_router.resolve_active_loop_session_id(
             root_fallback_session_id=self._root_fallback_session_id,
         )
 
+    def resolve_loop_session_id_for_event(self, raw_event: Dict[str, Any]) -> str | None:
+        """按 raw event 自身身份派生 loop session_id（并发 agent 事件主路径）。"""
+        return self._session_router.resolve_loop_session_id_for_event(
+            raw_event,
+            root_fallback_session_id=self._root_fallback_session_id,
+        )
+
     def consume(self, event: Dict[str, Any]) -> List[WorkflowEvent]:
         """消费单个 LangGraph 事件，返回 WorkflowEvent 列表
 

{langchain-agentx-python-1.6.8 → langchain-agentx-python-1.6.9}/langchain_agentx/workflow/event_adapter/session_router.py

@@ -11,7 +11,7 @@ session_router.py — Workflow 结构/agent 事件 session_id 路由
     - 由 WorkflowEventAdapter 在事件产出后绑定 session_id
 
 当前裁剪范围：
-    - 仅派生 session_id，不维护 mutable 全局单槽
+    - 结构容器事件仍走 stack/path；agent/loop 事件优先无状态 resolve_loop_session_id_for_event
     - aggregate 使用 aggregate_key 作为 task_key，无 special case
 """
 
@@ -19,6 +19,7 @@ from __future__ import annotations
 
 from typing import Any
 
+from .depth_resolver import DepthResolver
 from .scope_resolver import WorkflowScopeResolver
 from .stack import WorkflowStack
 from .types import WorkflowEvent, WorkflowEventType
@@ -71,6 +72,35 @@ def _build_policy_session_id(workflow_id: str, task_key: str) -> str:
     )
 
 
+def _extract_loop_session_id_from_raw(raw_event: dict[str, Any]) -> str | None:
+    """从 raw LangGraph 事件读取 loop 产出端写入的 session_id（无共享栈）。"""
+    if not isinstance(raw_event, dict):
+        return None
+    data = raw_event.get("data")
+    if isinstance(data, dict):
+        input_data = data.get("input")
+        if isinstance(input_data, dict):
+            sid = input_data.get("_session_id")
+            if isinstance(sid, str) and sid:
+                return sid
+    metadata = raw_event.get("metadata")
+    if isinstance(metadata, dict):
+        configurable = metadata.get("configurable")
+        if isinstance(configurable, dict):
+            for key in ("_session_id", "session_id"):
+                sid = configurable.get(key)
+                if isinstance(sid, str) and sid:
+                    return sid
+    return None
+
+
+def _build_scope_path_from_segment_ids(root_workflow_id: str, segment_ids: list[str]) -> str | None:
+    """与 WorkflowStack.build_path() 主键格式一致：root>seg>seg。"""
+    if not segment_ids:
+        return None
+    return ">".join([root_workflow_id, *segment_ids])
+
+
 class WorkflowSessionRouter:
     """按 active scope contract 派生 structure / loop session_id。"""
 
@@ -84,34 +114,46 @@ class WorkflowSessionRouter:
         self._scope_resolver = scope_resolver
         self._stack = stack
         self._root_workflow_id = root_workflow_id
+        self._depth_resolver = DepthResolver()
 
-    def resolve_session_id(
+    def resolve_loop_session_id_for_event(
         self,
-        event: WorkflowEvent,
+        raw_event: dict[str, Any],
         *,
         root_fallback_session_id: str | None = None,
     ) -> str | None:
-        """为已产出的 WorkflowEvent 绑定 session_id。"""
-        if (
-            event.event_type in _ROOT_CONTAINER_EVENTS
-            and event.workflow_depth == 0
-        ):
-            return root_fallback_session_id
+        """按事件自身身份（非共享栈顶）派生 loop session_id（方案 A，并发安全）。"""
+        explicit = _extract_loop_session_id_from_raw(raw_event)
+        if explicit:
+            return explicit
+
+        scope_path = self._scope_path_from_raw_event(raw_event)
+        if scope_path:
+            entry = self._scope_resolver.scope_entry_at(scope_path)
+            if entry is not None:
+                return self._loop_session_from_scope_entry(
+                    entry,
+                    root_fallback_session_id=root_fallback_session_id,
+                )
 
-        task_key = self._task_key_from_event(event)
-        if not task_key:
-            return root_fallback_session_id
-
-        owner_workflow_id = self._owner_workflow_id()
-        return _build_policy_session_id(owner_workflow_id, task_key)
+        return root_fallback_session_id
 
-    def resolve_active_loop_session_id(
+    def _scope_path_from_raw_event(self, raw_event: dict[str, Any]) -> str | None:
+        metadata = raw_event.get("metadata") if isinstance(raw_event, dict) else None
+        if not isinstance(metadata, dict):
+            return None
+        checkpoint_ns = metadata.get("langgraph_checkpoint_ns", "")
+        if not isinstance(checkpoint_ns, str) or not checkpoint_ns:
+            return None
+        segment_ids = self._depth_resolver.segment_graph_node_ids(checkpoint_ns)
+        return _build_scope_path_from_segment_ids(self._root_workflow_id, segment_ids)
+
+    def _loop_session_from_scope_entry(
         self,
+        entry: dict[str, Any],
         *,
         root_fallback_session_id: str | None = None,
     ) -> str | None:
-        """为当前 stack 下的 agent 事件派生 loop session_id（无 WorkflowEvent 上下文）。"""
-        entry = self._scope_resolver.current_scope_entry()
         scope_kind = entry.get("scope_kind")
         graph_key = entry.get("graph_key")
 
@@ -124,16 +166,48 @@ class WorkflowSessionRouter:
             "route",
             "aggregate",
         ):
-            owner_workflow_id = str(entry.get("workflow_id") or self._owner_workflow_id())
+            owner_workflow_id = str(entry.get("workflow_id") or self._root_workflow_id)
             return _build_policy_session_id(owner_workflow_id, str(graph_key))
 
         task_key = self._task_key_from_scope_entry(entry)
         if task_key:
-            owner_workflow_id = str(entry.get("workflow_id") or self._owner_workflow_id())
+            owner_workflow_id = str(entry.get("workflow_id") or self._root_workflow_id)
             return _build_policy_session_id(owner_workflow_id, task_key)
 
         return root_fallback_session_id
 
+    def resolve_session_id(
+        self,
+        event: WorkflowEvent,
+        *,
+        root_fallback_session_id: str | None = None,
+    ) -> str | None:
+        """为已产出的 WorkflowEvent 绑定 session_id。"""
+        if (
+            event.event_type in _ROOT_CONTAINER_EVENTS
+            and event.workflow_depth == 0
+        ):
+            return root_fallback_session_id
+
+        task_key = self._task_key_from_event(event)
+        if not task_key:
+            return root_fallback_session_id
+
+        owner_workflow_id = self._owner_workflow_id()
+        return _build_policy_session_id(owner_workflow_id, task_key)
+
+    def resolve_active_loop_session_id(
+        self,
+        *,
+        root_fallback_session_id: str | None = None,
+    ) -> str | None:
+        """为当前 stack 下的 agent 事件派生 loop session_id（结构容器兼容路径）。"""
+        entry = self._scope_resolver.current_scope_entry()
+        return self._loop_session_from_scope_entry(
+            entry,
+            root_fallback_session_id=root_fallback_session_id,
+        )
+
     def _owner_workflow_id(self) -> str:
         entry = self._scope_resolver.current_scope_entry()
         workflow_id = entry.get("workflow_id")

{langchain-agentx-python-1.6.8 → langchain-agentx-python-1.6.9/langchain_agentx_python.egg-info}/PKG-INFO

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

{langchain-agentx-python-1.6.8 → langchain-agentx-python-1.6.9}/pyproject.toml

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