fix：修改了文件结构
This commit is contained in:
SengokuCola
@@ -1,8 +1,8 @@
|
||||
from .emoji_manager import emoji_manager
|
||||
from .relationship_manager import relationship_manager
|
||||
from ..relationship.relationship_manager import relationship_manager
|
||||
from .chat_stream import chat_manager
|
||||
from .message_sender import message_manager
|
||||
from .storage import MessageStorage
|
||||
from ..storage.storage import MessageStorage
|
||||
from .auto_speak import auto_speak_manager
|
||||
|
||||
|
||||
|
||||
@@ -12,8 +12,8 @@ from .message import MessageSending, MessageRecv, MessageThinking, MessageSet
|
||||
from .chat_stream import chat_manager
|
||||
|
||||
from .message_sender import message_manager # 导入新的消息管理器
|
||||
from .relationship_manager import relationship_manager
|
||||
from .storage import MessageStorage
|
||||
from ..relationship.relationship_manager import relationship_manager
|
||||
from ..storage.storage import MessageStorage
|
||||
from .utils import is_mentioned_bot_in_message, get_recent_group_detailed_plain_text
|
||||
from .utils_image import image_path_to_base64
|
||||
from ..willing.willing_manager import willing_manager # 导入意愿管理器
|
||||
|
||||
@@ -7,7 +7,7 @@ from ...common.database import db
|
||||
from ..message.api import global_api
|
||||
from .message import MessageSending, MessageThinking, MessageSet
|
||||
|
||||
from .storage import MessageStorage
|
||||
from ..storage.storage import MessageStorage
|
||||
from ..config.config import global_config
|
||||
from .utils import truncate_message, calculate_typing_time
|
||||
|
||||
|
||||
@@ -1,383 +0,0 @@
|
||||
import asyncio
|
||||
from typing import Optional
|
||||
from src.common.logger import get_module_logger, LogConfig, RELATION_STYLE_CONFIG
|
||||
|
||||
from ...common.database import db
|
||||
from ..message.message_base import UserInfo
|
||||
from .chat_stream import ChatStream
|
||||
import math
|
||||
from bson.decimal128 import Decimal128
|
||||
|
||||
relationship_config = LogConfig(
|
||||
# 使用关系专用样式
|
||||
console_format=RELATION_STYLE_CONFIG["console_format"],
|
||||
file_format=RELATION_STYLE_CONFIG["file_format"],
|
||||
)
|
||||
logger = get_module_logger("rel_manager", config=relationship_config)
|
||||
|
||||
|
||||
class Impression:
|
||||
traits: str = None
|
||||
called: str = None
|
||||
know_time: float = None
|
||||
|
||||
relationship_value: float = None
|
||||
|
||||
|
||||
class Relationship:
|
||||
user_id: int = None
|
||||
platform: str = None
|
||||
gender: str = None
|
||||
age: int = None
|
||||
nickname: str = None
|
||||
relationship_value: float = None
|
||||
saved = False
|
||||
|
||||
def __init__(self, chat: ChatStream = None, data: dict = None):
|
||||
self.user_id = chat.user_info.user_id if chat else data.get("user_id", 0)
|
||||
self.platform = chat.platform if chat else data.get("platform", "")
|
||||
self.nickname = chat.user_info.user_nickname if chat else data.get("nickname", "")
|
||||
self.relationship_value = data.get("relationship_value", 0) if data else 0
|
||||
self.age = data.get("age", 0) if data else 0
|
||||
self.gender = data.get("gender", "") if data else ""
|
||||
|
||||
|
||||
class RelationshipManager:
|
||||
def __init__(self):
|
||||
self.relationships: dict[tuple[int, str], Relationship] = {} # 修改为使用(user_id, platform)作为键
|
||||
|
||||
async def update_relationship(self, chat_stream: ChatStream, data: dict = None, **kwargs) -> Optional[Relationship]:
|
||||
"""更新或创建关系
|
||||
Args:
|
||||
chat_stream: 聊天流对象
|
||||
data: 字典格式的数据（可选）
|
||||
**kwargs: 其他参数
|
||||
Returns:
|
||||
Relationship: 关系对象
|
||||
"""
|
||||
# 确定user_id和platform
|
||||
if chat_stream.user_info is not None:
|
||||
user_id = chat_stream.user_info.user_id
|
||||
platform = chat_stream.user_info.platform or "qq"
|
||||
else:
|
||||
platform = platform or "qq"
|
||||
|
||||
if user_id is None:
|
||||
raise ValueError("必须提供user_id或user_info")
|
||||
|
||||
# 使用(user_id, platform)作为键
|
||||
key = (user_id, platform)
|
||||
|
||||
# 检查是否在内存中已存在
|
||||
relationship = self.relationships.get(key)
|
||||
if relationship:
|
||||
# 如果存在，更新现有对象
|
||||
if isinstance(data, dict):
|
||||
for k, value in data.items():
|
||||
if hasattr(relationship, k) and value is not None:
|
||||
setattr(relationship, k, value)
|
||||
else:
|
||||
# 如果不存在，创建新对象
|
||||
if chat_stream.user_info is not None:
|
||||
relationship = Relationship(chat=chat_stream, **kwargs)
|
||||
else:
|
||||
raise ValueError("必须提供user_id或user_info")
|
||||
self.relationships[key] = relationship
|
||||
|
||||
# 保存到数据库
|
||||
await self.storage_relationship(relationship)
|
||||
relationship.saved = True
|
||||
|
||||
return relationship
|
||||
|
||||
async def update_relationship_value(self, chat_stream: ChatStream, **kwargs) -> Optional[Relationship]:
|
||||
"""更新关系值
|
||||
Args:
|
||||
user_id: 用户ID（可选，如果提供user_info则不需要）
|
||||
platform: 平台（可选，如果提供user_info则不需要）
|
||||
user_info: 用户信息对象（可选）
|
||||
**kwargs: 其他参数
|
||||
Returns:
|
||||
Relationship: 关系对象
|
||||
"""
|
||||
# 确定user_id和platform
|
||||
user_info = chat_stream.user_info
|
||||
if user_info is not None:
|
||||
user_id = user_info.user_id
|
||||
platform = user_info.platform or "qq"
|
||||
else:
|
||||
platform = platform or "qq"
|
||||
|
||||
if user_id is None:
|
||||
raise ValueError("必须提供user_id或user_info")
|
||||
|
||||
# 使用(user_id, platform)作为键
|
||||
key = (user_id, platform)
|
||||
|
||||
# 检查是否在内存中已存在
|
||||
relationship = self.relationships.get(key)
|
||||
if relationship:
|
||||
for k, value in kwargs.items():
|
||||
if k == "relationship_value":
|
||||
# 检查relationship.relationship_value是否为double类型
|
||||
if not isinstance(relationship.relationship_value, float):
|
||||
try:
|
||||
# 处理 Decimal128 类型
|
||||
if isinstance(relationship.relationship_value, Decimal128):
|
||||
relationship.relationship_value = float(relationship.relationship_value.to_decimal())
|
||||
else:
|
||||
relationship.relationship_value = float(relationship.relationship_value)
|
||||
logger.info(
|
||||
f"[关系管理] 用户 {user_id}({platform}) 的关系值已转换为double类型: {relationship.relationship_value}"
|
||||
) # noqa: E501
|
||||
except (ValueError, TypeError):
|
||||
# 如果不能解析/强转则将relationship.relationship_value设置为double类型的0
|
||||
relationship.relationship_value = 0.0
|
||||
logger.warning(f"[关系管理] 用户 {user_id}({platform}) 的无法转换为double类型，已设置为0")
|
||||
relationship.relationship_value += value
|
||||
await self.storage_relationship(relationship)
|
||||
relationship.saved = True
|
||||
return relationship
|
||||
else:
|
||||
# 如果不存在且提供了user_info，则创建新的关系
|
||||
if user_info is not None:
|
||||
return await self.update_relationship(chat_stream=chat_stream, **kwargs)
|
||||
logger.warning(f"[关系管理] 用户 {user_id}({platform}) 不存在，无法更新")
|
||||
return None
|
||||
|
||||
def get_relationship(self, chat_stream: ChatStream) -> Optional[Relationship]:
|
||||
"""获取用户关系对象
|
||||
Args:
|
||||
user_id: 用户ID（可选，如果提供user_info则不需要）
|
||||
platform: 平台（可选，如果提供user_info则不需要）
|
||||
user_info: 用户信息对象（可选）
|
||||
Returns:
|
||||
Relationship: 关系对象
|
||||
"""
|
||||
# 确定user_id和platform
|
||||
user_info = chat_stream.user_info
|
||||
platform = chat_stream.user_info.platform or "qq"
|
||||
if user_info is not None:
|
||||
user_id = user_info.user_id
|
||||
platform = user_info.platform or "qq"
|
||||
else:
|
||||
platform = platform or "qq"
|
||||
|
||||
if user_id is None:
|
||||
raise ValueError("必须提供user_id或user_info")
|
||||
|
||||
key = (user_id, platform)
|
||||
if key in self.relationships:
|
||||
return self.relationships[key]
|
||||
else:
|
||||
return None
|
||||
|
||||
async def load_relationship(self, data: dict) -> Relationship:
|
||||
"""从数据库加载或创建新的关系对象"""
|
||||
# 确保data中有platform字段，如果没有则默认为'qq'
|
||||
if "platform" not in data:
|
||||
data["platform"] = "qq"
|
||||
|
||||
rela = Relationship(data=data)
|
||||
rela.saved = True
|
||||
key = (rela.user_id, rela.platform)
|
||||
self.relationships[key] = rela
|
||||
return rela
|
||||
|
||||
async def load_all_relationships(self):
|
||||
"""加载所有关系对象"""
|
||||
all_relationships = db.relationships.find({})
|
||||
for data in all_relationships:
|
||||
await self.load_relationship(data)
|
||||
|
||||
async def _start_relationship_manager(self):
|
||||
"""每5分钟自动保存一次关系数据"""
|
||||
# 获取所有关系记录
|
||||
all_relationships = db.relationships.find({})
|
||||
# 依次加载每条记录
|
||||
for data in all_relationships:
|
||||
await self.load_relationship(data)
|
||||
logger.debug(f"[关系管理] 已加载 {len(self.relationships)} 条关系记录")
|
||||
|
||||
while True:
|
||||
logger.debug("正在自动保存关系")
|
||||
await asyncio.sleep(300) # 等待300秒(5分钟)
|
||||
await self._save_all_relationships()
|
||||
|
||||
async def _save_all_relationships(self):
|
||||
"""将所有关系数据保存到数据库"""
|
||||
# 保存所有关系数据
|
||||
for _, relationship in self.relationships.items():
|
||||
if not relationship.saved:
|
||||
relationship.saved = True
|
||||
await self.storage_relationship(relationship)
|
||||
|
||||
async def storage_relationship(self, relationship: Relationship):
|
||||
"""将关系记录存储到数据库中"""
|
||||
user_id = relationship.user_id
|
||||
platform = relationship.platform
|
||||
nickname = relationship.nickname
|
||||
relationship_value = relationship.relationship_value
|
||||
gender = relationship.gender
|
||||
age = relationship.age
|
||||
saved = relationship.saved
|
||||
|
||||
db.relationships.update_one(
|
||||
{"user_id": user_id, "platform": platform},
|
||||
{
|
||||
"$set": {
|
||||
"platform": platform,
|
||||
"nickname": nickname,
|
||||
"relationship_value": relationship_value,
|
||||
"gender": gender,
|
||||
"age": age,
|
||||
"saved": saved,
|
||||
}
|
||||
},
|
||||
upsert=True,
|
||||
)
|
||||
|
||||
def get_name(self, user_id: int = None, platform: str = None, user_info: UserInfo = None) -> str:
|
||||
"""获取用户昵称
|
||||
Args:
|
||||
user_id: 用户ID（可选，如果提供user_info则不需要）
|
||||
platform: 平台（可选，如果提供user_info则不需要）
|
||||
user_info: 用户信息对象（可选）
|
||||
Returns:
|
||||
str: 用户昵称
|
||||
"""
|
||||
# 确定user_id和platform
|
||||
if user_info is not None:
|
||||
user_id = user_info.user_id
|
||||
platform = user_info.platform or "qq"
|
||||
else:
|
||||
platform = platform or "qq"
|
||||
|
||||
if user_id is None:
|
||||
raise ValueError("必须提供user_id或user_info")
|
||||
|
||||
# 确保user_id是整数类型
|
||||
user_id = int(user_id)
|
||||
key = (user_id, platform)
|
||||
if key in self.relationships:
|
||||
return self.relationships[key].nickname
|
||||
elif user_info is not None:
|
||||
return user_info.user_nickname or user_info.user_cardname or "某人"
|
||||
else:
|
||||
return "某人"
|
||||
|
||||
async def calculate_update_relationship_value(self, chat_stream: ChatStream, label: str, stance: str) -> None:
|
||||
"""计算变更关系值
|
||||
新的关系值变更计算方式：
|
||||
将关系值限定在-1000到1000
|
||||
对于关系值的变更，期望：
|
||||
1.向两端逼近时会逐渐减缓
|
||||
2.关系越差，改善越难，关系越好，恶化越容易
|
||||
3.人维护关系的精力往往有限，所以当高关系值用户越多，对于中高关系值用户增长越慢
|
||||
"""
|
||||
stancedict = {
|
||||
"支持": 0,
|
||||
"中立": 1,
|
||||
"反对": 2,
|
||||
}
|
||||
|
||||
valuedict = {
|
||||
"开心": 1.5,
|
||||
"愤怒": -3.5,
|
||||
"悲伤": -1.5,
|
||||
"惊讶": 0.6,
|
||||
"害羞": 2.0,
|
||||
"平静": 0.3,
|
||||
"恐惧": -2,
|
||||
"厌恶": -2.5,
|
||||
"困惑": 0.5,
|
||||
}
|
||||
if self.get_relationship(chat_stream):
|
||||
old_value = self.get_relationship(chat_stream).relationship_value
|
||||
else:
|
||||
return
|
||||
|
||||
if old_value > 1000:
|
||||
old_value = 1000
|
||||
elif old_value < -1000:
|
||||
old_value = -1000
|
||||
|
||||
value = valuedict[label]
|
||||
if old_value >= 0:
|
||||
if valuedict[label] >= 0 and stancedict[stance] != 2:
|
||||
value = value * math.cos(math.pi * old_value / 2000)
|
||||
if old_value > 500:
|
||||
high_value_count = 0
|
||||
for _, relationship in self.relationships.items():
|
||||
if relationship.relationship_value >= 700:
|
||||
high_value_count += 1
|
||||
if old_value >= 700:
|
||||
value *= 3 / (high_value_count + 2) # 排除自己
|
||||
else:
|
||||
value *= 3 / (high_value_count + 3)
|
||||
elif valuedict[label] < 0 and stancedict[stance] != 0:
|
||||
value = value * math.exp(old_value / 1000)
|
||||
else:
|
||||
value = 0
|
||||
elif old_value < 0:
|
||||
if valuedict[label] >= 0 and stancedict[stance] != 2:
|
||||
value = value * math.exp(old_value / 1000)
|
||||
elif valuedict[label] < 0 and stancedict[stance] != 0:
|
||||
value = value * math.cos(math.pi * old_value / 2000)
|
||||
else:
|
||||
value = 0
|
||||
|
||||
level_num = self.calculate_level_num(old_value + value)
|
||||
relationship_level = ["厌恶", "冷漠", "一般", "友好", "喜欢", "暧昧"]
|
||||
logger.info(
|
||||
f"当前关系: {relationship_level[level_num]}, "
|
||||
f"关系值: {old_value:.2f}, "
|
||||
f"当前立场情感: {stance}-{label}, "
|
||||
f"变更: {value:+.5f}"
|
||||
)
|
||||
|
||||
await self.update_relationship_value(chat_stream=chat_stream, relationship_value=value)
|
||||
|
||||
def build_relationship_info(self, person) -> str:
|
||||
relationship_value = relationship_manager.get_relationship(person).relationship_value
|
||||
level_num = self.calculate_level_num(relationship_value)
|
||||
relationship_level = ["厌恶", "冷漠", "一般", "友好", "喜欢", "暧昧"]
|
||||
relation_prompt2_list = [
|
||||
"冷漠回应",
|
||||
"冷淡回复",
|
||||
"保持理性",
|
||||
"愿意回复",
|
||||
"积极回复",
|
||||
"无条件支持",
|
||||
]
|
||||
if person.user_info.user_cardname:
|
||||
return (
|
||||
f"你对昵称为'[({person.user_info.user_id}){person.user_info.user_nickname}]{person.user_info.user_cardname}'的用户的态度为{relationship_level[level_num]}，"
|
||||
f"回复态度为{relation_prompt2_list[level_num]}，关系等级为{level_num}。"
|
||||
)
|
||||
else:
|
||||
return (
|
||||
f"你对昵称为'({person.user_info.user_id}){person.user_info.user_nickname}'的用户的态度为{relationship_level[level_num]}，"
|
||||
f"回复态度为{relation_prompt2_list[level_num]}，关系等级为{level_num}。"
|
||||
)
|
||||
|
||||
def calculate_level_num(self, relationship_value) -> int:
|
||||
"""关系等级计算"""
|
||||
if -1000 <= relationship_value < -227:
|
||||
level_num = 0
|
||||
elif -227 <= relationship_value < -73:
|
||||
level_num = 1
|
||||
elif -73 <= relationship_value < 227:
|
||||
level_num = 2
|
||||
elif 227 <= relationship_value < 587:
|
||||
level_num = 3
|
||||
elif 587 <= relationship_value < 900:
|
||||
level_num = 4
|
||||
elif 900 <= relationship_value <= 1000:
|
||||
level_num = 5
|
||||
else:
|
||||
level_num = 5 if relationship_value > 1000 else 0
|
||||
return level_num
|
||||
|
||||
|
||||
relationship_manager = RelationshipManager()
|
||||
@@ -1,52 +0,0 @@
|
||||
from typing import Union
|
||||
|
||||
from ...common.database import db
|
||||
from .message import MessageSending, MessageRecv
|
||||
from .chat_stream import ChatStream
|
||||
from src.common.logger import get_module_logger
|
||||
|
||||
logger = get_module_logger("message_storage")
|
||||
|
||||
|
||||
class MessageStorage:
|
||||
async def store_message(self, message: Union[MessageSending, MessageRecv], chat_stream: ChatStream) -> None:
|
||||
"""存储消息到数据库"""
|
||||
try:
|
||||
message_data = {
|
||||
"message_id": message.message_info.message_id,
|
||||
"time": message.message_info.time,
|
||||
"chat_id": chat_stream.stream_id,
|
||||
"chat_info": chat_stream.to_dict(),
|
||||
"user_info": message.message_info.user_info.to_dict(),
|
||||
"processed_plain_text": message.processed_plain_text,
|
||||
"detailed_plain_text": message.detailed_plain_text,
|
||||
"memorized_times": message.memorized_times,
|
||||
}
|
||||
db.messages.insert_one(message_data)
|
||||
except Exception:
|
||||
logger.exception("存储消息失败")
|
||||
|
||||
async def store_recalled_message(self, message_id: str, time: str, chat_stream: ChatStream) -> None:
|
||||
"""存储撤回消息到数据库"""
|
||||
if "recalled_messages" not in db.list_collection_names():
|
||||
db.create_collection("recalled_messages")
|
||||
else:
|
||||
try:
|
||||
message_data = {
|
||||
"message_id": message_id,
|
||||
"time": time,
|
||||
"stream_id": chat_stream.stream_id,
|
||||
}
|
||||
db.recalled_messages.insert_one(message_data)
|
||||
except Exception:
|
||||
logger.exception("存储撤回消息失败")
|
||||
|
||||
async def remove_recalled_message(self, time: str) -> None:
|
||||
"""删除撤回消息"""
|
||||
try:
|
||||
db.recalled_messages.delete_many({"time": {"$lt": time - 300}})
|
||||
except Exception:
|
||||
logger.exception("删除撤回消息失败")
|
||||
|
||||
|
||||
# 如果需要其他存储相关的函数，可以在这里添加
|
||||
@@ -1,49 +0,0 @@
|
||||
from typing import List, Optional
|
||||
|
||||
|
||||
from ..models.utils_model import LLM_request
|
||||
from ..config.config import global_config
|
||||
from src.common.logger import get_module_logger, LogConfig, TOPIC_STYLE_CONFIG
|
||||
|
||||
# 定义日志配置
|
||||
topic_config = LogConfig(
|
||||
# 使用海马体专用样式
|
||||
console_format=TOPIC_STYLE_CONFIG["console_format"],
|
||||
file_format=TOPIC_STYLE_CONFIG["file_format"],
|
||||
)
|
||||
|
||||
logger = get_module_logger("topic_identifier", config=topic_config)
|
||||
|
||||
|
||||
class TopicIdentifier:
|
||||
def __init__(self):
|
||||
self.llm_topic_judge = LLM_request(model=global_config.llm_topic_judge, request_type="topic")
|
||||
|
||||
async def identify_topic_llm(self, text: str) -> Optional[List[str]]:
|
||||
"""识别消息主题，返回主题列表"""
|
||||
|
||||
prompt = f"""判断这条消息的主题，如果没有明显主题请回复"无主题"，要求：
|
||||
1. 主题通常2-4个字，必须简短，要求精准概括，不要太具体。
|
||||
2. 建议给出多个主题，之间用英文逗号分割。只输出主题本身就好，不要有前后缀。
|
||||
|
||||
消息内容：{text}"""
|
||||
|
||||
# 使用 LLM_request 类进行请求
|
||||
topic, _, _ = await self.llm_topic_judge.generate_response(prompt)
|
||||
|
||||
if not topic:
|
||||
logger.error("LLM API 返回为空")
|
||||
return None
|
||||
|
||||
# 直接在这里处理主题解析
|
||||
if not topic or topic == "无主题":
|
||||
return None
|
||||
|
||||
# 解析主题字符串为列表
|
||||
topic_list = [t.strip() for t in topic.split(",") if t.strip()]
|
||||
|
||||
logger.info(f"主题: {topic_list}")
|
||||
return topic_list if topic_list else None
|
||||
|
||||
|
||||
topic_identifier = TopicIdentifier()
|
||||
Reference in New Issue
Block a user