langchain-agentx-python 0.2.5__tar.gz → 0.2.7__tar.gz

{langchain-agentx-python-0.2.5/langchain_agentx_python.egg-info → langchain-agentx-python-0.2.7}/PKG-INFO

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

{langchain-agentx-python-0.2.5 → langchain-agentx-python-0.2.7}/langchain_agentx/loop/graph/graph_edges.py

@@ -461,6 +461,20 @@ class LoopControllerEdge:
     ) -> str | None:
         if terminal_reason != TERMINAL_REASON_MAX_STEPS:
             return None
+
+        # 防重入保护：如果已经给过机会（force_text_exit=True），直接终止
+        if state.get("force_text_exit"):
+            # 已经注入过 MAX_STEPS_PROMPT 且清空了工具，模型仍返回 tool_calls 或未正确退出
+            # 此时直接终止，避免无限循环
+            emit_loop_decision_event(
+                state=state,
+                decision="terminal",
+                selected_edge=self._task_reconcile_or_end(state),
+                reason_code="max_steps_force_text_exit_failed",
+                evidence={"step": state.get("step", 0), "reason": "model did not comply with force_text_exit"},
+            )
+            return self._task_reconcile_or_end(state)
+
         messages = list(state.get("messages") or [])
         messages.append(AIMessage(content=MAX_STEPS_PROMPT))
         state["messages"] = messages

{langchain-agentx-python-0.2.5 → langchain-agentx-python-0.2.7}/langchain_agentx/loop/model/model_node.py

@@ -42,7 +42,7 @@ from ..exit.reason_codes import (
     TRANSITION_WITHHOLD_RECOVERY_RETRY,
 )
 from .retrier import ModelCallRetrier, RetryContext
-from .retry_bridge import build_retry_event_commands
+from .retry_bridge import emit_retry_events
 from .tool_and_model_binding import get_bound_model, handle_model_output
 from .tool_transcript_guard import repair_messages_for_llm_invoke
 
@@ -295,14 +295,13 @@ class ModelNode(Runnable):
             compaction_settings=self._compaction_settings,
         )
         if synth is not None:
-            model_response, retry_event_commands = synth, []
+            model_response = synth
         else:
-            model_response, retry_event_commands = self._run_sync(request, state, config=config)
+            model_response, _ = self._run_sync(request, state, config=config)
 
         return self._build_state_update(
             state=state,
             model_response=model_response,
-            retry_event_commands=retry_event_commands,
             mode="sync",
         )
 
@@ -319,14 +318,13 @@ class ModelNode(Runnable):
             compaction_settings=self._compaction_settings,
         )
         if synth is not None:
-            model_response, retry_event_commands = synth, []
+            model_response = synth
         else:
-            model_response, retry_event_commands = await self._arun_async(request, state, config=config)
+            model_response, _ = await self._arun_async(request, state, config=config)
 
         return self._build_state_update(
             state=state,
             model_response=model_response,
-            retry_event_commands=retry_event_commands,
             mode="async",
         )
 
@@ -360,9 +358,12 @@ class ModelNode(Runnable):
                 SystemMessage(content=effective) if effective is not None else None
             )
 
+        # force_text_exit: max_steps 达限时，清空工具列表强制模型输出文本
+        tools = [] if state.get("force_text_exit") else self._default_tools
+
         return _ModelRequest(
             model=self._model,
-            tools=self._default_tools,
+            tools=tools,
             system_message=system_message,
             response_format=self._initial_response_format,
             messages=state.get("messages", []),
@@ -463,10 +464,9 @@ class ModelNode(Runnable):
         config: RunnableConfig | None = None,
     ) -> tuple[Any, list[Command]]:
         """同步重试与降级执行。"""
-        retry_event_commands: list[Command] = []
         try:
             if self._retrier is None:
-                return self._invoke_bound(request, config=config), retry_event_commands
+                return self._invoke_bound(request, config=config), []
             retry_ctx = RetryContext(
                 scope="background" if state.get("retry_scope") == "background" else "foreground"
             )
@@ -474,11 +474,11 @@ class ModelNode(Runnable):
                 lambda: self._invoke_bound(request, config=config),
                 context=retry_ctx,
             )
-            retry_event_commands = build_retry_event_commands(retry_result.events)
-            return retry_result.value, retry_event_commands
+            emit_retry_events(retry_result.events)
+            return retry_result.value, []
         except Exception as primary_exc:
             if self._fallback_model is None:
-                return _synthetic_api_error_model_response(primary_exc, self._name), retry_event_commands
+                return _synthetic_api_error_model_response(primary_exc, self._name), []
             logger.warning(
                 "Primary model invoke failed; retrying once with fallback_model",
                 exc_info=True,
@@ -486,15 +486,15 @@ class ModelNode(Runnable):
             req_fb = request.override(model=self._fallback_model)
             try:
                 if self._retrier is None:
-                    return self._invoke_bound(req_fb, config=config), retry_event_commands
+                    return self._invoke_bound(req_fb, config=config), []
                 fb_result = self._retrier.invoke(
                     lambda: self._invoke_bound(req_fb, config=config),
                     context=retry_ctx,
                 )
-                retry_event_commands.extend(build_retry_event_commands(fb_result.events))
-                return fb_result.value, retry_event_commands
+                emit_retry_events(fb_result.events)
+                return fb_result.value, []
             except Exception as fb_exc:
-                return _synthetic_api_error_model_response(fb_exc, self._name), retry_event_commands
+                return _synthetic_api_error_model_response(fb_exc, self._name), []
 
     async def _arun_async(
         self,
@@ -504,10 +504,9 @@ class ModelNode(Runnable):
         config: RunnableConfig | None = None,
     ) -> tuple[Any, list[Command]]:
         """异步重试与降级执行。"""
-        retry_event_commands: list[Command] = []
         try:
             if self._retrier is None:
-                return await self._ainvoke_bound(request, config=config), retry_event_commands
+                return await self._ainvoke_bound(request, config=config), []
             retry_ctx = RetryContext(
                 scope="background" if state.get("retry_scope") == "background" else "foreground"
             )
@@ -515,11 +514,11 @@ class ModelNode(Runnable):
                 lambda: self._ainvoke_bound(request, config=config),
                 context=retry_ctx,
             )
-            retry_event_commands = build_retry_event_commands(retry_result.events)
-            return retry_result.value, retry_event_commands
+            emit_retry_events(retry_result.events)
+            return retry_result.value, []
         except Exception as primary_exc:
             if self._fallback_model is None:
-                return _synthetic_api_error_model_response(primary_exc, self._name), retry_event_commands
+                return _synthetic_api_error_model_response(primary_exc, self._name), []
             logger.warning(
                 "Primary model ainvoke failed; retrying once with fallback_model",
                 exc_info=True,
@@ -527,15 +526,15 @@ class ModelNode(Runnable):
             req_fb = request.override(model=self._fallback_model)
             try:
                 if self._retrier is None:
-                    return await self._ainvoke_bound(req_fb, config=config), retry_event_commands
+                    return await self._ainvoke_bound(req_fb, config=config), []
                 fb_result = await self._retrier.ainvoke(
                     lambda: self._ainvoke_bound(req_fb, config=config),
                     context=retry_ctx,
                 )
-                retry_event_commands.extend(build_retry_event_commands(fb_result.events))
-                return fb_result.value, retry_event_commands
+                emit_retry_events(fb_result.events)
+                return fb_result.value, []
             except Exception as fb_exc:
-                return _synthetic_api_error_model_response(fb_exc, self._name), retry_event_commands
+                return _synthetic_api_error_model_response(fb_exc, self._name), []
 
     # ===== 退出逻辑与状态更新 =====
 
@@ -544,7 +543,6 @@ class ModelNode(Runnable):
         *,
         state: dict,
         model_response: Any,
-        retry_event_commands: list[Command],
         mode: str,
     ) -> dict:
         """构建状态更新 + Command 列表。"""
@@ -584,7 +582,7 @@ class ModelNode(Runnable):
             base_state["structured_response"] = model_response.structured_response
             state_update["structured_response"] = model_response.structured_response
 
-        return [*retry_event_commands, Command(update=base_state), Command(update=state_update)]
+        return [Command(update=base_state), Command(update=state_update)]
 
     def _find_last_ai_message(self, messages: list[Any]) -> AIMessage | None:
         for msg in reversed(messages):

{langchain-agentx-python-0.2.5 → langchain-agentx-python-0.2.7}/langchain_agentx/loop/model/model_nodes.py

@@ -37,7 +37,7 @@ from ..exit.reason_codes import (
     TRANSITION_WITHHOLD_RECOVERY_EXHAUSTED,
     TRANSITION_WITHHOLD_RECOVERY_RETRY,
 )
-from .retry_bridge import build_retry_event_commands
+from .retry_bridge import emit_retry_events
 from .retrier import ModelCallRetrier, RetryContext
 from .tool_and_model_binding import get_bound_model, handle_model_output
 from .tool_transcript_guard import repair_messages_for_llm_invoke
@@ -200,7 +200,7 @@ class _ModelNodeBuilder:
             config: RunnableConfig | None = None,
         ) -> List[Command[Any]]:
             request = self._build_request(state, runtime)
-            model_response, retry_event_commands = self._run_sync_with_retries(
+            model_response, _ = self._run_sync_with_retries(
                 request,
                 state,
                 config=config,
@@ -208,7 +208,6 @@ class _ModelNodeBuilder:
             return self._build_commands_from_response(
                 state=state,
                 model_response=model_response,
-                retry_event_commands=retry_event_commands,
                 mode="sync",
             )
 
@@ -223,7 +222,7 @@ class _ModelNodeBuilder:
             config: RunnableConfig | None = None,
         ) -> List[Command[Any]]:
             request = self._build_request(state, runtime)
-            model_response, retry_event_commands = await self._run_async_with_retries(
+            model_response, _ = await self._run_async_with_retries(
                 request,
                 state,
                 config=config,
@@ -231,7 +230,6 @@ class _ModelNodeBuilder:
             return self._build_commands_from_response(
                 state=state,
                 model_response=model_response,
-                retry_event_commands=retry_event_commands,
                 mode="async",
             )
 
@@ -262,9 +260,12 @@ class _ModelNodeBuilder:
             )
             system_message = _SystemMessage(content=effective) if effective is not None else None
 
+        # force_text_exit: max_steps 达限时，清空工具列表强制模型输出文本
+        tools = [] if state.get("force_text_exit") else self._default_tools
+
         return _ModelRequest(
             model=self._model,
-            tools=self._default_tools,
+            tools=tools,
             system_message=system_message,
             response_format=self._initial_response_format,
             messages=state["messages"],
@@ -371,10 +372,9 @@ class _ModelNodeBuilder:
         )
         if synth is not None:
             return synth, []
-        retry_event_commands: list[Command[Any]] = []
         try:
             if self._retrier is None:
-                return self._invoke_bound_sync(request, config=config), retry_event_commands
+                return self._invoke_bound_sync(request, config=config), []
             retry_ctx = RetryContext(
                 scope="background" if state.get("retry_scope") == "background" else "foreground"
             )
@@ -382,11 +382,11 @@ class _ModelNodeBuilder:
                 lambda: self._invoke_bound_sync(request, config=config),
                 context=retry_ctx,
             )
-            retry_event_commands = build_retry_event_commands(retry_result.events)
-            return retry_result.value, retry_event_commands
+            emit_retry_events(retry_result.events)
+            return retry_result.value, []
         except Exception as primary_exc:
             if self._fallback_model is None:
-                return _synthetic_api_error_model_response(primary_exc, self._name), retry_event_commands
+                return _synthetic_api_error_model_response(primary_exc, self._name), []
             logger.warning(
                 "Primary model invoke failed; retrying once with fallback_model",
                 exc_info=True,
@@ -395,15 +395,15 @@ class _ModelNodeBuilder:
             req_fb.model = self._fallback_model
             try:
                 if self._retrier is None:
-                    return self._invoke_bound_sync(req_fb, config=config), retry_event_commands
+                    return self._invoke_bound_sync(req_fb, config=config), []
                 fb_result = self._retrier.invoke(
                     lambda: self._invoke_bound_sync(req_fb, config=config),
                     context=retry_ctx,
                 )
-                retry_event_commands.extend(build_retry_event_commands(fb_result.events))
-                return fb_result.value, retry_event_commands
+                emit_retry_events(fb_result.events)
+                return fb_result.value, []
             except Exception as fb_exc:
-                return _synthetic_api_error_model_response(fb_exc, self._name), retry_event_commands
+                return _synthetic_api_error_model_response(fb_exc, self._name), []
 
     async def _run_async_with_retries(
         self,
@@ -421,10 +421,9 @@ class _ModelNodeBuilder:
         )
         if synth is not None:
             return synth, []
-        retry_event_commands: list[Command[Any]] = []
         try:
             if self._retrier is None:
-                return await self._invoke_bound_async(request, config=config), retry_event_commands
+                return await self._invoke_bound_async(request, config=config), []
             retry_ctx = RetryContext(
                 scope="background" if state.get("retry_scope") == "background" else "foreground"
             )
@@ -432,11 +431,11 @@ class _ModelNodeBuilder:
                 lambda: self._invoke_bound_async(request, config=config),
                 context=retry_ctx,
             )
-            retry_event_commands = build_retry_event_commands(retry_result.events)
-            return retry_result.value, retry_event_commands
+            emit_retry_events(retry_result.events)
+            return retry_result.value, []
         except Exception as primary_exc:
             if self._fallback_model is None:
-                return _synthetic_api_error_model_response(primary_exc, self._name), retry_event_commands
+                return _synthetic_api_error_model_response(primary_exc, self._name), []
             logger.warning(
                 "Primary model ainvoke failed; retrying once with fallback_model",
                 exc_info=True,
@@ -445,22 +444,21 @@ class _ModelNodeBuilder:
             req_fb.model = self._fallback_model
             try:
                 if self._retrier is None:
-                    return await self._invoke_bound_async(req_fb, config=config), retry_event_commands
+                    return await self._invoke_bound_async(req_fb, config=config), []
                 fb_result = await self._retrier.ainvoke(
                     lambda: self._invoke_bound_async(req_fb, config=config),
                     context=retry_ctx,
                 )
-                retry_event_commands.extend(build_retry_event_commands(fb_result.events))
-                return fb_result.value, retry_event_commands
+                emit_retry_events(fb_result.events)
+                return fb_result.value, []
             except Exception as fb_exc:
-                return _synthetic_api_error_model_response(fb_exc, self._name), retry_event_commands
+                return _synthetic_api_error_model_response(fb_exc, self._name), []
 
     def _build_commands_from_response(
         self,
         *,
         state: AgentState[Any],
         model_response: Any,
-        retry_event_commands: list[Command[Any]],
         mode: str,
     ) -> List[Command[Any]]:
         last_ai_message = self._find_last_ai_message(model_response.result)
@@ -498,7 +496,7 @@ class _ModelNodeBuilder:
         if model_response.structured_response is not None:
             base_state["structured_response"] = model_response.structured_response
             state_update["structured_response"] = model_response.structured_response
-        return [*retry_event_commands, Command(update=base_state), Command(update=state_update)]
+        return [Command(update=base_state), Command(update=state_update)]
 
     def _find_last_ai_message(self, messages: list[Any]) -> AIMessage | None:
         for msg in reversed(messages):

{langchain-agentx-python-0.2.5 → langchain-agentx-python-0.2.7}/langchain_agentx/loop/model/retrier.py

@@ -92,15 +92,18 @@ class RetryClassifier:
 @dataclass(slots=True)
 class ModelRetryConfig:
     max_retries: int = 10
-    initial_delay: float = 0.5
+    initial_delay: float = 2.0
     backoff_factor: float = 2.0
-    max_delay: float = 32.0
+    max_delay: float = 60.0
     jitter: bool = True
     heartbeat_threshold_seconds: float = 30.0
     heartbeat_interval_seconds: float = 30.0
     retry_on: Callable[[Exception], bool] = default_retry_on
     allow_background_529_retry: bool = False
     auth_recovery_handler: AuthRecoveryHandler | None = None
+    # Fallback 机制：连续 N 次 429/529 后触发 fallback
+    max_consecutive_rate_limit: int = 3
+    fallback_model: Any | None = None
 
 
 @dataclass(slots=True)

langchain-agentx-python-0.2.7/langchain_agentx/loop/model/retry_bridge.py

@@ -0,0 +1,56 @@
+"""
+模型重试事件处理。
+
+职责：
+- 将 retrier 产出的事件记录到日志
+- 不再写入 messages state，避免污染 LLM 上下文
+- 事件通过 trace/observability 通道对外暴露（由外部系统订阅）
+
+重要变更：
+  旧版本将重试事件转为 SystemMessage 写入 state，导致：
+  - LLM 上下文被大量重试提示污染
+  - _strip_system_messages_from_state 需要额外处理这些消息
+
+  新版本仅记录日志和返回事件数据，由外部系统（如 trace 包）决定如何展示。
+"""
+
+from __future__ import annotations
+
+import logging
+from typing import Iterable
+
+from .retry_events import ModelRetryEvent
+
+logger = logging.getLogger(__name__)
+
+
+def _format_retry_event_message(event: ModelRetryEvent) -> str:
+    """格式化重试事件为可读字符串。"""
+    seconds = max(0, int(round(event.retry_in_ms / 1000)))
+    if event.event_type == "heartbeat":
+        prefix = "Retry still pending"
+    else:
+        prefix = "Retry scheduled"
+    return (
+        f"[{prefix}] in {seconds}s "
+        f"(attempt {event.attempt}/{event.max_retries}) "
+        f"{event.error_type}: {event.error_message}"
+    )
+
+
+def emit_retry_events(events: Iterable[ModelRetryEvent]) -> None:
+    """
+    发出重试事件（记录日志 + 返回原始事件数据）。
+
+    不再返回 Command，避免重试事件写入 messages state。
+    外部系统可通过 observability/trace 通道订阅这些事件。
+
+    Args:
+        events: 重试事件列表
+    """
+    for event in events:
+        msg = _format_retry_event_message(event)
+        logger.info("[ModelRetry] %s", msg)
+
+
+__all__ = ["emit_retry_events", "_format_retry_event_message"]

{langchain-agentx-python-0.2.5 → langchain-agentx-python-0.2.7}/langchain_agentx/provider/compatible_chat_openai.py

@@ -29,7 +29,26 @@ from langchain_openai import ChatOpenAI
 
 
 class CompatibleChatOpenAI(ChatOpenAI):
-    """OpenAI 兼容 ChatModel 封装（支持 reasoning_content）。"""
+    """OpenAI 兼容 ChatModel 封装（支持 reasoning_content）。
+
+    重要：本类默认禁用 OpenAI SDK 内置重试（max_retries=0），由外层 ModelCallRetrier
+    统一管理重试逻辑，避免双层重试导致请求放大问题。
+    """
+
+    def __init__(
+        self,
+        max_retries: int = 0,
+        **kwargs: Any,
+    ) -> None:
+        """
+        初始化 CompatibleChatOpenAI。
+
+        Args:
+            max_retries: OpenAI SDK 内置重试次数，默认 0（由外层 ModelCallRetrier 接管）。
+                        如需启用 SDK 内置重试，显式传入 max_retries > 0。
+            **kwargs: 传递给 ChatOpenAI 的其他参数。
+        """
+        super().__init__(max_retries=max_retries, **kwargs)
 
     def _get_request_payload(
         self,

{langchain-agentx-python-0.2.5 → langchain-agentx-python-0.2.7/langchain_agentx_python.egg-info}/PKG-INFO

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

{langchain-agentx-python-0.2.5 → langchain-agentx-python-0.2.7}/pyproject.toml

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

langchain-agentx-python-0.2.5/langchain_agentx/loop/model/retry_bridge.py

@@ -1,58 +0,0 @@
-"""
-模型重试事件到 loop message 的桥接。
-
-职责：
-- 将 retrier 产出的事件转为 SystemMessage
-- 由 model_node 统一并入 Command(update={"messages": ...})
-"""
-
-from __future__ import annotations
-
-from typing import Iterable
-
-from langchain_core.messages import SystemMessage
-from langgraph.types import Command
-
-from .retry_events import (
-    RETRY_EVENT_METADATA_FLAG,
-    RETRY_EVENT_SUBTYPE,
-    ModelRetryEvent,
-)
-
-
-def _format_retry_event_message(event: ModelRetryEvent) -> str:
-    seconds = max(0, int(round(event.retry_in_ms / 1000)))
-    if event.event_type == "heartbeat":
-        prefix = "Retry still pending"
-    else:
-        prefix = "Retry scheduled"
-    return (
-        f"[{prefix}] in {seconds}s "
-        f"(attempt {event.attempt}/{event.max_retries}) "
-        f"{event.error_type}: {event.error_message}"
-    )
-
-
-def build_retry_event_commands(events: Iterable[ModelRetryEvent]) -> list[Command]:
-    commands: list[Command] = []
-    for event in events:
-        msg = SystemMessage(
-            content=_format_retry_event_message(event),
-            response_metadata={
-                RETRY_EVENT_METADATA_FLAG: True,
-                "subtype": RETRY_EVENT_SUBTYPE,
-                "event_type": event.event_type,
-                "retry_in_ms": event.retry_in_ms,
-                "attempt": event.attempt,
-                "max_retries": event.max_retries,
-                "error": {
-                    "type": event.error_type,
-                    "message": event.error_message,
-                },
-            },
-        )
-        commands.append(Command(update={"messages": [msg]}))
-    return commands
-
-
-__all__ = ["build_retry_event_commands"]