From 3b63005f579f2a2354bfbda94f966d85872d44fb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 30 Apr 2025 10:28:47 +0000 Subject: [PATCH] =?UTF-8?q?=F0=9F=A4=96=20=E8=87=AA=E5=8A=A8=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E5=8C=96=E4=BB=A3=E7=A0=81=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/heart_flow/subheartflow_manager.py | 12 ++++-------- src/plugins/emoji_system/emoji_manager.py | 2 +- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/heart_flow/subheartflow_manager.py b/src/heart_flow/subheartflow_manager.py index fe555ea2d..16f36dcc5 100644 --- a/src/heart_flow/subheartflow_manager.py +++ b/src/heart_flow/subheartflow_manager.py @@ -23,7 +23,6 @@ from src.individuality.individuality import Individuality import traceback - # 初始化日志记录器 logger = get_logger("subheartflow_manager") @@ -359,9 +358,7 @@ class SubHeartflowManager: # 3. 检查 CHAT 上限 current_chat_count = self.count_subflows_by_state_nolock(ChatState.CHAT) if current_chat_count >= chat_limit: - logger.info( - f"{log_prefix} 想看看能不能聊,但是聊天太多了, ({current_chat_count}/{chat_limit}) 满了。" - ) + logger.info(f"{log_prefix} 想看看能不能聊,但是聊天太多了, ({current_chat_count}/{chat_limit}) 满了。") return # 满了,这次就算了 # --- 获取 FOCUSED 计数 --- @@ -421,7 +418,7 @@ class SubHeartflowManager: # --- 4. LLM 评估是否想聊 --- yao_kai_shi_liao_ma, reason = await self._llm_evaluate_state_transition(prompt) - + if reason: if yao_kai_shi_liao_ma: logger.info(f"{log_prefix} 打算开始聊,原因是: {reason}") @@ -532,7 +529,6 @@ class SubHeartflowManager: f"{log_prefix_task} 完成,共检查 {checked_count} 个子心流,{transitioned_to_absent} 个因超时转为 ABSENT。" ) - # --- 结束新增 --- async def _llm_evaluate_state_transition(self, prompt: str) -> Tuple[Optional[bool], Optional[str]]: @@ -567,8 +563,8 @@ class SubHeartflowManager: if isinstance(decision, bool): logger.debug(f"{log_prefix} LLM评估结果 (来自JSON): {'建议转换' if decision else '建议不转换'}") - - return decision , reason + + return decision, reason else: logger.warning( f"{log_prefix} LLM 返回的 JSON 中 'decision' 键的值不是布尔型: {decision}。响应: {response_text}" diff --git a/src/plugins/emoji_system/emoji_manager.py b/src/plugins/emoji_system/emoji_manager.py index 1a9146a1b..844c68302 100644 --- a/src/plugins/emoji_system/emoji_manager.py +++ b/src/plugins/emoji_system/emoji_manager.py @@ -750,7 +750,7 @@ class EmojiManager: # 处理情感列表 emotions = [e.strip() for e in emotions_text.split(",") if e.strip()] - + # 根据情感标签数量随机选择喵~超过5个选3个,超过2个选2个 if len(emotions) > 5: emotions = random.sample(emotions, 3)