Update app.py

app.py

@@ -494,50 +494,48 @@ def predict(message, history):
         post_career_detail_asked = False
         post_career_detail_done = False
 
-    # ======================== 先处理基础问题 =========================
-    if 0 < current_q_index <= len(questions):
-        key = questions[current_q_index - 1][0]
-        # 第一个问题决定是 / 否
-        if key == "mode" and current_q_index == 1:
-            ans = message.strip()
-            user_profile["mode"] = ans
-            if "是" in ans:
-                in_backward_flow = True
-                # 重置Forward模式标记，确保不会混淆
-                in_forward_flow = False
-            else:
-                in_forward_flow = True
-                # 重置Backward模式标记，确保不会混淆
-                in_backward_flow = False
-        else:
-            user_profile[key] = message.strip()
-
+    # ======================== 先处理第一个基础问题(选择模式) =========================
+    if current_q_index == 1:  # 正在等待用户回答第一个问题
+        ans = message.strip()
+        user_profile["mode"] = ans
+        
+        # 严格判断用户输入
+        if "是" in ans:
+            in_backward_flow = True
+            in_forward_flow = False
+            # 设置下一个问题为Backward模式的第一个问题
+            questions = backward_additional_questions[:]
+            current_q_index = 0
+        else:  # "否"或其他输入
+            in_forward_flow = True
+            in_backward_flow = False
+            # 设置下一个问题为Forward模式的第一个问题
+            questions = forward_additional_questions[:]
+            current_q_index = 0
+    
+    # 如果还在基本问题中，就继续提问
     if current_q_index < len(questions):
         nxt = questions[current_q_index][1]
         current_q_index += 1
         return nxt
+    
+    # 收集上一个问题的答案
+    if current_q_index > 0 and current_q_index <= len(questions):
+        key = questions[current_q_index - 1][0]
+        user_profile[key] = message.strip()
 
     # ======================== 分模式处理 =========================
-    mode = user_profile.get("mode") or ""
-
     # ~~~~~~~~~ Backward模式 ~~~~~~~~~
-    if "是" in mode and in_backward_flow:
-        # 处理Backward模式的额外问题收集
-        if backward_index > 0 and backward_index <= len(backward_additional_questions):
-            prev_key = backward_additional_questions[backward_index - 1][0]
-            user_profile[prev_key] = message.strip()
-
-        if backward_index < len(backward_additional_questions):
-            k, prompt_text = backward_additional_questions[backward_index]
-            backward_index += 1
-            return prompt_text
-        
-        # 已收集完Backward模式的所有基本信息，但尚未提供职业分析
-        elif not backward_analysis_given:
+    if in_backward_flow:
+        # 已收集完Backward模式的所有基本问题，但尚未提供职业分析
+        if not backward_analysis_given:
+            # 设置职业选择状态
+            user_profile["final_choice"] = user_profile.get("specific_career")
+            backward_job_chosen = True
+            
             # 生成职业分析报告
             career_analysis = generate_backward_career_analysis()
             backward_analysis_given = True
-            backward_job_chosen = True
             
             # 询问是否需要A/B/C专项信息
             post_career_detail_asked = True
@@ -603,23 +601,13 @@ def predict(message, history):
                 return resp.choices[0].message.content
             except Exception as e:
                 return f"发生错误: {str(e)}"
-                
+
     # ~~~~~~~~~ Forward模式 ~~~~~~~~~
-    else:
+    elif in_forward_flow:
         # 前期处理：收集信息和推荐大方向
-        if in_forward_flow and not direction_chosen:
-            # 收集 4个基础问题
-            if forward_index > 0 and forward_index <= len(forward_additional_questions):
-                prev_key = forward_additional_questions[forward_index - 1][0]
-                user_profile[prev_key] = message.strip()
-
-            if forward_index < len(forward_additional_questions):
-                k, prompt_text = forward_additional_questions[forward_index]
-                forward_index += 1
-                return prompt_text
-
-            # 问完 4个问题 -> 推荐3方向
-            elif not forward_recommendation_given:
+        if not direction_chosen:
+            # 收集完4个基础问题后，推荐3方向
+            if not forward_recommendation_given:
                 forward_recommendation_given = True
                 return recommend_3directions()
 
@@ -699,7 +687,7 @@ def predict(message, history):
             else:
                 return "请回复1/2/3选择具体职业，或输入'换'来重新推荐"
 
-        # 处理 A/B/C 答疑
+        # 处理 A/B/C 答疑 (与Backward模式共用这部分逻辑)
         elif post_career_detail_asked and not post_career_detail_done:
             user_choice = message.strip().lower()
             if user_choice in ["不需要", "no", "n"]: