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

ruff，私聊视为提及了bot

Browse Source
This commit is contained in:
Windpicker-owo
2025-09-20 22:34:22 +08:00
parent 006f9130b9
commit 444f1ca315
76 changed files with 1066 additions and 882 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/person_info/person_info.py
View File

@@ -96,12 +96,13 @@ class PersonInfoManager:
# 在此处打一个补丁，如果platform为qq，尝试生成id后检查是否存在，如果不存在，则将平台换为napcat后再次检查，如果存在，则更新原id为platform为qq的id
components = [platform, str(user_id)]
key = "_".join(components)
# 如果不是 qq 平台，直接返回计算的 id
if platform != "qq":
return hashlib.md5(key.encode()).hexdigest()
qq_id = hashlib.md5(key.encode()).hexdigest()
# 对于 qq 平台，先检查该 person_id 是否已存在；如果存在直接返回
def _db_check_and_migrate_sync(p_id: str, raw_user_id: str):
try:
@@ -191,16 +192,16 @@ class PersonInfoManager:
# Ensure person_id is correctly set from the argument
final_data["person_id"] = person_id
# 你们的英文注释是何意味？
# 检查并修复关键字段为None的情况喵
if final_data.get("user_id") is None:
logger.warning(f"user_id为None，使用'unknown'作为默认值 person_id={person_id}")
final_data["user_id"] = "unknown"
if final_data.get("platform") is None:
logger.warning(f"platform为None，使用'unknown'作为默认值 person_id={person_id}")
final_data["platform"] = "unknown"
# 这里的目的是为了防止在识别出错的情况下有一个最小回退，不只是针对@消息识别成视频后的报错问题
# Serialize JSON fields
@@ -251,12 +252,12 @@ class PersonInfoManager:
# Ensure person_id is correctly set from the argument
final_data["person_id"] = person_id
# 检查并修复关键字段为None的情况
if final_data.get("user_id") is None:
logger.warning(f"user_id为None，使用'unknown'作为默认值 person_id={person_id}")
final_data["user_id"] = "unknown"
if final_data.get("platform") is None:
logger.warning(f"platform为None，使用'unknown'作为默认值 person_id={person_id}")
final_data["platform"] = "unknown"
@@ -356,12 +357,12 @@ class PersonInfoManager:
creation_data["platform"] = data["platform"]
if data and "user_id" in data:
creation_data["user_id"] = data["user_id"]
# 额外检查关键字段，如果为None则使用默认值
if creation_data.get("user_id") is None:
logger.warning(f"创建用户时user_id为None，使用'unknown'作为默认值 person_id={person_id}")
creation_data["user_id"] = "unknown"
if creation_data.get("platform") is None:
logger.warning(f"创建用户时platform为None，使用'unknown'作为默认值 person_id={person_id}")
creation_data["platform"] = "unknown"

28
src/person_info/relationship_fetcher.py
View File

@@ -123,7 +123,9 @@ class RelationshipFetcher:
all_points = current_points + forgotten_points
if all_points:
# 按权重和时效性综合排序
all_points.sort(key=lambda x: (float(x[1]) if len(x) > 1 else 0, float(x[2]) if len(x) > 2 else 0), reverse=True)
all_points.sort(
key=lambda x: (float(x[1]) if len(x) > 1 else 0, float(x[2]) if len(x) > 2 else 0), reverse=True
)
selected_points = all_points[:points_num]
points_text = "\n".join([f"- {point[0]}（{point[2]}）" for point in selected_points if len(point) > 2])
else:
@@ -139,15 +141,17 @@ class RelationshipFetcher:
# 2. 认识时间和频率
if know_since:
from datetime import datetime
know_time = datetime.fromtimestamp(know_since).strftime('%Y年%m月%d日')
know_time = datetime.fromtimestamp(know_since).strftime("%Y年%m月%d日")
relation_parts.append(f"你从{know_time}开始认识{person_name}")
if know_times > 0:
relation_parts.append(f"你们已经交流过{int(know_times)}次")
if last_know:
from datetime import datetime
last_time = datetime.fromtimestamp(last_know).strftime('%m月%d日')
last_time = datetime.fromtimestamp(last_know).strftime("%m月%d日")
relation_parts.append(f"最近一次交流是在{last_time}")
# 3. 态度和印象
@@ -156,7 +160,7 @@ class RelationshipFetcher:
if short_impression:
relation_parts.append(f"你对ta的总体印象：{short_impression}")
if full_impression:
relation_parts.append(f"更详细的了解：{full_impression}")
@@ -168,14 +172,14 @@ class RelationshipFetcher:
try:
from src.common.database.sqlalchemy_database_api import db_query
from src.common.database.sqlalchemy_models import UserRelationships
# 查询用户关系数据
relationships = await db_query(
UserRelationships,
filters=[UserRelationships.user_id == str(person_info_manager.get_value_sync(person_id, "user_id"))],
limit=1
limit=1,
)
if relationships:
rel_data = relationships[0]
if rel_data.relationship_text:
@@ -183,13 +187,15 @@ class RelationshipFetcher:
if rel_data.relationship_score:
score_desc = self._get_relationship_score_description(rel_data.relationship_score)
relation_parts.append(f"关系亲密程度：{score_desc}")
except Exception as e:
logger.debug(f"查询UserRelationships表失败: {e}")
# 构建最终的关系信息字符串
if relation_parts:
relation_info = f"关于{person_name}，你知道以下信息：\n" + "\n".join([f"• {part}" for part in relation_parts])
relation_info = f"关于{person_name}，你知道以下信息：\n" + "\n".join(
[f"• {part}" for part in relation_parts]
)
else:
relation_info = f"你对{person_name}了解不多，这是比较初步的交流。"