Update app.py

app.py

@@ -80,47 +80,41 @@ def tts3(text, sample, ns, nsw, ls):
         return "输入参数不为整数或其他错误", None
 app = gr.Blocks()
 with app:
-    with gr.Blocks() as app:
-        gr.Markdown(
-            "# <center> EMO-VITS语音在线合成demo\n"
-            "<div align='center'>月永雷欧</div>"
-            '<div align="center"><a><font color="#dd0000">结果有随机性，语调可能很奇怪，可多次生成取最佳效果</font></a></div>'
-            '<div align="center"><a><font color="#dd0000">标点符号会影响生成的结果</font></a></div>'
-        )    
-        with gr.Tabs():
-            with gr.TabItem("使用预制情感合成"):
-                tts_input1 = gr.TextArea(label="日语文本", value="こんにちは。私わあやちねねです。")
-                tts_input2 = gr.Dropdown(label="情感", choices=list(emotion_dict.keys()),  value="平静1")
-                ns = gr.Slider(label="noise_scale(控制感情变化程度)", minimum=0.1, maximum=1.0, step=0.1, value=0.6, interactive=True)
-                nsw = gr.Slider(label="noise_scale_w(控制音素发音长度)", minimum=0.1, maximum=1.0, step=0.1, value=0.668, interactive=True)
-                ls = gr.Slider(label="length_scale(控制整体语速)", minimum=0.1, maximum=2.0, step=0.1, value=1.2, interactive=True)
-                tts_submit = gr.Button("合成音频", variant="primary")
-                tts_output1 = gr.Textbox(label="Message")
-                tts_output2 = gr.Audio(label="Output")
-                tts_submit.click(tts1, [tts_input1, tts_input2, ns, nsw, ls], [tts_output1, tts_output2])
-            with gr.TabItem("随机抽取训练集样本作为情感参数"):
-                tts_input1 = gr.TextArea(label="日语文本", value="こんにちは。私わあやちねねです。")
-                ns = gr.Slider(label="noise_scale(控制感情变化程度)", minimum=0.1, maximum=1.0, step=0.1, value=0.6, interactive=True)
-                nsw = gr.Slider(label="noise_scale_w(控制音素发音长度)", minimum=0.1, maximum=1.0, step=0.1, value=0.668, interactive=True)
-                ls = gr.Slider(label="length_scale(控制整体语速)", minimum=0.1, maximum=2.0, step=0.1, value=1.2, interactive=True)
-                tts_submit = gr.Button("合成音频", variant="primary")
-                tts_output1 = gr.Textbox(label="随机样本id（可用于第三个tab中合成）")
-                tts_output2 = gr.Audio(label="Output")
-                tts_submit.click(tts2, [tts_input1, ns, nsw, ls], [tts_output1, tts_output2])
+   
+    with gr.Tabs():
+        with gr.TabItem("使用预制情感合成"):
+            tts_input1 = gr.TextArea(label="日语文本", value="こんにちは。私わあやちねねです。")
+            tts_input2 = gr.Dropdown(label="情感", choices=list(emotion_dict.keys()),  value="平静1")
+            ns = gr.Slider(label="noise_scale(控制感情变化程度)", minimum=0.1, maximum=1.0, step=0.1, value=0.6, interactive=True)
+            nsw = gr.Slider(label="noise_scale_w(控制音素发音长度)", minimum=0.1, maximum=1.0, step=0.1, value=0.668, interactive=True)
+            ls = gr.Slider(label="length_scale(控制整体语速)", minimum=0.1, maximum=2.0, step=0.1, value=1.2, interactive=True)
+            tts_submit = gr.Button("合成音频", variant="primary")
+            tts_output1 = gr.Textbox(label="Message")
+            tts_output2 = gr.Audio(label="Output")
+            tts_submit.click(tts1, [tts_input1, tts_input2, ns, nsw, ls], [tts_output1, tts_output2])
+        with gr.TabItem("随机抽取训练集样本作为情感参数"):
+            tts_input1 = gr.TextArea(label="日语文本", value="こんにちは。私わあやちねねです。")
+            ns = gr.Slider(label="noise_scale(控制感情变化程度)", minimum=0.1, maximum=1.0, step=0.1, value=0.6, interactive=True)
+            nsw = gr.Slider(label="noise_scale_w(控制音素发音长度)", minimum=0.1, maximum=1.0, step=0.1, value=0.668, interactive=True)
+            ls = gr.Slider(label="length_scale(控制整体语速)", minimum=0.1, maximum=2.0, step=0.1, value=1.2, interactive=True)
+            tts_submit = gr.Button("合成音频", variant="primary")
+            tts_output1 = gr.Textbox(label="随机样本id（可用于第三个tab中合成）")
+            tts_output2 = gr.Audio(label="Output")
+            tts_submit.click(tts2, [tts_input1, ns, nsw, ls], [tts_output1, tts_output2])
 
-            with gr.TabItem("使用情感样本id作为情感参数"):
+        with gr.TabItem("使用情感样本id作为情感参数"):
 
-                tts_input1 = gr.TextArea(label="日语文本", value="こんにちは。")
-                tts_input2 = gr.Number(label="情感样本id", value=0)
-                ns = gr.Slider(label="noise_scale(控制感情变化程度)", minimum=0.1, maximum=1.0, step=0.1, value=0.6, interactive=True)
-                nsw = gr.Slider(label="noise_scale_w(控制音素发音长度)", minimum=0.1, maximum=1.0, step=0.1, value=0.668, interactive=True)
-                ls = gr.Slider(label="length_scale(控制整体语速)", minimum=0.1, maximum=2.0, step=0.1, value=1.2, interactive=True)
-                tts_submit = gr.Button("合成音频", variant="primary")
-                tts_output1 = gr.Textbox(label="Message")
-                tts_output2 = gr.Audio(label="Output")
-                tts_submit.click(tts3, [tts_input1, tts_input2, ns, nsw, ls], [tts_output1, tts_output2])
+            tts_input1 = gr.TextArea(label="日语文本", value="こんにちは。")
+            tts_input2 = gr.Number(label="情感样本id", value=0)
+            ns = gr.Slider(label="noise_scale(控制感情变化程度)", minimum=0.1, maximum=1.0, step=0.1, value=0.6, interactive=True)
+            nsw = gr.Slider(label="noise_scale_w(控制音素发音长度)", minimum=0.1, maximum=1.0, step=0.1, value=0.668, interactive=True)
+            ls = gr.Slider(label="length_scale(控制整体语速)", minimum=0.1, maximum=2.0, step=0.1, value=1.2, interactive=True)
+            tts_submit = gr.Button("合成音频", variant="primary")
+            tts_output1 = gr.Textbox(label="Message")
+            tts_output2 = gr.Audio(label="Output")
+            tts_submit.click(tts3, [tts_input1, tts_input2, ns, nsw, ls], [tts_output1, tts_output2])
 
-            with gr.TabItem("使用参考音频作为情感参数"):
-                tts_input1 = gr.TextArea(label="text", value="暂未实现")
+        with gr.TabItem("使用参考音频作为情感参数"):
+            tts_input1 = gr.TextArea(label="text", value="暂未实现")
 
     app.launch()