gardel/Mofox-Core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

better：优化了取得聊天信息和strbuild函数，异步改为同步，优化了observation的加载

Browse Source
This commit is contained in:
SengokuCola
2025-06-04 13:42:19 +08:00
parent 25711e5b88
commit e483d0d94a
27 changed files with 185 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/chat/utils/chat_message_builder.py
View File

@@ -150,7 +150,7 @@ def num_new_messages_since_with_users(
return count_messages(message_filter=filter_query)
async def _build_readable_messages_internal(
def _build_readable_messages_internal(
messages: List[Dict[str, Any]],
replace_bot_name: bool = True,
merge_messages: bool = False,
@@ -214,7 +214,7 @@ async def _build_readable_messages_internal(
if replace_bot_name and user_id == global_config.bot.qq_account:
person_name = f"{global_config.bot.nickname}(你)"
else:
person_name = await person_info_manager.get_value(person_id, "person_name")
person_name = person_info_manager.get_value_sync(person_id, "person_name")
# 如果 person_name 未设置，则使用消息中的 nickname 或默认名称
if not person_name:
@@ -232,7 +232,7 @@ async def _build_readable_messages_internal(
aaa = match.group(1)
bbb = match.group(2)
reply_person_id = person_info_manager.get_person_id(platform, bbb)
reply_person_name = await person_info_manager.get_value(reply_person_id, "person_name")
reply_person_name = person_info_manager.get_value_sync(reply_person_id, "person_name")
if not reply_person_name:
reply_person_name = aaa
# 在内容前加上回复信息
@@ -249,7 +249,7 @@ async def _build_readable_messages_internal(
aaa = m.group(1)
bbb = m.group(2)
at_person_id = person_info_manager.get_person_id(platform, bbb)
at_person_name = await person_info_manager.get_value(at_person_id, "person_name")
at_person_name = person_info_manager.get_value_sync(at_person_id, "person_name")
if not at_person_name:
at_person_name = aaa
new_content += f"@{at_person_name}"
@@ -377,13 +377,13 @@ async def build_readable_messages_with_list(
将消息列表转换为可读的文本格式，并返回原始(时间戳, 昵称, 内容)列表。
允许通过参数控制格式化行为。
"""
formatted_string, details_list = await _build_readable_messages_internal(
formatted_string, details_list = _build_readable_messages_internal(
messages, replace_bot_name, merge_messages, timestamp_mode, truncate
)
return formatted_string, details_list
async def build_readable_messages(
def build_readable_messages(
messages: List[Dict[str, Any]],
replace_bot_name: bool = True,
merge_messages: bool = False,
@@ -398,7 +398,7 @@ async def build_readable_messages(
"""
if read_mark <= 0:
# 没有有效的 read_mark，直接格式化所有消息
formatted_string, _ = await _build_readable_messages_internal(
formatted_string, _ = _build_readable_messages_internal(
messages, replace_bot_name, merge_messages, timestamp_mode, truncate
)
return formatted_string
@@ -410,10 +410,10 @@ async def build_readable_messages(
# 分别格式化
# 注意：这里决定对已读和未读部分都应用相同的 truncate 设置
# 如果需要不同的行为（例如只截断已读部分），需要调整这里的调用
formatted_before, _ = await _build_readable_messages_internal(
formatted_before, _ = _build_readable_messages_internal(
messages_before_mark, replace_bot_name, merge_messages, timestamp_mode, truncate
)
formatted_after, _ = await _build_readable_messages_internal(
formatted_after, _ = _build_readable_messages_internal(
messages_after_mark,
replace_bot_name,
merge_messages,