refactor

app.py

@@ -2226,40 +2226,16 @@ def chat_with_opan_ai_assistant(password, youtube_id, user_data, thread_id, tras
     print("=====user_data=====")
     print(f"user_data: {user_data}")
 
-    # 先計算 user_message 是否超過 500 個字
-    if len(user_message) > 1500:
-        error_msg = "你的訊息太長了，請縮短訊息長度至五百字以內"
-        raise gr.Error(error_msg)
-    
-    questions_answers_json = json.loads(questions_answers_json)
-    for qa in questions_answers_json:
-        question = qa["question"]
-        answer = qa["answer"]
-        if user_message == question and answer != "":
-            print("=== in questions_answers_json==")
-            print(f"question: {question}")
-            print(f"answer: {answer}")
-            print(f"thread_id: {thread_id}")
-            # 更新聊天历史
-            # user_message 前方加上【預設問題】
-            user_message = f"【預設問題】{user_message}"
-            new_chat_history = (user_message, answer)
-            if chat_history is None:
-                chat_history = [new_chat_history]
-            else:
-                chat_history.append(new_chat_history)
-
-            # 等待 3 秒
-            time.sleep(3)
-            send_btn_update, send_feedback_btn_update = update_send_and_feedback_buttons(chat_history, CHAT_LIMIT)
-
-            return "", chat_history, thread_id, send_btn_update, send_feedback_btn_update
-
+    verify_message_length(user_message, max_length=1500)
+
+    is_questions_answers_exists, question_message, answer_message = check_questions_answers(user_message, questions_answers_json)
+    if is_questions_answers_exists:
+        chat_history = update_chat_history(question_message, answer_message, chat_history)
+        send_btn_update, send_feedback_btn_update = update_send_and_feedback_buttons(chat_history, CHAT_LIMIT)
+        time.sleep(3)
+        return "", chat_history, thread_id, send_btn_update, send_feedback_btn_update
     
-    # 如果 chat_history 超過 10 則訊息，直接 return "對話超過上限"
-    if chat_history is not None and len(chat_history) > CHAT_LIMIT:
-        error_msg = "此次對話超過上限（對話一輪10次）"
-        raise gr.Error(error_msg)
+    verify_chat_limit(chat_history, CHAT_LIMIT)
 
     try:
         assistant_id = OPEN_AI_ASSISTANT_ID_GPT4 #GPT 4 turbo
@@ -2338,16 +2314,12 @@ def chat_with_opan_ai_assistant(password, youtube_id, user_data, thread_id, tras
         else:
             response_text = "學習精靈有點累，請稍後再試！"
 
-        # 更新聊天历史
-        new_chat_history = (user_message, response_text)
-        if chat_history is None:
-            chat_history = [new_chat_history]
-        else:
-            chat_history.append(new_chat_history)
     except Exception as e:
         print(f"Error: {e}")
         raise gr.Error(f"Error: {e}")
 
+    # 更新聊天历史
+    chat_history = update_chat_history(user_message, response_text, chat_history)
     send_btn_update, send_feedback_btn_update = update_send_and_feedback_buttons(chat_history, CHAT_LIMIT)
 
 
@@ -2373,6 +2345,7 @@ def feedback_with_opan_ai_assistant(thread_id, chat_history):
         user_message = chat[0]
         assistant_message = chat[1]
         chat_history_conversation += f"User: {user_message}\nAssistant: {assistant_message}\n"
+    
     feedback_request_message = "請依據以上的對話，總結我的「提問力」，並給予我是否有「問對問題」的回饋和建議"
     user_content = f"""conversation: {chat_history_conversation}
         {feedback_request_message}
@@ -2427,7 +2400,6 @@ def feedback_with_opan_ai_assistant(thread_id, chat_history):
             response_text = messages.data[0].content[0].text.value
         else:
             response_text = "學習精靈有點累，請稍後再試！"
-
     except Exception as e:
         response_text = OPEN_AI_CLIENT.chat.completions.create(
             model="gpt-4-turbo",
@@ -2437,17 +2409,54 @@ def feedback_with_opan_ai_assistant(thread_id, chat_history):
             ],
             max_tokens=4000,
         ).choices[0].message.content.strip()
-    
-    new_chat_history = (feedback_request_message, response_text)
-    if chat_history is None:
-        chat_history = [new_chat_history]
-    else:
-        chat_history.append(new_chat_history)
 
+    chat_history = update_chat_history(feedback_request_message, response_text, chat_history)
     feedback_btn_update = gr.update(value="已回饋", interactive=False, variant="secondary")
 
     return chat_history, feedback_btn_update
 
+def verify_message_length(user_message, max_length=500):
+    # 驗證用戶消息的長度
+    if len(user_message) > max_length:
+        error_msg = "你的訊息太長了，請縮短訊息長度至五百字以內"
+        raise gr.Error(error_msg)
+
+def check_questions_answers(user_message, questions_answers_json):
+    """檢查問答是否存在，並處理相關邏輯"""
+    is_questions_answers_exists = False
+    answer = ""
+    # 解析問答數據
+    if isinstance(questions_answers_json, str):
+        qa_data = json.loads(questions_answers_json)
+    else:
+        qa_data = questions_answers_json
+    for qa in qa_data:
+        if user_message == qa["question"] and qa["answer"]:
+            is_questions_answers_exists = True
+            question_message = f"【預設問題】{user_message}"
+            answer_message = qa["answer"]
+            print("=== in questions_answers_json==")
+            print(f"question: {qa['question']}")
+            print(f"answer: {answer_message}")
+            break  # 匹配到答案後退出循環
+
+    return is_questions_answers_exists, question_message, answer_message
+
+def verify_chat_limit(chat_history, chat_limit):
+    if chat_history is not None and len(chat_history) > chat_limit:
+        error_msg = "此次對話超過上限（對話一輪10次）"
+        raise gr.Error(error_msg)
+
+def update_chat_history(user_message, response, chat_history):
+    # 更新聊天歷史的邏輯
+    new_chat_history = (user_message, response)
+    if chat_history is None:
+        chat_history = [new_chat_history]
+    else:
+        chat_history.append(new_chat_history)
+    
+    return chat_history
+
 def update_send_and_feedback_buttons(chat_history, chat_limit):
     # 计算发送次数
     send_count = len(chat_history) - 1