Update app.py

app.py

@@ -43,11 +43,10 @@ class ChatApp:
         max_tokens: int = ChatConfig.DEFAULT_MAX_TOKENS,
         temperature: float = ChatConfig.DEFAULT_TEMP,
         top_p: float = ChatConfig.DEFAULT_TOP_P
-    ) -> Generator[str, None, None]:
-        """Generate streaming responses from the model."""
+    ) -> str:
+        """Generate responses from the model."""
         if not message.strip():
-            yield "请输入消息。"
-            return
+            return "请输入消息。"
             
         messages = [{"role": "system", "content": system_message}]
         
@@ -72,10 +71,10 @@ class ChatApp:
             ):
                 token = chunk.choices[0].delta.content or ""
                 response += token
-                yield response
+            return response
         except Exception as e:
             logger.error(f"Error generating response: {e}")
-            yield f"抱歉，发生了错误: {str(e)}"
+            return f"抱歉，发生了错误: {str(e)}"
     
     def create_interface(self) -> gr.Blocks:
         """Create and configure the chat interface."""
@@ -191,37 +190,61 @@ class ChatApp:
                         - **描述**: Gemma 3是Google推出的先进开源大语言模型。
                         """)
             
-            # Set up event handlers
-            msg_and_submit = [msg, submit_btn]
+            # Define chatbot functions with correct input/output format
+            def add_text(history, text):
+                history = history + [(text, None)]
+                return history, ""
+            
+            def bot_response(history, system_message, max_tokens, temperature, top_p):
+                if history and history[-1][1] is None:
+                    user_message = history[-1][0]
+                    # Remove the last incomplete message pair
+                    history_for_model = history[:-1]
+                    # Generate response
+                    bot_message = self.generate_response(
+                        user_message, 
+                        history_for_model, 
+                        system_message, 
+                        max_tokens, 
+                        temperature, 
+                        top_p
+                    )
+                    # Update the history with the complete message pair
+                    history[-1] = (user_message, bot_message)
+                return history
+            
+            def load_example():
+                return [("介绍一下人工智能研究中最有趣的发展", None)]
             
+            # Set up event handlers
             submit_click = submit_btn.click(
-                fn=self.generate_response,
-                inputs=[msg, chatbot, system_msg, max_tokens, temperature, top_p],
-                outputs=chatbot,
-                api_name="chat"
+                add_text, 
+                [chatbot, msg], 
+                [chatbot, msg], 
+                queue=False
+            ).then(
+                bot_response, 
+                [chatbot, system_msg, max_tokens, temperature, top_p], 
+                chatbot
             )
             
-            # Submit when pressing Enter (but not when pressing Shift+Enter)
+            # Submit when pressing Enter
             msg.submit(
-                fn=self.generate_response,
-                inputs=[msg, chatbot, system_msg, max_tokens, temperature, top_p],
-                outputs=chatbot,
-                api_name=False
+                add_text, 
+                [chatbot, msg], 
+                [chatbot, msg], 
+                queue=False
+            ).then(
+                bot_response, 
+                [chatbot, system_msg, max_tokens, temperature, top_p], 
+                chatbot
             )
             
-            # Clear the textbox after sending
-            submit_click.then(lambda: "", None, msg)
-            msg.submit(lambda: "", None, msg)
-            
             # Clear chat button
-            clear_btn.click(lambda: None, None, chatbot)
+            clear_btn.click(lambda: [], None, chatbot)
             
             # Example button
-            example_btn.click(
-                lambda: ("介绍一下人工智能研究中最有趣的发展", []),
-                None,
-                [msg, chatbot]
-            )
+            example_btn.click(load_example, None, chatbot)
             
         return interface