Update weather_service.py

weather_service.py

@@ -1,70 +1,93 @@
 # weather_service.py
 import requests
 from config import CWA_AUTH_KEY
+from datetime import datetime
 
-CWA_WEATHER_API = "https://opendata.cwa.gov.tw/api/v1/rest/datastore/O-A0003-001"
+# [修改] API 端點更新為 36 小時預報
+CWA_FORECAST_API = "https://opendata.cwa.gov.tw/api/v1/rest/datastore/F-C0032-001"
 
-def fetch_weather_by_location(location_name: str) -> str:
-    """根據地點名稱查詢即時天氣資訊。"""
+def _normalize_location_name(loc_name: str) -> str:
+    """自動校正縣市名稱，以符合 API 要求 (例如 台北 -> 臺北市)"""
+    loc_name = loc_name.replace("台", "臺")
+    if loc_name.endswith("市") or loc_name.endswith("縣"):
+        return loc_name
+    
+    # 根據 API 文件支援的主要縣市列表進行校正
+    major_cities = "臺北,桃園,新竹,臺中,嘉義,臺南,高雄,基隆".split(',')
+    if any(city in loc_name for city in major_cities):
+        return f"{loc_name}市"
+    
+    return f"{loc_name}縣"
+
+def _format_time_period(start_str: str, end_str: str) -> str:
+    """將時間格式化為易讀的時段名稱"""
+    start_dt = datetime.fromisoformat(start_str)
+    start_hour = start_dt.hour
+    
+    if start_hour >= 18 or start_hour < 6:
+        return f"{start_dt.strftime('%m/%d')} 晚上至隔日清晨"
+    elif start_hour >= 6 and start_hour < 18:
+        return f"{start_dt.strftime('%m/%d')} 白天"
+    return f"{start_dt.strftime('%m/%d %H:%M')}"
+
+
+def fetch_forecast_by_location(location_name: str) -> str:
+    """根據地點名稱查詢未來 36 小時天氣預報。"""
     if not CWA_AUTH_KEY:
-        return "❌ 天氣查詢失敗：管理者尚未設定 CWA_AUTH_KEY。"
+        return "❌ 天氣預報查詢失敗：管理者尚未設定 CWA_AUTH_KEY。"
 
+    normalized_loc = _normalize_location_name(location_name)
+    
     params = {
         "Authorization": CWA_AUTH_KEY,
         "format": "JSON",
-        # [修改] 移除 locationName，一次獲取所有測站資料
-        "elementName": "TEMP,HUMD,Weather",
+        "locationName": normalized_loc,
+        "elementName": "Wx,PoP,MinT,MaxT", # 天氣現象,降雨機率,最低溫,最高溫
     }
+
     try:
-        r = requests.get(CWA_WEATHER_API, params=params, timeout=15)
+        r = requests.get(CWA_FORECAST_API, params=params, timeout=10)
         r.raise_for_status()
         data = r.json()
 
-        if not data.get("records") or not data["records"].get("location"):
-            return "無法獲取任何天氣觀測站資料。"
+        if not data.get("records") or not data["records"]["location"]:
+            return f"找不到「{location_name}」的預報資訊。\n請確認是否為台灣的縣市名稱 (例如: 臺北市, 花蓮縣)。"
 
-        all_locations = data["records"]["location"]
-        
-        # [新增] 遍歷所有測站，尋找符合使用者輸入的地點
-        # 處理 "臺" 和 "台" 的異體字，並移除 "市"
-        normalized_input = location_name.replace("臺", "台").replace("市", "")
+        loc_data = data["records"]["location"][0]
+        elements = {elem["elementName"]: elem["time"] for elem in loc_data["weatherElement"]}
         
-        target_location = None
-        for loc in all_locations:
-            normalized_loc_name = loc["locationName"].replace("臺", "台")
-            if normalized_input == normalized_loc_name:
-                target_location = loc
-                break # 找到完全符合的就停止
+        forecasts = []
+        # API 會回傳 3 個時間段的預報
+        for i in range(3):
+            try:
+                start_time = elements["Wx"][i]["startTime"]
+                end_time = elements["Wx"][i]["endTime"]
+                wx = elements["Wx"][i]["parameter"]["parameterName"]
+                pop = elements["PoP"][i]["parameter"]["parameterName"]
+                min_t = elements["MinT"][i]["parameter"]["parameterName"]
+                max_t = elements["MaxT"][i]["parameter"]["parameterName"]
+                
+                period_name = _format_time_period(start_time, end_time)
+                
+                forecast_str = (
+                    f"➢ {period_name}:\n"
+                    f"  天氣：{wx}\n"
+                    f"  氣溫：{min_t}°C - {max_t}°C\n"
+                    f"  降雨機率：{pop}%"
+                )
+                forecasts.append(forecast_str)
+            except (IndexError, KeyError):
+                continue
 
-        # 如果沒有完全符合的，則找名稱包含的
-        if not target_location:
-            for loc in all_locations:
-                normalized_loc_name = loc["locationName"].replace("臺", "台")
-                if normalized_input in normalized_loc_name:
-                    target_location = loc
-                    break
-        
-        if not target_location:
-            return f"找不到與「{location_name}」相關的即時天氣資訊，請試試看其他縣市或地區。"
+        if not forecasts:
+            return f"無法解析「{location_name}」的預報資料。"
 
-        # --- 找到地點後，格式化輸出 ---
-        loc_data = target_location
-        elements = {elem["elementName"]: elem["elementValue"] for elem in loc_data["weatherElement"]}
-        
-        temp = elements.get("TEMP", "未知")
-        humidity = float(elements.get("HUMD", -1)) * 100
-        weather_desc = elements.get("Weather", "未知")
-        
-        return (
-            f"📍 {loc_data['locationName']} 即時天氣：\n"
-            f"天氣狀況：{weather_desc}\n"
-            f"溫度：{temp}°C\n"
-            f"相對濕度：{humidity:.0f}%"
-        )
+        return f"📍 {loc_data['locationName']} 未來 36 小時天氣預報：\n\n" + "\n\n".join(forecasts)
 
     except requests.exceptions.HTTPError as e:
         if e.response.status_code == 401:
-            return "❌ 天氣查詢失敗：CWA 授權金鑰 (API Key) 無效。"
-        return f"❌ 天氣查詢失敗：{e}"
+            return "❌ 預報查詢失敗：CWA 授權金鑰 (API Key) 無效。"
+        return f"❌ 預報查詢失敗：{e}"
     except Exception as e:
-        return f"❌ 天氣查詢失敗：{e}"
+        return f"❌ 預報查詢失敗：{e}"
+