注释掉pfc内容，暂时恢复部分代码保证可启动性
This commit is contained in:
UnCLAS-Prommer
committed by
DrSmoothl
DrSmoothl
parent
568685758b
commit
272d0368b8
@@ -1,14 +1,12 @@
|
||||
from dataclasses import dataclass
|
||||
from dataclasses import dataclass, field
|
||||
from typing import Optional, Dict, TypedDict
|
||||
|
||||
import time
|
||||
|
||||
|
||||
@dataclass
|
||||
class CyclePlanInfo(TypedDict): ... # TODO: 根据实际需要补充字段
|
||||
|
||||
|
||||
@dataclass
|
||||
class CycleActionInfo(TypedDict): ... # TODO: 根据实际需要补充字段
|
||||
|
||||
|
||||
@@ -19,11 +17,11 @@ class CycleDetail:
|
||||
cycle_id: int
|
||||
thinking_id: str = ""
|
||||
"""思考ID"""
|
||||
start_time: float = time.time()
|
||||
start_time: float = field(default_factory=time.time)
|
||||
"""开始时间，单位为秒"""
|
||||
end_time: Optional[float] = None
|
||||
"""结束时间，单位为秒，None表示未结束"""
|
||||
time_records: Dict[str, float] = {}
|
||||
time_records: Dict[str, float] = field(default_factory=dict)
|
||||
"""计时器记录，key为计时器名称，value为用时，单位为秒"""
|
||||
loop_plan_info: Optional[CyclePlanInfo] = None
|
||||
"""循环计划记录"""
|
||||
|
||||
@@ -5,18 +5,19 @@ import traceback
|
||||
from src.common.logger import get_logger
|
||||
from src.chat.message_receive.chat_manager import chat_manager
|
||||
from src.chat.heart_flow.heartFC_chat import HeartFChatting
|
||||
from src.chat.brain_chat.brain_chat import BrainChatting
|
||||
# from src.chat.brain_chat.brain_chat import BrainChatting
|
||||
|
||||
logger = get_logger("heartflow")
|
||||
|
||||
|
||||
# TODO: 恢复PFC，现在暂时禁用
|
||||
class HeartflowManager:
|
||||
"""主心流协调器，负责初始化并协调聊天，控制聊天属性"""
|
||||
|
||||
def __init__(self):
|
||||
self.heartflow_chat_list: Dict[str, HeartFChatting | BrainChatting] = {}
|
||||
# self.heartflow_chat_list: Dict[str, HeartFChatting | BrainChatting] = {}
|
||||
self.heartflow_chat_list: Dict[str, HeartFChatting] = {}
|
||||
|
||||
async def get_or_create_heartflow_chat(self, session_id: str) -> Optional[HeartFChatting | BrainChatting]:
|
||||
async def get_or_create_heartflow_chat(self, session_id: str): # -> Optional[HeartFChatting | BrainChatting]:
|
||||
"""获取或创建一个新的HeartFChatting实例"""
|
||||
try:
|
||||
if chat := self.heartflow_chat_list.get(session_id):
|
||||
@@ -24,16 +25,17 @@ class HeartflowManager:
|
||||
chat_session = chat_manager.get_session_by_session_id(session_id)
|
||||
if not chat_session:
|
||||
raise ValueError(f"未找到 session_id={session_id} 的聊天流")
|
||||
new_chat = (
|
||||
HeartFChatting(session_id=session_id) if chat_session.group_id else BrainChatting(session_id=session_id)
|
||||
)
|
||||
# new_chat = (
|
||||
# HeartFChatting(session_id=session_id) if chat_session.group_id else BrainChatting(session_id=session_id)
|
||||
# )
|
||||
new_chat = HeartFChatting(session_id=session_id)
|
||||
await new_chat.start()
|
||||
self.heartflow_chat_list[session_id] = new_chat
|
||||
return new_chat
|
||||
except Exception as e:
|
||||
logger.error(f"创建心流聊天 {session_id} 失败: {e}", exc_info=True)
|
||||
traceback.print_exc()
|
||||
return None
|
||||
raise e
|
||||
|
||||
def adjust_talk_frequency(self, session_id: str, frequency: float):
|
||||
"""调整指定聊天流的说话频率"""
|
||||
|
||||
@@ -57,8 +57,11 @@ class HeartFCMessageReceiver:
|
||||
# message.is_at = is_at
|
||||
|
||||
MessageUtils.store_message_to_db(message) # 存储消息到数据库
|
||||
|
||||
await heartflow_manager.get_or_create_heartflow_chat(message.session_id)
|
||||
try:
|
||||
chat = await heartflow_manager.get_or_create_heartflow_chat(message.session_id)
|
||||
await chat.register_message(message)
|
||||
except Exception as e:
|
||||
logger.error(f"出现错误: {e}")
|
||||
|
||||
# 3. 日志记录
|
||||
mes_name = group_info.group_name if group_info else "私聊"
|
||||
|
||||
@@ -9,7 +9,7 @@ from src.common.logger import get_logger
|
||||
from src.common.utils.utils_message import MessageUtils
|
||||
from src.common.utils.utils_session import SessionUtils
|
||||
from src.chat.heart_flow.heartflow_message_processor import HeartFCMessageReceiver
|
||||
from src.chat.brain_chat.PFC.pfc_manager import PFCManager
|
||||
# from src.chat.brain_chat.PFC.pfc_manager import PFCManager
|
||||
from src.chat.utils.prompt_builder import Prompt, global_prompt_manager
|
||||
from src.core.announcement_manager import global_announcement_manager
|
||||
from src.core.component_registry import component_registry
|
||||
@@ -32,7 +32,7 @@ class ChatBot:
|
||||
self.bot = None # bot 实例引用
|
||||
self._started = False
|
||||
self.heartflow_message_receiver = HeartFCMessageReceiver() # 新增
|
||||
self.pfc_manager = PFCManager.get_instance() # PFC管理器
|
||||
# self.pfc_manager = PFCManager.get_instance() # PFC管理器 # TODO: PFC恢复
|
||||
|
||||
async def _ensure_started(self):
|
||||
"""确保所有任务已启动"""
|
||||
@@ -374,12 +374,14 @@ class ChatBot:
|
||||
# await preprocess()
|
||||
async def preprocess():
|
||||
if group_info is None:
|
||||
logger.debug("[私聊]检测到私聊消息，路由到PFC系统")
|
||||
MessageUtils.store_message_to_db(message) # 存储消息到数据库
|
||||
await self._create_pfc_chat(message)
|
||||
# logger.debug("[私聊]检测到私聊消息，路由到PFC系统")
|
||||
# MessageUtils.store_message_to_db(message) # 存储消息到数据库
|
||||
# await self._create_pfc_chat(message)
|
||||
logger.critical("暂时禁用私聊")
|
||||
else:
|
||||
logger.debug("[群聊]检测到群聊消息，路由到HeartFlow系统")
|
||||
await self.heartflow_message_receiver.process_message(message)
|
||||
await preprocess()
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"预处理消息失败: {e}")
|
||||
|
||||
@@ -23,266 +23,266 @@ _webui_chat_broadcaster = None
|
||||
VIRTUAL_GROUP_ID_PREFIX = "webui_virtual_group_"
|
||||
|
||||
# TODO: 重构完成后完成webui相关
|
||||
# def get_webui_chat_broadcaster():
|
||||
# """获取 WebUI 聊天室广播器"""
|
||||
# global _webui_chat_broadcaster
|
||||
# if _webui_chat_broadcaster is None:
|
||||
# try:
|
||||
# from src.webui.chat_routes import chat_manager, WEBUI_CHAT_PLATFORM
|
||||
def get_webui_chat_broadcaster():
|
||||
"""获取 WebUI 聊天室广播器"""
|
||||
global _webui_chat_broadcaster
|
||||
if _webui_chat_broadcaster is None:
|
||||
try:
|
||||
from src.webui.chat_routes import chat_manager, WEBUI_CHAT_PLATFORM
|
||||
|
||||
# _webui_chat_broadcaster = (chat_manager, WEBUI_CHAT_PLATFORM)
|
||||
# except ImportError:
|
||||
# _webui_chat_broadcaster = (None, None)
|
||||
# return _webui_chat_broadcaster
|
||||
_webui_chat_broadcaster = (chat_manager, WEBUI_CHAT_PLATFORM)
|
||||
except ImportError:
|
||||
_webui_chat_broadcaster = (None, None)
|
||||
return _webui_chat_broadcaster
|
||||
|
||||
|
||||
# def is_webui_virtual_group(group_id: str) -> bool:
|
||||
# """检查是否是 WebUI 虚拟群"""
|
||||
# return group_id and group_id.startswith(VIRTUAL_GROUP_ID_PREFIX)
|
||||
def is_webui_virtual_group(group_id: str) -> bool:
|
||||
"""检查是否是 WebUI 虚拟群"""
|
||||
return group_id and group_id.startswith(VIRTUAL_GROUP_ID_PREFIX)
|
||||
|
||||
|
||||
# def parse_message_segments(segment) -> list:
|
||||
# """解析消息段，转换为 WebUI 可用的格式
|
||||
def parse_message_segments(segment) -> list:
|
||||
"""解析消息段，转换为 WebUI 可用的格式
|
||||
|
||||
# 参考 NapCat 适配器的消息解析逻辑
|
||||
参考 NapCat 适配器的消息解析逻辑
|
||||
|
||||
# Args:
|
||||
# segment: Seg 消息段对象
|
||||
Args:
|
||||
segment: Seg 消息段对象
|
||||
|
||||
# Returns:
|
||||
# list: 消息段列表，每个元素为 {"type": "...", "data": ...}
|
||||
# """
|
||||
Returns:
|
||||
list: 消息段列表，每个元素为 {"type": "...", "data": ...}
|
||||
"""
|
||||
|
||||
# result = []
|
||||
result = []
|
||||
|
||||
# if segment is None:
|
||||
# return result
|
||||
if segment is None:
|
||||
return result
|
||||
|
||||
# if segment.type == "seglist":
|
||||
# # 处理消息段列表
|
||||
# if segment.data:
|
||||
# for seg in segment.data:
|
||||
# result.extend(parse_message_segments(seg))
|
||||
# elif segment.type == "text":
|
||||
# # 文本消息
|
||||
# if segment.data:
|
||||
# result.append({"type": "text", "data": segment.data})
|
||||
# elif segment.type == "image":
|
||||
# # 图片消息（base64）
|
||||
# if segment.data:
|
||||
# result.append({"type": "image", "data": f"data:image/png;base64,{segment.data}"})
|
||||
# elif segment.type == "emoji":
|
||||
# # 表情包消息（base64）
|
||||
# if segment.data:
|
||||
# result.append({"type": "emoji", "data": f"data:image/gif;base64,{segment.data}"})
|
||||
# elif segment.type == "imageurl":
|
||||
# # 图片链接消息
|
||||
# if segment.data:
|
||||
# result.append({"type": "image", "data": segment.data})
|
||||
# elif segment.type == "face":
|
||||
# # 原生表情
|
||||
# result.append({"type": "face", "data": segment.data})
|
||||
# elif segment.type == "voice":
|
||||
# # 语音消息（base64）
|
||||
# if segment.data:
|
||||
# result.append({"type": "voice", "data": f"data:audio/wav;base64,{segment.data}"})
|
||||
# elif segment.type == "voiceurl":
|
||||
# # 语音链接
|
||||
# if segment.data:
|
||||
# result.append({"type": "voice", "data": segment.data})
|
||||
# elif segment.type == "video":
|
||||
# # 视频消息（base64）
|
||||
# if segment.data:
|
||||
# result.append({"type": "video", "data": f"data:video/mp4;base64,{segment.data}"})
|
||||
# elif segment.type == "videourl":
|
||||
# # 视频链接
|
||||
# if segment.data:
|
||||
# result.append({"type": "video", "data": segment.data})
|
||||
# elif segment.type == "music":
|
||||
# # 音乐消息
|
||||
# result.append({"type": "music", "data": segment.data})
|
||||
# elif segment.type == "file":
|
||||
# # 文件消息
|
||||
# result.append({"type": "file", "data": segment.data})
|
||||
# elif segment.type == "reply":
|
||||
# # 回复消息
|
||||
# result.append({"type": "reply", "data": segment.data})
|
||||
# elif segment.type == "forward":
|
||||
# # 转发消息
|
||||
# forward_items = []
|
||||
# if segment.data:
|
||||
# for item in segment.data:
|
||||
# forward_items.append(
|
||||
# {
|
||||
# "content": parse_message_segments(item.get("message_segment", {}))
|
||||
# if isinstance(item, dict)
|
||||
# else []
|
||||
# }
|
||||
# )
|
||||
# result.append({"type": "forward", "data": forward_items})
|
||||
# else:
|
||||
# # 未知类型，尝试作为文本处理
|
||||
# if segment.data:
|
||||
# result.append({"type": "unknown", "original_type": segment.type, "data": str(segment.data)})
|
||||
if segment.type == "seglist":
|
||||
# 处理消息段列表
|
||||
if segment.data:
|
||||
for seg in segment.data:
|
||||
result.extend(parse_message_segments(seg))
|
||||
elif segment.type == "text":
|
||||
# 文本消息
|
||||
if segment.data:
|
||||
result.append({"type": "text", "data": segment.data})
|
||||
elif segment.type == "image":
|
||||
# 图片消息（base64）
|
||||
if segment.data:
|
||||
result.append({"type": "image", "data": f"data:image/png;base64,{segment.data}"})
|
||||
elif segment.type == "emoji":
|
||||
# 表情包消息（base64）
|
||||
if segment.data:
|
||||
result.append({"type": "emoji", "data": f"data:image/gif;base64,{segment.data}"})
|
||||
elif segment.type == "imageurl":
|
||||
# 图片链接消息
|
||||
if segment.data:
|
||||
result.append({"type": "image", "data": segment.data})
|
||||
elif segment.type == "face":
|
||||
# 原生表情
|
||||
result.append({"type": "face", "data": segment.data})
|
||||
elif segment.type == "voice":
|
||||
# 语音消息（base64）
|
||||
if segment.data:
|
||||
result.append({"type": "voice", "data": f"data:audio/wav;base64,{segment.data}"})
|
||||
elif segment.type == "voiceurl":
|
||||
# 语音链接
|
||||
if segment.data:
|
||||
result.append({"type": "voice", "data": segment.data})
|
||||
elif segment.type == "video":
|
||||
# 视频消息（base64）
|
||||
if segment.data:
|
||||
result.append({"type": "video", "data": f"data:video/mp4;base64,{segment.data}"})
|
||||
elif segment.type == "videourl":
|
||||
# 视频链接
|
||||
if segment.data:
|
||||
result.append({"type": "video", "data": segment.data})
|
||||
elif segment.type == "music":
|
||||
# 音乐消息
|
||||
result.append({"type": "music", "data": segment.data})
|
||||
elif segment.type == "file":
|
||||
# 文件消息
|
||||
result.append({"type": "file", "data": segment.data})
|
||||
elif segment.type == "reply":
|
||||
# 回复消息
|
||||
result.append({"type": "reply", "data": segment.data})
|
||||
elif segment.type == "forward":
|
||||
# 转发消息
|
||||
forward_items = []
|
||||
if segment.data:
|
||||
for item in segment.data:
|
||||
forward_items.append(
|
||||
{
|
||||
"content": parse_message_segments(item.get("message_segment", {}))
|
||||
if isinstance(item, dict)
|
||||
else []
|
||||
}
|
||||
)
|
||||
result.append({"type": "forward", "data": forward_items})
|
||||
else:
|
||||
# 未知类型，尝试作为文本处理
|
||||
if segment.data:
|
||||
result.append({"type": "unknown", "original_type": segment.type, "data": str(segment.data)})
|
||||
|
||||
# return result
|
||||
return result
|
||||
|
||||
|
||||
# async def _send_message(message: MessageSending, show_log=True) -> bool:
|
||||
# """合并后的消息发送函数，包含WS发送和日志记录"""
|
||||
# message_preview = truncate_message(message.processed_plain_text, max_length=200)
|
||||
# platform = message.platform
|
||||
# group_id = message.session.group_id
|
||||
async def _send_message(message: MessageSending, show_log=True) -> bool:
|
||||
"""合并后的消息发送函数，包含WS发送和日志记录"""
|
||||
message_preview = truncate_message(message.processed_plain_text, max_length=200)
|
||||
platform = message.platform
|
||||
group_id = message.session.group_id
|
||||
|
||||
# try:
|
||||
# # 检查是否是 WebUI 平台的消息，或者是 WebUI 虚拟群的消息
|
||||
# chat_manager, webui_platform = get_webui_chat_broadcaster()
|
||||
# is_webui_message = (platform == webui_platform) or is_webui_virtual_group(group_id)
|
||||
try:
|
||||
# 检查是否是 WebUI 平台的消息，或者是 WebUI 虚拟群的消息
|
||||
chat_manager, webui_platform = get_webui_chat_broadcaster()
|
||||
is_webui_message = (platform == webui_platform) or is_webui_virtual_group(group_id)
|
||||
|
||||
# if is_webui_message and chat_manager is not None:
|
||||
# # WebUI 聊天室消息（包括虚拟身份模式），通过 WebSocket 广播
|
||||
# import time
|
||||
# from src.config.config import global_config
|
||||
if is_webui_message and chat_manager is not None:
|
||||
# WebUI 聊天室消息（包括虚拟身份模式），通过 WebSocket 广播
|
||||
import time
|
||||
from src.config.config import global_config
|
||||
|
||||
# # 解析消息段，获取富文本内容
|
||||
# message_segments = parse_message_segments(message.message_segment)
|
||||
# 解析消息段，获取富文本内容
|
||||
message_segments = parse_message_segments(message.message_segment)
|
||||
|
||||
# # 判断消息类型
|
||||
# # 如果只有一个文本段，使用简单的 text 类型
|
||||
# # 否则使用 rich 类型，包含完整的消息段
|
||||
# if len(message_segments) == 1 and message_segments[0].get("type") == "text":
|
||||
# message_type = "text"
|
||||
# segments = None
|
||||
# else:
|
||||
# message_type = "rich"
|
||||
# segments = message_segments
|
||||
# 判断消息类型
|
||||
# 如果只有一个文本段，使用简单的 text 类型
|
||||
# 否则使用 rich 类型，包含完整的消息段
|
||||
if len(message_segments) == 1 and message_segments[0].get("type") == "text":
|
||||
message_type = "text"
|
||||
segments = None
|
||||
else:
|
||||
message_type = "rich"
|
||||
segments = message_segments
|
||||
|
||||
# await chat_manager.broadcast(
|
||||
# {
|
||||
# "type": "bot_message",
|
||||
# "content": message.processed_plain_text,
|
||||
# "message_type": message_type,
|
||||
# "segments": segments, # 富文本消息段
|
||||
# "timestamp": time.time(),
|
||||
# "group_id": group_id, # 包含群 ID 以便前端区分不同的聊天标签
|
||||
# "sender": {
|
||||
# "name": global_config.bot.nickname,
|
||||
# "avatar": None,
|
||||
# "is_bot": True,
|
||||
# },
|
||||
# }
|
||||
# )
|
||||
await chat_manager.broadcast(
|
||||
{
|
||||
"type": "bot_message",
|
||||
"content": message.processed_plain_text,
|
||||
"message_type": message_type,
|
||||
"segments": segments, # 富文本消息段
|
||||
"timestamp": time.time(),
|
||||
"group_id": group_id, # 包含群 ID 以便前端区分不同的聊天标签
|
||||
"sender": {
|
||||
"name": global_config.bot.nickname,
|
||||
"avatar": None,
|
||||
"is_bot": True,
|
||||
},
|
||||
}
|
||||
)
|
||||
|
||||
# # 注意：机器人消息会由 MessageStorage.store_message 自动保存到数据库
|
||||
# # 无需手动保存
|
||||
# 注意：机器人消息会由 MessageStorage.store_message 自动保存到数据库
|
||||
# 无需手动保存
|
||||
|
||||
# if show_log:
|
||||
# if is_webui_virtual_group(group_id):
|
||||
# logger.info(f"已将消息 '{message_preview}' 发往 WebUI 虚拟群 (平台: {platform})")
|
||||
# else:
|
||||
# logger.info(f"已将消息 '{message_preview}' 发往 WebUI 聊天室")
|
||||
# return True
|
||||
if show_log:
|
||||
if is_webui_virtual_group(group_id):
|
||||
logger.info(f"已将消息 '{message_preview}' 发往 WebUI 虚拟群 (平台: {platform})")
|
||||
else:
|
||||
logger.info(f"已将消息 '{message_preview}' 发往 WebUI 聊天室")
|
||||
return True
|
||||
|
||||
# # Fallback 逻辑: 尝试通过 API Server 发送
|
||||
# async def send_with_new_api(legacy_exception=None):
|
||||
# try:
|
||||
# from src.config.config import global_config
|
||||
# Fallback 逻辑: 尝试通过 API Server 发送
|
||||
async def send_with_new_api(legacy_exception=None):
|
||||
try:
|
||||
from src.config.config import global_config
|
||||
|
||||
# # 如果未开启 API Server，直接跳过 Fallback
|
||||
# if not global_config.maim_message.enable_api_server:
|
||||
# logger.debug("[API Server Fallback] API Server未开启，跳过fallback")
|
||||
# if legacy_exception:
|
||||
# raise legacy_exception
|
||||
# return False
|
||||
# 如果未开启 API Server，直接跳过 Fallback
|
||||
if not global_config.maim_message.enable_api_server:
|
||||
logger.debug("[API Server Fallback] API Server未开启，跳过fallback")
|
||||
if legacy_exception:
|
||||
raise legacy_exception
|
||||
return False
|
||||
|
||||
# global_api = get_global_api()
|
||||
# extra_server = getattr(global_api, "extra_server", None)
|
||||
global_api = get_global_api()
|
||||
extra_server = getattr(global_api, "extra_server", None)
|
||||
|
||||
# if not extra_server:
|
||||
# logger.warning("[API Server Fallback] extra_server不存在")
|
||||
# if legacy_exception:
|
||||
# raise legacy_exception
|
||||
# return False
|
||||
if not extra_server:
|
||||
logger.warning("[API Server Fallback] extra_server不存在")
|
||||
if legacy_exception:
|
||||
raise legacy_exception
|
||||
return False
|
||||
|
||||
# if not extra_server.is_running():
|
||||
# logger.warning("[API Server Fallback] extra_server未运行")
|
||||
# if legacy_exception:
|
||||
# raise legacy_exception
|
||||
# return False
|
||||
if not extra_server.is_running():
|
||||
logger.warning("[API Server Fallback] extra_server未运行")
|
||||
if legacy_exception:
|
||||
raise legacy_exception
|
||||
return False
|
||||
|
||||
# # Fallback: 使用极其简单的 Platform -> API Key 映射
|
||||
# # 只有收到过该平台的消息，我们才知道该平台的 API Key，才能回传消息
|
||||
# platform_map = getattr(global_api, "platform_map", {})
|
||||
# logger.debug(f"[API Server Fallback] platform_map: {platform_map}, 目标平台: '{platform}'")
|
||||
# target_api_key = platform_map.get(platform)
|
||||
# Fallback: 使用极其简单的 Platform -> API Key 映射
|
||||
# 只有收到过该平台的消息，我们才知道该平台的 API Key，才能回传消息
|
||||
platform_map = getattr(global_api, "platform_map", {})
|
||||
logger.debug(f"[API Server Fallback] platform_map: {platform_map}, 目标平台: '{platform}'")
|
||||
target_api_key = platform_map.get(platform)
|
||||
|
||||
# if not target_api_key:
|
||||
# logger.warning(f"[API Server Fallback] 未找到平台'{platform}'的API Key映射")
|
||||
# if legacy_exception:
|
||||
# raise legacy_exception
|
||||
# return False
|
||||
if not target_api_key:
|
||||
logger.warning(f"[API Server Fallback] 未找到平台'{platform}'的API Key映射")
|
||||
if legacy_exception:
|
||||
raise legacy_exception
|
||||
return False
|
||||
|
||||
# # 使用 MessageConverter 转换为 API 消息
|
||||
# from maim_message import MessageConverter
|
||||
# 使用 MessageConverter 转换为 API 消息
|
||||
from maim_message import MessageConverter
|
||||
|
||||
# # 新架构：通过 to_maim_message() 转换，内部已处理私聊/群聊的 user_info 差异
|
||||
# message_base = await message.to_maim_message()
|
||||
# 新架构：通过 to_maim_message() 转换，内部已处理私聊/群聊的 user_info 差异
|
||||
message_base = await message.to_maim_message()
|
||||
|
||||
# api_message = MessageConverter.to_api_send(
|
||||
# message=message_base,
|
||||
# api_key=target_api_key,
|
||||
# platform=platform,
|
||||
# )
|
||||
api_message = MessageConverter.to_api_send(
|
||||
message=message_base,
|
||||
api_key=target_api_key,
|
||||
platform=platform,
|
||||
)
|
||||
|
||||
# # 直接调用 Server 的 send_message 接口，它会自动处理路由
|
||||
# logger.debug("[API Server Fallback] 正在通过extra_server发送消息...")
|
||||
# results = await extra_server.send_message(api_message)
|
||||
# logger.debug(f"[API Server Fallback] 发送结果: {results}")
|
||||
# 直接调用 Server 的 send_message 接口，它会自动处理路由
|
||||
logger.debug("[API Server Fallback] 正在通过extra_server发送消息...")
|
||||
results = await extra_server.send_message(api_message)
|
||||
logger.debug(f"[API Server Fallback] 发送结果: {results}")
|
||||
|
||||
# # 检查是否有任何连接发送成功
|
||||
# if any(results.values()):
|
||||
# if show_log:
|
||||
# logger.info(
|
||||
# f"已通过API Server Fallback将消息 '{message_preview}' 发往平台'{platform}' (key: {target_api_key})"
|
||||
# )
|
||||
# return True
|
||||
# else:
|
||||
# logger.warning(f"[API Server Fallback] 没有连接发送成功, results={results}")
|
||||
# except Exception as e:
|
||||
# logger.error(f"[API Server Fallback] 发生异常: {e}")
|
||||
# import traceback
|
||||
# 检查是否有任何连接发送成功
|
||||
if any(results.values()):
|
||||
if show_log:
|
||||
logger.info(
|
||||
f"已通过API Server Fallback将消息 '{message_preview}' 发往平台'{platform}' (key: {target_api_key})"
|
||||
)
|
||||
return True
|
||||
else:
|
||||
logger.warning(f"[API Server Fallback] 没有连接发送成功, results={results}")
|
||||
except Exception as e:
|
||||
logger.error(f"[API Server Fallback] 发生异常: {e}")
|
||||
import traceback
|
||||
|
||||
# logger.debug(traceback.format_exc())
|
||||
logger.debug(traceback.format_exc())
|
||||
|
||||
# # 如果 Fallback 失败，且存在 legacy 异常，则抛出 legacy 异常
|
||||
# if legacy_exception:
|
||||
# raise legacy_exception
|
||||
# return False
|
||||
# 如果 Fallback 失败，且存在 legacy 异常，则抛出 legacy 异常
|
||||
if legacy_exception:
|
||||
raise legacy_exception
|
||||
return False
|
||||
|
||||
# try:
|
||||
# message_base = await message.to_maim_message()
|
||||
# send_result = await get_global_api().send_message(message_base)
|
||||
# if send_result:
|
||||
# if show_log:
|
||||
# logger.info(f"已将消息 '{message_preview}' 发往平台'{message.platform}'")
|
||||
# return True
|
||||
# else:
|
||||
# # Legacy API 返回 False (发送失败但未报错)，尝试 Fallback
|
||||
# fallback_result = await send_with_new_api()
|
||||
# if fallback_result and show_log:
|
||||
# # Fallback成功的日志已在send_with_new_api中打印
|
||||
# pass
|
||||
# return fallback_result
|
||||
try:
|
||||
message_base = await message.to_maim_message()
|
||||
send_result = await get_global_api().send_message(message_base)
|
||||
if send_result:
|
||||
if show_log:
|
||||
logger.info(f"已将消息 '{message_preview}' 发往平台'{message.platform}'")
|
||||
return True
|
||||
else:
|
||||
# Legacy API 返回 False (发送失败但未报错)，尝试 Fallback
|
||||
fallback_result = await send_with_new_api()
|
||||
if fallback_result and show_log:
|
||||
# Fallback成功的日志已在send_with_new_api中打印
|
||||
pass
|
||||
return fallback_result
|
||||
|
||||
# except Exception as legacy_e:
|
||||
# # Legacy API 抛出异常，尝试 Fallback
|
||||
# # 如果 Fallback 也失败，将重新抛出 legacy_e
|
||||
# return await send_with_new_api(legacy_exception=legacy_e)
|
||||
except Exception as legacy_e:
|
||||
# Legacy API 抛出异常，尝试 Fallback
|
||||
# 如果 Fallback 也失败，将重新抛出 legacy_e
|
||||
return await send_with_new_api(legacy_exception=legacy_e)
|
||||
|
||||
# except Exception as e:
|
||||
# logger.error(f"发送消息 '{message_preview}' 发往平台'{message.platform}' 失败: {str(e)}")
|
||||
# traceback.print_exc()
|
||||
# raise e # 重新抛出其他异常
|
||||
except Exception as e:
|
||||
logger.error(f"发送消息 '{message_preview}' 发往平台'{message.platform}' 失败: {str(e)}")
|
||||
traceback.print_exc()
|
||||
raise e # 重新抛出其他异常
|
||||
|
||||
|
||||
class UniversalMessageSender:
|
||||
@@ -363,9 +363,9 @@ class UniversalMessageSender:
|
||||
)
|
||||
await asyncio.sleep(typing_time)
|
||||
|
||||
# sent_msg = await _send_message(message, show_log=show_log)
|
||||
# if not sent_msg:
|
||||
# return False
|
||||
sent_msg = await _send_message(message, show_log=show_log)
|
||||
if not sent_msg:
|
||||
return False
|
||||
|
||||
# _event_msg = build_event_message(EventType.AFTER_SEND, message=message, stream_id=chat_id)
|
||||
# continue_flag, modified_message = await event_bus.emit(EventType.AFTER_SEND, _event_msg)
|
||||
|
||||
@@ -817,6 +817,10 @@ def assign_message_ids(messages: List[SessionMessage]) -> List[Tuple[str, Sessio
|
||||
result.append((message_id, message))
|
||||
|
||||
return result
|
||||
# break
|
||||
# result.append((message_id, message))
|
||||
|
||||
# return result
|
||||
|
||||
|
||||
def parse_keywords_string(keywords_input) -> list[str]:
|
||||
|
||||
Reference in New Issue
Block a user