Reorganize functions

app.py

@@ -11,6 +11,8 @@ USER_BLACKLIST = ["gdm", "necl", "ncel", "root"]
 
 
 def get_plot_df(df):
+    df = df.fillna({"fan_speed": "N/A", "users": ""})
+
     df["users"] = df["users"].str.split(",")
 
     # Clean users list with "Free" as the empty placeholder value
@@ -18,7 +20,7 @@ def get_plot_df(df):
         lambda user_list: [u for u in user_list if u and u not in USER_BLACKLIST] or ["Free"]
     )
 
-    # Construct a new DataFrame for the barplot
+    # Construct a new DataFrame for the bar chart
     new_df = []
     for _, row_series in df.iterrows():
         users_list = row_series["users"]
@@ -57,7 +59,36 @@ def username_to_hsl(username):
     return f"hsl({hue}, {saturation}%, {lightness}%)"
 
 
-def plot():
+def get_bar_chart(df):
+    last_update_time = max(df["query_time"])
+    last_update_time = datetime.fromisoformat(last_update_time).strftime("%Y-%m-%d %H:%M:%S")
+
+    # Create the bar chart
+    fig = go.Figure()
+
+    for _, row_series in df.iterrows():
+        fig.add_bar(
+            x=[row_series["count"]],
+            y=[row_series["server"]],
+            orientation="h",
+            marker_color=username_to_hsl(row_series["username"]),
+            text=f"{row_series['index']}<br>{row_series['username']}",
+            insidetextanchor="middle",
+            hoverinfo="none",
+        )
+
+    fig.update_layout(
+        barmode="stack",
+        title=f"Last Updated {last_update_time}",
+        showlegend=False,
+        xaxis_showticklabels=False,
+        yaxis_categoryorder="category descending",
+    )
+
+    return fig
+
+
+def get_interface_elements():
     fs = HfFileSystem()
 
     try:
@@ -82,48 +113,19 @@ def plot():
             return None, pd.DataFrame()
 
         df = pd.concat(df_list, ignore_index=True)
-        df = df.fillna({"fan_speed": "N/A", "users": ""})
         df = get_plot_df(df)
 
-        last_update_time = max(df["query_time"])
-        last_update_time = datetime.fromisoformat(last_update_time).strftime("%Y-%m-%d %H:%M:%S")
-
-        # Create the bar plot
-        fig = go.Figure()
-
-        for _, row_series in df.iterrows():
-            fig.add_bar(
-                x=[row_series["count"]],
-                y=[row_series["server"]],
-                orientation="h",
-                marker_color=username_to_hsl(row_series["username"]),
-                text=f"{row_series['index']}<br>{row_series['username']}",
-                insidetextanchor="middle",
-                hoverinfo="none",
-            )
-
-        fig.update_layout(
-            barmode="stack",
-            title=f"Last Updated {last_update_time}",
-            showlegend=False,
-            xaxis_showticklabels=False,
-            yaxis_categoryorder="category descending",
-        )
+        plot = get_bar_chart(df)
 
-        return fig, df
+        return plot, df
 
     except Exception as e:
         print(f"Global error in plot: {e}")
         return None, pd.DataFrame()
 
 
-def generate_interface():
-    fig, df = plot()
-    return fig, df
-
-
 demo = gr.Interface(
-    fn=generate_interface,
+    fn=get_interface_elements,
     inputs=[],
     outputs=[
         gr.Plot(label="GPU Status", elem_classes="plotcss"),