Update app.py

app.py

@@ -12,7 +12,7 @@ from datetime import datetime, timedelta, timezone
 # -----------------------------
 TAIPEI_TZ = timezone(timedelta(hours=8))
 
-def fmt_dt(dt: datetime) -> str:
+def _fmt(dt: datetime) -> str:
     return dt.strftime("%Y-%m-%dT%H:%M:%S")
 
 def set_time_range(hours=None, days=None):
@@ -24,7 +24,7 @@ def set_time_range(hours=None, days=None):
         t_from = now - timedelta(days=days)
     else:
         t_from = now - timedelta(days=3)
-    return fmt_dt(t_from), fmt_dt(now)
+    return _fmt(t_from), _fmt(now)
 
 # -----------------------------
 # 取 API 資料
@@ -35,167 +35,5 @@ def fetch_reports(time_from, time_to):
     api_key = os.getenv("CWA_API_KEY", "").strip()
     if not api_key:
         raise RuntimeError("請在環境變數設定 CWA_API_KEY")
-    params = {
-        "Authorization": api_key,
-        "timeFrom": time_from,
-        "timeTo": time_to
-    }
-    r = requests.get(API_URL, params=params, timeout=30)
-    r.raise_for_status()
-    return r.json()
-
-# -----------------------------
-# 解析 JSON → DataFrame
-# -----------------------------
-def safe_get(d, *keys, default=None):
-    cur = d
-    for k in keys:
-        if isinstance(cur, dict) and k in cur:
-            cur = cur[k]
-        else:
-            return default
-    return cur
-
-def _to_float(x):
-    try:
-        if x is None or x == "":
-            return None
-        return float(str(x).strip())
-    except Exception:
-        return None
-
-def parse_reports(data):
-    records = data.get("records") or {}
-    quakes = records.get("earthquake") or []
-    rows = []
-    for q in quakes:
-        origin = safe_get(q, "originTime")
-        lat = safe_get(q, "epicenter", "epicenterLat")
-        lon = safe_get(q, "epicenter", "epicenterLon")
-        depth = safe_get(q, "depth")
-        mag = safe_get(q, "magnitude", "magnitudeValue")
-        loc = safe_get(q, "epicenter", "location")
-        url = safe_get(q, "reportURL")
-        rows.append({
-            "OriginTime": origin,
-            "Lat": _to_float(lat),
-            "Lon": _to_float(lon),
-            "Depth_km": _to_float(depth),
-            "Magnitude": _to_float(mag),
-            "Location": loc,
-            "ReportURL": url
-        })
-    df = pd.DataFrame(rows)
-    if not df.empty:
-        df["OriginTime"] = pd.to_datetime(df["OriginTime"], errors="coerce")
-        df = df.sort_values("OriginTime", ascending=False).reset_index(drop=True)
-    return df
-
-# -----------------------------
-# 視覺化
-# -----------------------------
-def plot_trend(df):
-    if df.empty:
-        return None
-    fig, ax = plt.subplots(figsize=(6, 4))
-    ax.scatter(df["OriginTime"], df["Magnitude"])
-    ax.set_xlabel("Origin Time (Taipei)")
-    ax.set_ylabel("Magnitude")
-    ax.grid(True, linestyle="--", alpha=0.4)
-    fig.autofmt_xdate()
-    buf = io.BytesIO()
-    fig.savefig(buf, format="png", dpi=150, bbox_inches="tight")
-    plt.close(fig)
-    buf.seek(0)
-    return buf.getvalue()
-
-def plot_map(df):
-    if df.empty:
-        return None
-    lon_min, lon_max, lat_min, lat_max = 119, 123, 21, 26
-    fig, ax = plt.subplots(figsize=(6, 6))
-    ax.set_xlim(lon_min, lon_max)
-    ax.set_ylim(lat_min, lat_max)
-    mags = df["Magnitude"].fillna(0)
-    sizes = (mags + 2) ** 3
-    ax.scatter(df["Lon"], df["Lat"], s=sizes, alpha=0.6, edgecolor="black")
-    for m in [3, 4, 5, 6]:
-        ax.scatter([], [], s=((m + 2) ** 3), alpha=0.6, edgecolor="black", label=f"M {m}")
-    ax.legend(title="Magnitude")
-    ax.grid(True, linestyle="--", alpha=0.3)
-    buf = io.BytesIO()
-    fig.savefig(buf, format="png", dpi=150, bbox_inches="tight")
-    plt.close(fig)
-    buf.seek(0)
-    return buf.getvalue()
-
-# -----------------------------
-# 主流程
-# -----------------------------
-def df_to_markdown(df, top_n=100):
-    if df.empty:
-        return "（查無資料）"
-    show_cols = ["OriginTime", "Magnitude", "Depth_km", "Lat", "Lon", "Location", "ReportURL"]
-    exist_cols = [c for c in show_cols if c in df.columns]
-    slim = df[exist_cols].head(top_n).copy()
-    if "OriginTime" in slim.columns:
-        slim["OriginTime"] = slim["OriginTime"].dt.tz_localize("UTC").dt.tz_convert(TAIPEI_TZ).dt.strftime("%Y-%m-%d %H:%M:%S %Z")
-    return slim.to_markdown(index=False)
-
-def query_and_render(time_from, time_to, sort_order):
-    try:
-        raw = fetch_reports(time_from, time_to)
-        df = parse_reports(raw)
-        if df.empty:
-            return "（查無資料）", None, None, None
-        if sort_order == "OriginTime (舊→新)":
-            df = df.sort_values("OriginTime", ascending=True).reset_index(drop=True)
-        md = df_to_markdown(df)
-        trend_png = plot_trend(df)
-        map_png = plot_map(df)
-        csv_bytes = df.to_csv(index=False).encode("utf-8-sig")
-        # 建立臨時檔讓 DownloadButton 可以下載
-        tmp = tempfile.NamedTemporaryFile(delete=False, suffix=".csv", prefix="CWA_E-A0015-001_")
-        tmp.write(csv_bytes)
-        tmp.flush()
-        tmp.close()
-        return md, trend_png, map_png, tmp.name
-    except Exception as e:
-        return f"錯誤：{e}", None, None, None
-
-# -----------------------------
-# 介面
-# -----------------------------
-default_from, default_to = set_time_range(days=3)
-
-with gr.Blocks(fill_height=True) as demo:
-    gr.Markdown("## CWA 顯著有感地震報告 (E-A0015-001)\n預設查詢最近 3 天（台北時間）")
-
-    with gr.Column():
-        time_from = gr.Textbox(label="timeFrom yyyy-MM-ddTHH:mm:ss", value=default_from)
-        time_to   = gr.Textbox(label="timeTo yyyy-MM-ddTHH:mm:ss", value=default_to)
-
-        with gr.Row():
-            btn_12h = gr.Button("最近 12 小時")
-            btn_24h = gr.Button("最近 24 小時")
-            btn_3d  = gr.Button("最近 3 天")
-            btn_5d  = gr.Button("最近 5 天")
-
-        sort_dd = gr.Dropdown(choices=["OriginTime (新→舊)", "OriginTime (舊→新)"], value="OriginTime (新→舊)", label="排序")
-
-        run_btn = gr.Button("查詢", variant="primary")
-
-        table_out = gr.Markdown("（尚未查詢）")
-        trend_out = gr.Image(label="趨勢圖", type="numpy")
-        map_out   = gr.Image(label="台灣範圍圖", type="numpy")
-        dl_btn    = gr.DownloadButton(label="下載 CSV")  # 不加 file_name
-
-    btn_12h.click(lambda: set_time_range(hours=12), outputs=[time_from, time_to])
-    btn_24h.click(lambda: set_time_range(hours=24), outputs=[time_from, time_to])
-    btn_3d.click(lambda: set_time_range(days=3), outputs=[time_from, time_to])
-    btn_5d.click(lambda: set_time_range(days=5), outputs=[time_from, time_to])
-
-    run_btn.click(query_and_render, inputs=[time_from, time_to, sort_dd], outputs=[table_out, trend_out, map_out, dl_btn])
-
-if __name__ == "__main__":
-    demo.launch()
+    params = {"Authorization": api_key, "timeFrom": time_from, "timeTo": time_to}
+    r = requests.get(API_URL, params=params, timeout=30