Update app.py

app.py

@@ -328,7 +328,6 @@ def format_references(
 def is_academic_query(message: str) -> bool:
     """
     判断当前学生输入是否是“学术/课程相关”问题。
-    目的：避免像 hi、thanks、who are you 这类寒暄或自我介绍请求也触发 RAG 和 reference。
     """
     if not message:
         return False
@@ -390,7 +389,7 @@ with gr.Blocks(
     cognitive_state_state = gr.State({"confusion": 0, "mastery": 0})
     rag_chunks_state = gr.State(preloaded_chunks or [])
 
-    # 最近一次回答（用于每条回答的 thumbs / 详细反馈）
+    # 最近一次回答（用于详细反馈）
     last_question_state = gr.State("")
     last_answer_state = gr.State("")
 
@@ -540,20 +539,15 @@ with gr.Blocks(
                 height=450,
                 avatar_images=(None, CLARE_LOGO_PATH),
                 show_label=False,
-                bubble_full_width=False,  # will be ignored in future but safe to keep for now
-                type="messages",          # use OpenAI-style messages format
+                bubble_full_width=False,
+                type="tuples",       # 明确使用 tuples 历史格式
+                likeable=True,       # 每条消息下方显示 👍 / 👎
             )
 
-            # === Feedback on last answer ===
-            gr.Markdown("#### Rate Clare’s last answer")
-            with gr.Row():
-                thumb_up_btn = gr.Button(
-                    "👍 Helpful", size="sm", interactive=False
-                )
-                thumb_down_btn = gr.Button(
-                    "👎 Not helpful", size="sm", interactive=False
-                )
-
+            # 详细文字反馈（针对“最后一条回答”）
+            gr.Markdown(
+                "#### Optional: detailed feedback on Clare’s last answer"
+            )
             feedback_toggle_btn = gr.Button(
                 "Give detailed feedback", size="sm", variant="secondary", interactive=False
             )
@@ -709,8 +703,6 @@ with gr.Blocks(
                 learning_mode: gr.update(interactive=False),
                 model_name: gr.update(interactive=False),
                 docs_btn: gr.update(interactive=False),
-                thumb_up_btn: gr.update(interactive=False),
-                thumb_down_btn: gr.update(interactive=False),
                 feedback_toggle_btn: gr.update(interactive=False),
                 feedback_text: gr.update(visible=False, value=""),
                 feedback_submit_btn: gr.update(interactive=False, visible=False),
@@ -744,8 +736,6 @@ with gr.Blocks(
             learning_mode: gr.update(interactive=True),
             model_name: gr.update(interactive=False),
             docs_btn: gr.update(interactive=True),
-            thumb_up_btn: gr.update(interactive=True),
-            thumb_down_btn: gr.update(interactive=True),
             feedback_toggle_btn: gr.update(interactive=True),
             feedback_text: gr.update(visible=False, value=""),
             feedback_submit_btn: gr.update(interactive=True, visible=False),
@@ -773,8 +763,6 @@ with gr.Blocks(
             learning_mode,
             model_name,
             docs_btn,
-            thumb_up_btn,
-            thumb_down_btn,
             feedback_toggle_btn,
             feedback_text,
             feedback_submit_btn,
@@ -806,8 +794,6 @@ with gr.Blocks(
             language_preference: gr.update(interactive=False),
             learning_mode: gr.update(interactive=False),
             docs_btn: gr.update(interactive=False),
-            thumb_up_btn: gr.update(interactive=False),
-            thumb_down_btn: gr.update(interactive=False),
             feedback_toggle_btn: gr.update(interactive=False),
             feedback_text: gr.update(visible=False, value=""),
             feedback_submit_btn: gr.update(interactive=False, visible=False),
@@ -835,8 +821,6 @@ with gr.Blocks(
             language_preference,
             learning_mode,
             docs_btn,
-            thumb_up_btn,
-            thumb_down_btn,
             feedback_toggle_btn,
             feedback_text,
             feedback_submit_btn,
@@ -993,7 +977,7 @@ with gr.Blocks(
 
         new_status = render_session_status(mode_val, weaknesses, cognitive_state)
 
-        # 将当前这一轮的 Q/A 存入 state，后面 thumbs / 详细反馈用
+        # 将当前这一轮的 Q/A 存入 state，详细反馈用（针对“最后一条回答”）
         return "", new_history, weaknesses, cognitive_state, new_status, message, answer
 
     user_input.submit(
@@ -1154,76 +1138,6 @@ with gr.Blocks(
         [feedback_text, feedback_submit_btn],
     )
 
-    def send_thumb_up(last_q, last_a, user_id_val, mode_val, model_name_val, lang_pref):
-        if not last_q and not last_a:
-            print("No last QA to log for thumbs_up.")
-            return
-        try:
-            log_event(
-                {
-                    "experiment_id": "RESP_AI_W10",
-                    "student_id": user_id_val or "ANON",
-                    "event_type": "thumbs_up",
-                    "timestamp": time.time(),
-                    "question": last_q,
-                    "answer": last_a,
-                    "model_name": model_name_val,
-                    "language": lang_pref,
-                    "learning_mode": mode_val,
-                }
-            )
-            print("[Feedback] thumbs_up logged.")
-        except Exception as e:
-            print("thumb_up log error:", e)
-
-    def send_thumb_down(last_q, last_a, user_id_val, mode_val, model_name_val, lang_pref):
-        if not last_q and not last_a:
-            print("No last QA to log for thumbs_down.")
-            return
-        try:
-            log_event(
-                {
-                    "experiment_id": "RESP_AI_W10",
-                    "student_id": user_id_val or "ANON",
-                    "event_type": "thumbs_down",
-                    "timestamp": time.time(),
-                    "question": last_q,
-                    "answer": last_a,
-                    "model_name": model_name_val,
-                    "language": lang_pref,
-                    "learning_mode": mode_val,
-                }
-            )
-            print("[Feedback] thumbs_down logged.")
-        except Exception as e:
-            print("thumb_down log error:", e)
-
-    thumb_up_btn.click(
-        send_thumb_up,
-        [
-            last_question_state,
-            last_answer_state,
-            user_id_state,
-            learning_mode,
-            model_name,
-            language_preference,
-        ],
-        [],
-    )
-
-    thumb_down_btn.click(
-        send_thumb_down,
-        [
-            last_question_state,
-            last_answer_state,
-            user_id_state,
-            learning_mode,
-            model_name,
-            language_preference,
-        ],
-        [],
-    )
-
     def submit_detailed_feedback(
         text, last_q, last_a, user_id_val, mode_val, model_name_val, lang_pref
     ):
@@ -1273,6 +1187,54 @@ with gr.Blocks(
         [feedback_text],
     )
 
+    # ===== Per-message thumbs (像 ChatGPT 一样) =====
+    def handle_like(
+        data: gr.LikeData,
+        history,
+        user_id_val,
+        mode_val,
+        model_name_val,
+        lang_pref,
+    ):
+        """
+        data: gr.LikeData (自动注入)
+        history: Chatbot 历史 (list of [user, assistant])
+        """
+        if data is None or history is None:
+            return
+
+        idx = data.index
+        if not isinstance(idx, int) or idx < 0 or idx >= len(history):
+            return
+
+        question, answer = history[idx]
+        event_type = "thumbs_up" if data.liked else "thumbs_down"
+
+        try:
+            log_event(
+                {
+                    "experiment_id": "RESP_AI_W10",
+                    "student_id": user_id_val or "ANON",
+                    "event_type": event_type,
+                    "timestamp": time.time(),
+                    "question": question,
+                    "answer": answer,
+                    "model_name": model_name_val,
+                    "language": lang_pref,
+                    "learning_mode": mode_val,
+                    "turn_index": idx,
+                }
+            )
+            print(f"[Feedback] {event_type} logged for turn {idx}.")
+        except Exception as e:
+            print("like log error:", e)
+
+    chatbot.like(
+        handle_like,
+        inputs=[chatbot, user_id_state, learning_mode, model_name, language_preference],
+        outputs=[],
+    )
+
     # ===== Export / Summary =====
     export_btn.click(
         lambda h, c, m, w, cog: export_conversation(h, c, m, w, cog),
@@ -1319,7 +1281,7 @@ with gr.Blocks(
 
 if __name__ == "__main__":
     demo.launch(
-        share=True,          # required in this environment so UI can reach the app
+        share=True,          # 这个环境必须 share 才能访问
         server_name="0.0.0.0",
         server_port=7860,
     )