Update app.py

app.py

@@ -1,11 +1,11 @@
 import os
 import time
 import base64
-import requests
 from collections import defaultdict
-from typing import List, Dict, Tuple, Optional
+from typing import List, Dict
 
 import gradio as gr
+from langsmith import Client  # <<< 新增：LangSmith 客户端
 
 from config import (
     DEFAULT_MODEL,
@@ -262,39 +262,43 @@ if os.path.exists(MODULE10_PATH):
 else:
     print("Module 10 PDF not found at path:", MODULE10_PATH)
 
-# ===== Google Sheet logging ====
-GSHEET_WEBHOOK_URL = os.getenv("GSHEET_WEBHOOK_URL")
-GSHEET_API_KEY = os.getenv("GSHEET_API_KEY")
-
+# ===== LangSmith logging =====
+ls_client = Client()
+LS_DATASET_NAME = "clare_user_events"  # 你可以在 LangSmith 里看到这个 dataset 名字
 
 def log_event(data: Dict):
     """
-    把日志发到 Google Sheet（通过 Apps Script Webhook）
+    把日志写入 LangSmith 的一个 dataset（clare_user_events）
+    每个事件是一条 example，包含 inputs / outputs / metadata。
     """
-    if not GSHEET_WEBHOOK_URL:
-        print("Google Sheet webhook not configured, skip logging")
-        return
-
-    payload = data.copy()
-    payload["api_key"] = GSHEET_API_KEY or ""
-
     try:
-        resp = requests.post(GSHEET_WEBHOOK_URL, json=payload, timeout=3)
-        if not resp.ok:
-            print("GSheet log failed:", resp.status_code, resp.text)
-    except Exception as e:
-        print("GSheet log exception:", e)
+        inputs = {
+            "question": data.get("question"),
+            "event_type": data.get("event_type"),
+            "student_id": data.get("student_id"),
+        }
+        outputs = {
+            "answer": data.get("answer"),
+        }
+        metadata = {
+            k: v
+            for k, v in data.items()
+            if k not in ("question", "answer", "event_type")
+        }
 
+        ls_client.create_example(
+            inputs=inputs,
+            outputs=outputs,
+            metadata=metadata,
+            dataset_name=LS_DATASET_NAME,
+        )
+    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
 ) -> str:
-    """
-    根据当前使用的 rag_chunks，生成一个简短的 reference 列表：
-    - 按文件名分组
-    - 每个文件列出若干个 section
-    """
     if not rag_chunks:
         return ""
 
@@ -326,9 +330,6 @@ def format_references(
 
 
 def is_academic_query(message: str) -> bool:
-    """
-    判断当前学生输入是否是“学术/课程相关”问题。
-    """
     if not message:
         return False
 
@@ -338,7 +339,6 @@ def is_academic_query(message: str) -> bool:
 
     m = " ".join(m.split())
 
-    # 1) 典型闲聊词
     smalltalk_tokens = {
         "hi", "hello", "hey", "yo",
         "thanks", "thank", "thank you",
@@ -351,7 +351,6 @@ def is_academic_query(message: str) -> bool:
     if "?" not in m and all(t in smalltalk_tokens for t in tokens):
         return False
 
-    # 2) 自我介绍 / 工具说明
     meta_phrases = [
         "who are you",
         "what are you",
@@ -371,7 +370,6 @@ def is_academic_query(message: str) -> bool:
     if any(p in m for p in meta_phrases):
         return False
 
-    # 3) 很短又没有问号，大概率不是学术问题
     if len(tokens) <= 2 and "?" not in m:
         return False
 
@@ -389,7 +387,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("")
 
@@ -522,7 +520,7 @@ with gr.Blocks(
 
         # === Center Main ===
         with gr.Column(scale=3):
-        
+
             # Instruction + Chat
             gr.Markdown(
                 """
@@ -533,16 +531,16 @@ with gr.Blocks(
                 </div>
                 """
             )
-        
+
             chatbot = gr.Chatbot(
                 label="",
                 height=450,
                 avatar_images=(None, CLARE_LOGO_PATH),
                 show_label=False,
-                bubble_full_width=False,  # 未来会被忽略，但保留不影响
-                type="tuples",            # ✅ 关键：我们用的是 [(user, assistant), ...] 的格式
+                bubble_full_width=False,
+                type="tuples",
             )
-        
+
             # === Feedback on last answer ===
             gr.Markdown("#### Rate Clare’s last answer")
             with gr.Row():
@@ -552,7 +550,7 @@ with gr.Blocks(
                 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
             )
@@ -566,8 +564,6 @@ with gr.Blocks(
                 "Submit Feedback", size="sm", variant="primary", visible=False, interactive=False
             )
 
-
-
             # 用户输入
             user_input = gr.Textbox(
                 label="Your Input",
@@ -710,6 +706,8 @@ 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),
@@ -743,6 +741,8 @@ 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),
@@ -770,6 +770,8 @@ with gr.Blocks(
             learning_mode,
             model_name,
             docs_btn,
+            thumb_up_btn,
+            thumb_down_btn,
             feedback_toggle_btn,
             feedback_text,
             feedback_submit_btn,
@@ -801,6 +803,8 @@ 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),
@@ -828,6 +832,8 @@ with gr.Blocks(
             language_preference,
             learning_mode,
             docs_btn,
+            thumb_up_btn,
+            thumb_down_btn,
             feedback_toggle_btn,
             feedback_text,
             feedback_submit_btn,
@@ -961,7 +967,7 @@ with gr.Blocks(
                 new_history[-1] = [last_user, last_assistant]
                 answer = last_assistant
 
-        # 日志
+        # LangSmith 日志
         student_id = user_id_val or "ANON"
         experiment_id = "RESP_AI_W10"
         try:
@@ -984,7 +990,7 @@ with gr.Blocks(
 
         new_status = render_session_status(mode_val, weaknesses, cognitive_state)
 
-        # 将当前这一轮的 Q/A 存入 state，详细反馈用（针对“最后一条回答”）
+        # 将当前这一轮的 Q/A 存入 state，后面 thumbs / 详细反馈用
         return "", new_history, weaknesses, cognitive_state, new_status, message, answer
 
     user_input.submit(
@@ -1131,9 +1137,6 @@ with gr.Blocks(
 
     # ===== Feedback Handlers =====
     def show_feedback_box():
-        """
-        点击 'Give detailed feedback' 时显示文本框 + 提交按钮
-        """
         return {
             feedback_text: gr.update(visible=True),
             feedback_submit_btn: gr.update(visible=True),
@@ -1145,11 +1148,80 @@ 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 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": "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 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():
-            # 提示：请先填写再提交（用 placeholder 提醒）
             return gr.update(
                 value="",
                 placeholder="Please enter some feedback before submitting.",
@@ -1170,11 +1242,10 @@ with gr.Blocks(
                     "learning_mode": mode_val,
                 }
             )
-            print("[Feedback] detailed_feedback logged.")
+            print("[Feedback] detailed_feedback logged to LangSmith.")
         except Exception as e:
             print("detailed_feedback log error:", e)
 
-        # 清空文本框，并显示感谢（用 placeholder）
         return gr.update(
             value="",
             placeholder="Thanks! Your feedback has been recorded.",
@@ -1194,54 +1265,6 @@ 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),