SarahXia0405 commited on
Commit
da1a6b7
·
verified ·
1 Parent(s): 7f26fff

Update clare_core.py

Browse files
Files changed (1) hide show
  1. clare_core.py +35 -39
clare_core.py CHANGED
@@ -553,30 +553,32 @@ def chat_with_clare(
553
  weaknesses: Optional[List[str]],
554
  cognitive_state: Optional[Dict[str, int]],
555
  ) -> Tuple[str, List[Tuple[str, str]]]:
556
- try:
557
- messages = build_messages(
558
- user_message=message,
559
- history=history,
560
- language_preference=language_preference,
561
- learning_mode=learning_mode,
562
- doc_type=doc_type,
563
- course_outline=course_outline,
564
- weaknesses=weaknesses,
565
- cognitive_state=cognitive_state,
566
- )
567
- response = client.chat.completions.create(
568
- model=model_name or DEFAULT_MODEL,
569
- messages=messages,
570
- temperature=0.5,
571
- )
572
- answer = response.choices[0].message.content
573
- except Exception as e:
574
- answer = f"⚠️ Error talking to the model: {e}"
 
575
 
576
  history = history + [(message, answer)]
577
  return answer, history
578
 
579
 
 
580
  # ---------- 导出对话为 Markdown ----------
581
  def export_conversation(
582
  history: List[Tuple[str, str]],
@@ -665,16 +667,13 @@ def generate_quiz_from_history(
665
  }
666
  )
667
 
668
- try:
669
- response = client.chat.completions.create(
670
- model=model_name or DEFAULT_MODEL,
671
- messages=messages,
672
- temperature=0.5,
673
- )
674
- quiz_text = response.choices[0].message.content
675
- except Exception as e:
676
- quiz_text = f"⚠️ Error generating quiz: {e}"
677
-
678
  return quiz_text
679
 
680
 
@@ -738,14 +737,11 @@ def summarize_conversation(
738
  }
739
  )
740
 
741
- try:
742
- response = client.chat.completions.create(
743
- model=model_name or DEFAULT_MODEL,
744
- messages=messages,
745
- temperature=0.4,
746
- )
747
- summary_text = response.choices[0].message.content
748
- except Exception as e:
749
- summary_text = f"⚠️ Error generating summary: {e}"
750
-
751
  return summary_text
 
553
  weaknesses: Optional[List[str]],
554
  cognitive_state: Optional[Dict[str, int]],
555
  ) -> Tuple[str, List[Tuple[str, str]]]:
556
+ # 构建 messages
557
+ messages = build_messages(
558
+ user_message=message,
559
+ history=history,
560
+ language_preference=language_preference,
561
+ learning_mode=learning_mode,
562
+ doc_type=doc_type,
563
+ course_outline=course_outline,
564
+ weaknesses=weaknesses,
565
+ cognitive_state=cognitive_state,
566
+ )
567
+
568
+ # 统一安全调用
569
+ answer = safe_chat_completion(
570
+ model_name=model_name,
571
+ messages=messages,
572
+ lang=language_preference,
573
+ op="chat",
574
+ temperature=0.5,
575
+ )
576
 
577
  history = history + [(message, answer)]
578
  return answer, history
579
 
580
 
581
+
582
  # ---------- 导出对话为 Markdown ----------
583
  def export_conversation(
584
  history: List[Tuple[str, str]],
 
667
  }
668
  )
669
 
670
+ quiz_text = safe_chat_completion(
671
+ model_name=model_name,
672
+ messages=messages,
673
+ lang=language_preference,
674
+ op="quiz",
675
+ temperature=0.5,
676
+ )
 
 
 
677
  return quiz_text
678
 
679
 
 
737
  }
738
  )
739
 
740
+ summary_text = safe_chat_completion(
741
+ model_name=model_name,
742
+ messages=messages,
743
+ lang=language_preference,
744
+ op="summary",
745
+ temperature=0.4,
746
+ )
 
 
 
747
  return summary_text