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

Merge branch 'dev' of https://github.com/MoFox-Studio/MoFox-Core into dev

Browse Source
This commit is contained in:
tt-P607
2025-11-23 19:30:09 +08:00
parent 8f1dc4c70b 33c6ddc6dd
commit 690d4e4fca
12 changed files with 43 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/built_in/affinity_flow_chatter/core/affinity_interest_calculator.py
View File

@@ -223,7 +223,7 @@ class AffinityInterestCalculator(BaseInterestCalculator):
return 0.0
except asyncio.TimeoutError:
logger.warning("⏱️ 兴趣匹配计算超时(>1.5秒)，返回默认分值0.5以保留其他分数")
logger.warning("[超时] 兴趣匹配计算超时(>1.5秒)，返回默认分值0.5以保留其他分数")
return 0.5 # 超时时返回默认分值，避免丢失提及分和关系分
except Exception as e:
logger.warning(f"智能兴趣匹配失败: {e}")

8
src/plugins/built_in/affinity_flow_chatter/proactive/proactive_thinking_event.py
View File

@@ -85,14 +85,14 @@ class ProactiveThinkingReplyHandler(BaseEventHandler):
if success:
if was_paused:
logger.info(f"✅ 聊天流 {stream_id} 主动思考已恢复并重置")
logger.info(f"[成功] 聊天流 {stream_id} 主动思考已恢复并重置")
else:
logger.debug(f"✅ 聊天流 {stream_id} 主动思考任务已重置")
logger.debug(f"[成功] 聊天流 {stream_id} 主动思考任务已重置")
else:
logger.warning(f"❌ 重置聊天流 {stream_id} 主动思考任务失败")
logger.warning(f"[错误] 重置聊天流 {stream_id} 主动思考任务失败")
except Exception as e:
logger.error(f"❌ 处理reply事件时出错: {e}", exc_info=True)
logger.error(f"[错误] 处理reply事件时出错: {e}", exc_info=True)
# 总是继续处理其他handler
return HandlerResult(success=True, continue_process=True, message=None)

12
src/plugins/built_in/affinity_flow_chatter/proactive/proactive_thinking_executor.py
View File

@@ -694,11 +694,11 @@ async def execute_proactive_thinking(stream_id: str):
# 尝试获取锁，如果已被占用则跳过本次执行（防止重复）
if lock.locked():
logger.warning(f"⚠️ 主动思考跳过：聊天流 {stream_id} 已有正在执行的主动思考任务")
logger.warning(f"[警告] 主动思考跳过：聊天流 {stream_id} 已有正在执行的主动思考任务")
return
async with lock:
logger.debug(f"🤔 开始主动思考 {stream_id}")
logger.debug(f"[思考] 开始主动思考 {stream_id}")
try:
# 0. 前置检查
@@ -709,10 +709,10 @@ async def execute_proactive_thinking(stream_id: str):
chat_stream = await chat_manager.get_stream(stream_id)
if chat_stream and chat_stream.context_manager.context.is_chatter_processing:
logger.warning(f"⚠️ 主动思考等待：聊天流 {stream_id} 的 chatter 正在处理消息，等待3秒后重试...")
logger.warning(f"[警告] 主动思考等待：聊天流 {stream_id} 的 chatter 正在处理消息，等待3秒后重试...")
await asyncio.sleep(3)
if chat_stream.context_manager.context.is_chatter_processing:
logger.warning(f"⚠️ 主动思考跳过：聊天流 {stream_id} 的 chatter 仍在处理消息")
logger.warning(f"[警告] 主动思考跳过：聊天流 {stream_id} 的 chatter 仍在处理消息")
return
except Exception as e:
logger.warning(f"检查 chatter 处理状态时出错: {e}，继续执行")
@@ -781,7 +781,7 @@ async def execute_proactive_thinking(stream_id: str):
return
elif action == "simple_bubble":
logger.info(f"💬 决策：冒个泡。理由：{reasoning}")
logger.info(f"[决策] 决策：冒个泡。理由：{reasoning}")
proactive_thinking_scheduler.record_decision(stream_id, action, reasoning, None)
@@ -793,7 +793,7 @@ async def execute_proactive_thinking(stream_id: str):
stream_id=stream_id,
text=reply,
)
logger.info("✅ 已发送冒泡消息")
logger.info("[成功] 已发送冒泡消息")
# 增加每日计数
proactive_thinking_scheduler._increment_daily_count(stream_id)

12
src/plugins/built_in/affinity_flow_chatter/proactive/proactive_thinking_scheduler.py
View File

@@ -216,7 +216,7 @@ class ProactiveThinkingScheduler:
return 0.5
except Exception as e:
logger.error(f"[调度器] ❌ 获取聊天流 {stream_id} 的 focus_energy 失败: {e}", exc_info=True)
logger.error(f"[调度器] [错误] 获取聊天流 {stream_id} 的 focus_energy 失败: {e}", exc_info=True)
return 0.5
async def schedule_proactive_thinking(self, stream_id: str) -> bool:
@@ -280,7 +280,7 @@ class ProactiveThinkingScheduler:
return True
except Exception as e:
logger.error(f"❌ 创建主动思考任务失败 {stream_id}: {e}", exc_info=True)
logger.error(f"[错误] 创建主动思考任务失败 {stream_id}: {e}", exc_info=True)
return False
async def pause_proactive_thinking(self, stream_id: str, reason: str = "抛出话题") -> bool:
@@ -340,7 +340,7 @@ class ProactiveThinkingScheduler:
return success
except Exception as e:
logger.error(f"❌ 恢复主动思考失败 {stream_id}: {e}", exc_info=True)
logger.error(f"[错误] 恢复主动思考失败 {stream_id}: {e}", exc_info=True)
return False
async def cancel_proactive_thinking(self, stream_id: str) -> bool:
@@ -361,12 +361,12 @@ class ProactiveThinkingScheduler:
self._paused_streams.discard(stream_id)
success = await unified_scheduler.remove_schedule(schedule_id)
logger.debug(f"⏹️ 取消主动思考 {stream_id}")
logger.debug(f"[取消] 取消主动思考 {stream_id}")
return success
except Exception as e:
logger.error(f"❌ 取消主动思考失败 {stream_id}: {e}", exc_info=True)
logger.error(f"[错误] 取消主动思考失败 {stream_id}: {e}", exc_info=True)
return False
async def is_paused(self, stream_id: str) -> bool:
@@ -482,7 +482,7 @@ class ProactiveThinkingScheduler:
minutes = (remaining_seconds % 3600) // 60
time_str = f"{hours}小时{minutes}分钟后"
status = "⏸️ 暂停中" if is_paused else "✅ 活跃"
status = "[暂停] 暂停中" if is_paused else "[活跃] 活跃"
logger.info(
f"[{i:2d}] {status} | {stream_name}\n"

3
src/plugins/built_in/web_search_tool/utils/api_key_manager.py
View File

@@ -42,7 +42,7 @@ class APIKeyManager(Generic[T]):
try:
self.clients = [client_factory(key) for key in valid_keys]
self.client_cycle = itertools.cycle(self.clients)
logger.info(f"🔑 {service_name} 成功加载 {len(valid_keys)} 个 API 密钥")
logger.info(f" {service_name} 成功加载 {len(valid_keys)} 个 API 密钥")
except Exception as e:
logger.error(f"❌ 初始化 {service_name} 客户端失败: {e}")
self.clients = []
@@ -61,6 +61,7 @@ class APIKeyManager(Generic[T]):
if not self.is_available():
return None
assert self.client_cycle is not None
return next(self.client_cycle)
def get_client_count(self) -> int: