Update app.py

app.py

@@ -93,30 +93,36 @@ def _finalize_time(df: pd.DataFrame) -> pd.DataFrame:
 
 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
+    try:
+        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
+    except Exception as e:
+        raise ValueError(f"CSV 載入失敗：{str(e)}")
 
 
 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
+    try:
+        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
+    except Exception as e:
+        raise ValueError(f"Google 連結載入失敗：{str(e)}")
 
 
 def load_data(source: str, file: gr.File | None = None, sheet_url: str = "") -> pd.DataFrame:
@@ -133,6 +139,18 @@ def load_data(source: str, file: gr.File | None = None, sheet_url: str = "") ->
         return make_demo_dataframe()
 
 
+# -----------------------------
+# 新功能：資料過濾
+# -----------------------------
+def filter_data(df: pd.DataFrame, start_time: str, end_time: str) -> pd.DataFrame:
+    """根據時間範圍過濾資料"""
+    if start_time:
+        df = df[df["time"] >= pd.to_datetime(start_time).tz_localize(TAIPEI)]
+    if end_time:
+        df = df[df["time"] <= pd.to_datetime(end_time).tz_localize(TAIPEI)]
+    return df
+
+
 # -----------------------------
 # grafanalib JSON builder
 # -----------------------------
@@ -266,6 +284,8 @@ def render_map_folium(
     cmap_name: str = "viridis",
     tiles: str = "OpenStreetMap",
 ) -> str:
+    if df.empty:
+        return "<p>無資料可顯示地圖</p>"
     center_lat, center_lon = df["lat"].mean(), df["lon"].mean()
     m = folium.Map(location=[center_lat, center_lon], zoom_start=7, tiles=tiles)
 
@@ -328,46 +348,60 @@ def pick_detail(df: pd.DataFrame, choice: str) -> pd.DataFrame:
 # -----------------------------
 # Main pipeline
 # -----------------------------
-def pipeline(source, file, sheet_url, series_choice, dual_axis, rolling_window, cmap_choice, tiles_choice):
-    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])]
-    chosen = [c for c in (series_choice or numeric_cols[:2]) if c in numeric_cols]
-    if not chosen:
-        chosen = numeric_cols[:2]
-
-    dash_json = build_grafanalib_dashboard(chosen, bool(dual_axis), int(rolling_window))
-    dash_json_str = json.dumps(dash_json, ensure_ascii=False, indent=2, default=str)
-    with tempfile.NamedTemporaryFile(delete=False, suffix=".json", mode="w", encoding="utf-8") as f:
-        f.write(dash_json_str)
-        json_path = f.name
-
-    fig1 = render_line(df, chosen[0])
-    fig2 = render_bar_or_dual(df, chosen[1], chosen[0], bool(dual_axis)) if len(chosen) > 1 else plt.figure()
-    fig3, df_with_roll = render_rolling(df.copy(), chosen[0], int(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_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,
-        dash_json_str, json_path, df_with_roll,
-        demo_csv_path,
-        gr.Dropdown(choices=point_choices, value=default_choice),
-        detail_df,
-    )
+def pipeline(source, file, sheet_url, series_choice, dual_axis, rolling_window, cmap_choice, tiles_choice, start_time, end_time):
+    try:
+        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])]
+        chosen = [c for c in (series_choice or numeric_cols[:2]) if c in numeric_cols]
+        if not chosen:
+            chosen = numeric_cols[:2]
+        if not chosen:
+            raise ValueError("無有效數值欄位可視覺化")
+
+        dash_json = build_grafanalib_dashboard(chosen, bool(dual_axis), int(rolling_window))
+        dash_json_str = json.dumps(dash_json, ensure_ascii=False, indent=2, default=str)
+        with tempfile.NamedTemporaryFile(delete=False, suffix=".json", mode="w", encoding="utf-8") as f:
+            f.write(dash_json_str)
+            json_path = f.name
+
+        fig1 = render_line(df, chosen[0])
+        fig2 = render_bar_or_dual(df, chosen[1], chosen[0], bool(dual_axis)) if len(chosen) > 1 else plt.figure()
+        fig3, df_with_roll = render_rolling(df.copy(), chosen[0], int(rolling_window))
+
+        map_html = render_map_folium(df, value_col=chosen[0], size_col=chosen[1] if len(chosen) > 1 else "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_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,
+            dash_json_str, json_path, df_with_roll,
+            demo_csv_path,
+            gr.Dropdown(choices=point_choices, value=default_choice),
+            detail_df,
+            ""  # 錯誤訊息清空
+        )
+    except Exception as e:
+        return (
+            None, None, None, "<p>錯誤：無資料顯示</p>",
+            "", None, pd.DataFrame(),
+            None,
+            gr.Dropdown(choices=[], value=None),
+            pd.DataFrame(),
+            str(e)
+        )
 
 
-def regenerate_demo(series_choice, dual_axis, rolling_window, cmap_choice, tiles_choice, current_choice):
-    return pipeline("demo", None, "", series_choice, dual_axis, rolling_window, cmap_choice, tiles_choice)
+def regenerate_demo(series_choice, dual_axis, rolling_window, cmap_choice, tiles_choice, current_choice, start_time, end_time):
+    return pipeline("demo", None, "", series_choice, dual_axis, rolling_window, cmap_choice, tiles_choice, start_time, end_time)
 
 
 def update_detail(df: pd.DataFrame, choice: str):
@@ -375,93 +409,117 @@ def update_detail(df: pd.DataFrame, choice: str):
 
 
 # -----------------------------
-# UI（將 Google 來源改成只有下拉選單）
+# UI 優化：使用 Tab 分頁、添加錯誤顯示、時間過濾
 # -----------------------------
 with gr.Blocks(theme=gr.themes.Soft()) as demo:
-    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"])
+    gr.Markdown("## 優化版 Grafana-like Demo + Folium Map（支援 Google Drive / Sheets）")
 
-    # 只保留下拉選單，不再顯示可編輯的文字框
-    preset_dd = gr.Dropdown(
-        label="Google 預設來源（3 個連結）",
-        choices=DRIVE_PRESETS,
-        value=DRIVE_PRESETS[0]
-    )
-
-    series_multiselect = gr.CheckboxGroup(label="數值欄位", choices=[])
-    dual_axis_chk = gr.Checkbox(label="第二面板啟用雙軸", value=False)
-    rolling_dd = gr.Dropdown(label="Rolling window", choices=["3", "5", "10", "20"], value="5")
-    cmap_dd = gr.Dropdown(label="地圖配色 (colormap)",
-                          choices=["viridis", "plasma", "inferno", "magma", "cividis", "coolwarm"],
-                          value="viridis")
-    tiles_dd = gr.Dropdown(label="地圖底圖 (tiles)",
-                           choices=["OpenStreetMap", "Stamen Terrain", "Stamen Toner",
-                                    "CartoDB positron", "CartoDB dark_matter"],
-                           value="OpenStreetMap")
+    with gr.Row():
+        with gr.Column(scale=1):
+            source_radio = gr.Radio(["upload", "drive", "demo"], label="資料來源", value="demo")
+            file_in = gr.File(label="上傳 CSV（選 upload 時使用）", file_types=[".csv"])
+            preset_dd = gr.Dropdown(
+                label="Google 預設來源（3 個連結）",
+                choices=DRIVE_PRESETS,
+                value=DRIVE_PRESETS[0]
+            )
+            with gr.Row():
+                start_time_in = gr.Textbox(label="開始時間 (YYYY-MM-DD HH:MM:SS)", placeholder="2023-01-01 00:00:00")
+                end_time_in = gr.Textbox(label="結束時間 (YYYY-MM-DD HH:MM:SS)", placeholder="2023-12-31 23:59:59")
+
+        with gr.Column(scale=1):
+            series_multiselect = gr.CheckboxGroup(label="數值欄位", choices=[])
+            dual_axis_chk = gr.Checkbox(label="第二面板啟用雙軸", value=False)
+            rolling_dd = gr.Dropdown(label="Rolling window", choices=["3", "5", "10", "20"], value="5")
+            cmap_dd = gr.Dropdown(label="地圖配色 (colormap)",
+                                  choices=["viridis", "plasma", "inferno", "magma", "cividis", "coolwarm"],
+                                  value="viridis")
+            tiles_dd = gr.Dropdown(label="地圖底圖 (tiles)",
+                                   choices=["OpenStreetMap", "Stamen Terrain", "Stamen Toner",
+                                            "CartoDB positron", "CartoDB dark_matter"],
+                                   value="OpenStreetMap")
 
     with gr.Row():
         run_btn = gr.Button("產生 Dashboard", scale=1)
         regen_btn = gr.Button("🔁 重新產生示範資料", scale=1)
 
-    plot1 = gr.Plot(label="1：Line")
-    plot2 = gr.Plot(label="2：Bar / Dual Axis")
-    plot3 = gr.Plot(label="3：Rolling Mean")
-    map_out = gr.HTML(label="4：Geo Map (Interactive + Legend)")
+    error_msg = gr.Markdown(value="", label="錯誤訊息", visible=True)
 
-    json_box = gr.Code(label="grafanalib Dashboard JSON", language="json")
-    json_file = gr.File(label="下載 dashboard.json")
-    demo_csv_file = gr.File(label="下載示範資料 demo.csv")
-    df_view = gr.Dataframe(label="資料預覽（含 rolling）", wrap=True)
+    with gr.Tabs():
+        with gr.Tab("圖表"):
+            with gr.Row():
+                plot1 = gr.Plot(label="1：Line")
+                plot2 = gr.Plot(label="2：Bar / Dual Axis")
+                plot3 = gr.Plot(label="3：Rolling Mean")
 
-    gr.Markdown("### 🔎 點位詳情（對應地圖彈窗中的 #ID）")
-    point_selector = gr.Dropdown(label="選擇點位（#ID | 時間 | 值）", choices=[], value=None)
-    detail_view = gr.Dataframe(label="選取點詳細資料", wrap=True)
+        with gr.Tab("地圖"):
+            map_out = gr.HTML(label="4：Geo Map (Interactive + Legend)")
 
-    # 根據來源探勘欄位（drive 時讀取下拉的 URL）
-    def probe_columns(source, file, preset_url):
-        sheet_url = preset_url if source == "drive" else ""
-        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
+        with gr.Tab("JSON & 檔案"):
+            json_box = gr.Code(label="grafanalib Dashboard JSON", language="json")
+            json_file = gr.File(label="下載 dashboard.json")
+            demo_csv_file = gr.File(label="下載示範資料 demo.csv")
+
+        with gr.Tab("資料預覽"):
+            df_view = gr.Dataframe(label="資料預覽（含 rolling）", wrap=True)
 
-    source_radio.change(probe_columns, inputs=[source_radio, file_in, preset_dd], outputs=[series_multiselect, df_view])
-    file_in.change(probe_columns, inputs=[source_radio, file_in, preset_dd], outputs=[series_multiselect, df_view])
-    preset_dd.change(probe_columns, inputs=[source_radio, file_in, preset_dd], outputs=[series_multiselect, df_view])
+        with gr.Tab("點位詳情"):
+            gr.Markdown("### 🔎 點位詳情（對應地圖彈窗中的 #ID）")
+            point_selector = gr.Dropdown(label="選擇點位（#ID | 時間 | 值）", choices=[], value=None)
+            detail_view = gr.Dataframe(label="選取點詳細資料", wrap=True)
 
-    # 初次載入：預設用第一個 Google 連結
+    # 探勘欄位並更新 UI
+    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 = 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, ""
+        except Exception as e:
+            return gr.CheckboxGroup(choices=[]), pd.DataFrame(), str(e)
+
+    source_radio.change(probe_columns, inputs=[source_radio, file_in, preset_dd, start_time_in, end_time_in], outputs=[series_multiselect, df_view, error_msg])
+    file_in.change(probe_columns, inputs=[source_radio, file_in, preset_dd, start_time_in, end_time_in], outputs=[series_multiselect, df_view, error_msg])
+    preset_dd.change(probe_columns, inputs=[source_radio, file_in, preset_dd, start_time_in, end_time_in], outputs=[series_multiselect, df_view, error_msg])
+    start_time_in.change(probe_columns, inputs=[source_radio, file_in, preset_dd, start_time_in, end_time_in], outputs=[series_multiselect, df_view, error_msg])
+    end_time_in.change(probe_columns, inputs=[source_radio, file_in, preset_dd, start_time_in, end_time_in], outputs=[series_multiselect, df_view, error_msg])
+
+    # 初次載入
     demo.load(
-        lambda: pipeline("drive", None, DRIVE_PRESETS[0], [], False, "5", "viridis", "OpenStreetMap"),
+        lambda: pipeline("drive", None, DRIVE_PRESETS[0], [], False, "5", "viridis", "OpenStreetMap", "", ""),
         inputs=None,
         outputs=[
             plot1, plot2, plot3, map_out,
             json_box, json_file, df_view,
             demo_csv_file,
-            point_selector, detail_view
+            point_selector, detail_view,
+            error_msg
         ]
     )
 
     # 產生 / 重新產生
     run_btn.click(
         pipeline,
-        inputs=[source_radio, file_in, preset_dd, series_multiselect, dual_axis_chk, rolling_dd, cmap_dd, tiles_dd],
+        inputs=[source_radio, file_in, preset_dd, series_multiselect, dual_axis_chk, rolling_dd, cmap_dd, tiles_dd, start_time_in, end_time_in],
         outputs=[
             plot1, plot2, plot3, map_out,
             json_box, json_file, df_view,
             demo_csv_file,
-            point_selector, detail_view
+            point_selector, detail_view,
+            error_msg
         ]
     )
 
     regen_btn.click(
         regenerate_demo,
-        inputs=[series_multiselect, dual_axis_chk, rolling_dd, cmap_dd, tiles_dd, point_selector],
+        inputs=[series_multiselect, dual_axis_chk, rolling_dd, cmap_dd, tiles_dd, point_selector, start_time_in, end_time_in],
         outputs=[
             plot1, plot2, plot3, map_out,
             json_box, json_file, df_view,
             demo_csv_file,
-            point_selector, detail_view
+            point_selector, detail_view,
+            error_msg
         ]
     )
 
@@ -472,4 +530,4 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
     )
 
 if __name__ == "__main__":
-    demo.launch()
+    demo.launch(server_name="0.0.0.0", server_port=7860)  # 方便部署，綁定所有 IP