Update app.py

app.py

@@ -1,5 +1,6 @@
+# app.py
 import os
-os.environ["MPLCONFIGDIR"] = "/tmp/matplotlib"
+os.environ["MPLCONFIGDIR"] = "/tmp/matplotlib"  # 避免唯讀目錄警告
 
 import uuid
 import tempfile
@@ -19,7 +20,7 @@ from linebot.v3.webhooks import MessageEvent, TextMessageContent
 import requests
 import pandas as pd
 
-# Matplotlib headless + CJK
+# Matplotlib（無頭）
 import matplotlib
 matplotlib.use("Agg")
 import matplotlib.pyplot as plt
@@ -27,31 +28,138 @@ from matplotlib.colors import Normalize
 import matplotlib.cm as cm
 from matplotlib import font_manager as fm
 
-# ✅ 匯入你剛拆出的模組
-from fetch_cwa_alarm_list import fetch_cwa_alarm_list
+# ──────────────────────────────────────────────────────────────────────────────
+# 1) 嘗試載入「地震預警」外部模組；若不存在就用內建備援版本
+# ──────────────────────────────────────────────────────────────────────────────
+try:
+    from fetch_cwa_alarm_list import fetch_cwa_alarm_list  # 你若放了同名檔案，會用那個
+except Exception:
+    # 內建備援：直接呼叫 CWA API 並格式化輸出
+    CWA_ALARM_API = "https://app-2.cwa.gov.tw/api/v1/earthquake/alarm/list"
+
+    def _parse_cwa_time(s: str):
+        """回傳(台灣時間, UTC)。若無時區，視為台灣時間(UTC+8)。"""
+        if not s:
+            return ("未知", "未知")
+        try:
+            if "T" in s or s.endswith("Z") or "+" in s:
+                dt = datetime.fromisoformat(s.replace("Z", "+00:00"))
+            else:
+                dt = datetime.strptime(s, "%Y-%m-%d %H:%M:%S")
+                dt = dt.replace(tzinfo=timezone(timedelta(hours=8)))
+            tw = dt.astimezone(timezone(timedelta(hours=8))).strftime("%Y-%m-%d %H:%M")
+            utc = dt.astimezone(timezone.utc).strftime("%Y-%m-%d %H:%M")
+            return (tw, utc)
+        except Exception:
+            return (s, "未知")
+
+    def fetch_cwa_alarm_list(limit: int = 5) -> str:
+        try:
+            r = requests.get(CWA_ALARM_API, timeout=10)
+            r.raise_for_status()
+            payload = r.json()
+        except Exception as e:
+            return f"❌ 地震預警查詢失敗：{e}"
+
+        items = None
+        if isinstance(payload, dict):
+            items = payload.get("data") or payload.get("records") or payload.get("list") or payload.get("items")
+        if items is None and isinstance(payload, list):
+            items = payload
+        if not items:
+            return "✅ 目前沒有地震預警。"
+
+        # 依 originTime 新→舊
+        def _key(it):
+            s = it.get("originTime") or ""
+            try:
+                if "T" in s or s.endswith("Z") or "+" in s:
+                    dt = datetime.fromisoformat(s.replace("Z", "+00:00"))
+                else:
+                    dt = datetime.strptime(s, "%Y-%m-%d %H:%M:%S").replace(
+                        tzinfo=timezone(timedelta(hours=8))
+                    )
+                return dt.astimezone(timezone.utc)
+            except Exception:
+                return datetime.min.replace(tzinfo=timezone.utc)
+
+        try:
+            items = sorted(items, key=_key, reverse=True)
+        except Exception:
+            pass
+
+        def _num(x):
+            xs = str(x)
+            ok = xs.replace(".", "", 1).replace("-", "", 1).isdigit()
+            return float(xs) if ok else None
+
+        lines = ["🚨 地震預警（最新）:", "-" * 20]
+        for it in items[:limit]:
+            identifier = it.get("identifier") or it.get("eventId") or it.get("id") or "—"
+            status = it.get("status") or "—"
+            msg_type = it.get("msgType") or "—"
+            msg_no = it.get("msgNo") or it.get("msgSeq") or "—"
+
+            mag = _num(it.get("magnitudeValue") or it.get("magnitude") or it.get("ml") or it.get("mw"))
+            mag_str = f"{mag:.1f}" if mag is not None else "—"
+
+            depth = _num(it.get("depth"))
+            depth_str = f"{depth:.0f}" if depth is not None else "—"
+
+            lat = _num(it.get("epicenterLat") or it.get("latitude") or it.get("lat"))
+            lon = _num(it.get("epicenterLon") or it.get("longitude") or it.get("lon"))
+            lat_str = f"{lat:.2f}" if lat is not None else "—"
+            lon_str = f"{lon:.2f}" if lon is not None else "—"
+
+            origin = it.get("originTime") or ""
+            tw_str, utc_str = _parse_cwa_time(origin)
+
+            areas = it.get("locationDesc") or it.get("areas") or it.get("alertAreas")
+            if isinstance(areas, list):
+                areas_txt = "、".join(str(a) for a in areas if a)
+            elif isinstance(areas, str):
+                areas_txt = areas
+            else:
+                areas_txt = "���"
+
+            lines.append(
+                f"事件: {identifier} | 狀態: {status} | 類型: {msg_type}#{msg_no}\n"
+                f"震級/深度: M{mag_str} / {depth_str} km\n"
+                f"震中: lat {lat_str}, lon {lon_str}\n"
+                f"時間: {tw_str}（台灣） / {utc_str}（UTC）\n"
+                f"預警地區: {areas_txt}"
+            )
+            lines.append("")
+
+        if len(items) > limit:
+            lines.append(f"... 另有 {len(items) - limit} 筆。")
+        return "\n".join(lines).strip()
 
-# 設定 CJK 字型（如有）
-possible_fonts = [
+# ──────────────────────────────────────────────────────────────────────────────
+# 2) 中文字型（若容器有 Noto/WenQuanYi 之類會自動套用）
+# ──────────────────────────────────────────────────────────────────────────────
+for fp in [
     "/usr/share/fonts/opentype/noto/NotoSansCJK-Regular.ttc",
     "/usr/share/fonts/truetype/noto/NotoSansCJK-Regular.ttc",
+    "/usr/share/fonts/truetype/wqy/wqy-microhei.ttc",
     "/usr/share/fonts/truetype/arphic/ukai.ttc",
-    "/usr/share/fonts/truetype/wqy/wqy-microhei.ttc"
-]
-for font_path in possible_fonts:
-    if os.path.exists(font_path):
-        font_prop = fm.FontProperties(fname=font_path)
-        matplotlib.rcParams["font.family"] = font_prop.get_name()
+]:
+    if os.path.exists(fp):
+        matplotlib.rcParams["font.family"] = fm.FontProperties(fname=fp).get_name()
         break
 
+# ──────────────────────────────────────────────────────────────────────────────
+# 3) 基本設定
+# ──────────────────────────────────────────────────────────────────────────────
 CHANNEL_ACCESS_TOKEN = os.getenv("CHANNEL_ACCESS_TOKEN")
 CHANNEL_SECRET = os.getenv("CHANNEL_SECRET")
 
-# 自動偵測 HF Space 公網位址
+# 公網址自動偵測（HF Spaces）
 HF_SPACE_URL = os.getenv("SPACEURL")
 if not HF_SPACE_URL:
-    space_id = os.getenv("SPACE_ID")  # username/space-name
-    if space_id and "/" in space_id:
-        a, n = space_id.split("/", 1)
+    sid = os.getenv("SPACE_ID")  # 形如 user/space
+    if sid and "/" in sid:
+        a, n = sid.split("/", 1)
         HF_SPACE_URL = f"https://{a.replace('_','-')}-{n.replace('_','-')}.hf.space"
     else:
         HF_SPACE_URL = ""
@@ -63,6 +171,9 @@ app = Flask(__name__)
 configuration = Configuration(access_token=CHANNEL_ACCESS_TOKEN)
 handler = WebhookHandler(CHANNEL_SECRET)
 
+# ──────────────────────────────────────────────────────────────────────────────
+# 4) 工具函式 & 路由
+# ──────────────────────────────────────────────────────────────────────────────
 @app.route("/", methods=["GET"])
 def home():
     return "LINE Bot Server is Running"
@@ -75,7 +186,6 @@ def healthz():
 def serve_static(filename):
     return send_from_directory(STATIC_DIR, filename)
 
-# ---------- USGS ----------
 USGS_API_BASE_URL = "https://earthquake.usgs.gov/fdsnws/event/1/query"
 
 def _iso(dt: datetime) -> str:
@@ -137,7 +247,6 @@ def fetch_taiwan_df_this_year(min_mag=5.0) -> pd.DataFrame | str:
     except Exception as e:
         return f"❌ 查詢失敗: {e}"
 
-# ---------- 圖像 ----------
 def create_and_save_map(df: pd.DataFrame) -> str:
     fig, ax = plt.subplots(figsize=(9, 6), dpi=150)
     ax.set_xlim(118.5, 123.5)
@@ -168,7 +277,9 @@ def create_and_save_map(df: pd.DataFrame) -> str:
 def _base_url_for_images() -> str:
     return HF_SPACE_URL.rstrip("/") if HF_SPACE_URL else request.url_root.rstrip("/")
 
-# ---------- LINE Webhook ----------
+# ──────────────────────────────────────────────────────────────────────────────
+# 5) LINE Webhook
+# ──────────────────────────────────────────────────────────────────────────────
 @app.route("/callback", methods=["POST"])
 def callback():
     signature = request.headers.get("X-Line-Signature")
@@ -185,7 +296,7 @@ def handle_message(event):
     with ApiClient(configuration) as api_client:
         line_bot_api = MessagingApi(api_client)
 
-        # 地震預警（使用外部模組）
+        # 地震預警（CWA）
         if "地震預警" in user_message:
             reply_text = fetch_cwa_alarm_list(limit=5)
             line_bot_api.reply_message_with_http_info(
@@ -193,6 +304,7 @@ def handle_message(event):
             )
             return
 
+        # 臺灣地震畫圖
         if ("臺灣地震畫圖" in user_message) or ("台灣地震畫圖" in user_message):
             result = fetch_taiwan_df_this_year()
             if isinstance(result, pd.DataFrame):
@@ -210,14 +322,15 @@ def handle_message(event):
             line_bot_api.reply_message_with_http_info(reply)
             return
 
+        # 說明
         if user_message == "/help":
             text = (
-                "📖 地震預警 dayichen 指令說明\n\n"
+                "📖 地震預警 dayichen 指令\n\n"
                 "➡️ /help\n"
-                "➡️ 地震 / quake\n"
-                "➡️ 臺灣地震 / 台灣地震\n"
-                "➡️ 臺灣地震畫圖 / 台灣地震畫圖\n"
-                "➡️ 地震預警（中央氣象署最新 5 筆）\n"
+                "➡️ 地震 / quake（全球近24小時，含日期時間）\n"
+                "➡️ 臺灣地震 / 台灣地震（今年台灣區域清單）\n"
+                "➡️ 臺灣地震畫圖 / 台灣地震畫圖（今年台灣區域分佈圖）\n"
+                "➡️ 地震預警（CWA最新5筆）\n"
                 "➡️ 你好"
             )
             line_bot_api.reply_message_with_http_info(
@@ -225,6 +338,7 @@ def handle_message(event):
             )
             return
 
+        # 台灣清單
         if ("臺灣地震" in user_message) or ("台灣地震" in user_message):
             result = fetch_taiwan_df_this_year()
             if isinstance(result, pd.DataFrame):
@@ -243,6 +357,7 @@ def handle_message(event):
             )
             return
 
+        # 全球 24 小時
         if ("地震" in user_message) or ("quake" in user_message):
             reply_text = fetch_global_last24h_text()
             line_bot_api.reply_message_with_http_info(
@@ -250,8 +365,12 @@ def handle_message(event):
             )
             return
 
+        # 招呼
         if ("你好" in user_message) or ("hi" in user_message):
             line_bot_api.reply_message_with_http_info(
-                ReplyMessageRequest(reply_token=event.reply_token, messages=[TextMessage(text="👋 你好！輸入 /help 查看指令。")])
+                ReplyMessageRequest(
+                    reply_token=event.reply_token,
+                    messages=[TextMessage(text="👋 你好！輸入 /help 查看指令。")]
+                )
             )
             return