Update cwa_service.py

cwa_service.py

@@ -9,21 +9,62 @@ from config import CWA_API_KEY, CWA_ALARM_API, CWA_SIGNIFICANT_API
 
 TAIPEI_TZ = timezone(timedelta(hours=8))
 
-# --- Helper Function from Gradio Script ---
+# --- Helper Functions ---
 def _to_float(x):
     if x is None: return None
     s = str(x).strip()
     m = re.search(r"[-+]?\d+(?:\.\d+)?", s)
     return float(m.group()) if m else None
 
-# --- 地震預警 (舊功能) ---
+def _parse_cwa_time(s: str) -> tuple[str, str]:
+    """回傳 (台灣時間, UTC)；若字串無時區，預設視為台灣時間。"""
+    if not s: return ("未知", "未知")
+    try:
+        dt = datetime.fromisoformat(s.replace("Z", "+00:00"))
+        tw = dt.astimezone(TAIPEI_TZ).strftime("%Y-%m-%d %H:%M")
+        utc = dt.astimezone(timezone.utc).strftime("%Y-%m-%d %H:%M")
+        return (tw, utc)
+    except Exception:
+        return (s, "未知")
+
+# --- 地震預警 (CWA_ALARM_API) ---
 def fetch_cwa_alarm_list(limit: int = 5) -> str:
-    # ... (此函式內容不變) ...
-    return "\n".join(lines).strip()
+    """抓 CWA 地震預警並格式化輸出。"""
+    try:
+        r = requests.get(CWA_ALARM_API, timeout=10)
+        r.raise_for_status()
+        payload = r.json()
+    except Exception as e:
+        return f"❌ 地震預警查詢失敗：{e}"
 
-# --- [新功能] 顯著有感地震 (E-A0015-001) ---
+    items = payload.get("data", [])
+    if not items:
+        return "✅ 目前沒有地震預警。"
+
+    def _key(it):
+        try:
+            return datetime.fromisoformat(it.get("originTime", "").replace("Z", "+00:00"))
+        except:
+            return datetime.min.replace(tzinfo=timezone.utc)
+    
+    items = sorted(items, key=_key, reverse=True)
+
+    lines = ["🚨 地震預警（最新）:", "-" * 20]
+    for it in items[:limit]:
+        mag = _to_float(it.get("magnitudeValue"))
+        depth = _to_float(it.get("depth"))
+        tw_str, utc_str = _parse_cwa_time(it.get("originTime", ""))
+        lines.append(
+            f"事件: {it.get('identifier', '—')} | 類型: {it.get('msgType', '—')}#{it.get('msgNo', '—')}\n"
+            f"震級/深度: M{mag:.1f} / {depth:.0f} km\n"
+            f"時間: {tw_str}（台灣）\n"
+            f"預警地區: {it.get('alertAreas') or '—'}"
+        )
+    return "\n\n".join(lines).strip()
+
+# --- 顯著有感地震 (E-A0015-001) ---
 def _parse_significant_earthquakes(obj: dict) -> pd.DataFrame:
-    """移植自 Gradio 程式碼，用於解析 E-A0015-001 的 JSON 資料"""
+    """解析 E-A0015-001 的 JSON 資料"""
     quakes = obj.get("records", {}).get("Earthquake", [])
     rows = []
     for q in quakes:
@@ -81,4 +122,3 @@ def fetch_significant_earthquakes(days: int = 7, limit: int = 5) -> str:
         
     except Exception as e:
         return f"❌ 顯著地震查詢失敗：{e}"
-