Mirrors/text-generation-webui
1
0
Fork 0
mirror of https://github.com/oobabooga/text-generation-webui.git synced 2024-11-26 09:40:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't show 'None' in the LoRA list

Browse Source
This commit is contained in:
oobabooga 2023-04-17 13:52:23 -03:00
parent 19e3a59997
commit c3dc348d1c
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/chat.py
View File

@ -41,7 +41,6 @@ def generate_chat_prompt(user_input, state, **kwargs):
i = len(shared.history['internal']) - 1 i = len(shared.history['internal']) - 1
while i >= 0 and len(encode(''.join(rows))[0]) < max_length: while i >= 0 and len(encode(''.join(rows))[0]) < max_length:
if _continue and i == len(shared.history['internal']) - 1: if _continue and i == len(shared.history['internal']) - 1:
rows.insert(1, f"{prefix2}{shared.history['internal'][i][1]}") rows.insert(1, f"{prefix2}{shared.history['internal'][i][1]}")
else: else:
@ -433,12 +432,12 @@ def load_character(character, name1, name2, mode):
filepath = Path(f'{folder}/{character}.{extension}') filepath = Path(f'{folder}/{character}.{extension}')
if filepath.exists(): if filepath.exists():
break break
file_contents = open(filepath, 'r', encoding='utf-8').read() file_contents = open(filepath, 'r', encoding='utf-8').read()
data = json.loads(file_contents) if extension == "json" else yaml.safe_load(file_contents) data = json.loads(file_contents) if extension == "json" else yaml.safe_load(file_contents)
name2 = data['name'] if 'name' in data else data['char_name']
if 'your_name' in data and data['your_name'] != '': if 'your_name' in data and data['your_name'] != '':
name1 = data['your_name'] name1 = data['your_name']
name2 = data['name'] if 'name' in data else data['char_name']
for field in ['context', 'greeting', 'example_dialogue', 'char_persona', 'char_greeting', 'world_scenario']: for field in ['context', 'greeting', 'example_dialogue', 'char_persona', 'char_greeting', 'world_scenario']:
if field in data: if field in data:
@ -452,10 +451,13 @@ def load_character(character, name1, name2, mode):
if 'example_dialogue' in data: if 'example_dialogue' in data:
context += f"{data['example_dialogue'].strip()}\n" context += f"{data['example_dialogue'].strip()}\n"
if greeting_field in data: if greeting_field in data:
greeting = data[greeting_field] greeting = data[greeting_field]
if 'end_of_turn' in data: if 'end_of_turn' in data:
end_of_turn = data['end_of_turn'] end_of_turn = data['end_of_turn']
else: else:
context = shared.settings['context'] context = shared.settings['context']
name2 = shared.settings['name2'] name2 = shared.settings['name2']
@ -465,7 +467,6 @@ def load_character(character, name1, name2, mode):
if mode != 'instruct': if mode != 'instruct':
shared.history['internal'] = [] shared.history['internal'] = []
shared.history['visible'] = [] shared.history['visible'] = []
if Path(f'logs/{shared.character}_persistent.json').exists(): if Path(f'logs/{shared.character}_persistent.json').exists():
load_history(open(Path(f'logs/{shared.character}_persistent.json'), 'rb').read(), name1, name2) load_history(open(Path(f'logs/{shared.character}_persistent.json'), 'rb').read(), name1, name2)
else: else:

2
server.py
View File

@ -73,7 +73,7 @@ def get_available_softprompts():
def get_available_loras(): def get_available_loras():
return ['None'] + sorted([item.name for item in list(Path(shared.args.lora_dir).glob('*')) if not item.name.endswith(('.txt', '-np', '.pt', '.json'))], key=str.lower) return sorted([item.name for item in list(Path(shared.args.lora_dir).glob('*')) if not item.name.endswith(('.txt', '-np', '.pt', '.json'))], key=str.lower)
def load_model_wrapper(selected_model): def load_model_wrapper(selected_model):