Update cwa_service.py

cwa_service.py

@@ -1,4 +1,4 @@
-# cwa_service.py
+# cwa_service.py (Corrected for tz-naive error)
 import requests
 import re
 import pandas as pd
@@ -14,50 +14,35 @@ def _to_float(x):
     return float(m.group()) if m else None
 
 def _parse_cwa_time(s: str) -> tuple[str, str]:
-    """
-    [修正]
-    使其能夠處理兩種 CWA API 可能的時間格式:
-    1. ISO 8601 格式 (e.g., '2025-08-19T03:55:47Z')
-    2. 本地時間格式 (e.g., '2025-08-19 09:26:11')
-    """
     if not s: return ("未知", "未知")
-    
     dt_utc = None
-    # 嘗試解析 ISO 8601 格式
     try:
         dt_utc = datetime.fromisoformat(s.replace("Z", "+00:00"))
     except ValueError:
-        # 若失敗，嘗試解析 YYYY-MM-DD HH:MM:SS 格式，並假設其為台北時間
         try:
             dt_local = datetime.strptime(s, "%Y-%m-%d %H:%M:%S")
             dt_local = dt_local.replace(tzinfo=TAIPEI_TZ)
             dt_utc = dt_local.astimezone(timezone.utc)
         except Exception:
-            return (s, "未知") # 若兩種格式都失敗，回傳原始字串
-
+            return (s, "未知")
     if dt_utc:
         tw_str = dt_utc.astimezone(TAIPEI_TZ).strftime("%Y-%m-%d %H:%M")
         utc_str = dt_utc.astimezone(timezone.utc).strftime("%Y-%m-%d %H:%M")
         return (tw_str, utc_str)
-    
     return (s, "未知")
 
 def fetch_cwa_alarm_list(limit: int = 5) -> str:
-    """抓 CWA 地震預警並格式化輸出。"""
     try:
         r = requests.get(CWA_ALARM_API, timeout=10)
         r.raise_for_status()
         payload = r.json()
     except Exception as e:
         return f"❌ 地震預警查詢失敗：{e}"
-
     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]:
@@ -67,22 +52,16 @@ def fetch_cwa_alarm_list(limit: int = 5) -> str:
         identifier = str(it.get('identifier', '—')).replace('{', '{{').replace('}', '}}')
         msg_type = str(it.get('msgType', '—')).replace('{', '{{').replace('}', '}}')
         msg_no = str(it.get('msgNo', '—')).replace('{', '{{').replace('}', '}}')
-        
-        # [修正] 將讀取欄位從 alertAreas 改為 locationDesc
         location_desc_list = it.get('locationDesc')
-        if isinstance(location_desc_list, list) and location_desc_list:
-            areas_str = ", ".join(str(area) for area in location_desc_list)
-        else:
-            areas_str = "—"
+        areas_str = ", ".join(str(area) for area in location_desc_list) if isinstance(location_desc_list, list) and location_desc_list else "—"
         areas = areas_str.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"事件: {identifier} | 類型: {msg_type}#{msg_no}\n"
             f"規模/深度: M{mag_str} / {depth_str} km\n"
             f"時間: {tw_str}（台灣）\n"
-            f"地點: {areas}" # 標籤改為「地點」更符合 locationDesc 的語意
+            f"地點: {areas}"
         )
     return "\n\n".join(lines).strip()
 
@@ -105,7 +84,8 @@ def _parse_significant_earthquakes(obj: dict) -> pd.DataFrame:
         })
     df = pd.DataFrame(rows)
     if not df.empty and "Time" in df.columns:
-        df["Time"] = pd.to_datetime(df["Time"], errors="coerce").dt.tz_convert(TAIPEI_TZ)
+        # [修正] 加入 utc=True 參數，確保所有時間都有 UTC 時區資訊
+        df["Time"] = pd.to_datetime(df["Time"], errors="coerce", utc=True).dt.tz_convert(TAIPEI_TZ)
     return df
 
 def fetch_significant_earthquakes(days: int = 7, limit: int = 5) -> str:
@@ -135,21 +115,25 @@ def fetch_significant_earthquakes(days: int = 7, limit: int = 5) -> str:
         return f"❌ 顯著地震查詢失敗：{e}"
 
 def fetch_latest_significant_earthquake() -> dict | None:
-    if not CWA_API_KEY: raise ValueError("錯誤：尚未設定 CWA_API_KEY Secret。")
-    params = {"Authorization": CWA_API_KEY, "format": "JSON", "limit": 1, "orderby": "OriginTime desc"}
-    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 None
+    try:
+        if not CWA_API_KEY: raise ValueError("錯誤：尚未設定 CWA_API_KEY Secret。")
+        params = {"Authorization": CWA_API_KEY, "format": "JSON", "limit": 1, "orderby": "OriginTime desc"}
+        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 None
 
-    latest_eq_data = df.iloc[0].to_dict()
-    
-    quakes = data.get("records", {}).get("Earthquake", [])
-    if quakes:
-        latest_eq_data["ImageURL"] = quakes[0].get("ReportImageURI")
+        latest_eq_data = df.iloc[0].to_dict()
+        
+        quakes = data.get("records", {}).get("Earthquake", [])
+        if quakes:
+            latest_eq_data["ImageURL"] = quakes[0].get("ReportImageURI")
 
-    if pd.notna(latest_eq_data.get("Time")):
-        latest_eq_data["TimeStr"] = latest_eq_data["Time"].strftime('%Y-%m-%d %H:%M')
+        if pd.notna(latest_eq_data.get("Time")):
+            latest_eq_data["TimeStr"] = latest_eq_data["Time"].strftime('%Y-%m-%d %H:%M')
 
-    return latest_eq_data
+        return latest_eq_data
+    except Exception as e:
+        # 將錯誤傳遞給上層函式，以便在 LINE 上顯示
+        raise e