Update cwa_service.py

cwa_service.py

@@ -28,7 +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()
@@ -60,7 +60,7 @@ def fetch_cwa_alarm_list(limit: int = 5) -> str:
         depth_str = f"{depth:.0f}" if depth is not None else "—"
         lines.append(
             f"事件: {identifier} | 類型: {msg_type}#{msg_no}\n"
-            f"震級/深度: M{mag_str} / {depth_str} km\n"
+            f"規模/深度: M{mag_str} / {depth_str} km\n"
             f"時間: {tw_str}（台灣）\n"
             f"預警地區: {areas}"
         )
@@ -68,16 +68,17 @@ def fetch_cwa_alarm_list(limit: int = 5) -> str:
 
 # --- 顯著有感地震 (E-A0015-001) ---
 def _parse_significant_earthquakes(obj: dict) -> pd.DataFrame:
-    """[修改] 採用最穩健的方式解析 E-A0015-001 的 JSON，應對格式不一致問題"""
-    quakes = obj.get("records", {}).get("Earthquake", [])
+    """[修改] 採用參考程式碼中最穩健的解析邏輯，應對 CWA 不穩定的資料格式"""
+    records = obj.get("records") or obj.get("Records") or {}
+    quakes = records.get("earthquake") or records.get("Earthquake") or []
     rows = []
     for q in quakes:
-        # 兼容大小寫和不同寫法
+        # 兼容各種大小寫和可能的父節點名稱
         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 {}
-        
-        # 嘗試用所有可能的欄位名稱去取得資料
+        mag_info = ei.get("Magnitude") or ei.get("magnitude") or ei.get("EarthquakeMagnitude") or {}
+
+        # 嘗試用所有已知的欄位名稱去取得資料
         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")
         
@@ -95,6 +96,7 @@ def _parse_significant_earthquakes(obj: dict) -> pd.DataFrame:
     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
 
@@ -118,9 +120,10 @@ 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}"
+