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

refactor(replyer): 将 reply_message 类型从 dict 更改为 Messages 模型

Browse Source 
将 `DefaultReplyer` 中多个方法的 `reply_message` 参数类型从通用的 `dict` 更改为更具体的 SQLAlchemy 模型 `Messages`。

这一更改提高了代码的类型安全性和可读性，使得数据结构更加明确。同时，更新了相关代码以直接访问模型属性，而不是使用字典的 `get()` 方法。
This commit is contained in:
minecraft1024a
2025-10-12 14:03:20 +08:00
parent 4df61eba1c
commit e851dfbc62
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,6 +26,7 @@ from src.chat.utils.memory_mappings import get_memory_type_chinese_label
from src.chat.utils.prompt import Prompt, PromptParameters, global_prompt_manager
from src.chat.utils.timer_calculator import Timer
from src.chat.utils.utils import get_chat_type_and_target_info
from src.common.database.sqlalchemy_models import Messages
from src.common.logger import get_logger
from src.config.config import global_config, model_config
from src.individuality.individuality import get_individuality
@@ -255,7 +256,7 @@ class DefaultReplyer:
enable_tool: bool = True,
from_plugin: bool = True,
stream_id: str | None = None,
reply_message: dict[str, Any] | None = None,
reply_message: Messages | None = None,
) -> tuple[bool, dict[str, Any] | None, str | None]:
# sourcery skip: merge-nested-ifs
"""
@@ -1104,7 +1105,7 @@ class DefaultReplyer:
extra_info: str = "",
available_actions: dict[str, ActionInfo] | None = None,
enable_tool: bool = True,
reply_message: dict[str, Any] | None = None,
reply_message: Messages | None = None,
) -> str:
"""
构建回复器上下文
@@ -1146,10 +1147,10 @@ class DefaultReplyer:
if reply_message is None:
logger.warning("reply_message 为 None，无法构建prompt")
return ""
platform = reply_message.get("chat_info_platform")
platform = reply_message.chat_info_platform
person_id = person_info_manager.get_person_id(
platform, # type: ignore
reply_message.get("user_id"), # type: ignore
reply_message.user_id, # type: ignore
)
person_name = await person_info_manager.get_value(person_id, "person_name")
@@ -1158,22 +1159,22 @@ class DefaultReplyer:
# 尝试从reply_message获取用户名
await person_info_manager.first_knowing_some_one(
platform, # type: ignore
reply_message.get("user_id"), # type: ignore
reply_message.get("user_nickname") or "",
reply_message.get("user_cardname") or "",
reply_message.user_id, # type: ignore
reply_message.user_nickname or "",
reply_message.user_cardname or "",
)
# 检查是否是bot自己的名字，如果是则替换为"(你)"
bot_user_id = str(global_config.bot.qq_account)
current_user_id = await person_info_manager.get_value(person_id, "user_id")
current_platform = reply_message.get("chat_info_platform")
current_platform = reply_message.chat_info_platform
if current_user_id == bot_user_id and current_platform == global_config.bot.platform:
sender = f"{person_name}(你)"
else:
# 如果不是bot自己，直接使用person_name
sender = person_name
target = reply_message.get("processed_plain_text")
target = reply_message.processed_plain_text
# 最终的空值检查，确保sender和target不为None
if sender is None:
@@ -1495,15 +1496,15 @@ class DefaultReplyer:
raw_reply: str,
reason: str,
reply_to: str,
reply_message: dict[str, Any] | None = None,
reply_message: Messages | None = None,
) -> str: # sourcery skip: merge-else-if-into-elif, remove-redundant-if
chat_stream = self.chat_stream
chat_id = chat_stream.stream_id
is_group_chat = bool(chat_stream.group_info)
if reply_message:
sender = reply_message.get("sender")
target = reply_message.get("target")
sender = reply_message.user_nickname or reply_message.user_cardname
target = reply_message.processed_plain_text
else:
sender, target = self._parse_reply_target(reply_to)