Update app.py

app.py

@@ -294,11 +294,6 @@ def format_references(
     根据当前使用的 rag_chunks，生成一个简短的 reference 列表：
     - 按文件名分组
     - 每个文件列出若干个 section
-
-    期望 rag_engine 在每个 chunk 中填入:
-        chunk["source_file"]  -> 文件名
-        chunk["section"]      -> 段落 / section 描述（如 "Section 3.2 – Risk taxonomy"）
-    若未提供，将回退为 "Unknown file" / "Related section"。
     """
     if not rag_chunks:
         return ""
@@ -306,7 +301,7 @@ def format_references(
     refs_by_file: Dict[str, List[str]] = defaultdict(list)
 
     for chunk in rag_chunks:
-        file_name = chunk.get("source_file") or "Unknown file"
+        file_name = chunk.get("source_file") or "module10_responsible_ai.pdf"
         section = chunk.get("section") or "Related section"
         if section not in refs_by_file[file_name]:
             refs_by_file[file_name].append(section)
@@ -330,7 +325,6 @@ def format_references(
     return "\n".join(lines)
 
 
-
 def is_academic_query(message: str) -> bool:
     """
     判断当前学生输入是否是“学术/课程相关”问题。
@@ -343,7 +337,6 @@ def is_academic_query(message: str) -> bool:
     if not m:
         return False
 
-    # 归一化一下空格
     m = " ".join(m.split())
 
     # 1) 典型闲聊词
@@ -356,11 +349,10 @@ def is_academic_query(message: str) -> bool:
     }
     tokens = m.split()
 
-    # 如果全是闲聊词而且没有问号 → 视为非学术问题
     if "?" not in m and all(t in smalltalk_tokens for t in tokens):
         return False
 
-    # 2) 典型「自我介绍 / 工具说明」类问题，也视为非学术问题
+    # 2) 自我介绍 / 工具说明
     meta_phrases = [
         "who are you",
         "what are you",
@@ -375,22 +367,18 @@ def is_academic_query(message: str) -> bool:
         "what is this app",
         "what is this tool",
         "what is clare",
-        "who is clare"
+        "who is clare",
     ]
     if any(p in m for p in meta_phrases):
         return False
 
-    # 3) 很短、又没有问号的输入，大概率也不是严肃学术问题
+    # 3) 很短又没有问号，大概率不是学术问题
     if len(tokens) <= 2 and "?" not in m:
         return False
 
-    # 其他情况默认当作学术/课程相关问题
     return True
 
 
-
-
-
 # ================== Gradio App ==================
 with gr.Blocks(
     title="Clare – Hanbridge AI Teaching Assistant", css=CUSTOM_CSS
@@ -402,6 +390,10 @@ 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("")
+
     # 用户状态（登录）
     user_name_state = gr.State("")
     user_id_state = gr.State("")
@@ -532,7 +524,7 @@ with gr.Blocks(
         # === Center Main ===
         with gr.Column(scale=3):
 
-            # 1) Instruction + Chat 在最上方
+            # Instruction + Chat
             gr.Markdown(
                 """
                 <div style="background-color:#f9fafb; padding:10px; border-radius:5px; margin-top:10px; font-size:0.9em; color:#555;">
@@ -550,6 +542,31 @@ with gr.Blocks(
                 show_label=False,
                 bubble_full_width=False,
             )
+
+            # === 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
+                )
+
+            feedback_toggle_btn = gr.Button(
+                "Give detailed feedback", size="sm", variant="secondary", interactive=False
+            )
+            feedback_text = gr.Textbox(
+                label="What worked well or what was wrong?",
+                placeholder="Optional: describe what you liked / what was confusing or incorrect.",
+                lines=3,
+                visible=False,
+            )
+            feedback_submit_btn = gr.Button(
+                "Submit Feedback", size="sm", variant="primary", visible=False, interactive=False
+            )
+
+            # 用户输入
             user_input = gr.Textbox(
                 label="Your Input",
                 placeholder="Please log in on the right before asking Clare anything...",
@@ -559,7 +576,7 @@ with gr.Blocks(
                 interactive=False,
             )
 
-            # 2) Upload / File type / Memory Line 放到聊天框下面
+            # Upload / File type / Memory Line
             with gr.Row():
                 with gr.Column(scale=2):
                     syllabus_file = gr.File(
@@ -691,6 +708,11 @@ 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),
             }
 
         info_html = f"""
@@ -721,6 +743,11 @@ 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),
         }
 
     login_confirm_btn.click(
@@ -745,6 +772,11 @@ with gr.Blocks(
             learning_mode,
             model_name,
             docs_btn,
+            thumb_up_btn,
+            thumb_down_btn,
+            feedback_toggle_btn,
+            feedback_text,
+            feedback_submit_btn,
         ],
     )
 
@@ -773,6 +805,11 @@ 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),
         }
 
     logout_btn.click(
@@ -797,6 +834,11 @@ with gr.Blocks(
             language_preference,
             learning_mode,
             docs_btn,
+            thumb_up_btn,
+            thumb_down_btn,
+            feedback_toggle_btn,
+            feedback_text,
+            feedback_submit_btn,
         ],
     )
 
@@ -874,7 +916,7 @@ with gr.Blocks(
                 weaknesses or [],
                 cognitive_state or {"confusion": 0, "mastery": 0},
             )
-            return "", new_history, weaknesses, cognitive_state, new_status
+            return "", new_history, weaknesses, cognitive_state, new_status, "", ""
 
         resolved_lang = detect_language(message or "", lang_pref)
 
@@ -884,14 +926,13 @@ with gr.Blocks(
                 weaknesses or [],
                 cognitive_state or {"confusion": 0, "mastery": 0},
             )
-            return "", chat_history, weaknesses, cognitive_state, new_status
+            return "", chat_history, weaknesses, cognitive_state, new_status, "", ""
 
         # 更新学生状态
         weaknesses = update_weaknesses_from_message(message, weaknesses or [])
         cognitive_state = update_cognitive_state_from_message(message, cognitive_state)
 
-        # RAG 始终基于 (预加载 Module10 + 可选上传)
-        # 只对“学术/课程相关”问题调用 RAG；闲聊不查文档，也不打 reference
+        # RAG：只对学术问题启用
         if is_academic_query(message):
             rag_context_text, rag_used_chunks = retrieve_relevant_chunks(
                 message, rag_chunks or []
@@ -899,8 +940,6 @@ with gr.Blocks(
         else:
             rag_context_text, rag_used_chunks = "", []
 
-
-        # 计时
         start_ts = time.time()
         answer, new_history = chat_with_clare(
             message=message,
@@ -912,28 +951,27 @@ with gr.Blocks(
             course_outline=course_outline,
             weaknesses=weaknesses,
             cognitive_state=cognitive_state,
-            rag_context=rag_context_text,   # 这里传检索文本
+            rag_context=rag_context_text,
         )
         end_ts = time.time()
         latency_ms = (end_ts - start_ts) * 1000.0
 
-        # === 在这里附上 References（只在学术问题上附） ===
-        ref_text = ""
+        # 只在学术型问题上附 References
         if is_academic_query(message) and rag_used_chunks:
             ref_text = format_references(rag_used_chunks)
+        else:
+            ref_text = ""
 
         if ref_text and new_history:
             last_user, last_assistant = new_history[-1]
             if "References (RAG context used):" not in (last_assistant or ""):
                 last_assistant = f"{last_assistant}\n\n{ref_text}"
                 new_history[-1] = [last_user, last_assistant]
-                answer = last_assistant  # 同步给日志
-        # ============================================
+                answer = last_assistant
 
         # 日志
         student_id = user_id_val or "ANON"
         experiment_id = "RESP_AI_W10"
-
         try:
             log_event(
                 {
@@ -953,9 +991,9 @@ with gr.Blocks(
             print("log_event error:", e)
 
         new_status = render_session_status(mode_val, weaknesses, cognitive_state)
-        return "", new_history, weaknesses, cognitive_state, new_status
-
 
+        # 将当前这一轮的 Q/A 存入 state，后面 thumbs / 详细反馈用
+        return "", new_history, weaknesses, cognitive_state, new_status, message, answer
 
     user_input.submit(
         respond,
@@ -972,7 +1010,15 @@ with gr.Blocks(
             doc_type,
             user_id_state,
         ],
-        [user_input, chatbot, weakness_state, cognitive_state_state, session_status],
+        [
+            user_input,
+            chatbot,
+            weakness_state,
+            cognitive_state_state,
+            session_status,
+            last_question_state,
+            last_answer_state,
+        ],
     )
 
     # ===== Micro-Quiz: 直接在主 Chatbot 里进行 =====
@@ -1031,13 +1077,10 @@ with gr.Blocks(
         resolved_lang = lang_pref
 
         start_ts = time.time()
-
-
         quiz_ctx_text, _quiz_ctx_chunks = retrieve_relevant_chunks(
             "Module 10 quiz", rag_chunks or []
         )
 
-        
         answer, new_history = chat_with_clare(
             message=quiz_instruction,
             history=chat_history,
@@ -1094,6 +1137,141 @@ with gr.Blocks(
         [chatbot, weakness_state, cognitive_state_state, session_status],
     )
 
+    # ===== Feedback Handlers =====
+    def show_feedback_box():
+        """
+        点击 'Give detailed feedback' 时显示文本框 + 提交按钮
+        """
+        return {
+            feedback_text: gr.update(visible=True),
+            feedback_submit_btn: gr.update(visible=True),
+        }
+
+    feedback_toggle_btn.click(
+        show_feedback_box,
+        None,
+        [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
+    ):
+        if not text or not text.strip():
+            # 提示：请先填写再提交（用 placeholder 提醒）
+            return gr.update(
+                value="",
+                placeholder="Please enter some feedback before submitting.",
+            )
+
+        try:
+            log_event(
+                {
+                    "experiment_id": "RESP_AI_W10",
+                    "student_id": user_id_val or "ANON",
+                    "event_type": "detailed_feedback",
+                    "timestamp": time.time(),
+                    "question": last_q,
+                    "answer": last_a,
+                    "feedback_text": text.strip(),
+                    "model_name": model_name_val,
+                    "language": lang_pref,
+                    "learning_mode": mode_val,
+                }
+            )
+            print("[Feedback] detailed_feedback logged.")
+        except Exception as e:
+            print("detailed_feedback log error:", e)
+
+        # 清空文本框，并显示感谢（用 placeholder）
+        return gr.update(
+            value="",
+            placeholder="Thanks! Your feedback has been recorded.",
+        )
+
+    feedback_submit_btn.click(
+        submit_detailed_feedback,
+        [
+            feedback_text,
+            last_question_state,
+            last_answer_state,
+            user_id_state,
+            learning_mode,
+            model_name,
+            language_preference,
+        ],
+        [feedback_text],
+    )
+
     # ===== Export / Summary =====
     export_btn.click(
         lambda h, c, m, w, cog: export_conversation(h, c, m, w, cog),
@@ -1120,7 +1298,7 @@ with gr.Blocks(
     def clear_all():
         empty_state = {"confusion": 0, "mastery": 0}
         default_status = render_session_status("Concept Explainer", [], empty_state)
-        return [], [], empty_state, [], "", default_status
+        return [], [], empty_state, [], "", default_status, "", ""
 
     clear_btn.click(
         clear_all,
@@ -1132,6 +1310,8 @@ with gr.Blocks(
             rag_chunks_state,
             result_display,
             session_status,
+            last_question_state,
+            last_answer_state,
         ],
         queue=False,
     )