refactor(chat): 将用户引用处理从同步改为异步,优化性能
This commit is contained in:
@@ -18,7 +18,7 @@ from src.chat.message_receive.uni_message_sender import HeartFCSender
|
||||
from src.chat.utils.chat_message_builder import (
|
||||
build_readable_messages,
|
||||
get_raw_msg_before_timestamp_with_chat,
|
||||
replace_user_references_sync,
|
||||
replace_user_references_async,
|
||||
)
|
||||
from src.chat.utils.memory_mappings import get_memory_type_chinese_label
|
||||
|
||||
@@ -1025,9 +1025,9 @@ class DefaultReplyer:
|
||||
sender_name = "未知用户"
|
||||
|
||||
# 处理消息内容中的用户引用,确保bot回复在消息内容中也正确显示
|
||||
from src.chat.utils.chat_message_builder import replace_user_references_sync
|
||||
from src.chat.utils.chat_message_builder import replace_user_references_async
|
||||
if msg_content:
|
||||
msg_content = replace_user_references_sync(
|
||||
msg_content = await replace_user_references_async(
|
||||
msg_content,
|
||||
platform,
|
||||
replace_bot_name=True
|
||||
@@ -1126,8 +1126,8 @@ class DefaultReplyer:
|
||||
sender_name = "未知用户"
|
||||
|
||||
# 处理消息内容中的用户引用,确保bot回复在消息内容中也正确显示
|
||||
from src.chat.utils.chat_message_builder import replace_user_references_sync
|
||||
msg_content = replace_user_references_sync(
|
||||
from src.chat.utils.chat_message_builder import replace_user_references_async
|
||||
msg_content = await replace_user_references_async(
|
||||
msg_content,
|
||||
platform,
|
||||
replace_bot_name=True
|
||||
@@ -1264,7 +1264,7 @@ class DefaultReplyer:
|
||||
person_id = await person_info_manager.get_person_id_by_person_name(sender)
|
||||
platform = chat_stream.platform
|
||||
|
||||
target = replace_user_references_sync(target, chat_stream.platform, replace_bot_name=True)
|
||||
target = await replace_user_references_async(target, chat_stream.platform, replace_bot_name=True)
|
||||
|
||||
# 构建action描述 (如果启用planner)
|
||||
action_descriptions = ""
|
||||
@@ -1909,9 +1909,6 @@ class DefaultReplyer:
|
||||
return ""
|
||||
|
||||
async def build_relation_info(self, sender: str, target: str):
|
||||
if not global_config.affinity_flow.enable_relationship_tracking:
|
||||
return ""
|
||||
|
||||
# 获取用户ID
|
||||
person_info_manager = get_person_info_manager()
|
||||
person_id = await person_info_manager.get_person_id_by_person_name(sender)
|
||||
|
||||
@@ -43,14 +43,13 @@ def replace_user_references_sync(
|
||||
return ""
|
||||
|
||||
if name_resolver is None:
|
||||
person_info_manager = get_person_info_manager()
|
||||
|
||||
def default_resolver(platform: str, user_id: str) -> str:
|
||||
# 检查是否是机器人自己
|
||||
if replace_bot_name and user_id == global_config.bot.qq_account:
|
||||
return f"{global_config.bot.nickname}(你)"
|
||||
person_id = PersonInfoManager.get_person_id(platform, user_id)
|
||||
return person_info_manager.get_value(person_id, "person_name") or user_id # type: ignore
|
||||
# 同步函数中无法使用异步的 get_value,直接返回 user_id
|
||||
# 建议调用方使用 replace_user_references_async 以获取完整的用户名
|
||||
return user_id
|
||||
|
||||
name_resolver = default_resolver
|
||||
|
||||
|
||||
@@ -1086,9 +1086,6 @@ class Prompt:
|
||||
Returns:
|
||||
str: 格式化后的关系信息字符串,或在失败时返回空字符串。
|
||||
"""
|
||||
if not global_config.affinity_flow.enable_relationship_tracking:
|
||||
return ""
|
||||
|
||||
from src.person_info.relationship_fetcher import relationship_fetcher_manager
|
||||
|
||||
relationship_fetcher = relationship_fetcher_manager.get_fetcher(chat_id)
|
||||
|
||||
Reference in New Issue
Block a user