Update app.py

app.py

@@ -176,28 +176,38 @@ with gr.Blocks(css="""
 """) as demo:
     gr.Markdown("## Qwen × SimSimi Hybrid Chat\n小贴士：在 Settings → Repository secrets 设置 SIMSIMI_API_KEY 后即可使用 SimSimi。")
 
-    with gr.Row():
-        mode_dd = gr.Dropdown(choices=["Auto 混合", "只用 Qwen", "只用 SimSimi"], value="Auto 混合", label="对话模式")
-        lang_dd = gr.Dropdown(choices=["ch", "en", "zh", "vi", "th", "ko", "ja", "es", "fr", "de"], value=SIMSIMI_LANG or "ch", label="SimSimi 语言码")
-        bad_sl  = gr.Slider(0.0, 1.0, value=SIMSIMI_BAD_MAX, step=0.05, label="SimSimi 坏话阈值 (atext_bad_prob_max)")
+    # 只保留“对话模式”一个选项（映射到内部的“Auto 混合”）
+    mode_dd = gr.Dropdown(
+        choices=["对话模式"],
+        value="对话模式",
+        label="模式"
+    )
 
     chatbox = gr.Chatbot(elem_id="chatbot")
-    user_in = gr.Textbox(placeholder="输入内容，回车发送…", lines=2)
+    user_in = gr.Textbox(placeholder="输入内容，然后点击【提交】发送…", lines=2)
+    submit_btn = gr.Button("提交", variant="primary")
     clear_btn = gr.Button("清空对话")
 
     # 内部状态：存储 Qwen 用的 messages
     state_msgs = gr.State([{"role": "system", "content": SYSTEM_PROMPT}])
 
-    async def respond(user_text, history, messages, mode, lang, bad_max):
+    async def respond(user_text, history, messages, mode_label):
         user_text = (user_text or "").strip()
         if not user_text:
             return gr.update(), messages, ""
 
+        # 将“对话模式”映射到内部“Auto 混合”
+        internal_mode = "Auto 混合"
+
+        # 使用环境变量/默认值作为 SimSimi 参数
+        lang = SIMSIMI_LANG
+        bad_max = SIMSIMI_BAD_MAX
+
         # 更新 message 历史
         messages = list(messages) if messages else [{"role": "system", "content": SYSTEM_PROMPT}]
         messages.append({"role": "user", "content": user_text})
 
-        reply = await hybrid_reply(messages, user_text, mode=mode, lang=lang, bad_max=bad_max)
+        reply = await hybrid_reply(messages, user_text, mode=internal_mode, lang=lang, bad_max=bad_max)
 
         messages.append({"role": "assistant", "content": reply})
         history = (history or []) + [[user_text, reply]]
@@ -206,11 +216,13 @@ with gr.Blocks(css="""
     def clear_all():
         return [], [{"role": "system", "content": SYSTEM_PROMPT}]
 
-    user_in.submit(
+    # 仅“提交”按钮触发发送；移除回车提交
+    submit_btn.click(
         respond,
-        inputs=[user_in, chatbox, state_msgs, mode_dd, lang_dd, bad_sl],
+        inputs=[user_in, chatbox, state_msgs, mode_dd],
         outputs=[chatbox, state_msgs, user_in]
     )
+
     clear_btn.click(
         clear_all,
         inputs=None,