Update app.py

app.py

@@ -5,7 +5,7 @@ from collections import defaultdict
 from typing import List, Dict
 
 import gradio as gr
-from langsmith import Client  # <<< 新增：LangSmith 客户端
+from langsmith import Client
 
 from config import (
     DEFAULT_MODEL,
@@ -32,7 +32,6 @@ from rag_engine import (
 from syllabus_utils import extract_course_topics_from_file
 
 # ================== Assets ==================
-# HANBRIDGE_LOGO_PATH = "hanbridge_logo.png"
 CLARE_LOGO_PATH = "clare_mascot.png"
 CLARE_RUN_PATH = "Clare_Run.png"
 CLARE_READING_PATH = "Clare_reading.png"  # 确保存在
@@ -264,17 +263,18 @@ else:
 
 # ===== LangSmith logging =====
 ls_client = Client()
-LS_DATASET_NAME = "clare_user_events"  # 你可以在 LangSmith 里看到这个 dataset 名字
+LS_DATASET_NAME = "clare_user_events"
+
 
 def log_event(data: Dict):
     """
-    把日志写入 LangSmith 的一个 dataset（clare_user_events）
-    每个事件是一条 example，包含 inputs / outputs / metadata。
+    写入 LangSmith dataset：clare_user_events
+    每个事件是一条 example（inputs / outputs / metadata）
     """
     try:
         inputs = {
-            "question": data.get("question"),
             "event_type": data.get("event_type"),
+            "question": data.get("question"),
             "student_id": data.get("student_id"),
         }
         outputs = {
@@ -295,6 +295,7 @@ def log_event(data: Dict):
     except Exception as e:
         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
@@ -344,7 +345,7 @@ def is_academic_query(message: str) -> bool:
         "thanks", "thank", "thank you",
         "ok", "okay",
         "bye", "goodbye", "see you",
-        "haha", "lol"
+        "haha", "lol",
     }
     tokens = m.split()
 
@@ -381,17 +382,17 @@ with gr.Blocks(
     title="Clare – Hanbridge AI Teaching Assistant", css=CUSTOM_CSS
 ) as demo:
 
-    # 全局状态（预加载 Module 10 作为基础）
+    # 全局状态
     course_outline_state = gr.State(preloaded_topics or DEFAULT_COURSE_TOPICS)
     weakness_state = gr.State([])
     cognitive_state_state = gr.State({"confusion": 0, "mastery": 0})
     rag_chunks_state = gr.State(preloaded_chunks or [])
 
-    # 最近一次回答（用于每条回答的 thumbs / 详细反馈）
+    # 最近一次回答（用于 thumbs / 详细反馈）
     last_question_state = gr.State("")
     last_answer_state = gr.State("")
 
-    # 用户状态（登录）
+    # 用户登录状态
     user_name_state = gr.State("")
     user_id_state = gr.State("")
 
@@ -508,12 +509,18 @@ with gr.Blocks(
                     gr.Markdown(USER_GUIDE_SECTIONS["faq"])
 
             gr.Markdown("---")
-            gr.Button("System Settings", size="sm", variant="secondary", interactive=False)
+            gr.Button(
+                "System Settings",
+                size="sm",
+                variant="secondary",
+                interactive=False,
+            )
 
             gr.HTML(
                 """
                 <div style="font-size: 11px; color: #9ca3af; margin-top: 15px; text-align: left;">
-                    © 2025 Made by <a href="https://www.linkedin.com/in/qinghua-xia-479199252/" target="_blank" style="color: #6b7280; text-decoration: underline;">Sarah Xia</a>
+                    © 2025 Made by <a href="https://www.linkedin.com/in/qinghua-xia-479199252/"
+                    target="_blank" style="color: #6b7280; text-decoration: underline;">Sarah Xia</a>
                 </div>
                 """
             )
@@ -521,7 +528,6 @@ with gr.Blocks(
         # === Center Main ===
         with gr.Column(scale=3):
 
-            # Instruction + Chat
             gr.Markdown(
                 """
                 <div style="background-color:#f9fafb; padding:10px; border-radius:5px; margin-top:10px; font-size:0.9em; color:#555;">
@@ -532,57 +538,53 @@ with gr.Blocks(
                 """
             )
 
-
             chatbot = gr.Chatbot(
                 label="",
                 height=450,
                 avatar_images=(None, CLARE_LOGO_PATH),
                 show_label=False,
-                type="tuples",      # 你现在的 history 是 list[ [user, assistant], ... ]，保留 tuples 就行
-                likeable=True,      # 新版本才支持
-            )
-            
-            def handle_like(data, history, user_id, mode_val, model_name_val, lang_pref):
-                """
-                data 里一般会带：
-                  - data["index"]  被点的是第几条对话
-                  - data["value"]  是 "like" / "dislike"
-                你可以用这个信息去调用 LangSmith 的 feedback API
-                """
-                idx = data.get("index", -1)
-                value = data.get("value", "")
-                if idx < 0 or idx >= len(history):
-                    return
-            
-                question, answer = history[idx]
-            
-                # 在这里把 question/answer + value 发到 LangSmith
-                # （用你之前已经写好的 record_feedback / client.create_feedback 那一套）
-                # record_langsmith_feedback(question, answer, value, user_id, mode_val, model_name_val, lang_pref)
-            
-                print(f"[LIKE EVENT] idx={idx}, value={value}")
-            
-            chatbot.like(
-                fn=handle_like,
-                inputs=[chatbot, user_id_state, learning_mode, model_name, language_preference],
-                outputs=[],
+                bubble_full_width=False,  # 只是 warning，不影响
+                type="tuples",
             )
 
+            # === 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.",
+                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
+                "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...",
+                placeholder=(
+                    "Please log in on the right before asking Clare anything..."
+                ),
                 show_label=False,
                 container=True,
                 autofocus=False,
@@ -596,7 +598,9 @@ with gr.Blocks(
                         file_types=[".docx", ".pdf", ".pptx"],
                         file_count="single",
                         height=160,
-                        label="Upload additional Module 10 file (.docx/.pdf/.pptx) — optional",
+                        label=(
+                            "Upload additional Module 10 file (.docx/.pdf/.pptx) — optional"
+                        ),
                         interactive=False,
                     )
                 with gr.Column(scale=1):
@@ -669,13 +673,22 @@ with gr.Blocks(
 
             gr.Markdown("### Actions")
             export_btn = gr.Button(
-                "Export Conversation", size="sm", elem_classes="action-btn", interactive=False
+                "Export Conversation",
+                size="sm",
+                elem_classes="action-btn",
+                interactive=False,
             )
             quiz_btn = gr.Button(
-                "Let's Try (Micro-Quiz)", size="sm", elem_classes="action-btn", interactive=False
+                "Let's Try (Micro-Quiz)",
+                size="sm",
+                elem_classes="action-btn",
+                interactive=False,
             )
             summary_btn = gr.Button(
-                "Summarization", size="sm", elem_classes="action-btn", interactive=False
+                "Summarization",
+                size="sm",
+                elem_classes="action-btn",
+                interactive=False,
             )
 
             gr.Markdown("### Results")
@@ -705,7 +718,10 @@ with gr.Blocks(
                 login_state_2: gr.update(),
                 login_state_3: gr.update(),
                 student_info_html: gr.update(
-                    value="<p style='color:red; font-size:12px;'>Please enter both Name and Email/ID to start.</p>"
+                    value=(
+                        "<p style='color:red; font-size:12px;'>Please enter both "
+                        "Name and Email/ID to start.</p>"
+                    )
                 ),
                 user_name_state: gr.update(),
                 user_id_state: gr.update(),
@@ -743,7 +759,9 @@ with gr.Blocks(
             user_id_state: id_val,
             user_input: gr.update(
                 interactive=True,
-                placeholder="Ask about Module 10 concepts, Responsible AI, or let Clare test you...",
+                placeholder=(
+                    "Ask about Module 10 concepts, Responsible AI, or let Clare test you..."
+                ),
             ),
             clear_btn: gr.update(interactive=True),
             export_btn: gr.update(interactive=True),
@@ -806,7 +824,9 @@ with gr.Blocks(
             user_input: gr.update(
                 value="",
                 interactive=False,
-                placeholder="Please log in on the right before asking Clare anything...",
+                placeholder=(
+                    "Please log in on the right before asking Clare anything..."
+                ),
             ),
             clear_btn: gr.update(interactive=False),
             export_btn: gr.update(interactive=False),
@@ -897,7 +917,7 @@ with gr.Blocks(
 
     def show_loaded_docs(doc_type_val):
         gr.Info(
-            f"For this experiment, Clare always includes the pre-loaded Module 10 reading.\n"
+            "For this experiment, Clare always includes the pre-loaded Module 10 reading.\n"
             f"Additional uploaded {doc_type_val} files will be used as supplementary context.",
             title="Loaded Documents",
         )
@@ -917,7 +937,7 @@ with gr.Blocks(
         doc_type_val,
         user_id_val,
     ):
-        # 双保险：没登录就提示
+        # 没登录就提示
         if not user_id_val:
             out_msg = (
                 "🔒 Please log in with your Student Name and Email/ID on the right "
@@ -941,7 +961,6 @@ with gr.Blocks(
             )
             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)
 
@@ -1005,7 +1024,7 @@ with gr.Blocks(
 
         new_status = render_session_status(mode_val, weaknesses, cognitive_state)
 
-        # 将当前这一轮的 Q/A 存入 state，后面 thumbs / 详细反馈用
+        # 将当前这一轮的 Q/A 存入 state，供 thumbs / 文字反馈使用
         return "", new_history, weaknesses, cognitive_state, new_status, message, answer
 
     user_input.submit(
@@ -1072,8 +1091,7 @@ with gr.Blocks(
             "• Do NOT start a content question until I have answered 1 or 2.\n\n"
             "Step 2 – After I choose the style:\n"
             "• If I choose 1 (multiple-choice):\n"
-            "  - Ask ONE multiple-choice question at a time, based on Module 10 concepts "
-            "(Responsible AI definition, risk types, mitigation layers, EU AI Act, etc.).\n"
+            "  - Ask ONE multiple-choice question at a time, based on Module 10 concepts.\n"
             "  - Provide 3–4 options (A, B, C, D) and make only one option clearly correct.\n"
             "• If I choose 2 (short-answer):\n"
             "  - Ask ONE short-answer question at a time, also based on Module 10 concepts.\n"
@@ -1185,7 +1203,9 @@ with gr.Blocks(
         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):
+    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
@@ -1283,7 +1303,13 @@ with gr.Blocks(
     # ===== Export / Summary =====
     export_btn.click(
         lambda h, c, m, w, cog: export_conversation(h, c, m, w, cog),
-        [chatbot, course_outline_state, learning_mode, weakness_state, cognitive_state_state],
+        [
+            chatbot,
+            course_outline_state,
+            learning_mode,
+            weakness_state,
+            cognitive_state_state,
+        ],
         [result_display],
     )
 
@@ -1326,7 +1352,7 @@ with gr.Blocks(
 
 if __name__ == "__main__":
     demo.launch(
-        share=True,
+        share=True,          # HF Space 环境需要 share=True 才能访问
         server_name="0.0.0.0",
         server_port=7860,
     )