diff --git a/pkg/qqbot/manager.py b/pkg/qqbot/manager.py index b8c66fd8..9e7de955 100644 --- a/pkg/qqbot/manager.py +++ b/pkg/qqbot/manager.py @@ -159,8 +159,10 @@ class QQBotManager: event.sender.id) break except FunctionTimedOut: - logging.warning("person_{}: 超时,重试中".format(event.sender.id)) + logging.warning("person_{}: 超时".format(event.sender.id)) pkg.openai.session.get_session('person_{}'.format(event.sender.id)).release_response_lock() + if "person_{}".format(event.sender.id) in pkg.qqbot.process.processing: + pkg.qqbot.process.processing.remove('person_{}'.format(event.sender.id)) failed += 1 continue diff --git a/pkg/qqbot/process.py b/pkg/qqbot/process.py index 0fbfd00c..f5cb2513 100644 --- a/pkg/qqbot/process.py +++ b/pkg/qqbot/process.py @@ -8,7 +8,7 @@ from func_timeout import func_set_timeout import logging import openai -from mirai import Image, MessageChain +from mirai import Image, MessageChain, Plain # 这里不使用动态引入config # 因为在这里动态引入会卡死程序 @@ -114,7 +114,7 @@ def process_message(launcher_type: str, launcher_id: int, text_message: str, mes try: if session_name in processing: pkg.openai.session.get_session(session_name).release_response_lock() - return ["[bot]err:正在处理中,请稍后再试"] + return MessageChain([Plain("[bot]err:正在处理中,请稍后再试")]) processing.append(session_name)