diff --git a/.gitignore b/.gitignore index 362973b..10cc092 100644 --- a/.gitignore +++ b/.gitignore @@ -11,4 +11,6 @@ prompts/ logs/ sensitive.json temp/ -current_tag \ No newline at end of file +current_tag +scenario/ +!scenario/default-template.json \ No newline at end of file diff --git a/main.py b/main.py index bfdd7a8..de0d5a9 100644 --- a/main.py +++ b/main.py @@ -332,6 +332,10 @@ if __name__ == '__main__': if not os.path.exists("sensitive.json"): shutil.copy("sensitive-template.json", "sensitive.json") + # 检查是否有scenario/default.json + if not os.path.exists("scenario/default.json"): + shutil.copy("scenario/default-template.json", "scenario/default.json") + # 检查temp目录 if not os.path.exists("temp/"): os.mkdir("temp/") diff --git a/pkg/openai/dprompt.py b/pkg/openai/dprompt.py index 4768e59..152bfca 100644 --- a/pkg/openai/dprompt.py +++ b/pkg/openai/dprompt.py @@ -88,10 +88,8 @@ def get_prompt(name: str = None) -> list: json_content = json.load(f) logging.debug('succeed to load json: {}'.format(json_file)) return json_content['prompt'] - except FileNotFoundError: - - raise KeyError("未找到Json情景预设: " + name) + raise KeyError("未找到JSON情景预设: " + name) # 默认预设方式 elif preset_mode == 'default': diff --git a/scenario/default.json b/scenario/default-template.json similarity index 97% rename from scenario/default.json rename to scenario/default-template.json index 3dcfd9a..d9b7267 100644 --- a/scenario/default.json +++ b/scenario/default-template.json @@ -1,12 +1,12 @@ -{ - "prompt": [ - { - "role": "system", - "content": "You are a helpful assistant. 如果我需要帮助,你要说“输入!help获得帮助”" - }, - { - "role": "assistant", - "content": "好的,我是一个能干的AI助手。 如果你需要帮助,我会说“输入!help获得帮助”" - } - ] +{ + "prompt": [ + { + "role": "system", + "content": "You are a helpful assistant. 如果我需要帮助,你要说“输入!help获得帮助”" + }, + { + "role": "assistant", + "content": "好的,我是一个能干的AI助手。 如果你需要帮助,我会说“输入!help获得帮助”" + } + ] } \ No newline at end of file