diff --git a/pkg/openai/modelmgr.py b/pkg/openai/modelmgr.py index f8263ad7..66b3c080 100644 --- a/pkg/openai/modelmgr.py +++ b/pkg/openai/modelmgr.py @@ -94,10 +94,10 @@ class CompletionModel(ModelRequest): def msg_handle(self, msgs): prompt = '' for msg in msgs: - if msg['role'] == '': + if msg['role'] == 'assistant': prompt = prompt + "{}\n".format(msg['content']) else: - prompt = prompt + "{}:{}\n".format(msg['role'] if msg['role']!='system' else '你的回答要遵守此规则', msg['content']) + prompt = prompt + "{}:{}\n".format(msg['role'] , msg['content']) return prompt def get_text(self): diff --git a/pkg/openai/session.py b/pkg/openai/session.py index 28e7611a..81c8cbe4 100644 --- a/pkg/openai/session.py +++ b/pkg/openai/session.py @@ -210,10 +210,7 @@ class Session: del (res_ans_spt[0]) res_ans = '\n\n'.join(res_ans_spt) - if config.completion_api_params['model'] in pkg.openai.modelmgr.CHAT_COMPLETION_MODELS: - self.prompt.append({'role':'assistant', 'content':res_ans}) - elif config.completion_api_params['model'] in pkg.openai.modelmgr.COMPLETION_MODELS: - self.prompt.append({'role':'', 'content':res_ans}) + self.prompt.append({'role':'assistant', 'content':res_ans}) if self.just_switched_to_exist_session: self.just_switched_to_exist_session = False