Upload main.py

main.py

@@ -111,11 +111,10 @@ def create_calendar_event(booking_data, booking_id):
 # ============== Gemini AI 設定 ==============
 GOOGLE_API_KEY = os.getenv("GOOGLE_API_KEY")
 ai_enabled = False
-genai_client = None
 
 if GOOGLE_API_KEY:
     try:
-        genai_client = genai.Client(api_key=GOOGLE_API_KEY)
+        genai.configure(api_key=GOOGLE_API_KEY)
         ai_enabled = True
         logger.info("✅ Gemini AI 已啟用")
     except Exception as e:
@@ -340,74 +339,7 @@ def parse_people(people_str):
         return None, "❌ 人數必須在 1-10 人之間"
     return None, "❌ 請輸入有效的人數\n例如：2人、3"
 
-def check_booking_conflict(date_str, start_time, end_time, room):
-    """檢查預約時段是否有衝突"""
-    bookings_file = pathlib.Path("bookings/bookings.json")
-    
-    if not bookings_file.exists():
-        return False, None
-    
-    try:
-        with open(bookings_file, 'r', encoding='utf-8') as f:
-            bookings = json.load(f)
-    except:
-        return False, None
-    
-    # 將時間轉換為分鐘數便於比較
-    def time_to_minutes(time_str):
-        h, m = map(int, time_str.split(':'))
-        return h * 60 + m
-    
-    new_start = time_to_minutes(start_time)
-    new_end = time_to_minutes(end_time)
-    
-    conflicts = []
-    
-    for booking in bookings:
-        # 只檢查相同日期
-        if booking.get('date') != date_str:
-            continue
-        
-        # 只檢查相同琴房或任意琴房
-        booking_room = booking.get('room', '')
-        if room != '任意' and booking_room != '任意':
-            if booking_room != room:
-                continue
-        
-        # 獲取已預約的時段
-        existing_start = booking.get('start_time')
-        existing_end = booking.get('end_time')
-        
-        if not existing_start or not existing_end:
-            # 如果沒有 start_time/end_time，嘗試從 time 欄位解析
-            time_str = booking.get('time', '')
-            start, end, _, _, _ = parse_time_range(time_str)
-            if start and end:
-                existing_start = start
-                existing_end = end
-            else:
-                continue
-        
-        exist_start = time_to_minutes(existing_start)
-        exist_end = time_to_minutes(existing_end)
-        
-        # 檢查是否有時段重疊
-        # 重疊條件：新預約開始時間 < 既有預約結束時間 AND 新預約結束時間 > 既有預約開始時間
-        if new_start < exist_end and new_end > exist_start:
-            conflicts.append({
-                'booking_id': booking.get('booking_id'),
-                'time': booking.get('time'),
-                'room': booking_room
-            })
-    
-    if conflicts:
-        conflict_msg = f"❌ 預約衝突！\n\n該時段已有預約：\n"
-        for c in conflicts:
-            conflict_msg += f"• {c['room']} - {c['time']}\n"
-        conflict_msg += f"\n請選擇其他時段或琴房"
-        return True, conflict_msg
-    
-    return False, None
+def validate_room(room_str):
     room_normalized = room_str.strip().upper()
     for room in AVAILABLE_ROOMS:
         if room.upper() in room_normalized or room_normalized in room.upper():
@@ -490,7 +422,6 @@ def handle_booking_flow(user_id, user_message):
         # 解析並驗證時間
         start_time, end_time, display_time, error, err_msg = parse_time_range(user_message)
         if error:
-            # 格式錯誤，不進入下一步，保持在當前狀態
             return err_msg
         
         # 儲存標準格式
@@ -742,14 +673,12 @@ def handle_message(event):
         return
     
     # AI 問答
-    if ai_enabled and genai_client:
+    if ai_enabled:
         try:
             prompt = f"參考資料：{pdf_content}\n\n問題：{user_message}\n\n簡潔回答。" if pdf_content else user_message
             
-            response = genai_client.models.generate_content(
-                model='gemini-2.5-flash',
-                contents=prompt
-            )
+            model = genai.GenerativeModel('gemini-2.5-flash')
+            response = model.generate_content(prompt)
             
             out = response.text if response and response.text else "無法回答"
         except Exception as e: