fix:必要性修复

This commit is contained in:
SengokuCola
2025-08-11 01:08:42 +08:00
parent 577b238b20
commit 1515cef487
4 changed files with 45 additions and 16 deletions

View File

@@ -267,6 +267,8 @@ class HeartFChatting:
logger.info( logger.info(
f"{self.log_prefix} 累计消息数量达到{new_message_count}条(>{modified_exit_count_threshold}),结束等待" f"{self.log_prefix} 累计消息数量达到{new_message_count}条(>{modified_exit_count_threshold}),结束等待"
) )
logger.info(self.last_read_time)
logger.info(new_message)
return True,total_interest/new_message_count return True,total_interest/new_message_count
# 检查累计兴趣值 # 检查累计兴趣值
@@ -317,8 +319,9 @@ class HeartFChatting:
should_process,interest_value = await self._should_process_messages(recent_messages_dict) should_process,interest_value = await self._should_process_messages(recent_messages_dict)
if should_process: if should_process:
earliest_message_data = recent_messages_dict[0] # earliest_message_data = recent_messages_dict[0]
self.last_read_time = earliest_message_data.get("time") # self.last_read_time = earliest_message_data.get("time")
self.last_read_time = time.time()
await self._observe(interest_value = interest_value) await self._observe(interest_value = interest_value)
else: else:

View File

@@ -709,6 +709,38 @@ class EmojiManager:
return emoji return emoji
return None # 如果循环结束还没找到,则返回 None return None # 如果循环结束还没找到,则返回 None
async def get_emoji_tag_by_hash(self, emoji_hash: str) -> Optional[str]:
"""根据哈希值获取已注册表情包的描述
Args:
emoji_hash: 表情包的哈希值
Returns:
Optional[str]: 表情包描述如果未找到则返回None
"""
try:
# 先从内存中查找
emoji = await self.get_emoji_from_manager(emoji_hash)
if emoji and emoji.emotion:
logger.info(f"[缓存命中] 从内存获取表情包描述: {emoji.emotion}...")
return emoji.emotion
# 如果内存中没有,从数据库查找
self._ensure_db()
try:
emoji_record = Emoji.get_or_none(Emoji.emoji_hash == emoji_hash)
if emoji_record and emoji_record.emotion:
logger.info(f"[缓存命中] 从数据库获取表情包描述: {emoji_record.emotion[:50]}...")
return emoji_record.emotion
except Exception as e:
logger.error(f"从数据库查询表情包描述时出错: {e}")
return None
except Exception as e:
logger.error(f"获取表情包描述失败 (Hash: {emoji_hash}): {str(e)}")
return None
async def get_emoji_description_by_hash(self, emoji_hash: str) -> Optional[str]: async def get_emoji_description_by_hash(self, emoji_hash: str) -> Optional[str]:
"""根据哈希值获取已注册表情包的描述 """根据哈希值获取已注册表情包的描述

View File

@@ -38,7 +38,7 @@ def init_prompt():
{moderation_prompt} {moderation_prompt}
现在请你根据{by_what}选择合适的action和触发action的消息: 现在请你根据聊天内容和用户的最新消息选择合适的action和触发action的消息:
{actions_before_now_block} {actions_before_now_block}
{no_action_block} {no_action_block}
@@ -57,7 +57,8 @@ def init_prompt():
动作描述:{action_description} 动作描述:{action_description}
{action_require} {action_require}
{{ {{
"action": "{action_name}",{action_parameters}{target_prompt} "action": "{action_name}",{action_parameters},
"target_message_id":"触发action的消息id",
"reason":"触发action的原因" "reason":"触发action的原因"
}} }}
""", """,
@@ -310,10 +311,6 @@ class ActionPlanner:
if mode == ChatMode.FOCUS: if mode == ChatMode.FOCUS:
by_what = "聊天内容"
target_prompt = '\n "target_message_id":"触发action的消息id"'
no_action_block = f"""重要说明: no_action_block = f"""重要说明:
- 'no_reply' 表示只进行不进行回复,等待合适的回复时机 - 'no_reply' 表示只进行不进行回复,等待合适的回复时机
- 当你刚刚发送了消息没有人回复时选择no_reply - 当你刚刚发送了消息没有人回复时选择no_reply
@@ -333,8 +330,6 @@ class ActionPlanner:
""" """
else: else:
by_what = "聊天内容和用户的最新消息"
target_prompt = ""
no_action_block = f"""重要说明: no_action_block = f"""重要说明:
- 'reply' 表示只进行普通聊天回复,不执行任何额外动作 - 'reply' 表示只进行普通聊天回复,不执行任何额外动作
- 其他action表示在普通回复的基础上执行相应的额外动作 - 其他action表示在普通回复的基础上执行相应的额外动作
@@ -381,7 +376,6 @@ class ActionPlanner:
action_description=using_actions_info.description, action_description=using_actions_info.description,
action_parameters=param_text, action_parameters=param_text,
action_require=require_text, action_require=require_text,
target_prompt=target_prompt,
) )
action_options_block += using_action_prompt action_options_block += using_action_prompt
@@ -401,7 +395,6 @@ class ActionPlanner:
planner_prompt_template = await global_prompt_manager.get_prompt_async("planner_prompt") planner_prompt_template = await global_prompt_manager.get_prompt_async("planner_prompt")
prompt = planner_prompt_template.format( prompt = planner_prompt_template.format(
time_block=time_block, time_block=time_block,
by_what=by_what,
chat_context_description=chat_context_description, chat_context_description=chat_context_description,
chat_content_block=chat_content_block, chat_content_block=chat_content_block,
actions_before_now_block=actions_before_now_block, actions_before_now_block=actions_before_now_block,

View File

@@ -120,10 +120,11 @@ class ImageManager:
try: try:
from src.chat.emoji_system.emoji_manager import get_emoji_manager from src.chat.emoji_system.emoji_manager import get_emoji_manager
emoji_manager = get_emoji_manager() emoji_manager = get_emoji_manager()
cached_emoji_description = await emoji_manager.get_emoji_description_by_hash(image_hash) tags = await emoji_manager.get_emoji_tag_by_hash(image_hash)
if cached_emoji_description: if tags:
logger.info(f"[缓存命中] 使用已注册表情包描述: {cached_emoji_description[:50]}...") tag_str = ",".join(tags)
return cached_emoji_description logger.info(f"[缓存命中] 使用已注册表情包描述: {tag_str}...")
return f"[表情包:{tag_str}]"
except Exception as e: except Exception as e:
logger.debug(f"查询EmojiManager时出错: {e}") logger.debug(f"查询EmojiManager时出错: {e}")