Update cwa_service.py

cwa_service.py

@@ -28,8 +28,7 @@ def _parse_cwa_time(s: str) -> tuple[str, str]:
 
 # --- 地震預警 (CWA_ALARM_API) ---
 def fetch_cwa_alarm_list(limit: int = 5) -> str:
-    """抓 CWA 地震預警並格式化輸出。"""
-    # ... (此函式內容不變) ...
+    # ... (此函式內容不變，保持原樣) ...
     try:
         r = requests.get(CWA_ALARM_API, timeout=10)
         r.raise_for_status()
@@ -69,35 +68,37 @@ def fetch_cwa_alarm_list(limit: int = 5) -> str:
 
 # --- 顯著有感地震 (E-A0015-001) ---
 def _parse_significant_earthquakes(obj: dict) -> pd.DataFrame:
-    """[修改] 採用更穩健的方式解析 E-A0015-001 的 JSON 資料"""
+    """[修改] 採用最穩健的方式解析 E-A0015-001 的 JSON，應對格式不一致問題"""
     quakes = obj.get("records", {}).get("Earthquake", [])
     rows = []
     for q in quakes:
-        ei = q.get("EarthquakeInfo", {})
-        epic = ei.get("Epicenter", {})
-        mag_info = ei.get("Magnitude", {})
+        # 兼容大小寫和不同寫法
+        ei = q.get("EarthquakeInfo") or q.get("earthquakeInfo") or {}
+        epic = ei.get("Epicenter") or ei.get("epicenter") or {}
+        mag_info = ei.get("Magnitude") or ei.get("magnitude") or {}
         
-        # 嘗試用多種可能的欄位名稱去取得資料
-        depth_raw = ei.get("FocalDepth") or ei.get("Depth")
-        mag_raw = mag_info.get("MagnitudeValue") or mag_info.get("value") or mag_info.get("Magnitude")
+        # 嘗試用所有可能的欄位名稱去取得資料
+        depth_raw = ei.get("FocalDepth") or ei.get("depth") or ei.get("Depth")
+        mag_raw = mag_info.get("MagnitudeValue") or mag_info.get("magnitudeValue") or mag_info.get("Value") or mag_info.get("value")
         
         rows.append({
-            "ID": q.get("EarthquakeNo"), "Time": ei.get("OriginTime"),
-            "Lat": _to_float(epic.get("EpicenterLatitude")), "Lon": _to_float(epic.get("EpicenterLongitude")),
+            "ID": q.get("EarthquakeNo"),
+            "Time": ei.get("OriginTime"),
+            "Lat": _to_float(epic.get("EpicenterLatitude") or epic.get("epicenterLatitude")),
+            "Lon": _to_float(epic.get("EpicenterLongitude") or epic.get("epicenterLongitude")),
             "Depth": _to_float(depth_raw),
             "Magnitude": _to_float(mag_raw),
-            "Location": epic.get("Location"), "URL": q.get("Web"),
+            "Location": epic.get("Location") or epic.get("location"),
+            "URL": q.get("Web") or q.get("ReportURL"),
         })
     df = pd.DataFrame(rows)
     if not df.empty and "Time" in df.columns:
         time_series = pd.to_datetime(df["Time"], errors="coerce")
         if pd.api.types.is_datetime64_any_dtype(time_series):
-            # 假設 API 回傳的時間是 UTC 標準時間
             df["Time"] = time_series.dt.tz_localize("UTC").dt.tz_convert(TAIPEI_TZ)
     return df
 
 def fetch_significant_earthquakes(days: int = 7, limit: int = 5) -> str:
-    # ... (此函式上半部分不變) ...
     if not CWA_API_KEY: return "❌ 顯著地震查詢失敗：管理者尚未設定 CWA_API_KEY。"
     now = datetime.now(timezone.utc)
     time_from = (now - timedelta(days=days)).strftime("%Y-%m-%d")
@@ -109,6 +110,7 @@ def fetch_significant_earthquakes(days: int = 7, limit: int = 5) -> str:
         df = _parse_significant_earthquakes(data)
         if df.empty: return f"✅ 過去 {days} 天內沒有顯著有感地震報告。"
         df = df.sort_values(by="Time", ascending=False).head(limit)
+        
         lines = [f"🚨 CWA 最新顯著有感地震 (近{days}天內):", "-" * 20]
         for _, row in df.iterrows():
             mag_str = f"{row['Magnitude']:.1f}" if pd.notna(row['Magnitude']) else "—"
@@ -116,10 +118,9 @@ def fetch_significant_earthquakes(days: int = 7, limit: int = 5) -> str:
             lines.append(
                 f"時間: {row['Time'].strftime('%Y-%m-%d %H:%M') if pd.notna(row['Time']) else '—'}\n"
                 f"地點: {row['Location'] or '—'}\n"
-                f"震級: M{mag_str} | 深度: {depth_str} km\n"
+                f"規模: M{mag_str} | 深度: {depth_str} km\n" # [修改] 將 "震級" 改為 "規模"
                 f"報告: {row['URL'] or '無'}"
             )
         return "\n\n".join(lines)
     except Exception as e:
         return f"❌ 顯著地震查詢失敗：{e}"
-