Fix CoT and Answer content separation logic

app.py

@@ -200,93 +200,108 @@ def process_message(message, history, images, system_prompt, temperature, max_to
             stream=True
         )
         
-        print("[DEBUG] API call successful, starting streaming")
+        print("[DEBUG] API call successful, processing stream...")
         
         # 流式输出
         full_response = ""
+        chunk_count = 0
         in_reasoning = False
         reasoning_content = ""
         final_content = ""
-        has_reasoning_field = False
+        has_reasoning_field = False  # 标记是否通过 delta.reasoning 字段获取 CoT
         
         for chunk in response:
-            if chunk.choices and chunk.choices[0]:
+            chunk_count += 1
+            if chunk.choices and len(chunk.choices) > 0:
                 delta = chunk.choices[0].delta
                 
-                # 优先检查 delta.reasoning 字段（Step-3 API 的 CoT 内容）
+                # 检查 delta.reasoning 字段（Step-3 API 的 CoT 内容）
                 if hasattr(delta, 'reasoning') and delta.reasoning:
                     has_reasoning_field = True
                     reasoning_content += delta.reasoning
                     print(f"[DEBUG] CoT chunk: {delta.reasoning[:50] if len(delta.reasoning) > 50 else delta.reasoning}")
-                    
-                    # 实时更新显示 CoT 内容
-                    if final_content:
-                        display_text = f"💭 **Chain of Thought:**\n\n{reasoning_content}\n\n---\n\n📝 **Answer:**\n\n{final_content}"
-                    else:
-                        display_text = f"💭 **Chain of Thought:**\n\n{reasoning_content}\n\n---\n\n📝 **Answer:**\n\n*Generating...*"
-                    
-                    history[-1][1] = display_text
-                    yield history
                 
                 # 处理常规 content 字段
-                delta_content = delta.content if hasattr(delta, 'content') else None
-                if delta_content:
+                if hasattr(delta, 'content') and delta.content:
+                    content = delta.content
+                    
                     # 如果通过 reasoning 字段获取了 CoT，content 就是最终答案
                     if has_reasoning_field:
-                        final_content += delta_content
-                        full_response += delta_content
+                        final_content += content
+                        full_response = reasoning_content + final_content  # 完整响应包含两部分
                     else:
                         # 否则尝试解析 <reasoning> 标签
-                        full_response += delta_content
+                        full_response += content
                         
-                        # 检测reasoning标签
-                        if '<reasoning>' in full_response and not in_reasoning:
+                        # 检测 <reasoning> 标签
+                        if '<reasoning>' in content and not in_reasoning:
                             in_reasoning = True
-                            parts = full_response.split('<reasoning>')
+                            # 分割内容
+                            parts = content.split('<reasoning>')
+                            final_content += parts[0]
                             if len(parts) > 1:
-                                reasoning_content = parts[1]
-                        
-                        if in_reasoning and '</reasoning>' in full_response:
+                                reasoning_content += parts[1]
+                        elif '</reasoning>' in content and in_reasoning:
+                            # 结束推理部分
+                            parts = content.split('</reasoning>')
+                            if parts[0]:
+                                reasoning_content += parts[0]
                             in_reasoning = False
-                            parts = full_response.split('</reasoning>')
                             if len(parts) > 1:
-                                reasoning_content = parts[0].split('<reasoning>')[-1]
-                                final_content = parts[1]
+                                final_content += parts[1]
                         elif in_reasoning:
-                            reasoning_content = full_response.split('<reasoning>')[-1]
-                        elif '</reasoning>' in full_response:
-                            parts = full_response.split('</reasoning>')
-                            if len(parts) > 1:
-                                final_content = parts[1]
+                            # 在推理标签内
+                            reasoning_content += content
                         else:
-                            # 没有reasoning标签的情况
-                            if '<reasoning>' not in full_response:
+                            # 在推理标签外或没有标签
+                            if not reasoning_content:  # 如果还没有推理内容，说明没有reasoning标签
                                 final_content = full_response
-                    
-                    # 格式化显示
-                    if reasoning_content and final_content:
-                        display_text = f"💭 **Chain of Thought:**\n\n{reasoning_content.strip()}\n\n---\n\n📝 **Answer:**\n\n{final_content.strip()}"
-                    elif reasoning_content:
-                        display_text = f"💭 **Chain of Thought:**\n\n{reasoning_content.strip()}\n\n---\n\n📝 **Answer:**\n\n*Generating...*"
-                    else:
-                        display_text = full_response
-                    
-                    history[-1][1] = display_text
-                    yield history
+                            else:
+                                final_content += content
+                
+                # 实时更新显示
+                if reasoning_content and final_content:
+                    # 有推理和最终答案
+                    display_text = f"💭 **Chain of Thought:**\n\n{reasoning_content.strip()}\n\n---\n\n📝 **Answer:**\n\n{final_content.strip()}"
+                elif reasoning_content:
+                    # 只有推理过程
+                    display_text = f"💭 **Chain of Thought:**\n\n{reasoning_content.strip()}\n\n---\n\n📝 **Answer:**\n\n*Generating...*"
+                else:
+                    # 只有答案或普通回复
+                    display_text = final_content if final_content else full_response
+                
+                history[-1][1] = display_text
+                
+                if chunk_count % 5 == 0:
+                    print(f"[DEBUG] Received {chunk_count} chunks")
+                    if has_reasoning_field:
+                        print(f"[DEBUG] CoT length: {len(reasoning_content)}, Answer length: {len(final_content)}")
+                yield history
+        
+        print(f"[DEBUG] Stream complete. Total chunks: {chunk_count}, Total chars: {len(full_response)}")
         
         # 最终格式化
-        if reasoning_content or final_content:
+        if reasoning_content:
+            # 如果有推理内容，使用格式化显示
             final_display = f"💭 **Chain of Thought:**\n\n{reasoning_content.strip()}\n\n---\n\n📝 **Answer:**\n\n{final_content.strip()}"
             history[-1][1] = final_display
+            yield history
+        elif final_content:
+            # 只有最终答案
+            history[-1][1] = final_content.strip()
+            yield history
+        elif full_response:
+            # 使用完整响应
+            history[-1][1] = full_response.strip()
+            yield history
         else:
-            history[-1][1] = full_response
-        
-        print(f"[DEBUG] Streaming completed. Response length: {len(full_response)}")
-        yield history
-        
+            print("[DEBUG] No response content received")
+            history[-1][1] = "⚠️ No response received from API"
+            yield history
+            
     except Exception as e:
-        error_msg = f"❌ Error: {str(e)}"
-        print(f"[ERROR] {error_msg}")
+        print(f"[DEBUG] API error: {e}")
+        import traceback
         traceback.print_exc()
         history[-1][1] = f"❌ Error: {str(e)}"
         yield history