foxcat_chatbot_avatar_url

app.py

@@ -2051,17 +2051,42 @@ def chat_with_ai(ai_name, password, video_id, user_data, trascript_state, key_mo
         error_msg = "此次對話超過上限（對話一輪10次）"
         raise gr.Error(error_msg)
 
-    if not ai_name in ["jutor", "claude3", "groq"]:
-        ai_name = "jutor"
-
-    if ai_name == "jutor":
-        ai_client = ""
-    elif ai_name == "claude3":
-        ai_client = BEDROCK_CLIENT
-    elif ai_name == "groq":
-        ai_client = GROQ_CLIENT
-    else:
-        ai_client = ""
+    if not ai_name in ["foxcat", "lili", "maimai"]:
+        ai_name = "foxcat"
+
+    # if ai_name == "jutor":
+    #     ai_client = ""
+    # elif ai_name == "claude3":
+    #     ai_client = BEDROCK_CLIENT
+    # elif ai_name == "groq":
+    #     ai_client = GROQ_CLIENT
+    # else:
+    #     ai_client = ""
+        
+    ai_name_clients_model = {
+        "foxcat": {
+            "ai_name": "foxcat",
+            "ai_client": GROQ_CLIENT,
+            "ai_model_name": "groq_llama3",
+        },
+        "lili": {
+            "ai_name": "lili",
+            "ai_client": BEDROCK_CLIENT,
+            "ai_model_name": "claude3",
+        },
+        # "maimai": {
+        #     "ai_name": "maimai",
+        #     "ai_client": OPEN_AI_CLIENT,
+        #     "ai_model_name": "openai",
+        # }
+        "maimai": {
+            "ai_name": "maimai",
+            "ai_client": GROQ_CLIENT,
+            "ai_model_name": "groq_mixtral",
+        }
+    }
+    ai_client = ai_name_clients_model.get(ai_name, "foxcat")["ai_client"]
+    ai_model_name = ai_name_clients_model.get(ai_name, "foxcat")["ai_model_name"]
 
     if isinstance(trascript_state, str):
         simple_transcript = json.loads(trascript_state)
@@ -2088,14 +2113,14 @@ def chat_with_ai(ai_name, password, video_id, user_data, trascript_state, key_mo
         "content_subject": content_subject,
         "content_grade": content_grade,
         "jutor_chat_key": JUTOR_CHAT_KEY,
-        "ai_name": ai_name,
+        "ai_model_name": ai_model_name,
         "ai_client": ai_client,
         "instructions": instructions
     }
 
     try:
         chatbot = Chatbot(chatbot_config)
-        response_completion = chatbot.chat(user_message, chat_history, socratic_mode, ai_name)
+        response_completion = chatbot.chat(user_message, chat_history, socratic_mode, ai_model_name)
     except Exception as e:
         print(f"Error: {e}")
         response_completion = "學習精靈有點累，請稍後再試！"
@@ -2413,15 +2438,17 @@ def chatbot_select(chatbot_name):
     chatbot_open_ai_visible = gr.update(visible=False)
     chatbot_open_ai_streaming_visible = gr.update(visible=False)
     chatbot_jutor_visible = gr.update(visible=False)
+    ai_name_update = gr.update(value="jutor")
 
     if chatbot_name == "chatbot_open_ai":
         chatbot_open_ai_visible = gr.update(visible=True)
     elif chatbot_name == "chatbot_open_ai_streaming":
         chatbot_open_ai_streaming_visible = gr.update(visible=True)
-    elif chatbot_name == "chatbot_jutor":
+    else:
         chatbot_jutor_visible = gr.update(visible=True)
+        ai_name_update = gr.update(value=chatbot_name) 
         
-    return chatbot_select_accordion_visible, chatbot_open_ai_visible, chatbot_open_ai_streaming_visible, chatbot_jutor_visible
+    return chatbot_select_accordion_visible, chatbot_open_ai_visible, chatbot_open_ai_streaming_visible, chatbot_jutor_visible, ai_name_update
 
 # --- Slide mode ---
 def update_slide(direction):
@@ -2635,18 +2662,46 @@ with gr.Blocks(theme=gr.themes.Base(primary_hue=gr.themes.colors.orange, seconda
                     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"):
-                    jutor_chatbot_avatar_url = "https://storage.googleapis.com/wpassets.junyiacademy.org/1/2019/11/%E5%9B%9B%E6%A0%BC%E6%95%85%E4%BA%8B-04.jpg"
-                    jutor_chatbot_description = """Hi，我們是【梨梨、麥麥、狐狸貓】，\n
+                    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_chatbot_description = """Hi，我是【狐狸貓】，\n
                     也可以陪你一起學習本次的內容，有什麼問題都可以問我喔！\n
                     🤔 如果你不知道怎麼發問，可以點擊左下方的問題一、問題二、問題三，我會幫你生成問題！\n
                     🗣️ 也可以點擊右下方用語音輸入，我會幫你轉換成文字，厲害吧！\n
                     🔠 或是直接鍵盤輸入你的問題，我會盡力回答你的問題喔！\n
                     💤 精靈們體力都有限，每一次學習只能回答十個問題，請讓我休息一下再問問題喔！\n
                     """
-                    chatbot_jutor_name = gr.State("chatbot_jutor")
-                    gr.Image(value=jutor_chatbot_avatar_url, height=100, width=100, show_label=False, show_download_button=False)
-                    chatbot_jutor_select_btn = gr.Button("👆選擇【梨梨、麥麥、狐狸貓】", elem_id="jutor_chatbot_btn", visible=True, variant="primary")
-                    gr.Markdown(value=jutor_chatbot_description, visible=True)
+                    foxcat_chatbot_name = gr.State("foxcat")
+                    gr.Image(value=foxcat_chatbot_avatar_url, height=100, width=100, show_label=False, show_download_button=False)
+                    foxcat_chatbot_select_btn = gr.Button("👆選擇【狐狸貓】", visible=True, variant="primary")
+                    gr.Markdown(value=foxcat_chatbot_description, visible=True)
+                # 梨梨
+                with gr.Column(scale=1, variant="panel"): 
+                    lili_chatbot_avatar_url = "https://junyitopicimg.s3.amazonaws.com/live/v1283-new-topic-44-icon.png?v=20230529071206714"
+                    lili_chatbot_description = """你好，我是溫柔的【梨梨】， \n
+                        很高興可以在這裡陪伴你學習。如果你有任何疑問，請隨時向我提出哦！ \n
+                        🤔 如果你在思考如何提問，可以嘗試點擊下方的「問題一」、「問題二」或「問題三」，我會為你生成一些問題來幫助你啟動思考。 \n
+                        🗣️ 你也可以使用右下角的語音輸入功能，讓我幫你將語音轉化為文字，這樣可以更加方便快捷。\n
+                        🔠 當然，你也可以直接通過鍵盤輸入你的問題，我將盡我所能為你提供答案。\n
+                        💤 請理解，即使是我們這些精靈，也有疲憊的時候，每次學習後我能回答的問題有限。如果達到上限，讓我稍作休息之後再繼續回答你的問題吧！
+                    """
+                    lili_chatbot_name = gr.State("lili")
+                    gr.Image(value=lili_chatbot_avatar_url, height=100, width=100, show_label=False, show_download_button=False)
+                    lili_chatbot_select_btn = gr.Button("👆選擇【梨梨】", visible=True, variant="primary")
+                    gr.Markdown(value=lili_chatbot_description, visible=True)
+                # 麥麥
+                with gr.Column(scale=1, variant="panel"): 
+                    maimai_chatbot_avatar_url = "https://storage.googleapis.com/wpassets.junyiacademy.org/1/2020/07/%E6%80%9D%E8%80%83%E5%8A%9B%E8%B6%85%E4%BA%BA%E5%BE%BD%E7%AB%A0_%E5%B7%A5%E4%BD%9C%E5%8D%80%E5%9F%9F-1-%E8%A4%87%E6%9C%AC-150x150.png"
+                    maimai_chatbot_description = """Hi，我是迷人的【麥麥】，\n
+                        我在這裡等著和你一起探索新知，任何疑問都可以向我提出！\n
+                        🤔 如果你不知道從哪裡開始，試試左下方的「問題一」、「問題二」、「問題三」，我會為你提供一些啟發思考的問題。\n
+                        🗣️ 你也可以利用右下角的語音輸入功能，讓我將你的語音轉成文字，是不是很酷？\n
+                        🔠 當然，你也可以直接透過鍵盤向我發問，我會全力以赴來回答你的每一個問題。\n
+                        💤 我們這些精靈也需要休息，每次學習我們只能回答十個問題，當達到上限時，請給我一點時間充電再繼續。\n
+                    """
+                    maimai_chatbot_name = gr.State("maimai")
+                    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")
+                    gr.Markdown(value=maimai_chatbot_description, visible=True)
                     
         with gr.Row("飛特精靈") as chatbot_open_ai:
             with gr.Column():
@@ -2710,11 +2765,15 @@ with gr.Blocks(theme=gr.themes.Base(primary_hue=gr.themes.colors.orange, seconda
                     """,
                 ]]
                 ai_chatbot_bot_avatar = "https://storage.googleapis.com/wpassets.junyiacademy.org/1/2019/11/%E5%9B%9B%E6%A0%BC%E6%95%85%E4%BA%8B-04.jpg"
-                ai_name = gr.Dropdown(label="選擇 AI 助理", choices=[
-                    # ("梨梨","jutor"), 
-                    ("麥麥","claude3"), 
-                    ("狐狸貓","groq")], 
-                        value="claude3"
+                ai_name = gr.Dropdown(
+                    label="選擇 AI 助理", 
+                    choices=[
+                        ("梨梨","lili"), 
+                        ("麥麥","maimai"), 
+                        ("狐狸貓","foxcat")
+                    ], 
+                    value="foxcat",
+                    visible=False
                 )
                 ai_chatbot = gr.Chatbot(avatar_images=[user_avatar, ai_chatbot_bot_avatar], label="ai_chatbot", show_share_button=False, likeable=True, show_label=False, latex_delimiters=latex_delimiters, value=ai_chatbot_greeting)
                 ai_chatbot_socratic_mode_btn = gr.Checkbox(label="蘇格拉底家教助理模式", value=True, visible=False)
@@ -2915,21 +2974,31 @@ with gr.Blocks(theme=gr.themes.Base(primary_hue=gr.themes.colors.orange, seconda
     chatbot_open_ai_select_btn.click(
         chatbot_select,
         inputs=[chatbot_open_ai_name],
-        outputs=[chatbot_select_accordion, chatbot_open_ai, chatbot_open_ai_streaming, chatbot_jutor]
+        outputs=[chatbot_select_accordion, chatbot_open_ai, chatbot_open_ai_streaming, chatbot_jutor, ai_name]
     )
     chatbot_open_ai_streaming_select_btn.click(
         chatbot_select,
         inputs=[chatbot_open_ai_streaming_name],
-        outputs=[chatbot_select_accordion, chatbot_open_ai, chatbot_open_ai_streaming, chatbot_jutor]
+        outputs=[chatbot_select_accordion, chatbot_open_ai, chatbot_open_ai_streaming, chatbot_jutor, ai_name]
     ).then(
         create_thread_id,
         inputs=[],
         outputs=[streaming_chat_thread_id_state]
     )
-    chatbot_jutor_select_btn.click(
+    foxcat_chatbot_select_btn.click(
+        chatbot_select,
+        inputs=[foxcat_chatbot_name],
+        outputs=[chatbot_select_accordion, chatbot_open_ai, chatbot_open_ai_streaming, chatbot_jutor, ai_name]
+    )
+    lili_chatbot_select_btn.click(
+        chatbot_select,
+        inputs=[lili_chatbot_name],
+        outputs=[chatbot_select_accordion, chatbot_open_ai, chatbot_open_ai_streaming, chatbot_jutor, ai_name]
+    )
+    maimai_chatbot_select_btn.click(
         chatbot_select,
-        inputs=[chatbot_jutor_name],
-        outputs=[chatbot_select_accordion, chatbot_open_ai, chatbot_open_ai_streaming, chatbot_jutor]
+        inputs=[maimai_chatbot_name],
+        outputs=[chatbot_select_accordion, chatbot_open_ai, chatbot_open_ai_streaming, chatbot_jutor, ai_name]
     )
 
     # OPENAI ASSISTANT CHATBOT 模式

chatbot.py

@@ -39,10 +39,11 @@ class Chatbot:
         return key_moments_text
 
 
-    def chat(self, user_message, chat_history, socratic_mode=False, service_type='jutor'):
+    def chat(self, user_message, chat_history, socratic_mode=False, service_type='openai'):
         messages = self.prepare_messages(chat_history, user_message)
         system_prompt = self.instructions
-        if service_type in ['jutor', 'groq', 'claude3']:
+        service_type_list = ['openai', 'claude3', 'groq_llama3', 'groq_mixtral']
+        if service_type in service_type_list:
             response_text = self.chat_with_service(service_type, system_prompt, messages)
             return response_text
         else:
@@ -66,10 +67,12 @@ class Chatbot:
         return messages
 
     def chat_with_service(self, service_type, system_prompt, messages):
-        if service_type == 'jutor':
+        if service_type == 'openai':
             return self.chat_with_jutor(system_prompt, messages)
-        elif service_type == 'groq':
-            return self.chat_with_groq(system_prompt, messages)
+        elif service_type == 'groq_llama3':
+            return self.chat_with_groq(service_type, system_prompt, messages)
+        elif service_type == 'groq_mixtral':
+            return self.chat_with_groq(service_type, system_prompt, messages)
         elif service_type == 'claude3':
             return self.chat_with_claude3(system_prompt, messages)
         else:
@@ -83,6 +86,8 @@ class Chatbot:
             "x-api-key": self.jutor_chat_key,
         }
         model = "gpt-4-turbo"
+        print("======model======")
+        print(model)
         # model = "gpt-3.5-turbo-0125"
         data = {
             "data": {
@@ -99,11 +104,19 @@ class Chatbot:
         response_completion = response_data['data']['choices'][0]['message']['content'].strip()
         return response_completion
 
-    def chat_with_groq(self, system_prompt, messages):
+    def chat_with_groq(self, model_name, system_prompt, messages):
         # system_prompt insert to messages 的最前面 {"role": "system", "content": system_prompt}
         messages.insert(0, {"role": "system", "content": system_prompt})
+        model_name_dict = {
+            "groq_llama3": "llama3-70b-8192",
+            "groq_mixtral": "mixtral-8x7b-32768"
+        }
+        model = model_name_dict.get(model_name)
+        print("======model======")
+        print(model)
+
         request_payload = {
-            "model": "mixtral-8x7b-32768",
+            "model": model,
             "messages": messages,
             "max_tokens": 500  # 設定一個較大的值，可根據需要調整
         }
@@ -118,6 +131,8 @@ class Chatbot:
         
         model_id = "anthropic.claude-3-sonnet-20240229-v1:0"
         # model_id = "anthropic.claude-3-haiku-20240307-v1:0"
+        print("======model_id======")
+        print(model_id)
         kwargs = {
             "modelId": model_id,
             "contentType": "application/json",
@@ -129,7 +144,6 @@ class Chatbot:
                 "messages": messages
             })
         }
-        print(messages)
         # 建立 message API，讀取回應
         bedrock_client = self.ai_client
         response = bedrock_client.invoke_model(**kwargs)