refactor(proactive_thinker): 优化主动思考的冷却判断和上下文获取
主动思考插件的冷却时间判断逻辑已从依赖 `stream.last_active_time` 切换为获取最新的消息时间。这使得冷却判断更加准确,避免了因流未及时更新而导致的不准确。 同时,优化了上下文获取逻辑: - 获取最近聊天记录时,增加了12小时的时间限制。 - 获取历史主动决策记录时,改为获取过去24小时内的动作记录,以提供更相关的上下文。
This commit is contained in:
committed by
Windpicker-owo
parent
240ac9bdbb
commit
3b57bfc85c
@@ -11,7 +11,7 @@ from src.common.logger import get_logger
|
|||||||
from src.config.config import global_config
|
from src.config.config import global_config
|
||||||
from src.manager.async_task_manager import AsyncTask, async_task_manager
|
from src.manager.async_task_manager import AsyncTask, async_task_manager
|
||||||
from src.plugin_system import BaseEventHandler, EventType
|
from src.plugin_system import BaseEventHandler, EventType
|
||||||
from src.plugin_system.apis import chat_api, person_api
|
from src.plugin_system.apis import chat_api, message_api, person_api
|
||||||
from src.plugin_system.base.base_event import HandlerResult
|
from src.plugin_system.base.base_event import HandlerResult
|
||||||
|
|
||||||
from .proactive_thinker_executor import ProactiveThinkerExecutor
|
from .proactive_thinker_executor import ProactiveThinkerExecutor
|
||||||
@@ -160,7 +160,9 @@ class ProactiveThinkingTask(AsyncTask):
|
|||||||
continue
|
continue
|
||||||
|
|
||||||
# 检查冷却时间
|
# 检查冷却时间
|
||||||
time_since_last_active = time.time() - stream.last_active_time
|
recent_messages = await message_api.get_recent_messages(chat_id=stream.stream_id, limit=1,limit_mode="latest")
|
||||||
|
last_message_time = recent_messages[0]["time"] if recent_messages else stream.create_time
|
||||||
|
time_since_last_active = time.time() - last_message_time
|
||||||
if time_since_last_active > next_interval:
|
if time_since_last_active > next_interval:
|
||||||
logger.info(
|
logger.info(
|
||||||
f"【日常唤醒-私聊】聊天流 {stream.stream_id} 已冷却 {time_since_last_active:.2f} 秒,触发主动对话。"
|
f"【日常唤醒-私聊】聊天流 {stream.stream_id} 已冷却 {time_since_last_active:.2f} 秒,触发主动对话。"
|
||||||
@@ -184,7 +186,9 @@ class ProactiveThinkingTask(AsyncTask):
|
|||||||
# 检查群聊是否在白名单内
|
# 检查群聊是否在白名单内
|
||||||
if not enabled_groups or f"qq:{stream.group_info.group_id}" in enabled_groups:
|
if not enabled_groups or f"qq:{stream.group_info.group_id}" in enabled_groups:
|
||||||
# 检查冷却时间
|
# 检查冷却时间
|
||||||
time_since_last_active = time.time() - stream.last_active_time
|
recent_messages = await message_api.get_recent_messages(chat_id=stream.stream_id, limit=1)
|
||||||
|
last_message_time = recent_messages[0]["time"] if recent_messages else stream.create_time
|
||||||
|
time_since_last_active = time.time() - last_message_time
|
||||||
if time_since_last_active > next_interval:
|
if time_since_last_active > next_interval:
|
||||||
logger.info(
|
logger.info(
|
||||||
f"【日常唤醒-群聊】聊天流 {stream.stream_id} 已冷却 {time_since_last_active:.2f} 秒,触发主动对话。"
|
f"【日常唤醒-群聊】聊天流 {stream.stream_id} 已冷却 {time_since_last_active:.2f} 秒,触发主动对话。"
|
||||||
|
|||||||
@@ -1,8 +1,10 @@
|
|||||||
|
import time
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
from typing import Any
|
from typing import Any
|
||||||
|
|
||||||
import orjson
|
import orjson
|
||||||
|
|
||||||
|
from src.chat.utils.chat_message_builder import get_actions_by_timestamp_with_chat
|
||||||
from src.common.logger import get_logger
|
from src.common.logger import get_logger
|
||||||
from src.config.config import global_config, model_config
|
from src.config.config import global_config, model_config
|
||||||
from src.mood.mood_manager import mood_manager
|
from src.mood.mood_manager import mood_manager
|
||||||
@@ -140,17 +142,18 @@ class ProactiveThinkerExecutor:
|
|||||||
else "今天没有日程安排。"
|
else "今天没有日程安排。"
|
||||||
)
|
)
|
||||||
|
|
||||||
recent_messages = await message_api.get_recent_messages(stream.stream_id)
|
recent_messages = await message_api.get_recent_messages(stream.stream_id,limit=50,limit_mode="latest",hours=12)
|
||||||
recent_chat_history = (
|
recent_chat_history = (
|
||||||
await message_api.build_readable_messages_to_str(recent_messages) if recent_messages else "无"
|
await message_api.build_readable_messages_to_str(recent_messages) if recent_messages else "无"
|
||||||
)
|
)
|
||||||
|
|
||||||
action_history_list = await database_api.db_query(
|
action_history_list = await get_actions_by_timestamp_with_chat(
|
||||||
database_api.MODEL_MAPPING["ActionRecords"],
|
chat_id=stream.stream_id,
|
||||||
filters={"chat_id": stream_id, "action_name": "proactive_decision"},
|
timestamp_start=time.time() - 3600 * 24, #过去24小时
|
||||||
limit=3,
|
timestamp_end=time.time(),
|
||||||
order_by=["-time"],
|
limit=7,
|
||||||
)
|
)
|
||||||
|
|
||||||
action_history_context = (
|
action_history_context = (
|
||||||
"\n".join([f"- {a['action_data']}" for a in action_history_list if isinstance(a, dict)])
|
"\n".join([f"- {a['action_data']}" for a in action_history_list if isinstance(a, dict)])
|
||||||
if isinstance(action_history_list, list)
|
if isinstance(action_history_list, list)
|
||||||
|
|||||||
Reference in New Issue
Block a user