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

Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev

Browse Source
This commit is contained in:
SengokuCola
2025-04-30 18:30:29 +08:00
parent a206af76fb 3b63005f57
commit cb49714d85
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/heart_flow/subheartflow_manager.py
View File

@@ -23,7 +23,6 @@ from src.individuality.individuality import Individuality
import traceback import traceback
# 初始化日志记录器 # 初始化日志记录器
logger = get_logger("subheartflow_manager") logger = get_logger("subheartflow_manager")
@@ -359,9 +358,7 @@ class SubHeartflowManager:
# 3. 检查 CHAT 上限 # 3. 检查 CHAT 上限
current_chat_count = self.count_subflows_by_state_nolock(ChatState.CHAT) current_chat_count = self.count_subflows_by_state_nolock(ChatState.CHAT)
if current_chat_count >= chat_limit: if current_chat_count >= chat_limit:
logger.info( logger.info(f"{log_prefix} 想看看能不能聊，但是聊天太多了， ({current_chat_count}/{chat_limit}) 满了。")
f"{log_prefix} 想看看能不能聊，但是聊天太多了， ({current_chat_count}/{chat_limit}) 满了。"
)
return # 满了，这次就算了 return # 满了，这次就算了
# --- 获取 FOCUSED 计数 --- # --- 获取 FOCUSED 计数 ---
@@ -532,7 +529,6 @@ class SubHeartflowManager:
f"{log_prefix_task} 完成，共检查 {checked_count} 个子心流，{transitioned_to_absent} 个因超时转为 ABSENT。" f"{log_prefix_task} 完成，共检查 {checked_count} 个子心流，{transitioned_to_absent} 个因超时转为 ABSENT。"
) )
# --- 结束新增 --- # --- 结束新增 ---
async def _llm_evaluate_state_transition(self, prompt: str) -> Tuple[Optional[bool], Optional[str]]: async def _llm_evaluate_state_transition(self, prompt: str) -> Tuple[Optional[bool], Optional[str]]:
@@ -568,7 +564,7 @@ class SubHeartflowManager:
if isinstance(decision, bool): if isinstance(decision, bool):
logger.debug(f"{log_prefix} LLM评估结果 (来自JSON): {'建议转换' if decision else '建议不转换'}") logger.debug(f"{log_prefix} LLM评估结果 (来自JSON): {'建议转换' if decision else '建议不转换'}")
return decision , reason return decision, reason
else: else:
logger.warning( logger.warning(
f"{log_prefix} LLM 返回的 JSON 中 'decision' 键的值不是布尔型: {decision}。响应: {response_text}" f"{log_prefix} LLM 返回的 JSON 中 'decision' 键的值不是布尔型: {decision}。响应: {response_text}"