Update app.py

app.py

@@ -1,4 +1,6 @@
+# app.py
 import json
+import re
 import tempfile
 from datetime import datetime, timedelta
 from dateutil import tz
@@ -18,20 +20,55 @@ from grafanalib.core import (
 
 TAIPEI = tz.gettz("Asia/Taipei")
 
+# -----------------------------
+# Google Drive 連結處理
+# -----------------------------
+DRIVE_PRESETS = [
+    "https://drive.google.com/file/d/15yZ4QicICKZCnX6vjcD9JNXjnJmMFJD4/view?usp=drivesdk",
+    "https://drive.google.com/file/d/1dqazYh_YzNNMbkUpgLRKSE9Y3ioPhtFu/view?usp=drivesdk",
+    "https://drive.google.com/file/d/1A23f4q8DXHpoRIN5UQsDd6eM8jJ_Ruf8/view?usp=drivesdk",
+]
+
+def normalize_drive_url(url: str) -> str:
+    """
+    接受 Google Drive / Google Sheets 各式分享連結，回傳可直接給 pandas 讀取 CSV 的 URL。
+    規則：
+    - Sheets: .../spreadsheets/d/<ID>/edit → .../export?format=csv
+    - Drive File: .../file/d/<ID>/view → https://drive.google.com/uc?export=download&id=<ID>
+    其他 http(s) 連結原樣返回。
+    """
+    if not isinstance(url, str) or not url.strip():
+        raise ValueError("請提供有效的 Google Drive / Google Sheets 連結")
+
+    url = url.strip()
+
+    # Sheets
+    m = re.search(r"https://docs\.google\.com/spreadsheets/d/([a-zA-Z0-9-_]+)", url)
+    if m:
+        sheet_id = m.group(1)
+        return f"https://docs.google.com/spreadsheets/d/{sheet_id}/export?format=csv"
+
+    # Drive file
+    m = re.search(r"https://drive\.google\.com/file/d/([a-zA-Z0-9-_]+)/", url)
+    if m:
+        file_id = m.group(1)
+        return f"https://drive.google.com/uc?export=download&id={file_id}"
+
+    # 其他：若已經是 export?format=csv 或一般 http(s) 連結，原樣回傳
+    return url
+
+
 # -----------------------------
 # Demo / Data loading
 # -----------------------------
 def make_demo_dataframe() -> pd.DataFrame:
-    """隨機示範資料：含經緯度"""
+    """隨機示範資料：含經緯度 + pid"""
     t0 = datetime.now(tz=TAIPEI) - timedelta(minutes=60)
     times = [t0 + timedelta(minutes=i) for i in range(61)]
     amp = np.random.rand(len(times))
     cnt = np.random.randint(0, 11, size=len(times))
-
-    # 台灣範圍大致經緯度
     lats = np.random.uniform(21.8, 25.3, size=len(times))
     lons = np.random.uniform(120.0, 122.0, size=len(times))
-
     df = pd.DataFrame({
         "time": times,
         "amplitude": amp,
@@ -39,72 +76,61 @@ def make_demo_dataframe() -> pd.DataFrame:
         "lat": lats,
         "lon": lons
     })
-    df["pid"] = np.arange(len(df))  # 點位 ID
+    df["pid"] = np.arange(len(df))
     return df
 
 
-def load_csv(file: gr.File | None) -> pd.DataFrame:
-    """讀 CSV（需含時間欄），回傳整理好的 DataFrame"""
-    df = pd.read_csv(file.name)
+def _finalize_time(df: pd.DataFrame) -> pd.DataFrame:
+    """確保 time 欄位有時區、排序"""
     time_col = next((c for c in ["time", "timestamp", "datetime", "date"] if c in df.columns), None)
     if time_col is None:
-        raise ValueError("CSV 檔需包含時間欄位")
+        raise ValueError("資料需包含時間欄位（time/timestamp/datetime/date 其一）")
     df[time_col] = pd.to_datetime(df[time_col])
     df = df.rename(columns={time_col: "time"})
     if getattr(df["time"].dt, "tz", None) is None:
         df["time"] = df["time"].dt.tz_localize(TAIPEI)
     else:
         df["time"] = df["time"].dt.tz_convert(TAIPEI)
+    return df.sort_values("time").reset_index(drop=True)
 
-    # 若無 lat/lon，給預設隨機（避免地圖空白）
+
+def load_csv(file: gr.File | None) -> pd.DataFrame:
+    """讀上傳 CSV"""
+    df = pd.read_csv(file.name)
+    df = _finalize_time(df)
+    # 若無 lat/lon，補隨機（避免地圖空白）
     if "lat" not in df.columns or "lon" not in df.columns:
         n = len(df)
         df["lat"] = np.random.uniform(21.8, 25.3, size=n)
         df["lon"] = np.random.uniform(120.0, 122.0, size=n)
-
     if "pid" not in df.columns:
         df["pid"] = np.arange(len(df))
+    return df
 
-    return df.sort_values("time").reset_index(drop=True)
-
-
-def load_drive_csv(sheet_url: str) -> pd.DataFrame:
-    """從 Google Drive 試算表讀資料"""
-    if not sheet_url:
-        raise ValueError("請提供 Google Sheets 連結")
-    if "export?format=csv" not in sheet_url:
-        sheet_url = sheet_url.split("/edit")[0] + "/export?format=csv"
-
-    df = pd.read_csv(sheet_url)
-    time_col = next((c for c in ["time", "timestamp", "datetime", "date"] if c in df.columns), None)
-    if time_col is None:
-        raise ValueError("Google Drive CSV 檔需包含時間欄位")
-    df[time_col] = pd.to_datetime(df[time_col])
-    df = df.rename(columns={time_col: "time"})
-    if getattr(df["time"].dt, "tz", None) is None:
-        df["time"] = df["time"].dt.tz_localize(TAIPEI)
-    else:
-        df["time"] = df["time"].dt.tz_convert(TAIPEI)
 
-    # 若無 lat/lon，給預設隨機（避免地圖空白）
+def load_drive_csv(sheet_or_file_url: str) -> pd.DataFrame:
+    """從 Google Sheets 或 Google Drive File 讀 CSV"""
+    url = normalize_drive_url(sheet_or_file_url)
+    df = pd.read_csv(url)
+    df = _finalize_time(df)
     if "lat" not in df.columns or "lon" not in df.columns:
         n = len(df)
         df["lat"] = np.random.uniform(21.8, 25.3, size=n)
         df["lon"] = np.random.uniform(120.0, 122.0, size=n)
-
     if "pid" not in df.columns:
         df["pid"] = np.arange(len(df))
-
-    return df.sort_values("time").reset_index(drop=True)
+    return df
 
 
 def load_data(source: str, file: gr.File | None = None, sheet_url: str = "") -> pd.DataFrame:
-    """依來源載入資料"""
+    """依來源載入資料：demo / upload / drive"""
     if source == "drive":
+        if not sheet_url:
+            raise ValueError("請選擇或輸入 Google 連結")
         return load_drive_csv(sheet_url)
     elif source == "upload":
         if file is None:
-            raise ValueError("請上傳檔案")
+            raise ValueError("請上傳 CSV 檔")
         return load_csv(file)
     else:
         return make_demo_dataframe()
@@ -232,7 +258,6 @@ def render_rolling(df, col, window=5):
 # Folium helpers (map + legend)
 # -----------------------------
 def _to_hex_color(value: float, cmap=cm.viridis) -> str:
-    """把 0~1 數值轉成 hex 顏色"""
     rgba = cmap(value)
     return "#{:02x}{:02x}{:02x}".format(int(rgba[0]*255), int(rgba[1]*255), int(rgba[2]*255))
 
@@ -244,23 +269,19 @@ def render_map_folium(
     cmap_name: str = "viridis",
     tiles: str = "OpenStreetMap",
 ) -> str:
-    """用 folium 建立互動地圖，帶顏色圖例與 #ID 提示"""
     center_lat, center_lon = df["lat"].mean(), df["lon"].mean()
     m = folium.Map(location=[center_lat, center_lon], zoom_start=7, tiles=tiles)
 
     vmin, vmax = df[value_col].min(), df[value_col].max()
     cmap = getattr(cm, cmap_name)
 
-    # 建立 folium colormap (legend)
     colormap = bcm.LinearColormap(
         [_to_hex_color(i, cmap) for i in np.linspace(0, 1, 256)],
-        vmin=vmin,
-        vmax=vmax,
+        vmin=vmin, vmax=vmax
     )
     colormap.caption = f"{value_col} (color scale)"
     colormap.add_to(m)
 
-    # 加點資料（彈窗含 #ID，方便對應右側選擇器）
     for _, row in df.iterrows():
         norm_val = (row[value_col] - vmin) / (vmax - vmin + 1e-9)
         popup_html = (
@@ -288,7 +309,6 @@ def render_map_folium(
 # Detail helpers
 # -----------------------------
 def make_point_choices(df: pd.DataFrame) -> list[str]:
-    """建立下拉清單文字，例如: '#23 | 12:34:56 | amp=0.42'"""
     labels = []
     for _, r in df.iterrows():
         t = pd.to_datetime(r["time"]).strftime("%H:%M:%S")
@@ -297,7 +317,6 @@ def make_point_choices(df: pd.DataFrame) -> list[str]:
 
 
 def pick_detail(df: pd.DataFrame, choice: str) -> pd.DataFrame:
-    """依下拉選擇的 '#ID | ...' 找出對應列"""
     if not choice:
         return pd.DataFrame()
     try:
@@ -332,35 +351,29 @@ def pipeline(source, file, sheet_url, series_choice, dual_axis, rolling_window,
     map_html = render_map_folium(df, value_col=chosen[0], size_col="count",
                                  cmap_name=cmap_choice, tiles=tiles_choice)
 
-    # 準備點位下拉與預設詳細資料
     point_choices = make_point_choices(df)
     default_choice = point_choices[0] if point_choices else ""
     detail_df = pick_detail(df, default_choice)
 
-    # 也輸出 demo.csv
     demo_df = make_demo_dataframe()
     with tempfile.NamedTemporaryFile(delete=False, suffix=".csv", mode="w", encoding="utf-8") as f:
         demo_df.to_csv(f, index=False)
         demo_csv_path = f.name
 
     return (
-        fig1, fig2, fig3, map_html,               # 圖/地圖/JSON
-        dash_json_str, json_path, df_with_roll,   # JSON 內容/下載、資料預覽
-        demo_csv_path,                            # demo.csv 下載
-        gr.Dropdown(choices=point_choices, value=default_choice),  # 點位下拉
-        detail_df,                                # 詳細資料
+        fig1, fig2, fig3, map_html,
+        dash_json_str, json_path, df_with_roll,
+        demo_csv_path,
+        gr.Dropdown(choices=point_choices, value=default_choice),
+        detail_df,
     )
 
 
 def regenerate_demo(series_choice, dual_axis, rolling_window, cmap_choice, tiles_choice, current_choice):
-    # 重新隨機 demo，並嘗試保留相同 index 的選擇（若存在）
-    result = pipeline("demo", None, "", series_choice, dual_axis, rolling_window, cmap_choice, tiles_choice)
-    # result 的倒數二個回傳是 Dropdown 與 detail_df，我們已在 pipeline 設好預設
-    return result
+    return pipeline("demo", None, "", series_choice, dual_axis, rolling_window, cmap_choice, tiles_choice)
 
 
 def update_detail(df: pd.DataFrame, choice: str):
-    """使用目前資料與下拉選擇更新詳細資料表"""
     return pick_detail(df, choice)
 
 
@@ -368,11 +381,14 @@ def update_detail(df: pd.DataFrame, choice: str):
 # UI
 # -----------------------------
 with gr.Blocks(theme=gr.themes.Soft()) as demo:
-    gr.Markdown("## Grafana-like Demo + Folium Map + Colormap + Tiles + Legend + 點位詳情")
+    gr.Markdown("## Grafana-like Demo + Folium Map（支援 Google Drive / Sheets 連結與預設來源）")
 
     source_radio = gr.Radio(["upload", "drive", "demo"], label="資料來源", value="demo")
-    file_in = gr.File(label="上傳 CSV（僅在選擇 upload 時使用）", file_types=[".csv"])
-    sheet_url_box = gr.Textbox(label="Google Sheets 連結", value="")
+    file_in = gr.File(label="上傳 CSV（選 upload 時使用）", file_types=[".csv"])
+
+    with gr.Row():
+        preset_dd = gr.Dropdown(label="Google 預設來源（你提供的 3 個連結）", choices=DRIVE_PRESETS, value=DRIVE_PRESETS[0])
+        sheet_url_box = gr.Textbox(label="Google 連結（可自貼）", value=DRIVE_PRESETS[0])
 
     series_multiselect = gr.CheckboxGroup(label="數值欄位", choices=[])
     dual_axis_chk = gr.Checkbox(label="第二面板啟用雙軸", value=False)
@@ -399,23 +415,28 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
     demo_csv_file = gr.File(label="下載示範資料 demo.csv")
     df_view = gr.Dataframe(label="資料預覽（含 rolling）", wrap=True)
 
-    gr.Markdown("### 🔎 點位詳情（在地圖彈窗看到的 **#ID** 可對應到這裡）")
+    gr.Markdown("### 🔎 點位詳情（對應地圖彈窗中的 #ID）")
     point_selector = gr.Dropdown(label="選擇點位（#ID | 時間 | 值）", choices=[], value=None)
     detail_view = gr.Dataframe(label="選取點詳細資料", wrap=True)
 
+    # 預設下拉 → 同步到文字框，方便改
+    def use_preset(preset_url):
+        return normalize_drive_url(preset_url) if preset_url else ""
+
+    preset_dd.change(use_preset, inputs=[preset_dd], outputs=[sheet_url_box])
+
     def probe_columns(source, file, sheet_url):
         df = load_data(source, file, sheet_url)
         numeric_cols = [c for c in df.columns if c not in ["time", "lat", "lon", "pid"] and pd.api.types.is_numeric_dtype(df[c])]
-        # 初步資料預覽也回給前端
         return gr.CheckboxGroup(choices=numeric_cols, value=numeric_cols[:2]), df
 
     source_radio.change(probe_columns, inputs=[source_radio, file_in, sheet_url_box], outputs=[series_multiselect, df_view])
     file_in.change(probe_columns, inputs=[source_radio, file_in, sheet_url_box], outputs=[series_multiselect, df_view])
     sheet_url_box.change(probe_columns, inputs=[source_radio, file_in, sheet_url_box], outputs=[series_multiselect, df_view])
+    preset_dd.change(probe_columns, inputs=[source_radio, file_in, sheet_url_box], outputs=[series_multiselect, df_view])
 
-    # 初始載入 demo
     demo.load(
-        lambda: pipeline("demo", None, "", [], False, "5", "viridis", "OpenStreetMap"),
+        lambda: pipeline("drive", None, DRIVE_PRESETS[0], [], False, "5", "viridis", "OpenStreetMap"),
         inputs=None,
         outputs=[
             plot1, plot2, plot3, map_out,
@@ -425,7 +446,6 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
         ]
     )
 
-    # 產生與重新產生
     run_btn.click(
         pipeline,
         inputs=[source_radio, file_in, sheet_url_box, series_multiselect, dual_axis_chk, rolling_dd, cmap_dd, tiles_dd],
@@ -448,10 +468,9 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
         ]
     )
 
-    # 當使用者從下拉選擇點位 → 更新詳細資料
     point_selector.change(
         update_detail,
-        inputs=[df_view, point_selector],  # df_view 目前已包含最新資料
+        inputs=[df_view, point_selector],
         outputs=[detail_view]
     )