فهرست منبع

fix(agent): sanitize multi-turn history and persist clean QA turns to prevent DeepSeek 400 error

jerry 2 ماه پیش
والد
کامیت
f7158e8a1f
2فایلهای تغییر یافته به همراه65 افزوده شده و 6 حذف شده
  1. 12 4
      app/services/agent/engine.py
  2. 53 2
      app/services/agent/memory.py

+ 12 - 4
app/services/agent/engine.py

@@ -146,8 +146,12 @@ class AgentEngine:
             final_answer = summary_reply.get("content", "已完成操作处理。")
             new_history_messages.append({"role": "assistant", "content": final_answer})
 
-        # 持久化更新历史记录到 Redis
-        await AgentMemory.append_messages(session_id, new_history_messages)
+        # 持久化更新历史记录到 Redis(只保存完整问答对,避免孤立 tool 消息和上下文暴涨)
+        if final_answer:
+            await AgentMemory.append_messages(session_id, [
+                {"role": "user", "content": request.message},
+                {"role": "assistant", "content": final_answer},
+            ])
 
         return AgentChatResponse(
             session_id=session_id,
@@ -280,8 +284,12 @@ class AgentEngine:
                 yield cls._format_sse("message", {"delta": final_answer, "full": final_answer})
                 new_history_messages.append({"role": "assistant", "content": final_answer})
 
-            # 更新记忆
-            await AgentMemory.append_messages(session_id, new_history_messages)
+            # 更新记忆(只保存完整问答对,避免孤立 tool 消息和跨轮上下文结构错乱)
+            if final_answer:
+                await AgentMemory.append_messages(session_id, [
+                    {"role": "user", "content": request.message},
+                    {"role": "assistant", "content": final_answer},
+                ])
 
             # 发送 finish 完成事件
             yield cls._format_sse("finish", {

+ 53 - 2
app/services/agent/memory.py

@@ -15,9 +15,59 @@ class AgentMemory:
     def _make_key(cls, session_id: str) -> str:
         return f"{SESSION_KEY_PREFIX}{session_id.strip()}"
 
+    @classmethod
+    def sanitize_messages(cls, messages: List[Dict[str, Any]]) -> List[Dict[str, Any]]:
+        """
+        清洗消息列表,确保严格符合 OpenAI / DeepSeek API 的结构约束:
+        1. 任何 role=='tool' 的消息前面必须紧跟一个包含该 tool_call_id 的 assistant 消息;
+        2. 任何带有 tool_calls 的 assistant 消息必须紧随其所有对应的 tool 返回消息;
+        3. 剔除孤立的 tool 消息或截断导致的残缺调用块,防止 DeepSeek HTTP 400 报错。
+        """
+        clean: List[Dict[str, Any]] = []
+        i = 0
+        n = len(messages)
+        while i < n:
+            msg = messages[i]
+            role = msg.get("role")
+
+            if role == "tool":
+                # 孤立的 tool 消息,前一个不是合法 assistant tool_calls,直接丢弃
+                if not clean or clean[-1].get("role") != "assistant" or not clean[-1].get("tool_calls"):
+                    i += 1
+                    continue
+                matching_ids = {tc.get("id") for tc in clean[-1].get("tool_calls", [])}
+                if msg.get("tool_call_id") not in matching_ids:
+                    i += 1
+                    continue
+                clean.append(msg)
+                i += 1
+
+            elif role == "assistant" and msg.get("tool_calls"):
+                expected_ids = {tc.get("id") for tc in msg.get("tool_calls", []) if tc.get("id")}
+                j = i + 1
+                tool_msgs = []
+                while j < n and messages[j].get("role") == "tool":
+                    tool_msgs.append(messages[j])
+                    j += 1
+                found_ids = {tm.get("tool_call_id") for tm in tool_msgs}
+
+                if expected_ids and expected_ids.issubset(found_ids):
+                    clean.append(msg)
+                    clean.extend(tool_msgs)
+                    i = j
+                else:
+                    if msg.get("content"):
+                        clean.append({"role": "assistant", "content": msg["content"]})
+                    i = j
+            else:
+                clean.append(msg)
+                i += 1
+
+        return clean
+
     @classmethod
     async def get_history(cls, session_id: Optional[str], max_messages: int = 20) -> List[Dict[str, Any]]:
-        """获取指定 session 的历史消息"""
+        """获取指定 session 的历史消息(经自动清洗与安全校验)"""
         if not session_id:
             return []
 
@@ -29,7 +79,8 @@ class AgentMemory:
                 return []
             history = json.loads(raw)
             if isinstance(history, list):
-                return history[-max_messages:]
+                sliced = history[-max_messages:]
+                return cls.sanitize_messages(sliced)
             return []
         except Exception as e:
             logger.warning(f"[AgentMemory] Failed to read history for session {session_id}: {e}")