Update app.py

app.py

@@ -113,9 +113,31 @@ def _style_time_axis(ax):
     plt.margins(x=0.02, y=0.05)  # 留一點白邊
 
 
+def _normalize_times(series: pd.Series) -> pd.Series:
+    """
+    把可能帶時區的時間序列，轉成「UTC 再去時區」的 naive datetime，
+    以避免 Matplotlib 在處理 tz-aware 時間造成不一致。
+    """
+    s = series.copy()
+    if getattr(s.dt, "tz", None) is not None:
+        s = s.dt.tz_convert("UTC").dt.tz_localize(None)
+    return s
+
+
+def _infer_bar_width_days(times: pd.Series) -> float:
+    """依時間間距估算柱寬（單位：天）。避免整片藍牆。"""
+    t = pd.Series(times)
+    if len(t) < 2:
+        return 60 / 86400  # 60秒
+    diffs = t.astype("datetime64[ns]").diff().dt.total_seconds().dropna()
+    med = diffs.median() if not diffs.empty else 60.0
+    return max(10.0, med * 0.8) / 86400.0  # 取 80% 的中位數，至少 10 秒
+
+
 def render_line(df: pd.DataFrame, col: str):
+    times = _normalize_times(df["time"])
     fig, ax = plt.subplots(figsize=(6.5, 3.6))
-    ax.plot(df["time"], df[col], linewidth=1.6)
+    ax.plot(times, df[col], linewidth=1.6)
     ax.set_title(col, fontsize=12, pad=8)
     ax.set_xlabel("Time", fontsize=10)
     ax.set_ylabel(col, fontsize=10)
@@ -124,19 +146,13 @@ def render_line(df: pd.DataFrame, col: str):
     return fig
 
 
-def _infer_bar_width_days(times: pd.Series) -> float:
-    """依時間間距估算柱寬（單位：天）。避免整片藍牆。"""
-    if len(times) < 2:
-        return 60 / 86400  # 60秒
-    deltas = (times.iloc[1:].values - times.iloc[:-1].values) / np.timedelta64(1, 's')
-    med = np.median(deltas) if len(deltas) else 60
-    return max(10, med * 0.8) / 86400.0  # 取 80% 的中位數，至少 10 秒
-
-
 def render_bar_or_dual(df: pd.DataFrame, second_col: str, first_col: str, dual_axis: bool):
+    # --- 修正點：正確轉換 Series 為原生 datetime（處理時區 + .dt.to_pydatetime()） ---
+    times = _normalize_times(df["time"])
+    x = mdates.date2num(times.dt.to_pydatetime())
+
     fig, ax = plt.subplots(figsize=(6.5, 3.6))
-    width = _infer_bar_width_days(df["time"])
-    x = mdates.date2num(df["time"].to_pydatetime())
+    width = _infer_bar_width_days(times)
     ax.bar(x, df[second_col], width=width, align="center", label=second_col)
     ax.set_xlabel("Time", fontsize=10)
     ax.set_ylabel(second_col, fontsize=10)
@@ -144,7 +160,7 @@ def render_bar_or_dual(df: pd.DataFrame, second_col: str, first_col: str, dual_a
 
     if dual_axis:
         ax2 = ax.twinx()
-        ax2.plot(df["time"], df[first_col], linewidth=1.6, label=f"{first_col} (line)")
+        ax2.plot(times, df[first_col], linewidth=1.6, label=f"{first_col} (line)")
         ax2.set_ylabel(first_col, fontsize=10)
         title = f"{second_col} (bar) + {first_col} (line)"
         h1, l1 = ax.get_legend_handles_labels()
@@ -160,11 +176,12 @@ def render_bar_or_dual(df: pd.DataFrame, second_col: str, first_col: str, dual_a
 
 
 def render_rolling(df: pd.DataFrame, col: str, window: int = 5):
+    times = _normalize_times(df["time"])
     roll_col = f"{col}_rolling{window}"
     if roll_col not in df.columns:
         df[roll_col] = df[col].rolling(window=window, min_periods=1).mean()
     fig, ax = plt.subplots(figsize=(6.5, 3.6))
-    ax.plot(df["time"], df[roll_col], linewidth=1.6)
+    ax.plot(times, df[roll_col], linewidth=1.6)
     ax.set_title(f"{col} rolling({window})", fontsize=12, pad=8)
     ax.set_xlabel("Time", fontsize=10)
     ax.set_ylabel(roll_col, fontsize=10)
@@ -173,6 +190,14 @@ def render_rolling(df: pd.DataFrame, col: str, window: int = 5):
     return fig, df
 
 
+def _placeholder_fig():
+    fig, ax = plt.subplots(figsize=(6.5, 3.6))
+    ax.text(0.5, 0.5, "未選第二數值欄", ha="center", va="center", fontsize=12)
+    ax.axis("off")
+    fig.tight_layout()
+    return fig
+
+
 # -----------------------------
 # Main pipeline
 # -----------------------------
@@ -213,14 +238,6 @@ def pipeline(file, series_choice, dual_axis, rolling_window):
     return fig1, fig2, fig3, dash_json_str, json_path, df_with_roll, demo_csv_path
 
 
-def _placeholder_fig():
-    fig, ax = plt.subplots(figsize=(6.5, 3.6))
-    ax.text(0.5, 0.5, "未選第二數值欄", ha="center", va="center", fontsize=12)
-    ax.axis("off")
-    fig.tight_layout()
-    return fig
-
-
 # -----------------------------
 # Regenerate demo helper
 # -----------------------------