Update weather_service.py

weather_service.py

@@ -1,30 +1,54 @@
 # weather_service.py
 import requests
-from config import CWA_AUTH_KEY  # [修改] 從 config 匯入金鑰
+from config import CWA_AUTH_KEY
 
 CWA_WEATHER_API = "https://opendata.cwa.gov.tw/api/v1/rest/datastore/O-A0003-001"
 
 def fetch_weather_by_location(location_name: str) -> str:
     """根據地點名稱查詢即時天氣資訊。"""
-    # [新增] 檢查金鑰是否存在
     if not CWA_AUTH_KEY:
         return "❌ 天氣查詢失敗：管理者尚未設定 CWA_AUTH_KEY。"
 
     params = {
         "Authorization": CWA_AUTH_KEY,
         "format": "JSON",
-        "locationName": location_name,
+        # [修改] 移除 locationName，一次獲取所有測站資料
         "elementName": "TEMP,HUMD,Weather",
     }
     try:
-        r = requests.get(CWA_WEATHER_API, params=params, timeout=10)
+        r = requests.get(CWA_WEATHER_API, params=params, timeout=15)
         r.raise_for_status()
         data = r.json()
 
         if not data.get("records") or not data["records"].get("location"):
-            return f"找不到「{location_name}」的即時天氣資訊，請試試看其他縣市或地區。"
+            return "無法獲取任何天氣觀測站資料。"
 
-        loc_data = data["records"]["location"][0]
+        all_locations = data["records"]["location"]
+        
+        # [新增] 遍歷所有測站，尋找符合使用者輸入的地點
+        # 處理 "臺" 和 "台" 的異體字，並移除 "市"
+        normalized_input = location_name.replace("臺", "台").replace("市", "")
+        
+        target_location = None
+        for loc in all_locations:
+            normalized_loc_name = loc["locationName"].replace("臺", "台")
+            if normalized_input == normalized_loc_name:
+                target_location = loc
+                break # 找到完全符合的就停止
+
+        # 如果沒有完全符合的，則找名稱包含的
+        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}」相關的即時天氣資訊，請試試看其他縣市或地區。"
+
+        # --- 找到地點後，格式化輸出 ---
+        loc_data = target_location
         elements = {elem["elementName"]: elem["elementValue"] for elem in loc_data["weatherElement"]}
         
         temp = elements.get("TEMP", "未知")
@@ -38,5 +62,9 @@ def fetch_weather_by_location(location_name: str) -> str:
             f"相對濕度：{humidity:.0f}%"
         )
 
+    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}"