Update app_shared.py

app_shared.py

@@ -421,27 +421,53 @@ class ChatManager:
             st.session_state.chat_step += 1
             st.session_state.last_update_time = now
 
-        elif next_msg["role"] == "assistant":
-            # 调用API前，确认上一条是用户消息，且内容不为空
+        # elif next_msg["role"] == "assistant":
+        #     # 调用API前，确认上一条是用户消息，且内容不为空
+        #     if step == 0 or history[step - 1]["role"] != "user" or not history[step - 1]["content"]:
+        #         st.warning("⚠️ 无法生成 AI 回答：找不到上一条用户消息")
+        #         return
+
+        #     user_prompt = history[step - 1]["content"]
+
+        #     app_id = "c968f91131ac432787f5ef81f51922ba"
+        #     api_key = os.getenv("DASHSCOPE_API_KEY")
+        #     reply = self.generate_response(user_prompt, app_id, api_key)
+
+        #     # 写入 assistant 回复
+        #     if len(history) > step:
+        #         history[step]["content"] = reply
+        #     else:
+        #         history.append({"role": "assistant", "content": reply})
+
+        #     st.session_state.chat_step += 1
+        #     st.session_state.last_update_time = now
+        elif next_msg["role"] == "assistant":  #multi
             if step == 0 or history[step - 1]["role"] != "user" or not history[step - 1]["content"]:
                 st.warning("⚠️ 无法生成 AI 回答：找不到上一条用户消息")
                 return
-
-            user_prompt = history[step - 1]["content"]
-
+        
+            # 取当前上下文（含用户与助手历史）
+            messages = history[:step]  # 所有已发生的轮次
+            messages.append(history[step - 1])  # 确保当前用户输入在最后
+        
             app_id = "c968f91131ac432787f5ef81f51922ba"
             api_key = os.getenv("DASHSCOPE_API_KEY")
-            reply = self.generate_response(user_prompt, app_id, api_key)
-
+            reply = self.generate_response(messages, app_id, api_key)
+        
+            if not reply:
+                st.warning("⚠️ AI 未返回内容，请稍后重试")
+                return
+        
             # 写入 assistant 回复
             if len(history) > step:
                 history[step]["content"] = reply
             else:
                 history.append({"role": "assistant", "content": reply})
-
+        
             st.session_state.chat_step += 1
             st.session_state.last_update_time = now
-    
+        
+            
             
 
     def render_message(self, role: str, content: str) -> str:
@@ -516,18 +542,40 @@ class ChatManager:
     #             return response
 
     #     return "Thank you for your feedback. I will conduct an analysis based on this information. Please continue to describe your symptoms."
-    def generate_response(self, user_input: str, app_id: str, api_key: str) -> str:
-        if not api_key:
-            return "❌ 请在环境变量中配置 DASHSCOPE_API_KEY。"
-
-        try:
-            st.write(f"🚀 调用 Qwen，输入：{user_input}")
-            response = call_qwen_agent(user_input, app_id, api_key)
-            st.write(f"✅ Qwen 返回前200字：{response[:200]}")
-            return response
-        except Exception as e:
-            st.write(f"❌ Qwen 调用失败：{e}")
-            return "调用 Qwen API 出错，请稍后再试。"
+    
+    # def generate_response(self, user_input: str, app_id: str, api_key: str) -> str:
+    #     if not api_key:
+    #         return "❌ 请在环境变量中配置 DASHSCOPE_API_KEY。"
+
+    #     try:
+    #         st.write(f"🚀 调用 Qwen，输入：{user_input}")
+    #         response = call_qwen_agent(user_input, app_id, api_key)
+    #         st.write(f"✅ Qwen 返回前200字：{response[:200]}")
+    #         return response
+    #     except Exception as e:
+    #         st.write(f"❌ Qwen 调用失败：{e}")
+    #         return "调用 Qwen API 出错，请稍后再试。"
+
+    def generate_response(self, messages: list, app_id: str, api_key: str):
+        client = OpenAI(
+            api_key=api_key,
+            base_url="https://dashscope.aliyuncs.com/compatible-mode/v1"
+        )
+    
+        completion = client.chat.completions.create(
+            model="qwen-plus-2025-04-28",
+            messages=messages,
+            extra_body={"enable_thinking": True}
+        )
+    
+        full_reply = ""
+        for chunk in completion:
+            if chunk.choices:
+                delta = chunk.choices[0].delta
+                if hasattr(delta, "content") and delta.content:
+                    full_reply += delta.content
+        return full_reply
+
 
 
 # =============================================================================