Merge pull request #676 from AnguseZhang/chore/add_http_412

refactor: 提取工具重试退出逻辑为独立函数should_exit_retryLoop

Author: Rasic2

agents/matmaster_agent/flow_agents/execution_agent/agent.py

@@ -13,6 +13,9 @@
     DisallowTransferAndContentLimitLlmAgent,
 )
 from agents.matmaster_agent.flow_agents.constant import MATMASTER_SUPERVISOR_AGENT
+from agents.matmaster_agent.flow_agents.execution_agent.utils import (
+    should_exit_retryLoop,
+)
 from agents.matmaster_agent.flow_agents.model import PlanStepStatusEnum
 from agents.matmaster_agent.flow_agents.step_validation_agent.prompt import (
     STEP_VALIDATION_INSTRUCTION,
@@ -28,7 +31,7 @@
 from agents.matmaster_agent.locales import i18n
 from agents.matmaster_agent.logger import PrefixFilter
 from agents.matmaster_agent.prompt import MatMasterCheckTransferPrompt
-from agents.matmaster_agent.state import ERROR_DETAIL, ERROR_OCCURRED, PLAN
+from agents.matmaster_agent.state import PLAN
 from agents.matmaster_agent.sub_agents.mapping import (
     MatMasterSubAgentsEnum,
 )
@@ -368,15 +371,8 @@ async def _run_events(self, ctx: InvocationContext) -> AsyncGenerator[Event, Non
                             and ctx.session.state[PLAN]['steps'][index]['retry_count']
                             < MAX_TOOL_RETRIES
                         ):
-                            # 下载 results.txt 失败，退出同一工具重试
-                            DOWNLOAD_RESULTS_TXT_FAILED = (
-                                ctx.session.state[ERROR_OCCURRED]
-                                and ctx.session.state[ERROR_DETAIL].startswith(
-                                    'ClientResponseError'
-                                )
-                                and 'results.txt' in ctx.session.state[ERROR_DETAIL]
-                            )
-                            if DOWNLOAD_RESULTS_TXT_FAILED:
+                            # 对于某些错误，重试没有必要，直接退出
+                            if should_exit_retryLoop:
                                 break
 
                             validation_result = ctx.session.state.get(

agents/matmaster_agent/flow_agents/execution_agent/utils.py

@@ -0,0 +1,23 @@
+from google.adk.agents import InvocationContext
+
+from agents.matmaster_agent.state import ERROR_DETAIL, ERROR_OCCURRED
+
+
+def should_exit_retryLoop(ctx: InvocationContext) -> bool:
+    ANY_ERROR = ctx.session.state[ERROR_OCCURRED]
+
+    # 下载 results.txt 失败，退出同一工具重试
+    DOWNLOAD_RESULTS_TXT_FAILED = (
+        ANY_ERROR
+        and ctx.session.state[ERROR_DETAIL].startswith('ClientResponseError')
+        and 'results.txt' in ctx.session.state[ERROR_DETAIL]
+    )
+
+    # HTTP 412 ERROR
+    HTTP_412_ERROR = (
+        ANY_ERROR
+        and ctx.session.state[ERROR_DETAIL].startswith('HTTPStatusError')
+        and '412 Precondition Failed' in ctx.session.state[ERROR_DETAIL]
+    )
+
+    return DOWNLOAD_RESULTS_TXT_FAILED or HTTP_412_ERROR