Update cwa_service.py

cwa_service.py

@@ -1,4 +1,4 @@
-# cwa_service.py (Corrected for tz-naive error)
+# cwa_service.py (Corrected for Magnitude and tz-naive error)
 import requests
 import re
 import pandas as pd
@@ -74,7 +74,10 @@ def _parse_significant_earthquakes(obj: dict) -> pd.DataFrame:
         epic = ei.get("Epicenter", {})
         mag_info = ei.get("Magnitude", {})
         depth_raw = ei.get("FocalDepth")
-        mag_raw = mag_info.get("MagnitudeValue")
+        
+        # [修正] 依序嘗試多種可能的規模值鍵名，增加程式的穩健性
+        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")),
@@ -84,7 +87,6 @@ def _parse_significant_earthquakes(obj: dict) -> pd.DataFrame:
         })
     df = pd.DataFrame(rows)
     if not df.empty and "Time" in df.columns:
-        # [修正] 加入 utc=True 參數，確保所有時間都有 UTC 時區資訊
         df["Time"] = pd.to_datetime(df["Time"], errors="coerce", utc=True).dt.tz_convert(TAIPEI_TZ)
     return df
 
@@ -100,7 +102,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]
+        lines = [f"🚨 CWA 最新顯著有感地震 (近{days}天内):", "-" * 20]
         for _, row in df.iterrows():
             mag_str = f"{row['Magnitude']:.1f}" if pd.notna(row['Magnitude']) else "—"
             depth_str = f"{row['Depth']:.0f}" if pd.notna(row['Depth']) else "—"
@@ -135,5 +137,4 @@ def fetch_latest_significant_earthquake() -> dict | None:
 
         return latest_eq_data
     except Exception as e:
-        # 將錯誤傳遞給上層函式，以便在 LINE 上顯示
         raise e