Move characters/instruction-following to instruction-templates

extensions/openai/completions.py

@@ -165,7 +165,7 @@ def messages_to_prompt(body: dict, req_params: dict, max_tokens):
     # Instruct models can be much better
     if shared.settings['instruction_template']:
         try:
-            instruct = yaml.safe_load(open(f"characters/instruction-following/{shared.settings['instruction_template']}.yaml", 'r'))
+            instruct = yaml.safe_load(open(f"instruction-templates/{shared.settings['instruction_template']}.yaml", 'r'))
 
             template = instruct['turn_template']
             system_message_template = "{message}"
@@ -193,7 +193,7 @@ def messages_to_prompt(body: dict, req_params: dict, max_tokens):
         except Exception as e:
             req_params['stopping_strings'].extend(['\nUser:', 'User:'])  # XXX User: prompt here also
 
-            print(f"Exception: When loading characters/instruction-following/{shared.settings['instruction_template']}.yaml: {repr(e)}")
+            print(f"Exception: When loading instruction-templates/{shared.settings['instruction_template']}.yaml: {repr(e)}")
             print("Warning: Loaded default instruction-following template for model.")
 
     else:

extensions/openai/edits.py

@@ -31,7 +31,7 @@ def edits(instruction: str, input: str, temperature=1.0, top_p=1.0) -> dict:
             stopping_strings.extend(['\n###'])
         else:
             try:
-                instruct = yaml.safe_load(open(f"characters/instruction-following/{shared.settings['instruction_template']}.yaml", 'r'))
+                instruct = yaml.safe_load(open(f"instruction-templates/{shared.settings['instruction_template']}.yaml", 'r'))
 
                 template = instruct['turn_template']
                 template = template\
@@ -45,7 +45,7 @@ def edits(instruction: str, input: str, temperature=1.0, top_p=1.0) -> dict:
 
             except Exception as e:
                 instruction_template = default_template
-                print(f"Exception: When loading characters/instruction-following/{shared.settings['instruction_template']}.yaml: {repr(e)}")
+                print(f"Exception: When loading instruction-templates/{shared.settings['instruction_template']}.yaml: {repr(e)}")
                 print("Warning: Loaded default instruction-following template (Alpaca) for model.")
     else:
         stopping_strings.extend(['\n###'])

modules/chat.py

@@ -475,7 +475,7 @@ def load_character(character, name1, name2, instruct=False):
         Path("cache/pfp_character.png").unlink()
 
     if character not in ['None', '', None]:
-        folder = 'characters' if not instruct else 'characters/instruction-following'
+        folder = 'characters' if not instruct else 'instruction-templates'
         picture = generate_pfp_cache(character)
         filepath = None
         for extension in ["yml", "yaml", "json"]:

modules/prompts.py

@@ -12,7 +12,7 @@ def load_prompt(fname):
         return ''
     elif fname.startswith('Instruct-'):
         fname = re.sub('^Instruct-', '', fname)
-        file_path = Path(f'characters/instruction-following/{fname}.yaml')
+        file_path = Path(f'instruction-templates/{fname}.yaml')
         if not file_path.exists():
             return ''
 

modules/ui_chat.py

@@ -232,13 +232,13 @@ def create_event_handlers():
 
     shared.gradio['save_template'].click(
         lambda: 'My Template.yaml', None, gradio('save_filename')).then(
-        lambda: 'characters/instruction-following/', None, gradio('save_root')).then(
+        lambda: 'instruction-templates/', None, gradio('save_root')).then(
         chat.generate_instruction_template_yaml, gradio('name1_instruct', 'name2_instruct', 'context_instruct', 'turn_template'), gradio('save_contents')).then(
         lambda: gr.update(visible=True), None, gradio('file_saver'))
 
     shared.gradio['delete_template'].click(
         lambda x: f'{x}.yaml', gradio('instruction_template'), gradio('delete_filename')).then(
-        lambda: 'characters/instruction-following/', None, gradio('delete_root')).then(
+        lambda: 'instruction-templates/', None, gradio('delete_root')).then(
         lambda: gr.update(visible=True), None, gradio('file_deleter'))
 
     shared.gradio['save_chat_history'].click(

modules/utils.py

@@ -90,11 +90,11 @@ def get_available_prompts():
 
 def get_available_characters():
     paths = (x for x in Path('characters').iterdir() if x.suffix in ('.json', '.yaml', '.yml'))
-    return ['None'] + sorted(set((k.stem for k in paths if k.stem != "instruction-following")), key=natural_keys)
+    return ['None'] + sorted(set((k.stem for k in paths)), key=natural_keys)
 
 
 def get_available_instruction_templates():
-    path = "characters/instruction-following"
+    path = "instruction-templates"
     paths = []
     if os.path.exists(path):
         paths = (x for x in Path(path).iterdir() if x.suffix in ('.json', '.yaml', '.yml'))