def chatbot_select(chatbot_name):

app.py

@@ -2294,7 +2294,7 @@ def handle_conversation_by_open_ai_assistant(client, user_message, instructions,
             thread = client.beta.threads.retrieve(thread_id)
 
         if metadata:
-            client.beta.threads.update(thread_id=thread_id, metadata=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)
@@ -2580,26 +2580,31 @@ def create_thread_id():
 def chatbot_select(chatbot_name):
     chatbot_select_accordion_visible = gr.update(visible=False)
     all_chatbot_select_btn_visible = gr.update(visible=True)
-    chatbot_open_ai_visible = gr.update(visible=False)
     chatbot_open_ai_streaming_visible = gr.update(visible=False)
-    chatbot_jutor_visible = gr.update(visible=False)
+    chatbot_ai_visible = gr.update(visible=False)
     ai_name_update = gr.update(value="foxcat")
-
+    ai_chatbot_thread_id_update = gr.update(value="")
+    
     if chatbot_name == "chatbot_open_ai":
-        chatbot_open_ai_visible = gr.update(visible=True)
+        chatbot_ai_visible = gr.update(visible=True)
+        ai_chatbot_ai_type_update = gr.update(value="assistant")
     elif chatbot_name == "chatbot_open_ai_streaming":
         chatbot_open_ai_streaming_visible = gr.update(visible=True)
+        ai_chatbot_ai_type_update = gr.update(value="assistant_streaming")
     else:
-        chatbot_jutor_visible = gr.update(visible=True)
+        chatbot_ai_visible = gr.update(visible=True)
+        ai_chatbot_ai_type_update = gr.update(value="chat_completions")
     
     ai_name_update = gr.update(value=chatbot_name) 
         
-    return chatbot_select_accordion_visible, all_chatbot_select_btn_visible, chatbot_open_ai_visible, chatbot_open_ai_streaming_visible, chatbot_jutor_visible, ai_name_update
+    return chatbot_select_accordion_visible, all_chatbot_select_btn_visible, \
+        chatbot_open_ai_streaming_visible, chatbot_ai_visible, \
+        ai_name_update, ai_chatbot_ai_type_update, ai_chatbot_thread_id_update
 
-def update_avatar_images(avatar_images, maimai_chatbot_description_value):
+def update_avatar_images(avatar_images, chatbot_description_value):
     value = [[
         "請問你是誰？",
-        maimai_chatbot_description_value
+        chatbot_description_value
     ]]
     ai_chatbot_update = gr.update(avatar_images=avatar_images, value=value)
     return ai_chatbot_update
@@ -2657,12 +2662,9 @@ def init_params(text, request: gr.Request):
         lesson_plan_accordion = gr.update(visible=True)
         exit_ticket_accordion = gr.update(visible=True)
 
-        chatbot_open_ai = gr.update(visible=False)
         chatbot_open_ai_streaming = gr.update(visible=False)
-        chatbot_jutor = gr.update(visible=False)
-        socratic_mode_btn = gr.update(visible=True)
-        ai_chatbot_socratic_mode_btn = gr.update(visible=True)
-        streaming_chat_socratic_mode_btn = gr.update(visible=True)
+        chatbot_ai = gr.update(visible=False)
+        ai_chatbot_params = gr.update(visible=True)
 
         # if youtube_link in query_params
         if "youtube_id" in request.query_params:
@@ -2681,15 +2683,12 @@ def init_params(text, request: gr.Request):
             worksheet_accordion = gr.update(visible=False)
             lesson_plan_accordion = gr.update(visible=False)
             exit_ticket_accordion = gr.update(visible=False)
-            socratic_mode_btn = gr.update(visible=False)
-            ai_chatbot_socratic_mode_btn = gr.update(visible=False)
-            streaming_chat_socratic_mode_btn = gr.update(visible=False)
+            ai_chatbot_params = gr.update(visible=False)
 
     return admin, reading_passage_admin, summary_admin, see_detail, \
         worksheet_accordion, lesson_plan_accordion, exit_ticket_accordion, \
         password_text, youtube_link, \
-        chatbot_open_ai, chatbot_open_ai_streaming, chatbot_jutor, \
-        socratic_mode_btn, ai_chatbot_socratic_mode_btn, streaming_chat_socratic_mode_btn
+        chatbot_open_ai_streaming, chatbot_ai, ai_chatbot_params
 
 def update_state(content_subject, content_grade, trascript, key_moments, questions_answers):
     # inputs=[content_subject, content_grade, df_string_output],
@@ -2706,16 +2705,12 @@ def update_state(content_subject, content_grade, trascript, key_moments, questio
     question_1 = questions_answers_json[0]["question"]
     question_2 = questions_answers_json[1]["question"]
     question_3 = questions_answers_json[2]["question"]
-    btn_1 = question_1
-    btn_2 = question_2
-    btn_3 = question_3
     ai_chatbot_question_1 = question_1
     ai_chatbot_question_2 = question_2
     ai_chatbot_question_3 = question_3
 
     return content_subject_state, content_grade_state, trascript_state, key_moments_state, \
         streaming_chat_thread_id_state, \
-        btn_1, btn_2, btn_3, \
         ai_chatbot_question_1, ai_chatbot_question_2, ai_chatbot_question_3
 
 
@@ -2764,6 +2759,7 @@ with gr.Blocks(theme=gr.themes.Base(primary_hue=gr.themes.colors.orange, seconda
     with gr.Tab("AI小精靈"):
         with gr.Row():
             all_chatbot_select_btn = gr.Button("選擇 AI 小精靈 👈", elem_id="all_chatbot_select_btn", visible=False, variant="secondary", size="sm")
+        with gr.Row() as ai_chatbot_params:
             ai_name = gr.Dropdown(
                 label="選擇 AI 助理", 
                 choices=[
@@ -2774,15 +2770,20 @@ with gr.Blocks(theme=gr.themes.Base(primary_hue=gr.themes.colors.orange, seconda
                     ("狐狸貓","foxcat")
                 ], 
                 value="foxcat",
-                visible=False
+                visible=True
             )
+            ai_chatbot_ai_type = gr.Textbox(value="chat_completions", visible=True)
+            ai_chatbot_thread_id = gr.Textbox(label="thread_id", visible=True)
+            ai_chatbot_socratic_mode_btn = gr.Checkbox(label="蘇格拉底家教助理模式", value=True, visible=True)
+            latex_delimiters = [{"left": "$", "right": "$", "display": False}]
         with gr.Accordion("選擇 AI 小精靈", elem_id="chatbot_select_accordion") as chatbot_select_accordion:
             with gr.Row():
                 user_avatar = "https://em-content.zobj.net/source/google/263/flushed-face_1f633.png"
-                ai_chatbot_bot_avatar = "https://junyitopicimg.s3.amazonaws.com/s4byy--icon.jpe?v=20200513013523726"
+                # 飛特精靈
                 with gr.Column(scale=1, variant="panel", visible=True):
-                    chatbot_avatar_url = "https://junyitopicimg.s3.amazonaws.com/s4byy--icon.jpe?v=20200513013523726"
-                    chatbot_description = """Hi，我是你的AI學伴【飛特精靈】，\n
+                    vaitor_chatbot_avatar_url = "https://junyitopicimg.s3.amazonaws.com/s4byy--icon.jpe?v=20200513013523726"
+                    vaitor_chatbot_avatar_images = gr.State([user_avatar, vaitor_chatbot_avatar_url])
+                    vaitor_chatbot_description = """Hi，我是你的AI學伴【飛特精靈】，\n
                     我可以陪你一起學習本次的內容，有什麼問題都可以問我喔！\n
                     🤔 如果你不知道怎麼發問，可以點擊左下方的問題一、問題二、問題三，我會幫你生成問題！\n
                     🗣️ 也可以點擊右下方用語音輸入，我會幫你轉換成文字，厲害吧！\n
@@ -2791,21 +2792,10 @@ with gr.Blocks(theme=gr.themes.Base(primary_hue=gr.themes.colors.orange, seconda
                     🦄 如果達到上限，或是遇到精靈很累，請問問其他朋友，像是飛特音速說話的速度比較快，你是否跟得上呢？你也可以和其他精靈互動看看喔！\n
                     """
                     chatbot_open_ai_name = gr.State("chatbot_open_ai")
-                    gr.Image(value=chatbot_avatar_url, height=100, width=100, show_label=False, show_download_button=False)
+                    gr.Image(value=vaitor_chatbot_avatar_url, height=100, width=100, show_label=False, show_download_button=False)
                     chatbot_open_ai_select_btn = gr.Button("👆選擇【飛特精靈】", elem_id="chatbot_btn", visible=True, variant="primary")
-                    gr.Markdown(value=chatbot_description, visible=True)
-                with gr.Column(scale=1, variant="panel", visible=True):
-                    streaming_chatbot_avatar_url = "https://storage.googleapis.com/wpassets.junyiacademy.org/1/2020/11/1-%E6%98%9F%E7%A9%BA%E9%A0%AD%E8%B2%BC-%E5%A4%AA%E7%A9%BA%E7%8B%90%E7%8B%B8%E8%B2%93-150x150.png"
-                    streaming_chatbot_description = """Hi，我是【飛特音速】， \n
-                    說話比較快，但有什麼問題都可以問我喔！ \n
-                    🚀 我沒有預設問題、也沒有語音輸入，適合快問快答，一起練習問出好問題吧 \n
-                    🔠 擅長用文字表達的你，可以用鍵盤輸入你的問題，我會盡力回答你的問題喔\n
-                    💤 我還在成長，體力有限，每一次學習只能回答十個問題，請讓我休息一下再問問題喔～
-                    """
-                    chatbot_open_ai_streaming_name = gr.State("chatbot_open_ai_streaming")
-                    gr.Image(value=streaming_chatbot_avatar_url, height=100, width=100, show_label=False, show_download_button=False)
-                    chatbot_open_ai_streaming_select_btn = gr.Button("👆選擇【飛特音速】", elem_id="streaming_chatbot_btn", visible=True, variant="primary")
-                    gr.Markdown(value=streaming_chatbot_description, visible=True)
+                    vaitor_chatbot_description_value = gr.Markdown(value=vaitor_chatbot_description, visible=True)
+                # 狐狸貓
                 with gr.Column(scale=1, variant="panel"):
                     foxcat_chatbot_avatar_url = "https://storage.googleapis.com/wpassets.junyiacademy.org/1/2020/06/%E7%A7%91%E5%AD%B8%E5%BE%BD%E7%AB%A0-2-150x150.png"
                     foxcat_avatar_images = gr.State([user_avatar, foxcat_chatbot_avatar_url])
@@ -2850,51 +2840,32 @@ with gr.Blocks(theme=gr.themes.Base(primary_hue=gr.themes.colors.orange, seconda
                     gr.Image(value=maimai_chatbot_avatar_url, height=100, width=100, show_label=False, show_download_button=False)
                     maimai_chatbot_select_btn = gr.Button("👆選擇【麥麥】", visible=True, variant="primary", elem_classes="chatbot_select_btn")
                     maimai_chatbot_description_value = gr.Markdown(value=maimai_chatbot_description, visible=True)
+                # 飛特音速
+                with gr.Column(scale=1, variant="panel", visible=True):
+                    streaming_chatbot_avatar_url = "https://storage.googleapis.com/wpassets.junyiacademy.org/1/2020/11/1-%E6%98%9F%E7%A9%BA%E9%A0%AD%E8%B2%BC-%E5%A4%AA%E7%A9%BA%E7%8B%90%E7%8B%B8%E8%B2%93-150x150.png"
+                    streaming_chatbot_description = """Hi，我是【飛特音速】， \n
+                    說話比較快，但有什麼問題都可以問我喔！ \n
+                    🚀 我沒有預設問題、也沒有語音輸入，適合快問快答，一起練習問出好問題吧 \n
+                    🔠 擅長用文字表達的你，可以用鍵盤輸入你的問題，我會盡力回答你的問題喔\n
+                    💤 我還在成長，體力有限，每一次學習只能回答十個問題，請讓我休息一下再問問題喔～
+                    """
+                    chatbot_open_ai_streaming_name = gr.State("chatbot_open_ai_streaming")
+                    gr.Image(value=streaming_chatbot_avatar_url, height=100, width=100, show_label=False, show_download_button=False)
+                    chatbot_open_ai_streaming_select_btn = gr.Button("👆選擇【飛特音速】", elem_id="streaming_chatbot_btn", visible=True, variant="primary")
+                    gr.Markdown(value=streaming_chatbot_description, visible=True)
+                # 尚未開放
                 with gr.Column(scale=1, variant="panel"): 
                     gr.Markdown(value="### 尚未開放", visible=True)
 
-        with gr.Row("飛特精靈") as chatbot_open_ai:
-            with gr.Column():
-                bot_avatar = "https://junyitopicimg.s3.amazonaws.com/s4byy--icon.jpe?v=20200513013523726"
-                latex_delimiters = [{"left": "$", "right": "$", "display": False}]
-                chatbot_greeting = [[
-                    "請問你是誰？",
-                    """Hi，我是你的AI學伴【飛特精靈】，我可以陪你一起學習本次的內容，有什麼問題都可以問我喔！
-                    🤔 如果你不知道怎麼發問，可以點擊左下方的問題一、問題二、問題三，我會幫你生成問題！
-                    🗣️ 也可以點擊右下方用語音輸入，我會幫你轉換成文字，厲害吧！
-                    🔠 或是直接鍵盤輸入你的問題，我會盡力回答你的問題喔！
-                    💤 但我還在成長，體力有限，每一次學習只能回答十個問題，請讓我休息一下再問問題喔！
-                    🦄 如果達到上限，或是遇到精靈很累，請問問其他朋友，像是飛特音速說話的速度比較快，你是否跟得上呢？你也可以和其他精靈互動看看喔！
-                    """,
-                ]]
-                with gr.Row():
-                    chatbot = gr.Chatbot(avatar_images=[user_avatar, bot_avatar], label="OPEN AI", show_share_button=False, likeable=True, show_label=False, latex_delimiters=latex_delimiters,value=chatbot_greeting)
-                with gr.Row():
-                    chatbot_ai_type = gr.Textbox(value="assistant", visible=False)
-                    thread_id = gr.Textbox(label="thread_id", visible=False)
-                    socratic_mode_btn = gr.Checkbox(label="蘇格拉底家教助理模式", value=True, visible=False)
-                with gr.Row():
-                    with gr.Accordion("你也有類似的問題想問嗎？ 請按下 ◀︎", open=False) as ask_questions_accordion:
-                        btn_1 = gr.Button("問題一")
-                        btn_2 = gr.Button("問題一")
-                        btn_3 = gr.Button("問題一")
-                        gr.Markdown("### 重新生成問題")
-                        btn_create_question = gr.Button("生成其他問題", variant="primary")
-                    openai_chatbot_audio_input = gr.Audio(sources=["microphone"], type="filepath", max_length=60, label="語音輸入")
-                with gr.Row():
-                    msg = gr.Textbox(label="訊息",scale=3)
-                    send_button = gr.Button("送出", variant="primary", scale=1)
-                    send_feedback_btn = gr.Button("提問力回饋", variant="primary", scale=1, visible=False)
         with gr.Row("飛特音速") as chatbot_open_ai_streaming:
             with gr.Column():
-                streaming_chat_socratic_mode_btn = gr.Checkbox(label="蘇格拉底家教助理模式", value=True, visible=True)
                 streaming_chat_greeting = """
                 Hi，我是【飛特音速】，說話比較快，但有什麼問題都可以問我喔！ \n
                     🚀 我沒有預設問題、也沒有語音輸入，適合快問快答的你 \n
                     🔠 鍵盤輸入你的問題，我會盡力回答你的問題喔！\n
                     💤 我還在成長，體力有限，每一次學習只能回答十個問題，請讓我休息一下再問問題喔！
                     """
-                additional_inputs = [password, video_id, user_data, streaming_chat_thread_id_state, trascript_state, key_moments_state, content_subject_state, content_grade_state, streaming_chat_socratic_mode_btn]
+                additional_inputs = [password, video_id, user_data, streaming_chat_thread_id_state, trascript_state, key_moments_state, content_subject_state, content_grade_state, ai_chatbot_socratic_mode_btn]
                 streaming_chat = gr.ChatInterface(
                     fn=chat_with_opan_ai_assistant_streaming,
                     additional_inputs=additional_inputs,
@@ -2905,7 +2876,7 @@ with gr.Blocks(theme=gr.themes.Base(primary_hue=gr.themes.colors.orange, seconda
                     stop_btn=None,
                     description=streaming_chat_greeting
                 )
-        with gr.Row("其他精靈") as chatbot_jutor:   
+        with gr.Row("一般精靈") as chatbot_ai:   
             with gr.Column():
                 ai_chatbot_greeting = [[
                     "請問你是誰？",
@@ -2917,11 +2888,7 @@ with gr.Blocks(theme=gr.themes.Base(primary_hue=gr.themes.colors.orange, seconda
                     """,
                 ]]
                 with gr.Row():
-                    ai_chatbot = gr.Chatbot(label="ai_chatbot", show_share_button=False, likeable=True, show_label=False, latex_delimiters=latex_delimiters, value=ai_chatbot_greeting)
-                with gr.Row():
-                    ai_chatbot_ai_type = gr.Textbox(value="chat_completions", visible=False)
-                    ai_chatbot_thread_id = gr.Textbox(label="thread_id", visible=False)
-                    ai_chatbot_socratic_mode_btn = gr.Checkbox(label="蘇格拉底家教助理模式", value=True, visible=False)
+                    ai_chatbot = gr.Chatbot(label="ai_chatbot", show_share_button=False, likeable=True, show_label=False, latex_delimiters=latex_delimiters, value=ai_chatbot_greeting)                    
                 with gr.Row():
                     with gr.Accordion("你也有類似的問題想問嗎？ 請按下 ◀︎", open=False) as ask_questions_accordion_2:
                         ai_chatbot_question_1 = gr.Button("問題一")
@@ -3115,23 +3082,26 @@ with gr.Blocks(theme=gr.themes.Base(primary_hue=gr.themes.colors.orange, seconda
         with gr.Tab("心智圖",elem_id="mind_map_tab"):
             mind_map_html = gr.HTML()
        
-    # --- Event ---
-    chatbot_select_outputs=[chatbot_select_accordion, all_chatbot_select_btn, chatbot_open_ai, chatbot_open_ai_streaming, chatbot_jutor, ai_name]
-
     # OPEN AI CHATBOT SELECT
+    chatbot_select_outputs=[
+        chatbot_select_accordion, 
+        all_chatbot_select_btn, 
+        chatbot_open_ai_streaming, 
+        chatbot_ai, 
+        ai_name,
+        ai_chatbot_ai_type,
+        ai_chatbot_thread_id
+    ]
+
     chatbot_open_ai_select_btn.click(
         chatbot_select,
         inputs=[chatbot_open_ai_name],
         outputs=chatbot_select_outputs
-    )
-    chatbot_open_ai_streaming_select_btn.click(
-        chatbot_select,
-        inputs=[chatbot_open_ai_streaming_name],
-        outputs=chatbot_select_outputs
     ).then(
-        create_thread_id,
-        inputs=[],
-        outputs=[streaming_chat_thread_id_state]
+        update_avatar_images,
+        inputs=[vaitor_chatbot_avatar_images, vaitor_chatbot_description_value],
+        outputs=[ai_chatbot],
+        scroll_to_output=True
     )
     foxcat_chatbot_select_btn.click(
         chatbot_select,
@@ -3163,6 +3133,17 @@ with gr.Blocks(theme=gr.themes.Base(primary_hue=gr.themes.colors.orange, seconda
         outputs=[ai_chatbot],
         scroll_to_output=True
     )
+    # STREAMING CHATBOT SELECT
+    chatbot_open_ai_streaming_select_btn.click(
+        chatbot_select,
+        inputs=[chatbot_open_ai_streaming_name],
+        outputs=chatbot_select_outputs
+    ).then(
+        create_thread_id,
+        inputs=[],
+        outputs=[streaming_chat_thread_id_state]
+    )
+
     # ALL CHATBOT SELECT LIST
     all_chatbot_select_btn.click(
         show_all_chatbot_accordion,
@@ -3171,23 +3152,23 @@ with gr.Blocks(theme=gr.themes.Base(primary_hue=gr.themes.colors.orange, seconda
     )
 
     # OPENAI ASSISTANT CHATBOT 模式
-    send_button.click(
-        chat_with_any_ai,
-        inputs=[chatbot_ai_type, password, video_id, user_data, trascript_state, key_moments, msg, chatbot, content_subject, content_grade, questions_answers_json, socratic_mode_btn, thread_id, ai_name],
-        outputs=[msg, chatbot, send_button, send_feedback_btn, thread_id],
-        scroll_to_output=True
-    )
-    send_feedback_btn.click(
-        feedback_with_ai,
-        inputs=[chatbot_ai_type, chatbot, thread_id],
-        outputs=[chatbot, send_feedback_btn],
-        scroll_to_output=True
-    )
-    openai_chatbot_audio_input.change(
-        process_open_ai_audio_to_chatbot,
-        inputs=[password, openai_chatbot_audio_input],
-        outputs=[msg]
-    )
+    # send_button.click(
+    #     chat_with_any_ai,
+    #     inputs=[chatbot_ai_type, password, video_id, user_data, trascript_state, key_moments, msg, chatbot, content_subject, content_grade, questions_answers_json, socratic_mode_btn, thread_id, ai_name],
+    #     outputs=[msg, chatbot, send_button, send_feedback_btn, thread_id],
+    #     scroll_to_output=True
+    # )
+    # send_feedback_btn.click(
+    #     feedback_with_ai,
+    #     inputs=[chatbot_ai_type, chatbot, thread_id],
+    #     outputs=[chatbot, send_feedback_btn],
+    #     scroll_to_output=True
+    # )
+    # openai_chatbot_audio_input.change(
+    #     process_open_ai_audio_to_chatbot,
+    #     inputs=[password, openai_chatbot_audio_input],
+    #     outputs=[msg]
+    # )
     # OPENAI ASSISTANT CHATBOT 連接按鈕點擊事件
     def setup_question_button_click(button, inputs_list, outputs_list, chat_func, scroll_to_output=True):
         button.click(
@@ -3196,18 +3177,18 @@ with gr.Blocks(theme=gr.themes.Base(primary_hue=gr.themes.colors.orange, seconda
         outputs=outputs_list,
         scroll_to_output=scroll_to_output
     )
-    question_buttons = [btn_1, btn_2, btn_3]
-    for question_btn in question_buttons:
-        inputs_list = [chatbot_ai_type, password, video_id, user_data, trascript_state, key_moments, question_btn, chatbot, content_subject, content_grade, questions_answers_json, socratic_mode_btn, thread_id, ai_name]
-        outputs_list = [msg, chatbot, send_button, send_feedback_btn, thread_id]
-        setup_question_button_click(question_btn, inputs_list, outputs_list, chat_with_any_ai)
+    # question_buttons = [btn_1, btn_2, btn_3]
+    # for question_btn in question_buttons:
+    #     inputs_list = [chatbot_ai_type, password, video_id, user_data, trascript_state, key_moments, question_btn, chatbot, content_subject, content_grade, questions_answers_json, socratic_mode_btn, thread_id, ai_name]
+    #     outputs_list = [msg, chatbot, send_button, send_feedback_btn, thread_id]
+    #     setup_question_button_click(question_btn, inputs_list, outputs_list, chat_with_any_ai)
 
     # 為生成問題按鈕設定特殊的點擊事件
-    btn_create_question.click(
-        change_questions, 
-        inputs=[password, df_string_output], 
-        outputs=question_buttons
-    )
+    # btn_create_question.click(
+    #     change_questions, 
+    #     inputs=[password, df_string_output], 
+    #     outputs=question_buttons
+    # )
 
     # 其他精靈 ai_chatbot 模式
     ai_send_button.click(
@@ -3272,9 +3253,6 @@ with gr.Blocks(theme=gr.themes.Base(primary_hue=gr.themes.colors.orange, seconda
         trascript_state,
         key_moments_state,
         streaming_chat_thread_id_state,
-        btn_1, 
-        btn_2, 
-        btn_3,
         ai_chatbot_question_1,
         ai_chatbot_question_2,
         ai_chatbot_question_3
@@ -3606,11 +3584,9 @@ with gr.Blocks(theme=gr.themes.Base(primary_hue=gr.themes.colors.orange, seconda
         exit_ticket_accordion,
         password, 
         youtube_link,
-        chatbot_open_ai,
         chatbot_open_ai_streaming,
-        chatbot_jutor,
-        socratic_mode_btn,
-        ai_chatbot_socratic_mode_btn,
+        chatbot_ai,
+        ai_chatbot_params,
     ]
     demo.load(
         init_params,