zhengjl/text-generation-webui
Public Access
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move more widgets into generation_parameters

Browse Source
This commit is contained in:
oobabooga
2023-04-05 22:30:45 -03:00
parent 64978b45fe
commit cfdbc8bd23
3 changed files with 48 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
modules/chat.py
View File

@@ -96,7 +96,12 @@ def extract_message_from_reply(reply, name1, name2, stop_at_newline):
reply = fix_newlines(reply)
return reply, next_character_found
def chatbot_wrapper(text, max_new_tokens, generation_params, seed, name1, name2, context, stop_at_newline, chat_prompt_size, chat_generation_attempts=1, regenerate=False, mode="cai-chat", end_of_turn=""):
def chatbot_wrapper(text, generation_params, name1, name2, context, regenerate=False, mode="cai-chat", end_of_turn=""):
stop_at_newline = generation_params['stop_at_newline']
max_new_tokens = generation_params['max_new_tokens']
chat_prompt_size = generation_params['chat_prompt_size']
chat_generation_attempts = generation_params['chat_generation_attempts']
just_started = True
eos_token = '\n' if stop_at_newline else None
name1_original = name1
@@ -131,7 +136,7 @@ def chatbot_wrapper(text, max_new_tokens, generation_params, seed, name1, name2,
cumulative_reply = ''
for i in range(chat_generation_attempts):
reply = None
for reply in generate_reply(f"{prompt}{' ' if len(cumulative_reply) > 0 else ''}{cumulative_reply}", max_new_tokens, generation_params, seed, eos_token=eos_token, stopping_strings=[f"\n{name1}:", f"\n{name2}:"]):
for reply in generate_reply(f"{prompt}{' ' if len(cumulative_reply) > 0 else ''}{cumulative_reply}", generation_params, eos_token=eos_token, stopping_strings=[f"\n{name1}:", f"\n{name2}:"]):
reply = cumulative_reply + reply
# Extracting the reply
@@ -160,7 +165,12 @@ def chatbot_wrapper(text, max_new_tokens, generation_params, seed, name1, name2,
yield shared.history['visible']
def impersonate_wrapper(text, max_new_tokens, generation_params, seed, name1, name2, context, stop_at_newline, chat_prompt_size, chat_generation_attempts=1, mode="cai-chat", end_of_turn=""):
def impersonate_wrapper(text, generation_params, name1, name2, context, mode="cai-chat", end_of_turn=""):
stop_at_newline = generation_params['stop_at_newline']
max_new_tokens = generation_params['max_new_tokens']
chat_prompt_size = generation_params['chat_prompt_size']
chat_generation_attempts = generation_params['chat_generation_attempts']
eos_token = '\n' if stop_at_newline else None
if 'pygmalion' in shared.model_name.lower():
@@ -174,7 +184,7 @@ def impersonate_wrapper(text, max_new_tokens, generation_params, seed, name1, na
cumulative_reply = ''
for i in range(chat_generation_attempts):
reply = None
for reply in generate_reply(f"{prompt}{' ' if len(cumulative_reply) > 0 else ''}{cumulative_reply}", max_new_tokens, generation_params, seed, eos_token=eos_token, stopping_strings=[f"\n{name1}:", f"\n{name2}:"]):
for reply in generate_reply(f"{prompt}{' ' if len(cumulative_reply) > 0 else ''}{cumulative_reply}", generation_params, eos_token=eos_token, stopping_strings=[f"\n{name1}:", f"\n{name2}:"]):
reply = cumulative_reply + reply
reply, next_character_found = extract_message_from_reply(reply, name1, name2, stop_at_newline)
yield reply
@@ -186,11 +196,11 @@ def impersonate_wrapper(text, max_new_tokens, generation_params, seed, name1, na
yield reply
def cai_chatbot_wrapper(text, max_new_tokens, generation_params, seed, name1, name2, context, stop_at_newline, chat_prompt_size, chat_generation_attempts=1, mode="cai-chat", end_of_turn=""):
for history in chatbot_wrapper(text, max_new_tokens, generation_params, seed, name1, name2, context, stop_at_newline, chat_prompt_size, chat_generation_attempts, regenerate=False, mode=mode, end_of_turn=end_of_turn):
def cai_chatbot_wrapper(text, generation_params, name1, name2, context, mode="cai-chat", end_of_turn=""):
for history in chatbot_wrapper(text, generation_params, name1, name2, context, regenerate=False, mode=mode, end_of_turn=end_of_turn):
yield chat_html_wrapper(history, name1, name2, mode)
def regenerate_wrapper(text, max_new_tokens, generation_params, seed, name1, name2, context, stop_at_newline, chat_prompt_size, chat_generation_attempts=1, mode="cai-chat", end_of_turn=""):
def regenerate_wrapper(text, generation_params, name1, name2, context, mode="cai-chat", end_of_turn=""):
if (shared.character != 'None' and len(shared.history['visible']) == 1) or len(shared.history['internal']) == 0:
yield chat_html_wrapper(shared.history['visible'], name1, name2, mode)
else:
@@ -198,7 +208,7 @@ def regenerate_wrapper(text, max_new_tokens, generation_params, seed, name1, nam
last_internal = shared.history['internal'].pop()
# Yield '*Is typing...*'
yield chat_html_wrapper(shared.history['visible']+[[last_visible[0], shared.processing_message]], name1, name2, mode)
for history in chatbot_wrapper(last_internal[0], max_new_tokens, generation_params, seed, name1, name2, context, stop_at_newline, chat_prompt_size, chat_generation_attempts, regenerate=True, mode=mode, end_of_turn=end_of_turn):
for history in chatbot_wrapper(last_internal[0], generation_params, name1, name2, context, regenerate=True, mode=mode, end_of_turn=end_of_turn):
shared.history['visible'][-1] = [last_visible[0], history[-1][1]]
yield chat_html_wrapper(shared.history['visible'], name1, name2, mode)

4
modules/text_generation.py
View File

@@ -102,7 +102,9 @@ def set_manual_seed(seed):
def stop_everything_event():
shared.stop_everything = True
def generate_reply(question, max_new_tokens, generation_params, seed, eos_token=None, stopping_strings=[]):
def generate_reply(question, generation_params, eos_token=None, stopping_strings=[]):
max_new_tokens = generation_params['max_new_tokens']
seed = generation_params['seed']
print(generation_params)
print('---------------')
clear_torch_cache()