From b4fc1057d1f9d25e74fe8e1792aede01beaecbda Mon Sep 17 00:00:00 2001 From: Rock Chin <1010553892@qq.com> Date: Thu, 6 Jul 2023 23:09:39 +0800 Subject: [PATCH 1/4] =?UTF-8?q?perf:=20=E5=9C=A8session=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E9=87=8D=E7=BD=AE=E6=97=B6=E4=BF=9D=E7=95=99=E9=9D=9Edefault?= =?UTF-8?q?=E7=9A=84prompt=20(#494)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/openai/session.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/openai/session.py b/pkg/openai/session.py index fc217ab3..96d56d3c 100644 --- a/pkg/openai/session.py +++ b/pkg/openai/session.py @@ -345,7 +345,8 @@ class Session: if expired: pkg.utils.context.get_database_manager().set_session_expired(self.name, self.create_timestamp) - self.default_prompt = self.get_default_prompt(use_prompt) + if use_prompt: + self.default_prompt = self.get_default_prompt(use_prompt) self.prompt = [] self.token_counts = [] self.create_timestamp = int(time.time()) From 56e1ef36024bf9c074df3d640908c16d58424613 Mon Sep 17 00:00:00 2001 From: Rock Chin <1010553892@qq.com> Date: Fri, 7 Jul 2023 16:35:37 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dreset=E5=8F=AF?= =?UTF-8?q?=E8=83=BD=E5=BC=95=E8=B5=B7=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/openai/session.py | 4 ++-- pkg/qqbot/message.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/openai/session.py b/pkg/openai/session.py index 96d56d3c..06b00757 100644 --- a/pkg/openai/session.py +++ b/pkg/openai/session.py @@ -327,7 +327,7 @@ class Session: json.dumps(self.prompt), json.dumps(self.default_prompt), json.dumps(self.token_counts)) # 重置session - def reset(self, explicit: bool = False, expired: bool = False, schedule_new: bool = True, use_prompt: str = None): + def reset(self, explicit: bool = False, expired: bool = False, schedule_new: bool = True, use_prompt: str = None, persist: bool = False): if self.prompt: self.persistence() if explicit: @@ -345,7 +345,7 @@ class Session: if expired: pkg.utils.context.get_database_manager().set_session_expired(self.name, self.create_timestamp) - if use_prompt: + if not persist: # 不要求保持default prompt self.default_prompt = self.get_default_prompt(use_prompt) self.prompt = [] self.token_counts = [] diff --git a/pkg/qqbot/message.py b/pkg/qqbot/message.py index 4c0207df..b4dcbfba 100644 --- a/pkg/qqbot/message.py +++ b/pkg/qqbot/message.py @@ -115,7 +115,7 @@ def process_normal_message(text_message: str, mgr, config, launcher_type: str, "[bot]err:RateLimitError,请重试或联系作者，或等待修复") except openai.error.InvalidRequestError as e: if config.auto_reset and "This model's maximum context length is" in str(e): - session.reset() + session.reset(persist=True) reply = [tips_custom.session_auto_reset_message] else: reply = handle_exception("{}API调用参数错误:{}\n".format( From a0267416d7caa37bd5fa3e12c9d91f803d32277c Mon Sep 17 00:00:00 2001 From: Rock Chin <1010553892@qq.com> Date: Fri, 7 Jul 2023 16:37:05 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dreset=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E5=AF=BC=E8=87=B4=E7=9A=84=E6=97=A0=E6=B3=95=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96=E6=83=85=E6=99=AF=E9=A2=84=E8=AE=BE=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/qqbot/cmds/session/reset.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/qqbot/cmds/session/reset.py b/pkg/qqbot/cmds/session/reset.py index 87be5a9f..8cec9568 100644 --- a/pkg/qqbot/cmds/session/reset.py +++ b/pkg/qqbot/cmds/session/reset.py @@ -22,7 +22,7 @@ class ResetCommand(AbstractCommandNode): reply = "" if len(params) == 0: - pkg.openai.session.get_session(session_name).reset(explicit=True) + pkg.openai.session.get_session(session_name).reset(explicit=True, persist=True) reply = [tips_custom.command_reset_message] else: try: From ddb56d7a8e3d85edff19b043d51e801e92fdd3f7 Mon Sep 17 00:00:00 2001 From: Rock Chin <1010553892@qq.com> Date: Fri, 7 Jul 2023 17:49:43 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20reset=E5=91=BD=E4=BB=A4=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E7=9A=84=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/qqbot/cmds/session/reset.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/qqbot/cmds/session/reset.py b/pkg/qqbot/cmds/session/reset.py index 8cec9568..87be5a9f 100644 --- a/pkg/qqbot/cmds/session/reset.py +++ b/pkg/qqbot/cmds/session/reset.py @@ -22,7 +22,7 @@ class ResetCommand(AbstractCommandNode): reply = "" if len(params) == 0: - pkg.openai.session.get_session(session_name).reset(explicit=True, persist=True) + pkg.openai.session.get_session(session_name).reset(explicit=True) reply = [tips_custom.command_reset_message] else: try: