PyPI - langchain-agentx-python - Versions diffs - 0.7.9__tar.gz → 0.8.1__tar.gz - Mend

Files changed (514) hide show

{langchain-agentx-python-0.7.9 → langchain-agentx-python-0.8.1}/langchain_agentx/loop/exit/exit_logic.py RENAMED Viewed

@@ -21,6 +21,7 @@ Agent Loop 退出逻辑与扩展状态定义。
 from __future__ import annotations
+import logging
 from typing import Any, NotRequired, TypedDict
 from langchain_core.messages import AIMessage
@@ -36,8 +37,84 @@ from .reason_codes import (
 )
 from ..config.runtime_settings import UNBOUNDED_MAX_STEPS
+_logger = logging.getLogger(__name__)
 # 需要继续执行的 finish_reason 集合（与 OpenCode 一致）
 CONTINUE_FINISH_REASONS = frozenset({"tool-calls", "unknown"})
+# extract_finish_reason 输出的框架归一化值（含内部写入 metadata 的哨兵，如 corrector 写 "tool-calls"）。
+# 维护规则：新增 extract_finish_reason 分支输出时同步补入；与 _PROVIDER_FINISH_REASONS 分离。
+_FRAMEWORK_NORMALIZED_FINISH_REASONS: frozenset[str] = frozenset(
+    {
+        "tool-calls",
+        "unknown",
+        "stop",
+        "length",
+        "content-filter",
+        "error",
+        "sensitive",
+    }
+)
+# merge_dicts 拼接还原白名单：provider 原始 finish_reason 枚举（非框架归一化输出）。
+# 维护规则：新增 provider 协议枚举时补入；框架哨兵见 _FRAMEWORK_NORMALIZED_FINISH_REASONS。
+_PROVIDER_FINISH_REASONS: frozenset[str] = frozenset(
+    {
+        # OpenAI 协议
+        "tool_calls",
+        "function_call",
+        "tool_use",
+        "stop",
+        "stop_sequence",
+        "length",
+        "max_tokens",
+        "content_filter",
+        "content-filter",
+        "refusal",
+        "error",
+        # Anthropic 协议
+        "end_turn",
+        # GLM / 国产模型特有
+        "sensitive",
+        # 部分 adapter 可能写入的继续哨兵（与 CONTINUE_FINISH_REASONS 对齐）
+        "unknown",
+    }
+)
+def _normalize_concat_finish_reason(raw: str) -> str:
+    """将 merge_dicts 拼接的畸形 finish_reason 还原为已知枚举值。
+    算法原理：
+        langchain_core.utils._merge.merge_dicts 合并流式 chunk 的 response_metadata 时，
+        对字符串值使用 ``+=`` 拼接。当每个 chunk 都携带相同 finish_reason（如 GLM），
+        N 个 ``"tool_calls"`` 会被拼成 ``"tool_callstool_calls...tool_calls"``。
+        本函数检测输入是否为白名单枚举的整数次重复，若是则还原为单次枚举。
+    与 merge_dicts 的关系：
+        对未拼接的正常枚举值是 no-op；仅修复拼接畸形。merge_dicts 行为变更不影响安全性。
+    白名单维护：
+        仅覆盖 provider 原始枚举（``_PROVIDER_FINISH_REASONS``）；框架归一化值见
+        ``_FRAMEWORK_NORMALIZED_FINISH_REASONS``，不在此做拼接还原。
+    未命中行为：
+        无法还原时原样透传；告警在 ``extract_finish_reason`` 分类完成后、对仍未识别的
+        provider 枚举打出（不含框架已归一化值）。
+    """
+    if raw in _FRAMEWORK_NORMALIZED_FINISH_REASONS:
+        return raw
+    if raw in _PROVIDER_FINISH_REASONS:
+        return raw
+    for base in _PROVIDER_FINISH_REASONS:
+        unit_len = len(base)
+        if len(raw) > unit_len and len(raw) % unit_len == 0:
+            repeat_count = len(raw) // unit_len
+            if raw == base * repeat_count:
+                return base
+    return raw
 # 可恢复终态集合（terminal_reason 枚举，先 withhold，由 loop_controller 走恢复链）
 RECOVERABLE_TERMINAL_REASONS = frozenset(
     {
@@ -82,7 +159,10 @@ def extract_finish_reason(response: AIMessage | None) -> str | None:
     if raw_reason is None:
         return None
-    finish_reason = str(raw_reason)
+    finish_reason = _normalize_concat_finish_reason(str(raw_reason))
+    if finish_reason in _FRAMEWORK_NORMALIZED_FINISH_REASONS:
+        return finish_reason
     if finish_reason in {"tool_calls", "function_call", "tool_use"}:
         return "tool-calls"
@@ -97,6 +177,10 @@ def extract_finish_reason(response: AIMessage | None) -> str | None:
     if finish_reason == "error":
         return "error"
+    if finish_reason:
+        _logger.warning(
+            "unrecognized finish_reason from provider metadata: %r", finish_reason
+        )
     return finish_reason

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

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

@@ -14,21 +14,31 @@ from __future__ import annotations
 from typing import Any
+DEFAULT_RECURSION_LIMIT = 9_999
 def merge_run_config(
     graph: Any,
     caller: dict[str, Any] | None = None,
 ) -> dict[str, Any]:
-    """合并 graph 绑定的 recursion_limit 与调用方 config。
+    """合并 graph 绑定 config 与调用方 config。
-    与 ``create_loop_agent(max_steps=...)`` 经 ``compute_recursion_limit`` 写入 graph 的上限对齐；
-    ``caller`` 中的同名字段可覆盖。
+    保留 graph 上通过 ``with_config`` 绑定的全部 LangGraph config（如
+    ``configurable`` / ``metadata``），同时让 ``caller`` 的同名字段覆盖。
+    对于 ``metadata`` 与 ``configurable`` 这两个嵌套 dict，采用浅合并，
+    避免调用方仅传部分字段时整体替换 graph 绑定值。
     """
     bound_raw = getattr(graph, "config", None)
-    bound: dict[str, Any] = bound_raw if isinstance(bound_raw, dict) else {}
-    limit = bound.get("recursion_limit", 9_999)
-    merged = build_agent_config(recursion_limit=limit)
-    if caller:
-        merged.update(caller)
+    bound: dict[str, Any] = dict(bound_raw) if isinstance(bound_raw, dict) else {}
+    bound.setdefault("recursion_limit", DEFAULT_RECURSION_LIMIT)
+    if not caller:
+        return bound
+    merged = dict(bound)
+    merged.update(caller)
+    if isinstance(bound.get("metadata"), dict) and isinstance(caller.get("metadata"), dict):
+        merged["metadata"] = {**bound["metadata"], **caller["metadata"]}
+    if isinstance(bound.get("configurable"), dict) and isinstance(caller.get("configurable"), dict):
+        merged["configurable"] = {**bound["configurable"], **caller["configurable"]}
     return merged

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

@@ -4,7 +4,7 @@
  [project]
  name = "langchain-agentx-python"
- version = "0.7.9"
+ version = "0.8.1"
  description = "LangChain/LangGraph-based agent utilities for CodeBaseX."
  readme = "README.md"
  requires-python = ">=3.11"
@@ -90,6 +90,8 @@ include-package-data = true
 [tool.pytest.ini_options]
+# 根 conftest.py 依赖 ``from tests._common...``；直接 ``pytest``（非 ``python -m pytest``）时须显式加入仓库根
+pythonpath = ["."]
 # importlib 模式：每个测试文件作为独立模块加载，不触发父包 __init__.py
 # 配合 tool_runtime/conftest.py 的 stub 注册，隔离 tool_runtime 测试与现有破损依赖
 addopts = "--import-mode=importlib"

langchain-agentx-python 0.7.9__tar.gz → 0.8.1__tar.gz

langchain-agentx-python 0.7.9tar.gz → 0.8.1tar.gz