Update weather_service.py

weather_service.py

@@ -1,100 +1,21 @@
 # weather_service.py
 import requests
-from config import CWA_AUTH_KEY
+from config import CWA_API_KEY # [修改] 更新變數名稱
 from datetime import datetime
 
-CWA_FORECAST_API = "https://opendata.cwa.gov.tw/api/v1/rest/datastore/F-C0032-001"
-
-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。"
+    if not CWA_API_KEY: # [修改] 更新變數名稱
+        return "❌ 天氣預報查詢失敗：管理者尚未設定 CWA_API_KEY。"
 
+    normalized_loc = _normalize_location_name(location_name)
+    
     params = {
-        "Authorization": CWA_AUTH_KEY,
+        "Authorization": CWA_API_KEY, # [修改] 更新變數名稱
         "format": "JSON",
-        # [修改] 移除 locationName 參數，一次獲取所有縣市的資料
+        "locationName": normalized_loc,
         "elementName": ["Wx", "PoP", "MinT", "MaxT"],
     }
-
-    try:
-        r = requests.get(CWA_FORECAST_API, params=params, timeout=15)
-        r.raise_for_status()
-        data = r.json()
-
-        if not data.get("records") or not data["records"]["location"]:
-            return "❌ 無法從 CWA 獲取任何天氣預報資料。"
-
-        all_locations = data["records"]["location"]
-        
-        # [修改] 在所有回傳的資料中，手動尋找使用者指定的地點
-        normalized_input = location_name.replace("台", "臺")
-        if not (normalized_input.endswith("市") or normalized_input.endswith("縣")):
-             normalized_input += "市" # 預設加上 "市" 來比對
-
-        target_location = None
-        for loc in all_locations:
-            if loc["locationName"] == normalized_input:
-                target_location = loc
-                break
-        
-        # 如果找不到 "市"，試試看 "縣"
-        if not target_location:
-            normalized_input = normalized_input.replace("市", "縣")
-            for loc in all_locations:
-                if loc["locationName"] == normalized_input:
-                    target_location = loc
-                    break
-
-        if not target_location:
-            return f"找不到「{location_name}」的預報資訊。\n請確認是否為台灣的縣市名稱 (例如: 臺北市, 花蓮縣)。"
-
-        # --- 找到地點後，格式化輸出 (邏輯不變) ---
-        loc_data = target_location
-        elements = {elem["elementName"]: elem["time"] for elem in loc_data["weatherElement"]}
-        
-        forecasts = []
-        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 forecasts:
-            return f"無法解析「{location_name}」的預報資料。"
-
-        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}"
-    except Exception as e:
-        return f"❌ 預報查詢失敗：{e}"
+    # ... (try...except 區塊不變) ...