Update cwa_service.py

cwa_service.py

@@ -28,6 +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()
@@ -51,12 +52,22 @@ def fetch_cwa_alarm_list(limit: int = 5) -> str:
     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", ""))
+        tw_str, _ = _parse_cwa_time(it.get("originTime", ""))
+
+        # [修正] 在格式化前，先對來自 API 的字串進行轉義，避免其中的 { } 字元造成錯誤
+        identifier = str(it.get('identifier', '—')).replace('{', '{{').replace('}', '}}')
+        msg_type = str(it.get('msgType', '—')).replace('{', '{{').replace('}', '}}')
+        msg_no = str(it.get('msgNo', '—')).replace('{', '{{').replace('}', '}}')
+        areas = str(it.get('alertAreas') or '—').replace('{', '{{').replace('}', '}}')
+        
+        mag_str = f"{mag:.1f}" if mag is not None else "—"
+        depth_str = f"{depth:.0f}" if depth is not None else "—"
+
         lines.append(
-            f"事件: {it.get('identifier', '—')} | 類型: {it.get('msgType', '—')}#{it.get('msgNo', '—')}\n"
-            f"震級/深度: M{mag:.1f if mag is not None else '—'} / {depth:.0f if depth is not None else '—'} km\n"
+            f"事件: {identifier} | 類型: {msg_type}#{msg_no}\n"
+            f"震級/深度: M{mag_str} / {depth_str} km\n"
             f"時間: {tw_str}（台灣）\n"
-            f"預警地區: {it.get('alertAreas') or '—'}"
+            f"預警地區: {areas}"
         )
     return "\n\n".join(lines).strip()
 
@@ -105,7 +116,6 @@ def fetch_significant_earthquakes(days: int = 7, limit: int = 5) -> str:
         
         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 "—"
             
@@ -119,4 +129,3 @@ def fetch_significant_earthquakes(days: int = 7, limit: int = 5) -> str:
         
     except Exception as e:
         return f"❌ 顯著地震查詢失敗：{e}"
-