Update app.py

app.py

@@ -1,84 +1,52 @@
 import os
-from datetime import datetime
-import pytz
 import gradio as gr
-from notion_client import Client
+from notion_client import Client  # 安裝 notion-client 套件
 
-# Install and import Groq
+# 初始化 Notion Client
+notion = Client(auth=os.getenv('NOTION_API_KEY'))
+
+# Notion Database ID
+NOTION_DB_ID = os.getenv('NOTION_DB_ID')
+
+# 安裝並導入 Groq
 try:
     from groq import Groq
 except ImportError:
     os.system('pip install groq')
     from groq import Groq
 
-# Initialize Groq client with API key
+# 初始化 Groq 用戶端
 client = Groq(api_key=os.getenv('groq_key'))
 
-# Initialize Notion client
-notion = Client(auth=os.getenv('NOTION_API_KEY'))
-NOTION_DB_ID = os.getenv('NOTION_DB_ID')
-
-def log_to_notion(name, user_message, bot_response):
-    """Log conversation to Notion database"""
-    try:
-        notion.pages.create(
-            parent={"database_id": NOTION_DB_ID},
-            properties={
-                "Name": {
-                    "title": [
-                        {
-                            "text": {
-                                "content": name
-                            }
-                        }
-                    ]
-                },
-                "Timestamp": {
-                    "date": {
-                        "start": datetime.now(pytz.UTC).isoformat()
-                    }
-                },
-                "User Input": {
-                    "rich_text": [
-                        {
-                            "text": {
-                                "content": user_message
-                            }
-                        }
-                    ]
-                },
-                "Bot Response": {
-                    "rich_text": [
-                        {
-                            "text": {
-                                "content": bot_response
-                            }
-                        }
-                    ]
-                }
-            }
-        )
-    except Exception as e:
-        print(f"Error logging to Notion: {e}")
+def log_to_notion(name, user_input, bot_response):
+    """將對話日誌記錄到 Notion 資料表。"""
+    notion.pages.create(
+        parent={"database_id": NOTION_DB_ID},
+        properties={
+            "Name": {"title": [{"text": {"content": name}}]},
+            "Timestamp": {"date": {"start": datetime.now().isoformat()}}},
+            "User Input": {"rich_text": [{"text": {"content": user_input}}]},
+            "Bot Response": {"rich_text": [{"text": {"content": bot_response}}]},
+        },
+    )
 
 def process_message(message, history):
-    # Prepare the messages including history and new message
+    """處理用戶輸入，並生成機器人回應。"""
+    # 準備歷史消息
     messages = [
         {
             "role": "system",
             "content": "你是一個高中數學老師，使用的語言是英文。學生用中文問妳任何字彙，你都可以告訴他那個中文對應的英文和例句，以及在數學上的可能用法以及數學例題和解法。\n說明數學上的可能用法時，先用中文講一遍再用B1程度的英文複述一遍\n"
         }
     ]
-
-    # Add chat history
+    # 添加歷史記錄
     for user_msg, bot_msg in history:
         messages.append({"role": "user", "content": user_msg})
         messages.append({"role": "assistant", "content": bot_msg})
-
-    # Add the new message
+    # 添加新消息
     messages.append({"role": "user", "content": message})
 
-    # Get response from Groq
+    # 從 Groq 獲取回應
     completion = client.chat.completions.create(
         model="llama-3.3-70b-versatile",
         messages=messages,
@@ -88,64 +56,37 @@ def process_message(message, history):
         stream=True,
         stop=None,
     )
-
-    # Initialize response text
     response_text = ""
-
-    # Stream the response
     for chunk in completion:
         delta_content = chunk.choices[0].delta.content
         if delta_content is not None:
             response_text += delta_content
             yield response_text
 
-# Create Gradio interface
+# 創建 Gradio 界面
 with gr.Blocks() as demo:
-    name_input = gr.Textbox(
-        placeholder="請輸入您的名字...",
-        label="名字",
-    )
-    
-    chatbot = gr.Chatbot(
-        height=600,
-        show_label=False,
-        container=True,
-    )
-    
-    msg = gr.Textbox(
-        placeholder="輸入您的問題...",
-        show_label=False,
-    )
-    
+    name_input = gr.Textbox(placeholder="輸入您的名字...", label="Name")
+    chatbot = gr.Chatbot(height=600, show_label=False, container=True)
+    msg = gr.Textbox(placeholder="輸入您的問題...", show_label=False)
     clear = gr.Button("清除對話")
 
-    def user(user_message, history):
+    def user(user_message, user_name, history):
         return "", history + [[user_message, None]]
 
-    def bot(user_message, history, name):
+    def bot(history, name):
         history[-1][1] = ""
         for response in process_message(history[-1][0], history[:-1]):
             history[-1][1] = response
             yield history
-        
-        # Log the complete conversation to Notion after the response is complete
-        if history[-1][1]:  # Only log if there's a response
-            log_to_notion(name, user_message, history[-1][1])
+        # 將對話記錄到 Notion
+        log_to_notion(name, history[-1][0], history[-1][1])
 
-    msg.submit(
-        user,
-        [msg, chatbot],
-        [msg, chatbot],
-        queue=False
-    ).then(
-        bot,
-        [msg, chatbot, name_input],
-        chatbot
+    msg.submit(user, [msg, name_input, chatbot], [msg, chatbot], queue=False).then(
+        bot, [chatbot, name_input], chatbot
     )
-
     clear.click(lambda: None, None, chatbot, queue=False)
 
-# Launch the app
+# 啟動應用
 if __name__ == "__main__":
     demo.queue()
-    demo.launch()
+    demo.launch()