Update app.py

app.py

@@ -40,7 +40,7 @@ def plot_gpus():
     )
     fig.update_layout(
         yaxis={'categoryorder': 'array', 'categoryarray': dfs_plot["server"].unique()[::-1]},
-        barcornerradius=50,
+        barcornerradius=5,
     )
     fig.update_traces(textposition='inside', insidetextanchor='middle')
     # print(dfs_plot)
@@ -71,6 +71,8 @@ def plot_disks(alert_threshold_pct=99.0):
     if "Unnamed: 0" in df.columns:
         df = df.drop(columns=["Unnamed: 0"])
 
+    df = pd.concat([df[df['Mounted'] != '/data2'], df[df['Mounted'] == '/data2'].drop_duplicates(subset=['Mounted'])])  # Keep one of /data2
+
     server_col = _pick_col(df, ["server"])
     fs_col     = _pick_col(df, ["filesystem"])
     blocks_col = _pick_col(df, ["1k-blocks", "1k blocks", "blocks"])
@@ -106,7 +108,8 @@ def plot_disks(alert_threshold_pct=99.0):
     df["ALERT"] = df["Used_pct"] > alert_threshold_pct
 
     # Sort
-    df = df.sort_values("Total_kb", ascending=False).reset_index(drop=True)
+    # df = df.sort_values("Total_kb", ascending=False).reset_index(drop=True)
+    df = df.sort_values("Mounted", ascending=False).reset_index(drop=True)
 
     y_labels = np.where(df["ALERT"].to_numpy(), "⚠ " + df["Label"], df["Label"])
 
@@ -218,6 +221,7 @@ def plot_disks(alert_threshold_pct=99.0):
         height=max(420, 28 * len(df)),
         margin=dict(l=280, r=120, t=60, b=40),
         legend=dict(orientation="h", yanchor="bottom", y=1.02, xanchor="right", x=1),
+        barcornerradius=4,
     )
     fig.update_yaxes(autorange="reversed")
     return fig, df
@@ -226,9 +230,9 @@ def plot_disks(alert_threshold_pct=99.0):
 
 ##### PLOT ALL #####
 def plot_figs():
-    fig_gpus, dfn = plot_gpus()
-    fig_disks, dfh = plot_disks()
-    return fig_gpus, dfn, fig_disks
+    fig_gpus, df_gpus = plot_gpus()
+    fig_disks, df_disks = plot_disks()
+    return fig_gpus, fig_disks, df_gpus, df_disks
 
 demo = gr.Interface(
     fn=plot_figs,
@@ -237,8 +241,9 @@ demo = gr.Interface(
     ],
     outputs = [
         gr.Plot(label="GPU Status", elem_classes="plotcss"),
-        gr.Dataframe(label="GPU Status Details"),
         gr.Plot(label="Disk Status", elem_classes="plotcss"),
+        gr.Dataframe(label="GPU Status Details"),
+        gr.Dataframe(label="Disk Status Details"),
     ],
     live=True,
     flagging_options=[],