handle_conversation_by_open_ai_assistant

app.py

@@ -2237,94 +2237,38 @@ def chat_with_opan_ai_assistant(password, youtube_id, user_data, thread_id, tras
     
     verify_chat_limit(chat_history, CHAT_LIMIT)
 
-    try:
-        assistant_id = OPEN_AI_ASSISTANT_ID_GPT4 #GPT 4 turbo
-        # assistant_id = OPEN_AI_ASSISTANT_ID_GPT3 #GPT 3.5 turbo
-
-        client = OPEN_AI_CLIENT
-        # 直接安排逐字稿資料 in instructions
-        # if isinstance(trascript_state, str):
-        #     trascript_json = json.loads(trascript_state)
-        # else:
-        #     trascript_json = trascript_state
-        # # 移除 embed_url, screenshot_path
-        # for entry in trascript_json:
-        #     entry.pop('end_time', None)
-        # trascript_text = json.dumps(trascript_json, ensure_ascii=False)
-
-        if isinstance(key_moments, str):
-            key_moments_json = json.loads(key_moments)
-        else:
-            key_moments_json = key_moments
-        # key_moments_json remove images
-        for moment in key_moments_json:
-            moment.pop('images', None)
-            moment.pop('end', None)
-            moment.pop('transcript', None)
-        key_moments_text = json.dumps(key_moments_json, ensure_ascii=False)
-        
-        instructions = get_instructions(content_subject, content_grade, key_moments_text)
-        print("=== instructions ===")
-        print(instructions)
-
-        # 创建线程
-        if not thread_id:
-            thread = client.beta.threads.create(
-
-            )
-            thread_id = thread.id
-        else:
-            thread = client.beta.threads.retrieve(thread_id)
-        
-        # add meta data to thread
-        client.beta.threads.update(
-            thread_id=thread_id,
-            metadata={
-                "youtube_id": youtube_id,
-                "user_data": user_data,
-                "content_subject": content_subject,
-                "content_grade": content_grade,
-                "socratic_mode": str(socratic_mode),
-                "assistant_id": assistant_id,
-                "is_streaming": "false",
-            }
-        )           
-
-        # 向线程添加用户的消息
-        client.beta.threads.messages.create(
-            thread_id=thread.id,
-            role="user",
-            content=user_message + "/n 請嚴格遵循instructions，擔任一位蘇格拉底家教，絕對不要重複 user 的問句，請用引導的方式指引方向，請一定要用繁體中文回答 zh-TW，並用台灣人的禮貌口語表達，回答時不要特別說明這是台灣人的語氣，請在回答的最後標註【參考：（時）:（分）:（秒）】，（如果是反問學生，就只問一個問題，請幫助學生更好的理解資料，字數在100字以內，回答時如果講到數學專有名詞，請用數學符號代替文字（Latex 用 $ 字號 render, ex: $x^2$)"
-        )
-
-        # 运行助手，生成响应
-        run = client.beta.threads.runs.create(
-            thread_id=thread.id,
-            assistant_id=assistant_id,
-            instructions=instructions,
-        )
-
-        # 等待助手响应，设定最大等待时间为 30 秒
-        run_status = poll_run_status(run.id, thread.id, timeout=30)
-        # 获取助手的响应消息
-        if run_status == "completed":
-            messages = client.beta.threads.messages.list(thread_id=thread.id)
-            # [MessageContentText(text=Text(annotations=[], value='您好！有什麼我可以幫助您的嗎？如果有任何問題或需要指導，請隨時告訴我！'), type='text')]
-            response_text = messages.data[0].content[0].text.value
-        else:
-            response_text = "學習精靈有點累，請稍後再試！"
-
-    except Exception as e:
-        print(f"Error: {e}")
-        raise gr.Error(f"Error: {e}")
-
+    client = OPEN_AI_CLIENT
+    assistant_id = OPEN_AI_ASSISTANT_ID_GPT4 #GPT 4 turbo
+    if isinstance(key_moments, str):
+        key_moments_json = json.loads(key_moments)
+    else:
+        key_moments_json = key_moments
+    # key_moments_json remove images
+    for moment in key_moments_json:
+        moment.pop('images', None)
+        moment.pop('end', None)
+        moment.pop('transcript', None)
+    key_moments_text = json.dumps(key_moments_json, ensure_ascii=False)
+    instructions = get_instructions(content_subject, content_grade, key_moments_text)
+    print(f"=== instructions:{instructions} ===")
+    metadata={
+        "video_id": youtube_id,
+        "user_data": user_data,
+        "content_subject": content_subject,
+        "content_grade": content_grade,
+        "socratic_mode": str(socratic_mode),
+        "assistant_id": assistant_id,
+        "is_streaming": "false",
+    }
+    user_message_note = "/n 請嚴格遵循instructions，擔任一位蘇格拉底家教，絕對不要重複 user 的問句，請用引導的方式指引方向，請一定要用繁體中文回答 zh-TW，並用台灣人的禮貌口語表達，回答時不要特別說明這是台灣人的語氣，請在回答的最後標註【參考：（時）:（分）:（秒）】，（如果是反問學生，就只問一個問題，請幫助學生更好的理解資料，字數在100字以內，回答時如果講到數學專有名詞，請用數學符號代替文字（Latex 用 $ 字號 render, ex: $x^2$)"
+    user_content = user_message + user_message_note
+    response_text, thread_id = handle_conversation_by_open_ai_assistant(client, user_content, instructions, assistant_id, thread_id, metadata, fallback=True)
+    
     # 更新聊天历史
     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)
 
-
-    # 返回聊天历史和空字符串清空输入框
-    return "", chat_history, thread.id, send_btn_update, send_feedback_btn_update
+    return "", chat_history, thread_id, send_btn_update, send_feedback_btn_update
 
 def feedback_with_opan_ai_assistant(thread_id, chat_history):
     # prompt: 請依據以上的對話(chat_history)，總結我的「提問力」，並給予我是否有「問對問題」的回饋和建議
@@ -2363,53 +2307,11 @@ def feedback_with_opan_ai_assistant(thread_id, chat_history):
     """
 
 
-    try:
-        client = OPEN_AI_CLIENT
-        assistant_id = OPEN_AI_ASSISTANT_ID_GPT4 #GPT 4 turbo
-        # assistant_id = OPEN_AI_ASSISTANT_ID_GPT3 #GPT 3.5 turbo
-
-        # 创建线程
-        if not thread_id:
-            thread = client.beta.threads.create(
-
-            )
-            thread_id = thread.id
-        else:
-            thread = client.beta.threads.retrieve(thread_id)     
-
-        # 向线程添加用户的消息
-        client.beta.threads.messages.create(
-            thread_id=thread.id,
-            role="user",
-            content=user_content
-        )
-
-        # 运行助手，生成响应
-        run = client.beta.threads.runs.create(
-            thread_id=thread.id,
-            assistant_id=assistant_id,
-            instructions=system_content,
-        )
-
-        # 等待助手响应，设定最大等待时间为 30 秒
-        run_status = poll_run_status(run.id, thread.id, timeout=30)
-        # 获取助手的响应消息
-        if run_status == "completed":
-            messages = client.beta.threads.messages.list(thread_id=thread.id)
-            # [MessageContentText(text=Text(annotations=[], value='您好！有什麼我可以幫助您的嗎？如果有任何問題或需要指導，請隨時告訴我！'), type='text')]
-            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",
-            messages=[
-                {"role": "system", "content": system_content},
-                {"role": "user", "content": user_content}
-            ],
-            max_tokens=4000,
-        ).choices[0].message.content.strip()
-
+    client = OPEN_AI_CLIENT
+    assistant_id = OPEN_AI_ASSISTANT_ID_GPT4 #GPT 4 turbo
+    # assistant_id = OPEN_AI_ASSISTANT_ID_GPT3 #GPT 3.5 turbo
+    instructions = system_content
+    response_text, thread_id = handle_conversation_by_open_ai_assistant(client, user_content, instructions, assistant_id, thread_id, metadata=None, fallback=True)
     chat_history = update_chat_history(feedback_request_message, response_text, chat_history)
     feedback_btn_update = gr.update(value="已回饋", interactive=False, variant="secondary")
 
@@ -2447,6 +2349,60 @@ def verify_chat_limit(chat_history, chat_limit):
         error_msg = "此次對話超過上限（對話一輪10次）"
         raise gr.Error(error_msg)
 
+def handle_conversation_by_open_ai_assistant(client, user_message, instructions, assistant_id, thread_id=None, metadata=None, fallback=False):
+    """
+    Handles the creation and management of a conversation thread.
+    :param client: The OpenAI client object.
+    :param thread_id: The existing thread ID, if any.
+    :param user_message: The message from the user.
+    :param instructions: System instructions for the assistant.
+    :param assistant_id: ID of the assistant to use.
+    :param metadata: Additional metadata to add to the thread.
+    :param fallback: Whether to use a fallback method in case of failure.
+    :return: A string with the response text or an error message.
+    """
+    try:
+        if not thread_id:
+            thread = client.beta.threads.create()
+            thread_id = thread.id
+        else:
+            thread = client.beta.threads.retrieve(thread_id)
+
+        if metadata:
+            client.beta.threads.update(thread_id=thread_id, metadata=metadata)
+
+        # Send the user message to the thread
+        client.beta.threads.messages.create(thread_id=thread.id, role="user", content=user_message)
+
+        # Run the assistant
+        run = client.beta.threads.runs.create(thread_id=thread.id, assistant_id=assistant_id, instructions=instructions)
+        
+        # Wait for the response
+        run_status = poll_run_status(run.id, thread.id, timeout=30)
+        
+        if run_status == "completed":
+            messages = client.beta.threads.messages.list(thread_id=thread.id)
+            response_text = messages.data[0].content[0].text.value
+        else:
+            response_text = "學習精靈有點累，請稍後再試！"
+
+    except Exception as e:
+        if fallback:
+            response = client.chat.completions.create(
+                model="gpt-4-turbo",
+                messages=[
+                    {"role": "system", "content": instructions},
+                    {"role": "user", "content": user_message}
+                ],
+                max_tokens=4000,
+            )
+            response_text = response.choices[0].message.content.strip()
+        else:
+            print(f"Error: {e}")
+            raise gr.Error(f"Error: {e}")
+
+    return response_text, thread_id
+
 def update_chat_history(user_message, response, chat_history):
     # 更新聊天歷史的邏輯
     new_chat_history = (user_message, response)