From 8e4e8dd7415fe7f5a40406a87b1af27c097859a1 Mon Sep 17 00:00:00 2001 From: oobabooga <112222186+oobabooga@users.noreply.github.com> Date: Thu, 6 Apr 2023 23:33:09 -0300 Subject: [PATCH] Unrelated bugs that I noticed and had to fix --- extensions/silero_tts/script.py | 13 +++++++------ extensions/silero_tts/tts_preprocessor.py | 1 + 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/extensions/silero_tts/script.py b/extensions/silero_tts/script.py index 364a6bd..e2681fb 100644 --- a/extensions/silero_tts/script.py +++ b/extensions/silero_tts/script.py @@ -5,6 +5,7 @@ import gradio as gr import torch from extensions.silero_tts import tts_preprocessor from modules import chat, shared +from modules.html_generator import chat_html_wrapper torch._C._jit_set_profiling_mode(False) @@ -50,13 +51,13 @@ def load_model(): model = load_model() -def remove_tts_from_history(name1, name2): +def remove_tts_from_history(name1, name2, mode): for i, entry in enumerate(shared.history['internal']): shared.history['visible'][i] = [shared.history['visible'][i][0], entry[1]] - return chat.generate_chat_output(shared.history['visible'], name1, name2, shared.character) + return chat_html_wrapper(shared.history['visible'], name1, name2, mode) -def toggle_text_in_history(name1, name2): +def toggle_text_in_history(name1, name2, mode): for i, entry in enumerate(shared.history['visible']): visible_reply = entry[1] if visible_reply.startswith('')[0]}\n\n{reply}"] else: shared.history['visible'][i] = [shared.history['visible'][i][0], f"{visible_reply.split('')[0]}"] - return chat.generate_chat_output(shared.history['visible'], name1, name2, shared.character) + return chat_html_wrapper(shared.history['visible'], name1, name2, mode) def input_modifier(string): @@ -153,13 +154,13 @@ def ui(): convert_arr = [convert_confirm, convert, convert_cancel] convert.click(lambda :[gr.update(visible=True), gr.update(visible=False), gr.update(visible=True)], None, convert_arr) convert_confirm.click(lambda :[gr.update(visible=False), gr.update(visible=True), gr.update(visible=False)], None, convert_arr) - convert_confirm.click(remove_tts_from_history, [shared.gradio['name1'], shared.gradio['name2']], shared.gradio['display']) + convert_confirm.click(remove_tts_from_history, [shared.gradio[k] for k in ['name1', 'name2', 'Chat mode']], shared.gradio['display']) convert_confirm.click(lambda : chat.save_history(timestamp=False), [], [], show_progress=False) convert_cancel.click(lambda :[gr.update(visible=False), gr.update(visible=True), gr.update(visible=False)], None, convert_arr) # Toggle message text in history show_text.change(lambda x: params.update({"show_text": x}), show_text, None) - show_text.change(toggle_text_in_history, [shared.gradio['name1'], shared.gradio['name2']], shared.gradio['display']) + show_text.change(toggle_text_in_history, [shared.gradio[k] for k in ['name1', 'name2', 'Chat mode']], shared.gradio['display']) show_text.change(lambda : chat.save_history(timestamp=False), [], [], show_progress=False) # Event functions to update the parameters in the backend diff --git a/extensions/silero_tts/tts_preprocessor.py b/extensions/silero_tts/tts_preprocessor.py index 9dc3fd5..3682fcf 100644 --- a/extensions/silero_tts/tts_preprocessor.py +++ b/extensions/silero_tts/tts_preprocessor.py @@ -2,6 +2,7 @@ import re from num2words import num2words +#punctuation = r'[\s,.?!/)"\'\]>]“”' punctuation = r'[\s,.?!/)"\'\]>]' alphabet_map = { "A": " Ei ",