Update cwa_service.py

cwa_service.py

@@ -33,21 +33,64 @@ def fetch_cwa_alarm_list(limit: int = 5) -> str:
 
 # --- 顯著有感地震 (E-A0015-001) (此區塊不變) ---
 def _parse_significant_earthquakes(obj: dict) -> pd.DataFrame:
-    # ... (此函式內容不變) ...
+    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 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")
+        rows.append({
+            "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") 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):
+            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:
     # ... (此函式內容不變) ...
-    return "\n\n".join(lines)
+    if not CWA_API_KEY: return "❌ 顯著地震查詢失敗：管理者尚未設定 CWA_API_KEY。"
+    now = datetime.now(timezone.utc)
+    time_from = (now - timedelta(days=days)).strftime("%Y-%m-%d")
+    params = {"Authorization": CWA_API_KEY, "format": "JSON", "timeFrom": time_from}
+    try:
+        r = requests.get(CWA_SIGNIFICANT_API, params=params, timeout=15)
+        r.raise_for_status()
+        data = r.json()
+        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 "—"
+            depth_str = f"{row['Depth']:.0f}" if pd.notna(row['Depth']) else "—"
+            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"報告: {row['URL'] or '無'}"
+            )
+        return "\n\n".join(lines)
+    except Exception as e:
+        return f"❌ 顯著地震查詢失敗：{e}"
 
-# --- [新功能] 最新一筆顯著地震 ---
+
+# --- 最新一筆顯著地震 ---
 def fetch_latest_significant_earthquake() -> dict | None:
     """從 CWA 獲取最新一筆顯著有感地震的詳細資料，包含報告圖。"""
     if not CWA_API_KEY:
-        # 在這種情況下拋出錯誤，讓呼叫者處理
         raise ValueError("錯誤：尚未設定 CWA_API_KEY Secret。")
     
-    # 查詢過去24小時內最新的一筆資料
     now = datetime.now(timezone.utc)
     time_from = (now - timedelta(days=1)).strftime("%Y-%m-%dT%H:%M:%S")
 
@@ -55,8 +98,9 @@ def fetch_latest_significant_earthquake() -> dict | None:
         "Authorization": CWA_API_KEY,
         "format": "JSON",
         "timeFrom": time_from,
-        "limit": 1, # 只取最新一筆
-        "sort": "OriginTime desc" # 依時間倒序
+        "limit": 1,
+        # [修正] 移除不支援的 sort 參數，API 預設即為時間倒序
+        # "sort": "OriginTime desc" 
     }
     
     r = requests.get(CWA_SIGNIFICANT_API, params=params, timeout=15)
@@ -69,26 +113,23 @@ def fetch_latest_significant_earthquake() -> dict | None:
 
     q = quakes[0]
     ei = q.get("EarthquakeInfo", {})
-    epic = ei.get("Epicenter", {})
+    epic = q.get("Epicenter", {})
     mag_info = ei.get("Magnitude", {})
     
     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")
     
-    # 將解析出的資料存入字典
     result = {
         "Time": ei.get("OriginTime"),
         "Location": epic.get("Location"),
         "Magnitude": _to_float(mag_raw),
         "Depth": _to_float(depth_raw),
         "URL": q.get("Web"),
-        "ImageURL": q.get("ReportImageURI") # 獲取報告圖網址
+        "ImageURL": q.get("ReportImageURI")
     }
     
-    # 將時間轉換為台北時區
     if result["Time"]:
         dt = pd.to_datetime(result["Time"]).tz_localize("UTC").tz_convert(TAIPEI_TZ)
         result["TimeStr"] = dt.strftime('%Y-%m-%d %H:%M')
 
     return result
-