From ea97303509598790b389b79243b08e74e7651dfa Mon Sep 17 00:00:00 2001 From: "Alex \"mcmonkey\" Goodwin" <4000772+mcmonkey4eva@users.noreply.github.com> Date: Sun, 2 Apr 2023 17:54:29 -0700 Subject: [PATCH] Apply dialogue format in all character fields not just example dialogue (#650) --- modules/chat.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/modules/chat.py b/modules/chat.py index 2280be03..ae478f08 100644 --- a/modules/chat.py +++ b/modules/chat.py @@ -330,6 +330,10 @@ def load_default_history(name1, name2): shared.history['internal'] = [] shared.history['visible'] = [] +def replace_character_names(text, name1, name2): + text = text.replace('{{user}}', name1).replace('{{char}}', name2) + return text.replace('', name1).replace('', name2) + def build_pygmalion_style_context(data): context = "" if 'char_persona' in data and data['char_persona'] != '': @@ -344,25 +348,26 @@ def load_character(_character, name1, name2): shared.history['visible'] = [] if _character != 'None': shared.character = _character - + for extension in ["yml", "yaml", "json"]: filepath = Path(f'characters/{_character}.{extension}') if filepath.exists(): break data = yaml.safe_load(open(filepath, 'r', encoding='utf-8').read()) + name2 = data['name'] if 'name' in data else data['char_name'] + for field in ['context', 'greeting', 'example_dialogue', 'char_persona', 'char_greeting', 'world_scenario']: + if field in data: + data[field] = replace_character_names(data[field], name1, name2) + if 'context' in data: context = f"{data['context'].strip()}\n\n" - name2 = data['name'] greeting_field = 'greeting' else: context = build_pygmalion_style_context(data) - name2 = data['char_name'] greeting_field = 'char_greeting' if 'example_dialogue' in data and data['example_dialogue'] != '': - data['example_dialogue'] = data['example_dialogue'].replace('{{user}}', name1).replace('{{char}}', name2) - data['example_dialogue'] = data['example_dialogue'].replace('', name1).replace('', name2) context += f"{data['example_dialogue'].strip()}\n" if greeting_field in data and len(data[greeting_field].strip()) > 0: shared.history['internal'] += [['<|BEGIN-VISIBLE-CHAT|>', data[greeting_field]]]