From c94a9e1ae6511dfb43f46b202c755b2f7d22fcb4 Mon Sep 17 00:00:00 2001 From: chordfish <592229466@qq.com> Date: Fri, 10 Mar 2023 13:55:56 +0800 Subject: [PATCH] =?UTF-8?q?bug:=E4=BF=AE=E5=A4=8D=E4=B8=8A=E6=AC=A1?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=90=8E=E4=B8=8D=E5=93=8D=E5=BA=94=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/openai/dprompt.py | 2 +- pkg/openai/session.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/openai/dprompt.py b/pkg/openai/dprompt.py index e45ab9ed..3638dea5 100644 --- a/pkg/openai/dprompt.py +++ b/pkg/openai/dprompt.py @@ -89,7 +89,7 @@ def get_prompt(name: str = None) -> str: with open(json_file, 'r', encoding ='utf-8') as f: json_content = json.load(f) logging.debug('succeed to load json: {}'.format(json_file)) - return json_content['prompt'] + return json_content['prompt'], json_content['name'], json_content['filter'] except FileNotFoundError: diff --git a/pkg/openai/session.py b/pkg/openai/session.py index 8a922df8..8a227c5e 100644 --- a/pkg/openai/session.py +++ b/pkg/openai/session.py @@ -306,7 +306,8 @@ class Session: if expired: pkg.utils.context.get_database_manager().set_session_expired(self.name, self.create_timestamp) - self.prompt = self.get_default_prompt(use_prompt) + # a, b为bot_name和bot_filter占位变量 + self.prompt, a, b = self.get_default_prompt(use_prompt) self.create_timestamp = int(time.time()) self.last_interact_timestamp = int(time.time()) self.just_switched_to_exist_session = False