mirror of
https://github.com/bytedance/deer-flow.git
synced 2026-04-25 11:18:22 +00:00
- title_middleware: drop the _resolve_title_config() try/except wrapper and the optional title_config=None fallback on every helper. after_model/aafter_model read runtime.context.app_config.title directly; helpers take TitleConfig as a required parameter. Matches the typed Runtime[DeerFlowContext] signature. - memory_middleware: drop resolve_context() call; use runtime.context directly since the type is already declared. - sandbox/tools.py: drop three layers of try/except Exception around resolve_context(runtime).app_config.sandbox. If the config can't be resolved that's a real bug that should surface, not be swallowed with a default. - task_tool.py: same — drop the try/except around resolve_context(). - client.py: drop the set_override() call in __init__ and _reload_config(). It was leaking overrides across test boundaries and the leak-free path (init() alone) is enough for the single-Client case. - conftest: autouse fixture that initializes a minimal AppConfig for every test so AppConfig.current() doesn't try to auto-load config.yaml. - test_title_middleware_core_logic: pass TitleConfig explicitly to helpers instead of patching AppConfig.current globally.
250 lines
9.7 KiB
Python
250 lines
9.7 KiB
Python
"""Middleware for memory mechanism."""
|
||
|
||
import logging
|
||
import re
|
||
from typing import Any, override
|
||
|
||
from langchain.agents import AgentState
|
||
from langchain.agents.middleware import AgentMiddleware
|
||
from langgraph.runtime import Runtime
|
||
|
||
from deerflow.agents.memory.queue import get_memory_queue
|
||
from deerflow.config.deer_flow_context import DeerFlowContext
|
||
from deerflow.runtime.user_context import get_effective_user_id
|
||
|
||
logger = logging.getLogger(__name__)
|
||
|
||
_UPLOAD_BLOCK_RE = re.compile(r"<uploaded_files>[\s\S]*?</uploaded_files>\n*", re.IGNORECASE)
|
||
_CORRECTION_PATTERNS = (
|
||
re.compile(r"\bthat(?:'s| is) (?:wrong|incorrect)\b", re.IGNORECASE),
|
||
re.compile(r"\byou misunderstood\b", re.IGNORECASE),
|
||
re.compile(r"\btry again\b", re.IGNORECASE),
|
||
re.compile(r"\bredo\b", re.IGNORECASE),
|
||
re.compile(r"不对"),
|
||
re.compile(r"你理解错了"),
|
||
re.compile(r"你理解有误"),
|
||
re.compile(r"重试"),
|
||
re.compile(r"重新来"),
|
||
re.compile(r"换一种"),
|
||
re.compile(r"改用"),
|
||
)
|
||
|
||
_REINFORCEMENT_PATTERNS = (
|
||
re.compile(r"\byes[,.]?\s+(?:exactly|perfect|that(?:'s| is) (?:right|correct|it))\b", re.IGNORECASE),
|
||
re.compile(r"\bperfect(?:[.!?]|$)", re.IGNORECASE),
|
||
re.compile(r"\bexactly\s+(?:right|correct)\b", re.IGNORECASE),
|
||
re.compile(r"\bthat(?:'s| is)\s+(?:exactly\s+)?(?:right|correct|what i (?:wanted|needed|meant))\b", re.IGNORECASE),
|
||
re.compile(r"\bkeep\s+(?:doing\s+)?that\b", re.IGNORECASE),
|
||
re.compile(r"\bjust\s+(?:like\s+)?(?:that|this)\b", re.IGNORECASE),
|
||
re.compile(r"\bthis is (?:great|helpful)\b(?:[.!?]|$)", re.IGNORECASE),
|
||
re.compile(r"\bthis is what i wanted\b(?:[.!?]|$)", re.IGNORECASE),
|
||
re.compile(r"对[,,]?\s*就是这样(?:[。!?!?.]|$)"),
|
||
re.compile(r"完全正确(?:[。!?!?.]|$)"),
|
||
re.compile(r"(?:对[,,]?\s*)?就是这个意思(?:[。!?!?.]|$)"),
|
||
re.compile(r"正是我想要的(?:[。!?!?.]|$)"),
|
||
re.compile(r"继续保持(?:[。!?!?.]|$)"),
|
||
)
|
||
|
||
|
||
class MemoryMiddlewareState(AgentState):
|
||
"""Compatible with the `ThreadState` schema."""
|
||
|
||
pass
|
||
|
||
|
||
def _extract_message_text(message: Any) -> str:
|
||
"""Extract plain text from message content for filtering and signal detection."""
|
||
content = getattr(message, "content", "")
|
||
if isinstance(content, list):
|
||
text_parts: list[str] = []
|
||
for part in content:
|
||
if isinstance(part, str):
|
||
text_parts.append(part)
|
||
elif isinstance(part, dict):
|
||
text_val = part.get("text")
|
||
if isinstance(text_val, str):
|
||
text_parts.append(text_val)
|
||
return " ".join(text_parts)
|
||
return str(content)
|
||
|
||
|
||
def _filter_messages_for_memory(messages: list[Any]) -> list[Any]:
|
||
"""Filter messages to keep only user inputs and final assistant responses.
|
||
|
||
This filters out:
|
||
- Tool messages (intermediate tool call results)
|
||
- AI messages with tool_calls (intermediate steps, not final responses)
|
||
- The <uploaded_files> block injected by UploadsMiddleware into human messages
|
||
(file paths are session-scoped and must not persist in long-term memory).
|
||
The user's actual question is preserved; only turns whose content is entirely
|
||
the upload block (nothing remains after stripping) are dropped along with
|
||
their paired assistant response.
|
||
|
||
Only keeps:
|
||
- Human messages (with the ephemeral upload block removed)
|
||
- AI messages without tool_calls (final assistant responses), unless the
|
||
paired human turn was upload-only and had no real user text.
|
||
|
||
Args:
|
||
messages: List of all conversation messages.
|
||
|
||
Returns:
|
||
Filtered list containing only user inputs and final assistant responses.
|
||
"""
|
||
filtered = []
|
||
skip_next_ai = False
|
||
for msg in messages:
|
||
msg_type = getattr(msg, "type", None)
|
||
|
||
if msg_type == "human":
|
||
content_str = _extract_message_text(msg)
|
||
if "<uploaded_files>" in content_str:
|
||
# Strip the ephemeral upload block; keep the user's real question.
|
||
stripped = _UPLOAD_BLOCK_RE.sub("", content_str).strip()
|
||
if not stripped:
|
||
# Nothing left — the entire turn was upload bookkeeping;
|
||
# skip it and the paired assistant response.
|
||
skip_next_ai = True
|
||
continue
|
||
# Rebuild the message with cleaned content so the user's question
|
||
# is still available for memory summarisation.
|
||
from copy import copy
|
||
|
||
clean_msg = copy(msg)
|
||
clean_msg.content = stripped
|
||
filtered.append(clean_msg)
|
||
skip_next_ai = False
|
||
else:
|
||
filtered.append(msg)
|
||
skip_next_ai = False
|
||
elif msg_type == "ai":
|
||
tool_calls = getattr(msg, "tool_calls", None)
|
||
if not tool_calls:
|
||
if skip_next_ai:
|
||
skip_next_ai = False
|
||
continue
|
||
filtered.append(msg)
|
||
# Skip tool messages and AI messages with tool_calls
|
||
|
||
return filtered
|
||
|
||
|
||
def detect_correction(messages: list[Any]) -> bool:
|
||
"""Detect explicit user corrections in recent conversation turns.
|
||
|
||
The queue keeps only one pending context per thread, so callers pass the
|
||
latest filtered message list. Checking only recent user turns keeps signal
|
||
detection conservative while avoiding stale corrections from long histories.
|
||
"""
|
||
recent_user_msgs = [msg for msg in messages[-6:] if getattr(msg, "type", None) == "human"]
|
||
|
||
for msg in recent_user_msgs:
|
||
content = _extract_message_text(msg).strip()
|
||
if not content:
|
||
continue
|
||
if any(pattern.search(content) for pattern in _CORRECTION_PATTERNS):
|
||
return True
|
||
|
||
return False
|
||
|
||
|
||
def detect_reinforcement(messages: list[Any]) -> bool:
|
||
"""Detect explicit positive reinforcement signals in recent conversation turns.
|
||
|
||
Complements detect_correction() by identifying when the user confirms the
|
||
agent's approach was correct. This allows the memory system to record what
|
||
worked well, not just what went wrong.
|
||
|
||
The queue keeps only one pending context per thread, so callers pass the
|
||
latest filtered message list. Checking only recent user turns keeps signal
|
||
detection conservative while avoiding stale signals from long histories.
|
||
"""
|
||
recent_user_msgs = [msg for msg in messages[-6:] if getattr(msg, "type", None) == "human"]
|
||
|
||
for msg in recent_user_msgs:
|
||
content = _extract_message_text(msg).strip()
|
||
if not content:
|
||
continue
|
||
if any(pattern.search(content) for pattern in _REINFORCEMENT_PATTERNS):
|
||
return True
|
||
|
||
return False
|
||
|
||
|
||
class MemoryMiddleware(AgentMiddleware[MemoryMiddlewareState]):
|
||
"""Middleware that queues conversation for memory update after agent execution.
|
||
|
||
This middleware:
|
||
1. After each agent execution, queues the conversation for memory update
|
||
2. Only includes user inputs and final assistant responses (ignores tool calls)
|
||
3. The queue uses debouncing to batch multiple updates together
|
||
4. Memory is updated asynchronously via LLM summarization
|
||
"""
|
||
|
||
state_schema = MemoryMiddlewareState
|
||
|
||
def __init__(self, agent_name: str | None = None):
|
||
"""Initialize the MemoryMiddleware.
|
||
|
||
Args:
|
||
agent_name: If provided, memory is stored per-agent. If None, uses global memory.
|
||
"""
|
||
super().__init__()
|
||
self._agent_name = agent_name
|
||
|
||
@override
|
||
def after_agent(self, state: MemoryMiddlewareState, runtime: Runtime[DeerFlowContext]) -> dict | None:
|
||
"""Queue conversation for memory update after agent completes.
|
||
|
||
Args:
|
||
state: The current agent state.
|
||
runtime: The runtime context.
|
||
|
||
Returns:
|
||
None (no state changes needed from this middleware).
|
||
"""
|
||
memory_config = runtime.context.app_config.memory
|
||
if not memory_config.enabled:
|
||
return None
|
||
|
||
thread_id = runtime.context.thread_id
|
||
if not thread_id:
|
||
logger.debug("No thread_id in context, skipping memory update")
|
||
return None
|
||
|
||
# Get messages from state
|
||
messages = state.get("messages", [])
|
||
if not messages:
|
||
logger.debug("No messages in state, skipping memory update")
|
||
return None
|
||
|
||
# Filter to only keep user inputs and final assistant responses
|
||
filtered_messages = _filter_messages_for_memory(messages)
|
||
|
||
# Only queue if there's meaningful conversation
|
||
# At minimum need one user message and one assistant response
|
||
user_messages = [m for m in filtered_messages if getattr(m, "type", None) == "human"]
|
||
assistant_messages = [m for m in filtered_messages if getattr(m, "type", None) == "ai"]
|
||
|
||
if not user_messages or not assistant_messages:
|
||
return None
|
||
|
||
# Queue the filtered conversation for memory update
|
||
correction_detected = detect_correction(filtered_messages)
|
||
reinforcement_detected = not correction_detected and detect_reinforcement(filtered_messages)
|
||
# Capture user_id at enqueue time while the request context is still alive.
|
||
# threading.Timer fires on a different thread where ContextVar values are not
|
||
# propagated, so we must store user_id explicitly in ConversationContext.
|
||
user_id = get_effective_user_id()
|
||
queue = get_memory_queue()
|
||
queue.add(
|
||
thread_id=thread_id,
|
||
messages=filtered_messages,
|
||
agent_name=self._agent_name,
|
||
user_id=user_id,
|
||
correction_detected=correction_detected,
|
||
reinforcement_detected=reinforcement_detected,
|
||
)
|
||
|
||
return None
|