Update app.py

app.py

@@ -27,59 +27,45 @@ def format_message(content):
     formatted = []
     current_pos = 0
     
-    # 处理 <think> 标签
     for match in re.finditer(r"<think>(.*?)</think>", content, re.DOTALL):
         start, end = match.span()
         think_content = match.group(1).strip()
         think_id = f"think-{hash(think_content)}"
         
-        # 添加前面的内容
         if current_pos < start:
             formatted.append(content[current_pos:start])
         
-        # 添加思考内容
         formatted.append(f'''
         <details class="think-container" open>
-            <summary class="think-summary">🤔 思考过程（点击展开）</summary>
+            <summary class="think-summary">🤔 思考过程(点击展开)</summary>
             <div class="think-content">{think_content}</div>
         </details>
         ''')
         current_pos = end
     
-    # 添加剩余内容
     formatted.append(content[current_pos:])
-    
-    # 合并内容
     final_content = "".join(formatted)
-    
-    # 处理代码块
-    final_content = re.sub(r"```([\s\S]*?)```", 
-                         r'<div class="code-block">\1</div>', 
-                         final_content)
-    
-    # 处理换行
+    final_content = re.sub(r"```([\s\S]*?)```", r'<div class="code-block">\1</div>', final_content)
     final_content = final_content.replace("\n", "<br>")
-    
-    # 清理多余换行
     final_content = re.sub(r"(<br>)*</details>(<br>)*", "</details>", final_content)
     final_content = re.sub(r"(<br>)*(<div class=[^>]+>)(<br>)*", r"\2", final_content)
     
     return final_content
 
-def predict(history, system_msg, temperature, top_p, repetition_penalty):
-    # 初始化 history 如果为 None
-    if history is None:
-        history = []
-    
+def user_input(user_message, history):
+    return "", history + [[user_message, None]]
+
+def predict(message, chat_history, system_msg, temperature, top_p, repetition_penalty):
     headers = {
         "Content-Type": "application/json",
         "Authorization": f"Bearer {API_KEY}"
     }
     
     messages = [{"role": "system", "content": system_msg}]
-    for msg in history:
+    for msg in chat_history:
         messages.append({"role": "user", "content": msg[0]})
-        messages.append({"role": "assistant", "content": msg[1]})
+        if msg[1]:
+            messages.append({"role": "assistant", "content": msg[1]})
     
     data = {
         "model": "mini",
@@ -98,6 +84,8 @@ def predict(history, system_msg, temperature, top_p, repetition_penalty):
     )
     
     buffer = ""
+    history = chat_history.copy()
+    
     for chunk in response.iter_lines():
         if chunk:
             chunk_str = chunk.decode("utf-8").replace("data: ", "")
@@ -107,9 +95,12 @@ def predict(history, system_msg, temperature, top_p, repetition_penalty):
                     delta = chunk_data["choices"][0]["delta"]
                     if "content" in delta:
                         buffer += delta["content"]
-                        yield format_message(buffer)
+                        history[-1][1] = format_message(buffer)
+                        yield history
             except:
-                pass
+                continue
+    
+    return history
 
 with gr.Blocks(css=CSS, title="Tifa-Deepsex-COT-14B") as demo:
     gr.HTML(f"<h1 id='gpt-title'>Tifa-Deepsex-COT-14B</h1>")
@@ -121,10 +112,9 @@ with gr.Blocks(css=CSS, title="Tifa-Deepsex-COT-14B") as demo:
                 elem_id="chatbot",
                 bubble_full_width=False,
                 avatar_images=(
-                    "https://i.imgur.com/8O4ZSgh.png",  # 用户头像
-                    "https://i.imgur.com/hUAXKg0.png"    # 机器人头像
+                    "https://i.imgur.com/8O4ZSgh.png",
+                    "https://i.imgur.com/hUAXKg0.png"
                 ),
-                value=[]  # 初始化 Chatbot 的值
             )
             msg = gr.Textbox(
                 placeholder="输入消息...",
@@ -146,29 +136,29 @@ with gr.Blocks(css=CSS, title="Tifa-Deepsex-COT-14B") as demo:
                 top_p = gr.Slider(0, 1, value=0.7, label="Top-p")
                 repetition_penalty = gr.Slider(1, 2, value=1.17, label="重复惩罚")
 
-    submit_event = msg.submit(
-        fn=lambda user_msg, history: history + [[user_msg, None]],
-        inputs=[msg, chatbot],
-        outputs=chatbot,
-        show_progress="hidden"
+    msg.submit(
+        user_input,
+        [msg, chatbot],
+        [msg, chatbot],
+        queue=False
     ).then(
         predict,
-        inputs=[chatbot, system_msg, temperature, top_p, repetition_penalty],
-        outputs=chatbot
+        [msg, chatbot, system_msg, temperature, top_p, repetition_penalty],
+        chatbot
     )
     
     submit_btn.click(
-        fn=lambda user_msg, history: history + [[user_msg, None]],
-        inputs=[msg, chatbot],
-        outputs=chatbot,
-        show_progress="hidden"
+        user_input,
+        [msg, chatbot],
+        [msg, chatbot],
+        queue=False
     ).then(
         predict,
-        inputs=[chatbot, system_msg, temperature, top_p, repetition_penalty],
-        outputs=chatbot
+        [msg, chatbot, system_msg, temperature, top_p, repetition_penalty],
+        chatbot
     )
     
-    clear_btn.click(lambda: [], None, chatbot, queue=False)
+    clear_btn.click(lambda: None, None, chatbot, queue=False)
 
 if __name__ == "__main__":
     demo.queue().launch(share=True)