Fix message submission logic - properly pass message to API

app.py

@@ -32,10 +32,12 @@ def process_message(message, history, system_prompt, temperature, max_tokens, to
     print(f"[DEBUG] Processing message: {message[:100] if message else 'None'}...")
     
     if not message:
+        print("[DEBUG] No message provided, skipping")
         yield history
         return
     
     if not STEP_API_KEY:
+        print("[DEBUG] No API key configured")
         history.append([message, "❌ API key not configured. Please add STEP_API_KEY in Settings."])
         yield history
         return
@@ -58,6 +60,7 @@ def process_message(message, history, system_prompt, temperature, max_tokens, to
                 image_content = image_path.split(',')[1]
             else:
                 image_content = image_to_base64(image_path)
+            print(f"[DEBUG] Image processed successfully")
         except Exception as e:
             print(f"[DEBUG] Failed to process image: {e}")
     
@@ -94,11 +97,14 @@ def process_message(message, history, system_prompt, temperature, max_tokens, to
         messages.append({"role": "user", "content": text_content})
     
     print(f"[DEBUG] Sending {len(messages)} messages to API")
+    print(f"[DEBUG] Last message: {messages[-1]}")
     
     # 创建客户端并调用API
     try:
         client = OpenAI(api_key=STEP_API_KEY, base_url=BASE_URL)
+        print("[DEBUG] Client created successfully")
         
+        print("[DEBUG] Calling API...")
         response = client.chat.completions.create(
             model="step-3",
             messages=messages,
@@ -108,22 +114,33 @@ def process_message(message, history, system_prompt, temperature, max_tokens, to
             stream=True
         )
         
+        print("[DEBUG] API call successful, processing stream...")
+        
         # 流式输出
         full_response = ""
+        chunk_count = 0
         for chunk in response:
+            chunk_count += 1
             if chunk.choices and len(chunk.choices) > 0:
                 delta = chunk.choices[0].delta
                 if hasattr(delta, 'content') and delta.content:
                     full_response += delta.content
                     history[-1][1] = full_response
+                    if chunk_count % 10 == 0:
+                        print(f"[DEBUG] Received {chunk_count} chunks, {len(full_response)} chars")
                     yield history
         
+        print(f"[DEBUG] Stream complete. Total chunks: {chunk_count}, Total chars: {len(full_response)}")
+        
         if not full_response:
+            print("[DEBUG] No response content received")
             history[-1][1] = "⚠️ No response received from API"
             yield history
             
     except Exception as e:
         print(f"[DEBUG] API error: {e}")
+        import traceback
+        traceback.print_exc()
         history[-1][1] = f"❌ Error: {str(e)}"
         yield history
 
@@ -215,9 +232,24 @@ with gr.Blocks(title="Step-3 Chat", theme=gr.themes.Soft()) as demo:
                     label=""
                 )
     
-    # 事件处理
+    # 事件处理函数
     def user_submit(message, history):
-        return "", history
+        """用户提交消息时的处理"""
+        print(f"[DEBUG] user_submit called with message: {message[:50] if message else 'None'}...")
+        if message:
+            # 保存消息内容用于后续处理
+            return gr.update(value=""), history, message
+        return gr.update(value=message), history, message
+    
+    def bot_response(history, saved_message, system_prompt, temperature, max_tokens, top_p):
+        """生成机器人响应"""
+        print(f"[DEBUG] bot_response called with saved_message: {saved_message[:50] if saved_message else 'None'}...")
+        if saved_message:
+            # 使用生成器处理消息
+            for updated_history in process_message(saved_message, history, system_prompt, temperature, max_tokens, top_p):
+                yield updated_history
+        else:
+            yield history
     
     def undo_last(history):
         if history:
@@ -227,29 +259,34 @@ with gr.Blocks(title="Step-3 Chat", theme=gr.themes.Soft()) as demo:
     def retry_last(history):
         if history and history[-1][0]:
             last_message = history[-1][0]
-            return history[:-1], last_message
+            new_history = history[:-1]
+            return new_history, last_message
         return history, ""
     
-    # 提交消息
+    # 创建一个隐藏的组件来存储消息
+    saved_msg = gr.State("")
+    
+    # 提交消息 - Enter键
     msg.submit(
         user_submit,
         [msg, chatbot],
-        [msg, chatbot],
+        [msg, chatbot, saved_msg],
         queue=False
     ).then(
-        process_message,
-        [msg, chatbot, system_prompt, temperature, max_tokens, top_p],
+        bot_response,
+        [chatbot, saved_msg, system_prompt, temperature, max_tokens, top_p],
         chatbot
     )
     
+    # 提交消息 - Send按钮
     submit_btn.click(
         user_submit,
         [msg, chatbot],
-        [msg, chatbot],
+        [msg, chatbot, saved_msg],
         queue=False
     ).then(
-        process_message,
-        [msg, chatbot, system_prompt, temperature, max_tokens, top_p],
+        bot_response,
+        [chatbot, saved_msg, system_prompt, temperature, max_tokens, top_p],
         chatbot
     )
     
@@ -271,10 +308,10 @@ with gr.Blocks(title="Step-3 Chat", theme=gr.themes.Soft()) as demo:
     retry_btn.click(
         retry_last,
         chatbot,
-        [chatbot, msg]
+        [chatbot, saved_msg]
     ).then(
-        process_message,
-        [msg, chatbot, system_prompt, temperature, max_tokens, top_p],
+        bot_response,
+        [chatbot, saved_msg, system_prompt, temperature, max_tokens, top_p],
         chatbot
     )