Merge remote-tracking branch 'upstream/r-dev' into r-dev

# Conflicts:
#	src/memory_system/chat_history_summarizer.py
#	src/memory_system/memory_retrieval.py
#	src/memory_system/retrieval_tools/__init__.py
This commit is contained in:
A-Dawn
2026-04-01 14:20:22 +08:00
29 changed files with 434 additions and 304 deletions

View File

@@ -103,7 +103,6 @@ async def generate_reply(
available_actions: Optional[Dict[str, ActionInfo]] = None,
chosen_actions: Optional[List["ActionPlannerInfo"]] = None,
unknown_words: Optional[List[str]] = None,
enable_tool: bool = False,
enable_splitter: bool = True,
enable_chinese_typo: bool = True,
request_type: str = "generator_api",
@@ -133,7 +132,6 @@ async def generate_reply(
extra_info=extra_info,
available_actions=available_actions,
chosen_actions=chosen_actions,
enable_tool=enable_tool,
reply_message=reply_message,
reply_reason=reply_reason,
unknown_words=unknown_words,