Update app.py

app.py

@@ -4,6 +4,7 @@ import re
 import tempfile
 from datetime import datetime, timedelta
 from dateutil import tz
+import time
 
 import gradio as gr
 import pandas as pd
@@ -59,12 +60,15 @@ def normalize_drive_url(url: str) -> str:
 
 
 # -----------------------------
-# Demo / Data loading
+# Demo / Data loading with dynamic update
 # -----------------------------
-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)]
+def make_demo_dataframe(last_time=None) -> pd.DataFrame:
+    """隨機示範資料：含經緯度 + pid，模擬實時更新"""
+    if last_time is None:
+        last_time = datetime.now(tz=TAIPEI) - timedelta(minutes=60)
+    else:
+        last_time = last_time + timedelta(minutes=1)  # 模擬每分鐘新增數據
+    times = [last_time + 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))
@@ -77,7 +81,7 @@ def make_demo_dataframe() -> pd.DataFrame:
         "lon": lons
     })
     df["pid"] = np.arange(len(df))
-    return df
+    return df, last_time
 
 
 def _finalize_time(df: pd.DataFrame) -> pd.DataFrame:
@@ -128,18 +132,20 @@ def load_drive_csv(sheet_or_file_url: str) -> pd.DataFrame:
         raise ValueError(f"Google 連結載入失敗：{str(e)}")
 
 
-def load_data(source: str, file: gr.File | None = None, sheet_url: str = "") -> pd.DataFrame:
-    """依來源載入資料：demo / upload / drive"""
+def load_data(source: str, file: gr.File | None = None, sheet_url: str = "", last_time=None) -> tuple[pd.DataFrame, datetime]:
+    """依來源載入資料：demo / upload / drive，支援動態更新"""
     if source == "drive":
         if not sheet_url:
             raise ValueError("請選擇 Google 連結")
-        return load_drive_csv(sheet_url)
+        df = load_drive_csv(sheet_url)
+        return df, None
     elif source == "upload":
         if file is None:
             raise ValueError("請上傳 CSV 檔")
-        return load_csv(file)
+        df = load_csv(file)
+        return df, None
     else:
-        return make_demo_dataframe()
+        return make_demo_dataframe(last_time)
 
 
 # -----------------------------
@@ -434,11 +440,11 @@ def pick_detail(df: pd.DataFrame, choice: str) -> pd.DataFrame:
 
 
 # -----------------------------
-# Main pipeline
+# Main pipeline with dynamic update
 # -----------------------------
-def pipeline(source, file, sheet_url, series_choice, dual_axis, rolling_window, cmap_choice, tiles_choice, start_time, end_time, show_heatmap):
+def pipeline(source, file, sheet_url, series_choice, dual_axis, rolling_window, cmap_choice, tiles_choice, start_time, end_time, show_heatmap, last_time=None):
     try:
-        df = load_data(source, file, sheet_url)
+        df, new_last_time = load_data(source, file, sheet_url, last_time)
         df = filter_data(df, start_time, end_time)  # 新增過濾
         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])]
         chosen = [c for c in (series_choice or numeric_cols[:2]) if c in numeric_cols]
@@ -465,7 +471,7 @@ def pipeline(source, file, sheet_url, series_choice, dual_axis, rolling_window,
         default_choice = point_choices[0] if point_choices else ""
         detail_df = pick_detail(df, default_choice)
 
-        demo_df = make_demo_dataframe()
+        demo_df = make_demo_dataframe()[0]  # 只取 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
@@ -476,7 +482,8 @@ def pipeline(source, file, sheet_url, series_choice, dual_axis, rolling_window,
             demo_csv_path,
             gr.Dropdown(choices=point_choices, value=default_choice),
             detail_df,
-            ""  # 錯誤訊息清空
+            "",  # 錯誤訊息清空
+            new_last_time
         )
     except Exception as e:
         return (
@@ -485,12 +492,13 @@ def pipeline(source, file, sheet_url, series_choice, dual_axis, rolling_window,
             None,
             gr.Dropdown(choices=[], value=None),
             pd.DataFrame(),
-            str(e)
+            str(e),
+            last_time
         )
 
 
-def regenerate_demo(series_choice, dual_axis, rolling_window, cmap_choice, tiles_choice, current_choice, start_time, end_time, show_heatmap):
-    return pipeline("demo", None, "", series_choice, dual_axis, rolling_window, cmap_choice, tiles_choice, start_time, end_time, show_heatmap)
+def regenerate_demo(series_choice, dual_axis, rolling_window, cmap_choice, tiles_choice, current_choice, start_time, end_time, show_heatmap, last_time):
+    return pipeline("demo", None, "", series_choice, dual_axis, rolling_window, cmap_choice, tiles_choice, start_time, end_time, show_heatmap, last_time)
 
 
 def update_detail(df: pd.DataFrame, choice: str):
@@ -498,10 +506,10 @@ def update_detail(df: pd.DataFrame, choice: str):
 
 
 # -----------------------------
-# UI 優化：使用 Tab 分頁、添加錯誤顯示、時間過濾、熱圖選項、優化圖表佈局
+# UI 優化：添加動態更新按鈕和間隔更新
 # -----------------------------
 with gr.Blocks(theme=gr.themes.Soft()) as demo:
-    gr.Markdown("## 優化版 Grafana-like Demo + Folium Map（支援 Google Drive / Sheets，新增熱圖與 Gauge）")
+    gr.Markdown("## 動態時間序列 - Grafana-like Demo + Folium Map（支援 Google Drive / Sheets，新增熱圖與 Gauge）")
 
     with gr.Row():
         with gr.Column(scale=1):
@@ -531,7 +539,8 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
 
     with gr.Row():
         run_btn = gr.Button("產生 Dashboard", scale=1)
-        regen_btn = gr.Button("🔁 重新產生示範資料", scale=1)
+        update_btn = gr.Button("手動更新數據", scale=1)
+        interval = gr.Slider(5, 60, value=10, step=5, label="自動更新間隔 (秒)")
 
     error_msg = gr.Markdown(value="", label="錯誤訊息", visible=True)
 
@@ -568,7 +577,7 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
     def probe_columns(source, file, preset_url, start_time, end_time):
         sheet_url = preset_url if source == "drive" else ""
         try:
-            df = load_data(source, file, sheet_url)
+            df, _ = load_data(source, file, sheet_url)
             df = filter_data(df, start_time, end_time)
             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, ""
@@ -590,35 +599,61 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
             json_box, json_file, df_view,
             demo_csv_file,
             point_selector, detail_view,
-            error_msg
+            error_msg,
+            gr.State(value=None)
         ]
     )
 
-    # 產生 / 重新產生
+    # 產生 / 重新產生 / 動態更新
     run_btn.click(
         pipeline,
-        inputs=[source_radio, file_in, preset_dd, series_multiselect, dual_axis_chk, rolling_dd, cmap_dd, tiles_dd, start_time_in, end_time_in, heatmap_chk],
+        inputs=[source_radio, file_in, preset_dd, series_multiselect, dual_axis_chk, rolling_dd, cmap_dd, tiles_dd, start_time_in, end_time_in, heatmap_chk, gr.State(value=None)],
         outputs=[
             plot1, plot2, plot3, plot4, map_out,
             json_box, json_file, df_view,
             demo_csv_file,
             point_selector, detail_view,
-            error_msg
+            error_msg,
+            gr.State(value=None)
         ]
     )
 
-    regen_btn.click(
-        regenerate_demo,
-        inputs=[series_multiselect, dual_axis_chk, rolling_dd, cmap_dd, tiles_dd, point_selector, start_time_in, end_time_in, heatmap_chk],
+    update_btn.click(
+        pipeline,
+        inputs=[source_radio, file_in, preset_dd, series_multiselect, dual_axis_chk, rolling_dd, cmap_dd, tiles_dd, start_time_in, end_time_in, heatmap_chk, gr.State()],
         outputs=[
             plot1, plot2, plot3, plot4, map_out,
             json_box, json_file, df_view,
             demo_csv_file,
             point_selector, detail_view,
-            error_msg
+            error_msg,
+            gr.State()
         ]
     )
 
+    interval.change(
+        fn=lambda x: gr.update(),
+        inputs=[interval],
+        outputs=[]
+    )
+
+    demo.load(
+        None,
+        _js="""
+        () => {
+            function update() {
+                setTimeout(() => {
+                    document.querySelector('button[aria-label="手動更新數據"]').click();
+                    update();
+                }, interval * 1000);
+            }
+            const interval = """ + str(10) + """; // 初始間隔
+            update();
+        }
+        """,
+        _js_args=[interval]
+    )
+
     point_selector.change(
         update_detail,
         inputs=[df_view, point_selector],