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