fix: 超时不重试的问题 (#91)

This commit is contained in:
Rock Chin
2023-01-08 14:49:23 +08:00
parent 2dcbe87986
commit 06264354cf
2 changed files with 5 additions and 3 deletions
+3 -1
View File
@@ -159,8 +159,10 @@ class QQBotManager:
event.sender.id) event.sender.id)
break break
except FunctionTimedOut: 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() 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 failed += 1
continue continue
+2 -2
View File
@@ -8,7 +8,7 @@ from func_timeout import func_set_timeout
import logging import logging
import openai import openai
from mirai import Image, MessageChain from mirai import Image, MessageChain, Plain
# 这里不使用动态引入config # 这里不使用动态引入config
# 因为在这里动态引入会卡死程序 # 因为在这里动态引入会卡死程序
@@ -114,7 +114,7 @@ def process_message(launcher_type: str, launcher_id: int, text_message: str, mes
try: try:
if session_name in processing: if session_name in processing:
pkg.openai.session.get_session(session_name).release_response_lock() pkg.openai.session.get_session(session_name).release_response_lock()
return ["[bot]err:正在处理中,请稍后再试"] return MessageChain([Plain("[bot]err:正在处理中,请稍后再试")])
processing.append(session_name) processing.append(session_name)