fix：hfc现在会在FOCUS下持续运行，有小概率掉出FOCUS模式
This commit is contained in:
SengokuCola
@@ -16,6 +16,8 @@ background_tasks_log_config = LogConfig(
|
||||
|
||||
logger = get_module_logger("background_tasks", config=background_tasks_log_config)
|
||||
|
||||
# 新增随机停用间隔 (5 分钟)
|
||||
RANDOM_DEACTIVATION_INTERVAL_SECONDS = 300
|
||||
# 新增兴趣评估间隔
|
||||
INTEREST_EVAL_INTERVAL_SECONDS = 5
|
||||
|
||||
@@ -35,6 +37,8 @@ class BackgroundTaskManager:
|
||||
inactive_threshold: int,
|
||||
# 新增兴趣评估间隔参数
|
||||
interest_eval_interval: int = INTEREST_EVAL_INTERVAL_SECONDS,
|
||||
# 新增随机停用间隔参数
|
||||
random_deactivation_interval: int = RANDOM_DEACTIVATION_INTERVAL_SECONDS,
|
||||
):
|
||||
self.mai_state_info = mai_state_info
|
||||
self.mai_state_manager = mai_state_manager
|
||||
@@ -47,19 +51,21 @@ class BackgroundTaskManager:
|
||||
self.log_interval = log_interval
|
||||
self.inactive_threshold = inactive_threshold # For cleanup task
|
||||
self.interest_eval_interval = interest_eval_interval # 存储兴趣评估间隔
|
||||
self.random_deactivation_interval = random_deactivation_interval # 存储随机停用间隔
|
||||
|
||||
# Task references
|
||||
self._state_update_task: Optional[asyncio.Task] = None
|
||||
self._cleanup_task: Optional[asyncio.Task] = None
|
||||
self._logging_task: Optional[asyncio.Task] = None
|
||||
self._interest_eval_task: Optional[asyncio.Task] = None # 新增兴趣评估任务引用
|
||||
self._random_deactivation_task: Optional[asyncio.Task] = None # 新增随机停用任务引用
|
||||
self._tasks: List[Optional[asyncio.Task]] = [] # Keep track of all tasks
|
||||
|
||||
async def start_tasks(self):
|
||||
"""启动所有后台任务
|
||||
|
||||
功能说明:
|
||||
- 启动核心后台任务: 状态更新、清理、日志记录和兴趣评估
|
||||
- 启动核心后台任务: 状态更新、清理、日志记录、兴趣评估和随机停用
|
||||
- 每个任务启动前检查是否已在运行
|
||||
- 将任务引用保存到任务列表
|
||||
"""
|
||||
@@ -99,6 +105,15 @@ class BackgroundTaskManager:
|
||||
f"兴趣评估任务已启动 间隔:{self.interest_eval_interval}s",
|
||||
"_interest_eval_task",
|
||||
),
|
||||
# 新增随机停用任务配置
|
||||
(
|
||||
self._random_deactivation_task,
|
||||
self._run_random_deactivation_cycle,
|
||||
"hf_random_deactivation",
|
||||
"debug", # 设为debug，避免过多日志
|
||||
f"随机停用任务已启动 间隔:{self.random_deactivation_interval}s",
|
||||
"_random_deactivation_task",
|
||||
),
|
||||
]
|
||||
|
||||
# 统一启动所有任务
|
||||
@@ -230,6 +245,12 @@ class BackgroundTaskManager:
|
||||
|
||||
# --- 结束新增 ---
|
||||
|
||||
# --- 新增随机停用工作函数 ---
|
||||
async def _perform_random_deactivation_work(self):
|
||||
"""执行一轮子心流随机停用检查。"""
|
||||
await self.subheartflow_manager.randomly_deactivate_subflows()
|
||||
# --- 结束新增 ---
|
||||
|
||||
# --- Specific Task Runners --- #
|
||||
async def _run_state_update_cycle(self, interval: int):
|
||||
await self._run_periodic_loop(
|
||||
@@ -255,3 +276,14 @@ class BackgroundTaskManager:
|
||||
)
|
||||
|
||||
# --- 结束新增 ---
|
||||
|
||||
# --- 新增随机停用任务运行器 ---
|
||||
async def _run_random_deactivation_cycle(self):
|
||||
"""运行随机停用循环。"""
|
||||
await self._run_periodic_loop(
|
||||
task_name="Random Deactivation",
|
||||
interval=self.random_deactivation_interval,
|
||||
task_func=self._perform_random_deactivation_work,
|
||||
)
|
||||
|
||||
# --- 结束新增 ---
|
||||
|
||||
@@ -358,30 +358,40 @@ class SubHeartflow:
|
||||
self.clear_interest_dict() # 清理兴趣字典，准备专注聊天
|
||||
|
||||
log_prefix = self.log_prefix
|
||||
# 如果实例已存在，检查其循环任务状态
|
||||
if self.heart_fc_instance:
|
||||
if not self.heart_fc_instance._loop_active:
|
||||
logger.warning(f"{log_prefix} HeartFChatting 实例存在但未激活，尝试重新激活...")
|
||||
await self.heart_fc_instance.add_time() # 尝试添加时间以激活循环
|
||||
return True # 假设 add_time 会处理激活逻辑
|
||||
# 如果任务已完成或不存在，则尝试重新启动
|
||||
if self.heart_fc_instance._loop_task is None or self.heart_fc_instance._loop_task.done():
|
||||
logger.info(f"{log_prefix} HeartFChatting 实例存在但循环未运行，尝试启动...")
|
||||
try:
|
||||
await self.heart_fc_instance.start() # 启动循环
|
||||
logger.info(f"{log_prefix} HeartFChatting 循环已启动。")
|
||||
return True
|
||||
except Exception as e:
|
||||
logger.error(f"{log_prefix} 尝试启动现有 HeartFChatting 循环时出错: {e}")
|
||||
logger.error(traceback.format_exc())
|
||||
return False # 启动失败
|
||||
else:
|
||||
# 任务正在运行
|
||||
logger.debug(f"{log_prefix} HeartFChatting 已在运行中。")
|
||||
return True # 已经在运行
|
||||
return True # 已经在运行
|
||||
|
||||
logger.info(f"{log_prefix} 麦麦准备开始专注聊天...")
|
||||
# 如果实例不存在，则创建并启动
|
||||
logger.info(f"{log_prefix} 麦麦准备开始专注聊天 (创建新实例)...")
|
||||
try:
|
||||
self.heart_fc_instance = HeartFChatting(
|
||||
chat_id=self.chat_id,
|
||||
)
|
||||
if await self.heart_fc_instance._initialize():
|
||||
await self.heart_fc_instance.add_time() # 初始化成功后添加初始时间
|
||||
logger.info(f"{log_prefix} 麦麦已成功进入专注聊天模式。")
|
||||
await self.heart_fc_instance.start() # 初始化成功后启动循环
|
||||
logger.info(f"{log_prefix} 麦麦已成功进入专注聊天模式 (新实例已启动)。")
|
||||
return True
|
||||
else:
|
||||
logger.error(f"{log_prefix} HeartFChatting 初始化失败，无法进入专注模式。")
|
||||
self.heart_fc_instance = None # 初始化失败，清理实例
|
||||
return False
|
||||
except Exception as e:
|
||||
logger.error(f"{log_prefix} 创建或初始化 HeartFChatting 实例时出错: {e}")
|
||||
logger.error(f"{log_prefix} 创建或启动 HeartFChatting 实例时出错: {e}")
|
||||
logger.error(traceback.format_exc())
|
||||
self.heart_fc_instance = None # 创建或初始化异常，清理实例
|
||||
return False
|
||||
|
||||
@@ -358,6 +358,74 @@ class SubHeartflowManager:
|
||||
else:
|
||||
logger.debug(f"{log_prefix_manager} 评估周期结束, 未提升任何子心流。")
|
||||
|
||||
async def randomly_deactivate_subflows(self, deactivation_probability: float = 0.3):
|
||||
"""以一定概率将 FOCUSED 或 CHAT 状态的子心流回退到 ABSENT 状态。"""
|
||||
log_prefix_manager = "[子心流管理器-随机停用]"
|
||||
logger.debug(f"{log_prefix_manager} 开始随机停用检查... (概率: {deactivation_probability:.0%})")
|
||||
|
||||
# 使用快照安全遍历
|
||||
subflows_snapshot = list(self.subheartflows.values())
|
||||
deactivated_count = 0
|
||||
|
||||
# 预先计算状态数量，因为 set_chat_state 需要
|
||||
states_num_before = (
|
||||
self.count_subflows_by_state(ChatState.ABSENT),
|
||||
self.count_subflows_by_state(ChatState.CHAT),
|
||||
self.count_subflows_by_state(ChatState.FOCUSED),
|
||||
)
|
||||
|
||||
try:
|
||||
for sub_hf in subflows_snapshot:
|
||||
flow_id = sub_hf.subheartflow_id
|
||||
stream_name = chat_manager.get_stream_name(flow_id) or flow_id
|
||||
log_prefix_flow = f"[{stream_name}]"
|
||||
current_state = sub_hf.chat_state.chat_status
|
||||
|
||||
# 只处理 FOCUSED 或 CHAT 状态
|
||||
if current_state not in [ChatState.FOCUSED, ChatState.CHAT]:
|
||||
continue
|
||||
|
||||
# 检查随机概率
|
||||
if random.random() < deactivation_probability:
|
||||
logger.info(
|
||||
f"{log_prefix_manager} {log_prefix_flow} 随机触发停用 (从 {current_state.value}) -> ABSENT"
|
||||
)
|
||||
|
||||
# 获取当前实例以检查最新状态
|
||||
current_subflow = self.subheartflows.get(flow_id)
|
||||
if not current_subflow or current_subflow.chat_state.chat_status != current_state:
|
||||
logger.warning(f"{log_prefix_manager} {log_prefix_flow} 尝试停用时状态已改变或实例消失，跳过。")
|
||||
continue
|
||||
|
||||
# --- 状态设置 --- #
|
||||
# 注意：这里传递的状态数量是 *停用前* 的状态数量
|
||||
await current_subflow.set_chat_state(ChatState.ABSENT, states_num_before)
|
||||
|
||||
# --- 状态验证 (可选) ---
|
||||
final_subflow = self.subheartflows.get(flow_id)
|
||||
if final_subflow:
|
||||
final_state = final_subflow.chat_state.chat_status
|
||||
if final_state == ChatState.ABSENT:
|
||||
logger.debug(
|
||||
f"{log_prefix_manager} {log_prefix_flow} 成功从 {current_state.value} 停用到 ABSENT 状态"
|
||||
)
|
||||
deactivated_count += 1
|
||||
# 注意：停用后不需要更新 states_num_before，因为它只用于 set_chat_state 的限制检查
|
||||
else:
|
||||
logger.warning(
|
||||
f"{log_prefix_manager} {log_prefix_flow} 尝试停用到 ABSENT 后状态仍为 {final_state.value}"
|
||||
)
|
||||
else:
|
||||
logger.warning(f"{log_prefix_manager} {log_prefix_flow} 停用后验证时子心流 {flow_id} 消失")
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"{log_prefix_manager} 随机停用周期出错: {e}", exc_info=True)
|
||||
|
||||
if deactivated_count > 0:
|
||||
logger.info(f"{log_prefix_manager} 随机停用周期结束, 成功停用 {deactivated_count} 个子心流。")
|
||||
else:
|
||||
logger.debug(f"{log_prefix_manager} 随机停用周期结束, 未停用任何子心流。")
|
||||
|
||||
def count_subflows_by_state(self, state: ChatState) -> int:
|
||||
"""统计指定状态的子心流数量
|
||||
|
||||
|
||||
Reference in New Issue
Block a user