Update app.py

app.py

@@ -4,12 +4,8 @@ import base64
 from collections import defaultdict
 from typing import List, Dict
 
-import time
-import gradio as gr
-
-
 import gradio as gr
-from langsmith import Client
+from langsmith import Client  # LangSmith 客户端
 
 from config import (
     DEFAULT_MODEL,
@@ -38,7 +34,7 @@ from syllabus_utils import extract_course_topics_from_file
 # ================== Assets ==================
 CLARE_LOGO_PATH = "clare_mascot.png"
 CLARE_RUN_PATH = "Clare_Run.png"
-CLARE_READING_PATH = "Clare_reading.png"
+CLARE_READING_PATH = "Clare_reading.png"  # 确保存在
 
 # ================== Base64 Helper ==================
 def image_to_base64(image_path: str) -> str:
@@ -185,7 +181,7 @@ Currently: English & 简体中文.
 """
 }
 
-# ================== CSS ==================
+# ================== CSS 样式表 ==================
 CUSTOM_CSS = """
 /* --- Main Header --- */
 .header-container { padding: 10px 20px; background-color: #ffffff; border-bottom: 2px solid #f3f4f6; margin-bottom: 15px; display: flex; align-items: center; }
@@ -269,7 +265,11 @@ else:
 ls_client = Client()
 LS_DATASET_NAME = "clare_user_events"
 
+
 def log_event(data: Dict):
+    """
+    把日志写入 LangSmith Dataset (clare_user_events)
+    """
     try:
         inputs = {
             "question": data.get("question"),
@@ -279,11 +279,10 @@ def log_event(data: Dict):
         outputs = {
             "answer": data.get("answer"),
         }
-        # ✅ 只排除 question / answer，其余都进 metadata
         metadata = {
             k: v
             for k, v in data.items()
-            if k not in ("question", "answer")
+            if k not in ("question", "answer", "event_type")
         }
 
         ls_client.create_example(
@@ -296,7 +295,6 @@ def log_event(data: Dict):
         print("LangSmith log failed:", e)
 
 
-
 # ===== Reference Formatting Helper =====
 def format_references(
     rag_chunks: List[Dict], max_files: int = 2, max_sections_per_file: int = 3
@@ -330,6 +328,7 @@ def format_references(
         return ""
     return "\n".join(lines)
 
+
 def is_academic_query(message: str) -> bool:
     if not message:
         return False
@@ -375,46 +374,6 @@ def is_academic_query(message: str) -> bool:
         return False
 
     return True
-# ======= Chatbot like/dislike handler (per-message, ChatGPT-style) =======
-def handle_like(
-    data: "gr.LikeData",   # 或者直接去掉类型标注也可以
-    history,
-    user_id_val,
-    mode_val,
-    model_name_val,
-    lang_pref,
-):
-    """
-    data.index: 第几条消息被点
-    data.value: "like" / "dislike"
-    history: 当前 Chatbot 的 [ [user, assistant], ... ]
-    """
-    try:
-        idx = data.index
-        value = data.value  # "like" or "dislike"
-        if history is None or idx < 0 or idx >= len(history):
-            print("[Like] invalid index", idx)
-            return
-
-        question, answer = history[idx]
-        student_id = user_id_val or "ANON"
-
-        log_event(
-            {
-                "experiment_id": "RESP_AI_W10",
-                "student_id": student_id,
-                "event_type": value,  # "like" / "dislike"
-                "timestamp": time.time(),
-                "question": question,
-                "answer": answer,
-                "model_name": model_name_val,
-                "language": lang_pref,
-                "learning_mode": mode_val,
-            }
-        )
-        print(f"[Like] event logged: index={idx}, value={value}")
-    except Exception as e:
-        print("handle_like error:", e)
 
 
 # ================== Gradio App ==================
@@ -428,6 +387,9 @@ with gr.Blocks(
     cognitive_state_state = gr.State({"confusion": 0, "mastery": 0})
     rag_chunks_state = gr.State(preloaded_chunks or [])
 
+    last_question_state = gr.State("")
+    last_answer_state = gr.State("")
+
     user_name_state = gr.State("")
     user_id_state = gr.State("")
 
@@ -482,7 +444,6 @@ with gr.Blocks(
                 interactive=False,
             )
 
-            # User Guide
             with gr.Accordion(
                 "User Guide", open=True, elem_classes="main-user-guide"
             ):
@@ -573,24 +534,31 @@ with gr.Blocks(
                 avatar_images=(None, CLARE_LOGO_PATH),
                 show_label=False,
                 type="tuples",
-                likeable=True,
             )
 
-            # ChatGPT-style per-message like/dislike
-            chatbot.like(
-                fn=handle_like,
-                inputs=[
-                    chatbot,          # history
-                    user_id_state,
-                    learning_mode,
-                    model_name,
-                    language_preference,
-                ],
-                outputs=[],           # 我们这里只写日志，不改 UI
-            )
+            # Rating bar (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...",
@@ -600,7 +568,6 @@ with gr.Blocks(
                 interactive=False,
             )
 
-            # Upload / File type / Memory Line
             with gr.Row():
                 with gr.Column(scale=2):
                     syllabus_file = gr.File(
@@ -697,6 +664,7 @@ with gr.Blocks(
                 )
 
     # ================== Login Flow ==================
+
     def show_inputs():
         return {
             login_state_1: gr.update(visible=False),
@@ -731,6 +699,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"""
@@ -761,6 +734,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(
@@ -785,6 +763,11 @@ with gr.Blocks(
             learning_mode,
             model_name,
             docs_btn,
+            thumb_up_btn,
+            thumb_down_btn,
+            feedback_toggle_btn,
+            feedback_text,
+            feedback_submit_btn,
         ],
     )
 
@@ -813,6 +796,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(
@@ -837,10 +825,16 @@ with gr.Blocks(
             language_preference,
             learning_mode,
             docs_btn,
+            thumb_up_btn,
+            thumb_down_btn,
+            feedback_toggle_btn,
+            feedback_text,
+            feedback_submit_btn,
         ],
     )
 
     # ================== Main Logic ==================
+
     def update_course_and_rag(file, doc_type_val):
         local_topics = preloaded_topics or []
         local_chunks = preloaded_chunks or []
@@ -909,7 +903,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)
 
@@ -919,7 +913,7 @@ 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)
@@ -981,7 +975,7 @@ with gr.Blocks(
 
         new_status = render_session_status(mode_val, weaknesses, cognitive_state)
 
-        return "", new_history, weaknesses, cognitive_state, new_status
+        return "", new_history, weaknesses, cognitive_state, new_status, message, answer
 
     user_input.submit(
         respond,
@@ -1004,6 +998,8 @@ with gr.Blocks(
             weakness_state,
             cognitive_state_state,
             session_status,
+            last_question_state,
+            last_answer_state,
         ],
     )
 
@@ -1123,6 +1119,136 @@ with gr.Blocks(
         [chatbot, weakness_state, cognitive_state_state, session_status],
     )
 
+    # ===== Feedback Handlers (thumb + detailed) =====
+    def show_feedback_box():
+        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": "like",
+                    "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 to LangSmith.")
+        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": "dislike",
+                    "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 to LangSmith.")
+        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():
+            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 to LangSmith.")
+        except Exception as e:
+            print("detailed_feedback log error:", e)
+
+        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),
@@ -1149,7 +1275,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,
@@ -1161,6 +1287,8 @@ with gr.Blocks(
             rag_chunks_state,
             result_display,
             session_status,
+            last_question_state,
+            last_answer_state,
         ],
         queue=False,
     )