Update main.py

main.py

@@ -1,8 +1,14 @@
-import json, os, glob, pathlib, time, re
+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():
+            return room, None
+    return None, f"❌ 請選擇：{', '.join(AVAILABLE_ROOMS)}"import json, os, glob, pathlib, time, re
 from fastapi import FastAPI, Request, Header, BackgroundTasks, HTTPException
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import HTMLResponse, JSONResponse
-import google.generativeai as genai
+from google import genai
 from linebot import LineBotApi, WebhookHandler
 from linebot.exceptions import InvalidSignatureError
 from linebot.models import MessageEvent, TextMessage, TextSendMessage
@@ -111,10 +117,11 @@ 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.configure(api_key=GOOGLE_API_KEY)
+        genai_client = genai.Client(api_key=GOOGLE_API_KEY)
         ai_enabled = True
         logger.info("✅ Gemini AI 已啟用")
     except Exception as e:
@@ -339,7 +346,74 @@ def parse_people(people_str):
         return None, "❌ 人數必須在 1-10 人之間"
     return None, "❌ 請輸入有效的人數\n例如：2人、3"
 
-def validate_room(room_str):
+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
     room_normalized = room_str.strip().upper()
     for room in AVAILABLE_ROOMS:
         if room.upper() in room_normalized or room_normalized in room.upper():
@@ -422,6 +496,7 @@ 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
         
         # 儲存標準格式
@@ -443,7 +518,21 @@ def handle_booking_flow(user_id, user_message):
     elif current_state == BookingState.ASKING_ROOM:
         room, error = validate_room(user_message)
         if error:
+            # 格式錯誤，保持在當前狀態
             return error
+        
+        # 檢查時段是否有衝突
+        has_conflict, conflict_msg = check_booking_conflict(
+            booking["date"],
+            booking["start_time"],
+            booking["end_time"],
+            room
+        )
+        
+        if has_conflict:
+            # 有衝突，保持在當前狀態，讓使用者重新選擇琴房
+            return conflict_msg
+        
         booking["room"] = room
         booking["state"] = BookingState.CONFIRMING
         
@@ -455,7 +544,8 @@ def handle_booking_flow(user_id, user_message):
             f"👥 {booking['people']}人\n"
             f"🎹 {booking['room']}\n"
             f"{'='*20}\n\n"
-            f"輸入「確認」送出"
+            f"輸入「確認」送出\n"
+            f"輸入「取消」重新填寫"
         )
     
     elif current_state == BookingState.CONFIRMING:
@@ -532,6 +622,32 @@ def get_bookings():
                 return {"total": 0, "bookings": [], "error": "讀取失敗"}
     return {"total": 0, "bookings": []}
 
+@app.get("/bookings/check")
+def check_availability(date: str = None, room: str = None):
+    """檢查特定日期或琴房的預約狀況"""
+    bookings_file = pathlib.Path("bookings/bookings.json")
+    if not bookings_file.exists():
+        return {"message": "無預約資料"}
+    
+    with open(bookings_file, 'r', encoding='utf-8') as f:
+        try:
+            all_bookings = json.load(f)
+        except:
+            return {"error": "讀取失敗"}
+    
+    # 篩選預約
+    filtered = all_bookings
+    if date:
+        filtered = [b for b in filtered if b.get('date') == date]
+    if room:
+        filtered = [b for b in filtered if b.get('room') == room]
+    
+    return {
+        "date": date,
+        "room": room,
+        "count": len(filtered),
+        "bookings": filtered
+    }
 @app.get("/bookings/latest", response_class=JSONResponse)
 def get_latest_booking():
     """最新預約"""
@@ -673,12 +789,14 @@ def handle_message(event):
         return
     
     # AI 問答
-    if ai_enabled:
+    if ai_enabled and genai_client:
         try:
             prompt = f"參考資料：{pdf_content}\n\n問題：{user_message}\n\n簡潔回答。" if pdf_content else user_message
             
-            model = genai.GenerativeModel('gemini-2.5-flash')
-            response = model.generate_content(prompt)
+            response = genai_client.models.generate_content(
+                model='gemini-2.5-flash',
+                contents=prompt
+            )
             
             out = response.text if response and response.text else "無法回答"
         except Exception as e: