Upload folder using huggingface_hub

app.py

@@ -1,3 +1,4 @@
+import random
 import nltk
 import ssl
 
@@ -27,11 +28,9 @@ device = config.webui_config.device
 if device == "mps":
     os.environ["PYTORCH_ENABLE_MPS_FALLBACK"] = "1"
 
-
 def speak_fn(
         text: str,
         exceed_flag,
-        bubble_text,
         speaker="TalkFlower_CNzh",
         sdp_ratio=0.2,      # SDP/DP混合比
         noise_scale=0.6,        # 感情
@@ -45,11 +44,12 @@ def speak_fn(
         text = text.replace("\n\n", "\n")
     if len(text) > 100:
         print(f"Too Long Text: {text}")
-        gr.Warning("Too long! No more than 100 characters. 一口气不要超过 100 个字，憋坏我了。")
         if exceed_flag:
-            return gr.update(value="./assets/audios/nomorethan100.wav", autoplay=True), False, "不要超过100个字！"
+            text = "不要超过100字！"
+            return gr.update(value="./assets/audios/nomorethan100.wav"), get_character_html(text), False, gr.update(interactive=True)
         else:
-            return gr.update(value="./assets/audios/overlength.wav", autoplay=True), True, "这句太长啦，憋坏我了！"
+            text = "这句太长了，憋坏我啦！"
+            return gr.update(value="./assets/audios/overlength.wav"), get_character_html(text), True, gr.update(interactive=True)
     audio_list = []
     if len(text) > 42:
         print(f"Long Text: {text}")
@@ -74,13 +74,9 @@ def speak_fn(
                 silence = np.zeros((int)(44100 * interval_between_sent))
                 audio_list_sent.append(silence)
             if (interval_between_para - interval_between_sent) > 0:
-                silence = np.zeros(
-                    (int)(44100 * (interval_between_para - interval_between_sent))
-                )
+                silence = np.zeros((int)(44100 * (interval_between_para - interval_between_sent)))
                 audio_list_sent.append(silence)
-            audio16bit = gr.processing_utils.convert_to_16_bit_wav(
-                np.concatenate(audio_list_sent)
-            )  # 对完整句子做音量归一
+            audio16bit = gr.processing_utils.convert_to_16_bit_wav(np.concatenate(audio_list_sent))  # 对完整句子做音量归一
             audio_list.append(audio16bit)
     else:
         print(f"Short Text: {text}")
@@ -104,17 +100,29 @@ def speak_fn(
                 audio_list.append(silence)  # 将静音添加到列表中
     
     audio_concat = np.concatenate(audio_list)    
-    return (hps.data.sampling_rate, audio_concat), exceed_flag, text
+    return (hps.data.sampling_rate, audio_concat), get_character_html(text), exceed_flag, gr.update(interactive=True)
 
 
-def update_bubble_fn(text):
-    return gr.update(value=get_character_html(text))
+def submit_lock_fn():    
+    return gr.update(interactive=False)
 
 
 def init_fn():
-    gr.Info("2023-11-23: 有什么建议可以在 Community 中提哦。")
     gr.Info("2023-11-24: 优化长句生成效果；增加示例；更新了一些小彩蛋；画了一些大饼）")
-    gr.Info("Only support Chinese now. Trying to train a mutilingual model.")
+    gr.Info("Only support Chinese now. Trying to train a mutilingual model. 欢迎在 Community 中提建议~")
+    
+    index = random.randint(1,7)
+    welcome_dict = {
+        1: "哇！你来找我玩啦！",
+        2: "你好呀！",
+        3: "哇！你来啦~",
+        4: "真高兴见到你！",
+        5: "我一朵花好无聊啊！",
+        6: "欢迎你！",
+        7: "来找我玩啦！",
+    }
+    
+    return gr.update(value=f"./assets/audios/Welcome{index}.wav"), get_character_html(welcome_dict[index])
 
 
 with open("./css/style.css", "r", encoding="utf-8") as f:
@@ -122,8 +130,8 @@ with open("./css/style.css", "r", encoding="utf-8") as f:
 
 with gr.Blocks(css=customCSS) as demo:
     exceed_flag = gr.State(value=False)
-    bubble_text = gr.State(value="你好呀！")
-    character_area = gr.HTML(get_character_html("你好呀！"), elem_id="character_area")
+    bubble_text = gr.State(value="感谢你来找我玩！")
+    character_area = gr.HTML(get_character_html("感谢你来找我玩！"), elem_id="character_area")
     with gr.Tab("Speak", elem_id="tab-speak"):
         speak_input = gr.Textbox(lines=1, label="Talking Flower will say:", elem_classes="wonder-card", elem_id="input_text")
         speak_button = gr.Button("Speak!", elem_id="speak_button", elem_classes="main-button wonder-card")
@@ -136,22 +144,21 @@ with gr.Blocks(css=customCSS) as demo:
         mimic_button = gr.Button("Mimic!", elem_id="mimic_button", elem_classes="main-button wonder-card")
     audio_output = gr.Audio(label="输出音频", show_label=False, autoplay=True, elem_id="audio_output", elem_classes="wonder-card")
     
-    
     demo.load(
         init_fn,
         inputs=[],
-        outputs=[]
+        outputs=[audio_output, character_area]
     )
-    speak_input.submit(
+    speak_input.submit(submit_lock_fn, show_progress=False).then(
         speak_fn,
-        inputs=[speak_input, exceed_flag, bubble_text],
-        outputs=[audio_output, exceed_flag, bubble_text],
-    ).then(update_bubble_fn, inputs=[speak_input], outputs=[character_area], show_progress=False)
-    speak_button.click(
+        inputs=[speak_input, exceed_flag],
+        outputs=[audio_output, character_area, exceed_flag, speak_button],
+    )
+    speak_button.click(submit_lock_fn, show_progress=False).then(
         speak_fn,
-        inputs=[speak_input, exceed_flag, bubble_text],
-        outputs=[audio_output, exceed_flag, bubble_text],
-    ).then(update_bubble_fn, inputs=[speak_input], outputs=[character_area], show_progress=False)
+        inputs=[speak_input, exceed_flag],
+        outputs=[audio_output, character_area, exceed_flag, speak_button],
+    )
 
 
 if __name__ == "__main__":

css/style.css

@@ -67,6 +67,12 @@ gradio-app {
     width: var(--card-width) !important;
     align-self: center;
 }
+#character_area .pending {
+    opacity: 1 !important;
+}
+#character_area div.wrap {
+    display: none;
+}
 .character {
     display: flex;
     flex-direction: row;
@@ -191,6 +197,9 @@ gradio-app {
 #input_text label textarea {
     width: 80%;
 }
+#input_text div.wrap {
+    display: none;
+}
 #input_text {
     display: flex;
     background: #ffffff !important;
@@ -231,6 +240,10 @@ gradio-app {
 
     transform: translate(-2px,-2px) !important;
 }
+.main-button:disabled,
+.main-button[disabled]{
+  opacity: 100% !important;
+}
 #speak_button {
     background: var(--color-yellow) !important;
     color: var(--color-accent-black) !important;