Conversable support force_retry

Author: cinjospeh

dbgpt/agent/core/action/base.py

@@ -53,6 +53,8 @@ class ActionOutput(BaseModel):
     ask_user: Optional[bool] = False
     # 如果当前agent能确定下个发言者，需要在这里指定
     next_speakers: Optional[List[str]] = None
+    # 强制重试，不受重试次数影响限制
+    force_retry: Optional[bool] = False
 
     @model_validator(mode="before")
     @classmethod

dbgpt/agent/core/base_agent.py

@@ -355,7 +355,20 @@ async def generate_reply(
             fail_reason = None
             current_retry_counter = 0
             is_success = True
-            while current_retry_counter < self.max_retry_count:
+            force_retry = False
+            while force_retry or current_retry_counter < self.max_retry_count:
+                # Action force_retry 强制重试的处理: Action中明确指定需要进行重试，重试的消息按以下规则重新生成
+                # - 重新生成消息，保留上一轮的Action，并增加Rounds
+                # - 将上一轮的Action的Content作为当前输入消息
+                if force_retry:
+                    received_message.content = reply_message.action_report.content
+                    received_message.rounds = reply_message.rounds + 1
+                    reply_message = self._init_reply_message(
+                        received_message=received_message,
+                        rely_messages=rely_messages,
+                    )
+
+                # 普通重试的处理
                 if current_retry_counter > 0:
                     retry_message = self._init_reply_message(
                         received_message=received_message,
@@ -468,6 +481,20 @@ async def generate_reply(
 
                 question: str = received_message.content or ""
                 ai_message: str = llm_reply or ""
+
+                # force_retry means this reply do not complete, should reentry and do more things
+                force_retry = False
+                if act_out is not None and act_out.force_retry:
+                    await self.write_memories(
+                        question=question,
+                        ai_message=ai_message,
+                        action_output=act_out,
+                        check_pass=check_pass,
+                        check_fail_reason=fail_reason,
+                    )
+                    force_retry = True
+                    continue
+
                 # 5.Optimize wrong answers myself
                 if not check_pass:
                     if not act_out.have_retry: