From 8f7703c15832395a738fba5b5425565c81928529 Mon Sep 17 00:00:00 2001 From: Soulter <37870767+Soulter@users.noreply.github.com> Date: Wed, 19 Apr 2023 16:25:07 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E5=BC=BA=E5=8C=96=E8=B6=85=E5=87=BA?= =?UTF-8?q?=E4=BC=9A=E8=AF=9D=E9=99=90=E5=88=B6=E5=90=8E=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E9=87=8D=E7=BD=AE=EF=BC=9B=E5=85=B6=E4=BB=96=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cores/qqbot/core.py | 6 +++--- model/provider/provider_rev_edgegpt.py | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cores/qqbot/core.py b/cores/qqbot/core.py index fe4bc36bd..8946d9d5b 100644 --- a/cores/qqbot/core.py +++ b/cores/qqbot/core.py @@ -20,7 +20,6 @@ from nakuru import ( GroupMessage, GroupMemberIncrease, FriendMessage - ) from nakuru.entities.components import Plain,At @@ -481,7 +480,7 @@ def oper_msg(message, group=False, msg_ref = None, platform = None): chatgpt_res = "" - if chosen_provider == OPENAI_OFFICIAL: + if chosen_provider == OPENAI_OFFICIAL: hit, command_result = command_openai_official.check_command(qq_msg, session_id, user_name, role, platform=platform) # hit: 是否触发了指令. if not hit: @@ -523,7 +522,8 @@ def oper_msg(message, group=False, msg_ref = None, platform = None): asyncio.run_coroutine_threadsafe(rev_edgegpt.forget(), bing_cache_loop).result() res, res_code = asyncio.run_coroutine_threadsafe(rev_edgegpt.text_chat(qq_msg), bing_cache_loop).result() if res_code == 0: # bing还是不想继续话题，大概率说明提问有问题。 - send_message(platform, message, "Bing仍然不想继续话题, 请检查您的提问。", msg_ref=msg_ref, gocq_loop=gocq_loop, qqchannel_bot=qqchannel_bot, gocq_bot=gocq_bot) + asyncio.run_coroutine_threadsafe(rev_edgegpt.forget(), bing_cache_loop).result() + send_message(platform, message, "Bing仍然不想继续话题, 会话已重置, 请检查您的提问后重试。", msg_ref=msg_ref, gocq_loop=gocq_loop, qqchannel_bot=qqchannel_bot, gocq_bot=gocq_bot) res = "" chatgpt_res = str(res) if REV_EDGEGPT in reply_prefix: diff --git a/model/provider/provider_rev_edgegpt.py b/model/provider/provider_rev_edgegpt.py index 0ac1cf73a..daf82ebab 100644 --- a/model/provider/provider_rev_edgegpt.py +++ b/model/provider/provider_rev_edgegpt.py @@ -36,7 +36,10 @@ class ProviderRevEdgeGPT(Provider): self.busy = False return '', 0 if resp == prompt: - resp += '\n\n如果你没有让我复述你的话，那代表我可能不想和你继续这个话题了，请输入reset重置会话😶' + # resp += '\n\n如果你没有让我复述你的话，那代表我可能不想和你继续这个话题了，请输入reset重置会话😶' + await self.forget() + err_count += 1 + continue break except BaseException as e: print(e.with_traceback)