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

6

Browse Source
This commit is contained in:
tt-P607
2025-09-20 12:26:31 +08:00
committed by Windpicker-owo
parent d9f2cd084d
commit 610688f641
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/chat/replyer/default_generator.py
View File

@@ -907,7 +907,7 @@ class DefaultReplyer:
target = "(无消息内容)" target = "(无消息内容)"
person_info_manager = get_person_info_manager() person_info_manager = get_person_info_manager()
person_id = person_info_manager.get_person_id_by_person_name(sender) person_id = await person_info_manager.get_person_id_by_person_name(sender)
platform = chat_stream.platform platform = chat_stream.platform
target = replace_user_references_sync(target, chat_stream.platform, replace_bot_name=True) target = replace_user_references_sync(target, chat_stream.platform, replace_bot_name=True)
@@ -936,7 +936,7 @@ class DefaultReplyer:
# 获取目标用户信息，用于s4u模式 # 获取目标用户信息，用于s4u模式
target_user_info = None target_user_info = None
if sender: if sender:
target_user_info = person_info_manager.get_person_info_by_name(sender) target_user_info = await person_info_manager.get_person_info_by_name(sender)
from src.chat.utils.prompt import Prompt from src.chat.utils.prompt import Prompt
# 并行执行六个构建任务 # 并行执行六个构建任务

12
src/plugin_system/apis/cross_context_api.py
View File

@@ -53,14 +53,14 @@ async def build_cross_context_normal(chat_stream: ChatStream, other_chat_infos:
continue continue
try: try:
messages = get_raw_msg_before_timestamp_with_chat( messages = await get_raw_msg_before_timestamp_with_chat(
chat_id=stream_id, chat_id=stream_id,
timestamp=time.time(), timestamp=time.time(),
limit=5, # 可配置 limit=5, # 可配置
) )
if messages: if messages:
chat_name = get_chat_manager().get_stream_name(stream_id) or chat_raw_id chat_name = get_chat_manager().get_stream_name(stream_id) or chat_raw_id
formatted_messages, _ = build_readable_messages_with_id(messages, timestamp_mode="relative") formatted_messages, _ = await build_readable_messages_with_id(messages, timestamp_mode="relative")
cross_context_messages.append(f'[以下是来自"{chat_name}"的近期消息]\n{formatted_messages}') cross_context_messages.append(f'[以下是来自"{chat_name}"的近期消息]\n{formatted_messages}')
except Exception as e: except Exception as e:
logger.error(f"获取聊天 {chat_raw_id} 的消息失败: {e}") logger.error(f"获取聊天 {chat_raw_id} 的消息失败: {e}")
@@ -92,7 +92,7 @@ async def build_cross_context_s4u(
continue continue
try: try:
messages = get_raw_msg_before_timestamp_with_chat( messages = await get_raw_msg_before_timestamp_with_chat(
chat_id=stream_id, chat_id=stream_id,
timestamp=time.time(), timestamp=time.time(),
limit=20, # 获取更多消息以供筛选 limit=20, # 获取更多消息以供筛选
@@ -104,7 +104,7 @@ async def build_cross_context_s4u(
user_name = ( user_name = (
target_user_info.get("person_name") or target_user_info.get("user_nickname") or user_id target_user_info.get("person_name") or target_user_info.get("user_nickname") or user_id
) )
formatted_messages, _ = build_readable_messages_with_id( formatted_messages, _ = await build_readable_messages_with_id(
user_messages, timestamp_mode="relative" user_messages, timestamp_mode="relative"
) )
cross_context_messages.append( cross_context_messages.append(
@@ -161,14 +161,14 @@ async def get_chat_history_by_group_name(group_name: str) -> str:
stream_id = found_stream.stream_id stream_id = found_stream.stream_id
try: try:
messages = get_raw_msg_before_timestamp_with_chat( messages = await get_raw_msg_before_timestamp_with_chat(
chat_id=stream_id, chat_id=stream_id,
timestamp=time.time(), timestamp=time.time(),
limit=5, # 可配置 limit=5, # 可配置
) )
if messages: if messages:
chat_name = get_chat_manager().get_stream_name(stream_id) or chat_raw_id chat_name = get_chat_manager().get_stream_name(stream_id) or chat_raw_id
formatted_messages, _ = build_readable_messages_with_id(messages, timestamp_mode="relative") formatted_messages, _ = await build_readable_messages_with_id(messages, timestamp_mode="relative")
cross_context_messages.append(f'[以下是来自"{chat_name}"的近期消息]\n{formatted_messages}') cross_context_messages.append(f'[以下是来自"{chat_name}"的近期消息]\n{formatted_messages}')
except Exception as e: except Exception as e:
logger.error(f"获取聊天 {chat_raw_id} 的消息失败: {e}") logger.error(f"获取聊天 {chat_raw_id} 的消息失败: {e}")