Update clare_core.py

clare_core.py

@@ -69,6 +69,7 @@ MASTERY_KEYWORDS = [
     "清楚了",
 ]
 
+
 def update_weaknesses_from_message(message: str, weaknesses: List[str]) -> List[str]:
     lower_msg = message.lower()
     if any(k in lower_msg for k in WEAKNESS_KEYWORDS):
@@ -176,7 +177,8 @@ def detect_language(message: str, preference: str) -> str:
     if re.search(r"[\u4e00-\u9fff]", message):
         return "中文"
     return "English"
-    
+
+
 def get_empty_input_prompt(lang: str) -> str:
     """
     空输入时的友好提示，根据语言返回中/英文。
@@ -186,6 +188,7 @@ def get_empty_input_prompt(lang: str) -> str:
     # 默认英文
     return "Please type a question or some text before sending, then hit Enter."
 
+
 def build_error_message(
     e: Exception,
     lang: str,
@@ -351,7 +354,6 @@ def find_similar_past_question(
 
     return None
 
-from config import client, DEFAULT_MODEL, EMBEDDING_MODEL  # 确认已导入 DEFAULT_MODEL
 
 def safe_chat_completion(
     model_name: str,
@@ -399,6 +401,7 @@ def safe_chat_completion(
     # 两次都失败，返回友好的错误文案
     return build_error_message(last_error or Exception("unknown error"), lang, op)
 
+
 # ---------- 构建 messages ----------
 def build_messages(
     user_message: str,
@@ -409,6 +412,7 @@ def build_messages(
     course_outline: Optional[List[str]],
     weaknesses: Optional[List[str]],
     cognitive_state: Optional[Dict[str, int]],
+    rag_context: Optional[str] = None,   # 👈 新增：RAG 检索结果
 ) -> List[Dict[str, str]]:
     messages: List[Dict[str, str]] = [
         {"role": "system", "content": CLARE_SYSTEM_PROMPT}
@@ -531,6 +535,21 @@ def build_messages(
         }
     )
 
+    # ✅ RAG 检索结果（如果有）
+    if rag_context:
+        messages.append(
+            {
+                "role": "system",
+                "content": (
+                    "Here are some relevant excerpts from the course materials. "
+                    "Use them as the primary factual grounding when answering the student's question. "
+                    "If there is any conflict between these excerpts and your prior knowledge, "
+                    "prefer the excerpts.\n\n"
+                    + rag_context
+                ),
+            }
+        )
+
     # 历史对话
     for user, assistant in history:
         messages.append({"role": "user", "content": user})
@@ -552,6 +571,7 @@ def chat_with_clare(
     course_outline: Optional[List[str]],
     weaknesses: Optional[List[str]],
     cognitive_state: Optional[Dict[str, int]],
+    rag_context: Optional[str] = None,   # 👈 新增
 ) -> Tuple[str, List[Tuple[str, str]]]:
     # 构建 messages
     messages = build_messages(
@@ -563,6 +583,7 @@ def chat_with_clare(
         course_outline=course_outline,
         weaknesses=weaknesses,
         cognitive_state=cognitive_state,
+        rag_context=rag_context,
     )
 
     # 统一安全调用
@@ -578,7 +599,6 @@ def chat_with_clare(
     return answer, history
 
 
-
 # ---------- 导出对话为 Markdown ----------
 def export_conversation(
     history: List[Tuple[str, str]],