feat(context): 增强s4u跨上下文模式并重构API
在跨上下文功能中为s4u模式引入`s4u_ignore_whitelist`配置项。当启用时，除了白名单中配置的聊天记录外，还会自动获取目标用户与Bot的私聊记录，以构建更全面的用户画像。 主要变更： - 在 `ContextGroup` 配置中添加 `s4u_ignore_whitelist` 字段。 - 重构 `cross_context_api`，将 `get_context_groups` 更改为 `get_context_group`，使其返回完整的 `ContextGroup` 对象而非仅ID列表，以便于访问新配置。 - 调整 `build_cross_context_s4u` 函数以处理新逻辑，包括获取私聊记录和避免重复处理。 - 更新了配置文件模板以包含新选项的说明和示例。
This commit is contained in:
minecraft1024a
committed by
Windpicker-owo
Windpicker-owo
parent
7481962b64
commit
07d60d3604
@@ -13,13 +13,14 @@ from src.chat.utils.chat_message_builder import (
|
||||
)
|
||||
from src.common.logger import get_logger
|
||||
from src.config.config import global_config
|
||||
from src.config.official_configs import ContextGroup
|
||||
|
||||
logger = get_logger("cross_context_api")
|
||||
|
||||
|
||||
async def get_context_groups(chat_id: str) -> list[list[str]] | None:
|
||||
async def get_context_group(chat_id: str) -> ContextGroup | None:
|
||||
"""
|
||||
获取当前聊天所在的共享组的其他聊天ID
|
||||
获取当前聊天所在的共享组
|
||||
"""
|
||||
current_stream = await get_chat_manager().get_stream(chat_id)
|
||||
if not current_stream:
|
||||
@@ -39,8 +40,7 @@ async def get_context_groups(chat_id: str) -> list[list[str]] | None:
|
||||
# 排除maizone专用组
|
||||
if group.name == "maizone_context_group":
|
||||
continue
|
||||
# 返回组内其他聊天的 [type, id] 列表
|
||||
return [chat_info for chat_info in group.chat_ids if chat_info != [current_type, str(current_chat_raw_id)]]
|
||||
return group
|
||||
|
||||
return None
|
||||
|
||||
@@ -79,51 +79,85 @@ async def build_cross_context_normal(chat_stream: ChatStream, other_chat_infos:
|
||||
|
||||
async def build_cross_context_s4u(
|
||||
chat_stream: ChatStream,
|
||||
other_chat_infos: list[list[str]],
|
||||
context_group: ContextGroup,
|
||||
target_user_info: dict[str, Any] | None,
|
||||
) -> str:
|
||||
"""
|
||||
构建跨群聊/私聊上下文 (S4U模式)
|
||||
"""
|
||||
cross_context_messages = []
|
||||
if target_user_info:
|
||||
user_id = target_user_info.get("user_id")
|
||||
if not target_user_info or not (user_id := target_user_info.get("user_id")):
|
||||
return ""
|
||||
|
||||
if user_id:
|
||||
for chat_info in other_chat_infos:
|
||||
chat_type, chat_raw_id, limit = (
|
||||
chat_info[0],
|
||||
chat_info[1],
|
||||
int(chat_info[2]) if len(chat_info) > 2 else 5,
|
||||
chat_manager = get_chat_manager()
|
||||
current_chat_raw_id = (
|
||||
chat_stream.group_info.group_id if chat_stream.group_info else chat_stream.user_info.user_id
|
||||
)
|
||||
current_type = "group" if chat_stream.group_info else "private"
|
||||
|
||||
other_chat_infos = [
|
||||
chat_info
|
||||
for chat_info in context_group.chat_ids
|
||||
if chat_info[:2] != [current_type, str(current_chat_raw_id)]
|
||||
]
|
||||
|
||||
# 1. 处理在白名单内的聊天
|
||||
for chat_info in other_chat_infos:
|
||||
chat_type, chat_raw_id, limit = (
|
||||
chat_info[0],
|
||||
chat_info[1],
|
||||
int(chat_info[2]) if len(chat_info) > 2 else 5,
|
||||
)
|
||||
is_group = chat_type == "group"
|
||||
stream_id = chat_manager.get_stream_id(chat_stream.platform, chat_raw_id, is_group=is_group)
|
||||
if not stream_id:
|
||||
continue
|
||||
|
||||
try:
|
||||
messages = await get_raw_msg_before_timestamp_with_chat(
|
||||
chat_id=stream_id, timestamp=time.time(), limit=limit * 4
|
||||
)
|
||||
user_messages = [msg for msg in messages if msg.get("user_id") == user_id][-limit:]
|
||||
|
||||
if user_messages:
|
||||
chat_name = await chat_manager.get_stream_name(stream_id) or chat_raw_id
|
||||
user_name = target_user_info.get("person_name") or target_user_info.get("user_nickname") or user_id
|
||||
formatted_messages, _ = await build_readable_messages_with_id(
|
||||
user_messages, timestamp_mode="relative"
|
||||
)
|
||||
is_group = chat_type == "group"
|
||||
stream_id = get_chat_manager().get_stream_id(chat_stream.platform, chat_raw_id, is_group=is_group)
|
||||
if not stream_id:
|
||||
continue
|
||||
cross_context_messages.append(
|
||||
f'[以下是"{user_name}"在"{chat_name}"的近期发言]\n{formatted_messages}'
|
||||
)
|
||||
except Exception as e:
|
||||
logger.error(f"获取用户 {user_id} 在聊天 {chat_raw_id} 的消息失败: {e}")
|
||||
|
||||
try:
|
||||
# S4U模式下，我们获取更多消息以供筛选
|
||||
messages = await get_raw_msg_before_timestamp_with_chat(
|
||||
chat_id=stream_id,
|
||||
timestamp=time.time(),
|
||||
limit=limit * 4, # 获取4倍limit的消息以供筛选
|
||||
# 2. 如果开启了 s4u_ignore_whitelist，则获取用户与Bot的私聊记录
|
||||
if context_group.s4u_ignore_whitelist:
|
||||
private_stream_id = chat_manager.get_stream_id(chat_stream.platform, user_id, is_group=False)
|
||||
# 检查该私聊是否已在白名单中处理过
|
||||
is_already_processed = any(
|
||||
info[0] == "private" and info[1] == user_id for info in context_group.chat_ids
|
||||
)
|
||||
|
||||
if private_stream_id and not is_already_processed:
|
||||
try:
|
||||
limit = 5 # 使用默认值
|
||||
messages = await get_raw_msg_before_timestamp_with_chat(
|
||||
chat_id=private_stream_id, timestamp=time.time(), limit=limit * 4
|
||||
)
|
||||
user_messages = [msg for msg in messages if msg.get("user_id") == user_id][-limit:]
|
||||
|
||||
if user_messages:
|
||||
chat_name = await chat_manager.get_stream_name(private_stream_id) or user_id
|
||||
user_name = target_user_info.get("person_name") or target_user_info.get("user_nickname") or user_id
|
||||
formatted_messages, _ = await build_readable_messages_with_id(
|
||||
user_messages, timestamp_mode="relative"
|
||||
)
|
||||
user_messages = [msg for msg in messages if msg.get("user_id") == user_id][-limit:]
|
||||
|
||||
if user_messages:
|
||||
chat_name = await get_chat_manager().get_stream_name(stream_id) or chat_raw_id
|
||||
user_name = (
|
||||
target_user_info.get("person_name") or target_user_info.get("user_nickname") or user_id
|
||||
)
|
||||
formatted_messages, _ = await build_readable_messages_with_id(
|
||||
user_messages, timestamp_mode="relative"
|
||||
)
|
||||
cross_context_messages.append(
|
||||
f'[以下是"{user_name}"在"{chat_name}"的近期发言]\n{formatted_messages}'
|
||||
)
|
||||
except Exception as e:
|
||||
logger.error(f"获取用户 {user_id} 在聊天 {chat_raw_id} 的消息失败: {e}")
|
||||
continue
|
||||
cross_context_messages.append(
|
||||
f'[以下是"{user_name}"在与你的私聊中的近期发言]\n{formatted_messages}'
|
||||
)
|
||||
except Exception as e:
|
||||
logger.error(f"获取用户 {user_id} 的私聊消息失败: {e}")
|
||||
|
||||
if not cross_context_messages:
|
||||
return ""
|
||||
|
||||
Reference in New Issue
Block a user