Update app.py

app.py

@@ -104,21 +104,55 @@ def _summarize_df(df: pd.DataFrame):
     return {"total": total, "neg": neg, "pos": pos, "neg_avg": neg_avg, "pos_avg": pos_avg, "md": info}
 
 def _make_figures(df: pd.DataFrame):
-    s = _summarize_df(df)
-    # Bar รวม
-    fig_bar = go.Figure([go.Bar(x=["negative","positive"], y=[s["neg"], s["pos"]])])
-    fig_bar.update_layout(title="Label counts", xaxis_title="label", yaxis_title="count")
-    # Pie รวม
-    fig_pie = go.Figure(go.Pie(labels=["negative","positive"], values=[s["neg"], s["pos"]], hole=0.35))
-    fig_pie.update_layout(title="Label share")
-    return fig_bar, fig_pie, s["md"]
+    # สรุปเบื้องต้น
+    total = len(df)
+    neg = int((df["label"] == "negative").sum())
+    pos = int((df["label"] == "positive").sum())
+    neg_avg = pd.to_numeric(df["negative(%)"].str.rstrip("%"), errors="coerce").mean()
+    pos_avg = pd.to_numeric(df["positive(%)"].str.rstrip("%"), errors="coerce").mean()
+    info = (
+        f"**Summary**  \n"
+        f"- Total: {total}  \n"
+        f"- Negative: {neg}  \n"
+        f"- Positive: {pos}  \n"
+        f"- Avg negative: {neg_avg:.2f}%  \n"
+        f"- Avg positive: {pos_avg:.2f}%"
+    )
+
+    # --- BAR: 2 trace, สีคงที่ ---
+    fig_bar = go.Figure()
+    fig_bar.add_bar(name="negative", x=["negative"], y=[neg], marker_color=NEG_COLOR)
+    fig_bar.add_bar(name="positive", x=["positive"], y=[pos], marker_color=POS_COLOR)
+    fig_bar.update_layout(
+        barmode="group",
+        title="Label counts",
+        xaxis_title="label",
+        yaxis_title="count",
+        template=TEMPLATE,
+        legend_title="label",
+    )
+
+    # --- PIE: สีสอดคล้องกับ bar ---
+    fig_pie = go.Figure(
+        go.Pie(
+            labels=["negative", "positive"],
+            values=[neg, pos],
+            hole=0.35,
+            sort=False,
+            marker=dict(colors=[NEG_COLOR, POS_COLOR]),
+        )
+    )
+    fig_pie.update_layout(title="Label share", template=TEMPLATE)
+
+    return fig_bar, fig_pie, info
 
 def _shop_summary(out_df: pd.DataFrame, max_shops=15):
-    """สรุปต่อร้าน: table + stacked bar (pos/neg counts) — ถ้ามีคอลัมน์ shop"""
+    """สรุปต่อร้าน: ตาราง + stacked bar (pos/neg) — ใช้สีคงที่"""
     if "shop" not in out_df.columns:
-        return go.Figure(), pd.DataFrame(columns=["shop","total","positive","negative","positive_rate(%)","negative_rate(%)"])
+        empty_tbl = pd.DataFrame(columns=["shop","total","positive","negative","positive_rate(%)","negative_rate(%)"])
+        return go.Figure(), empty_tbl
+
     g = out_df.groupby("shop")["label"].value_counts().unstack(fill_value=0)
-    # ให้มีทั้งสองคอลัมน์เสมอ
     for col in ["positive","negative"]:
         if col not in g.columns:
             g[col] = 0
@@ -130,13 +164,20 @@ def _shop_summary(out_df: pd.DataFrame, max_shops=15):
     table["negative_rate(%)"] = (table["negative"] / table["total"] * 100).round(2)
     table = table.reset_index().rename(columns={"index":"shop"})
 
-    # กราฟโชว์ top N ร้านตามจำนวนรีวิวรวม
+    # กราฟโชว์ top N ร้าน
     top = table.head(max_shops)
     fig = go.Figure()
-    fig.add_bar(name="positive", x=top["shop"], y=top["positive"])
-    fig.add_bar(name="negative", x=top["shop"], y=top["negative"])
-    fig.update_layout(barmode="stack", title=f"Per-shop counts (top {len(top)})",
-                      xaxis_title="shop", yaxis_title="count", legend_title="label")
+    fig.add_bar(name="positive", x=top["shop"], y=top["positive"], marker_color=POS_COLOR)
+    fig.add_bar(name="negative", x=top["shop"], y=top["negative"], marker_color=NEG_COLOR)
+    fig.update_layout(
+        barmode="stack",
+        title=f"Per-shop counts (top {len(top)})",
+        xaxis_title="shop",
+        yaxis_title="count",
+        legend_title="label",
+        template=TEMPLATE,
+        xaxis=dict(tickangle=-30),
+    )
     return fig, table
 
 # ---------- API wrappers ----------