update

modules/prompts/news_oral_prompt.txt

@@ -2,7 +2,7 @@
 任务：新闻稿口播化
 
 你需要将一个新闻稿改写为口语化的口播文本，以提供给新闻主播在晚间新闻节目中播报
-同时，适当的添加一些 附语言 标签为文本增加多样性
+同时，适当的添加一些 副语言 标签为文本增加多样性
 
 目前可以使用的附语言标签如下:
 - `[laugh]`: 表示笑声

modules/webui/speaker/speaker_creator.py

@@ -77,11 +77,12 @@ def create_spk_from_seed(
 
 @torch.inference_mode()
 @spaces.GPU(duration=120)
-def test_spk_voice(seed: int, text: str):
-    return tts_generate(
-        spk=seed,
-        text=text,
-    )
+def test_spk_voice(
+    seed: int,
+    text: str,
+    progress=gr.Progress(track_tqdm=True),
+):
+    return tts_generate(spk=seed, text=text, progress=progress)
 
 
 def random_speaker():

modules/webui/speaker/speaker_editor.py

@@ -11,14 +11,15 @@ from modules.webui.webui_utils import tts_generate
 
 @torch.inference_mode()
 @spaces.GPU(duration=120)
-def test_spk_voice(spk_file, text: str):
+def test_spk_voice(
+    spk_file,
+    text: str,
+    progress=gr.Progress(track_tqdm=True),
+):
     if spk_file == "" or spk_file is None:
         return None
     spk = Speaker.from_file(spk_file)
-    return tts_generate(
-        spk=spk,
-        text=text,
-    )
+    return tts_generate(spk=spk, text=text, progress=progress)
 
 
 def speaker_editor_ui():

modules/webui/speaker/speaker_merger.py

@@ -77,7 +77,16 @@ def merge_spk(
 @torch.inference_mode()
 @spaces.GPU(duration=120)
 def merge_and_test_spk_voice(
-    spk_a, spk_a_w, spk_b, spk_b_w, spk_c, spk_c_w, spk_d, spk_d_w, test_text
+    spk_a,
+    spk_a_w,
+    spk_b,
+    spk_b_w,
+    spk_c,
+    spk_c_w,
+    spk_d,
+    spk_d_w,
+    test_text,
+    progress=gr.Progress(track_tqdm=True),
 ):
     merged_spk = merge_spk(
         spk_a,
@@ -89,10 +98,7 @@ def merge_and_test_spk_voice(
         spk_d,
         spk_d_w,
     )
-    return tts_generate(
-        spk=merged_spk,
-        text=test_text,
-    )
+    return tts_generate(spk=merged_spk, text=test_text, progress=progress)
 
 
 @torch.inference_mode()

webui.py

@@ -2,12 +2,6 @@ import logging
 import os
 import sys
 
-from modules.api.api_setup import (
-    process_api_args,
-    process_model_args,
-    setup_api_args,
-    setup_model_args,
-)
 from modules.ffmpeg_env import setup_ffmpeg_path
 
 try:
@@ -22,6 +16,12 @@ except BaseException:
 import argparse
 
 from modules import config
+from modules.api.api_setup import (
+    process_api_args,
+    process_model_args,
+    setup_api_args,
+    setup_model_args,
+)
 from modules.api.app_config import app_description, app_title, app_version
 from modules.gradio_dcls_fix import dcls_patch
 from modules.utils.env import get_and_update_env