refactor filtering from plotting with gr.State

app.py

@@ -100,7 +100,7 @@ min_elo_score, max_elo_score, upper_models_per_month = get_constants(merged_dfs)
 date_updated = elo_results["full"]["last_updated_datetime"].split(" ")[0]
 
 ###################
-### Plot Data
+### Build and Plot Data
 ###################
 
 
@@ -109,8 +109,7 @@ def get_data_split(dfs, set_name):
     return df.reset_index(drop=True)
 
 
-def build_plot(min_score, max_models_per_month, toggle_annotations, set_selector):
-
+def filter_df(min_score, max_models_per_month, set_selector):
     df = get_data_split(merged_dfs, set_name=set_selector)
 
     # filter data
@@ -121,6 +120,10 @@ def build_plot(min_score, max_models_per_month, toggle_annotations, set_selector
         .apply(lambda x: x.nlargest(max_models_per_month, "rating"))
         .reset_index(drop=True)
     )
+    return filtered_df
+
+
+def build_plot(toggle_annotations, filtered_df):
 
     # construct plot
     custom_colors = {"Open": "#ff7f0e", "Proprietary": "#1f77b4"}
@@ -246,31 +249,37 @@ with gr.Blocks(
 
     # Show plot
     plot = gr.Plot()
+    filtered_df = gr.State()
+
     demo.load(
-        fn=build_plot,
-        inputs=[min_score, max_models_per_month, toggle_annotations, set_selector],
-        outputs=plot,
-    )
+        fn=filter_df,
+        inputs=[min_score, max_models_per_month, set_selector],
+        outputs=filtered_df,
+    ).then(fn=build_plot, inputs=[toggle_annotations, filtered_df], outputs=plot)
+
     min_score.change(
-        fn=build_plot,
-        inputs=[min_score, max_models_per_month, toggle_annotations, set_selector],
-        outputs=plot,
-    )
+        fn=filter_df,
+        inputs=[min_score, max_models_per_month, set_selector],
+        outputs=filtered_df,
+    ).then(fn=build_plot, inputs=[toggle_annotations, filtered_df], outputs=plot)
+
     max_models_per_month.change(
-        fn=build_plot,
-        inputs=[min_score, max_models_per_month, toggle_annotations, set_selector],
-        outputs=plot,
-    )
+        fn=filter_df,
+        inputs=[min_score, max_models_per_month, set_selector],
+        outputs=filtered_df,
+    ).then(fn=build_plot, inputs=[toggle_annotations, filtered_df], outputs=plot)
+
     toggle_annotations.change(
-        fn=build_plot,
-        inputs=[min_score, max_models_per_month, toggle_annotations, set_selector],
-        outputs=plot,
-    )
+        fn=filter_df,
+        inputs=[min_score, max_models_per_month, set_selector],
+        outputs=filtered_df,
+    ).then(fn=build_plot, inputs=[toggle_annotations, filtered_df], outputs=plot)
+
     set_selector.change(
-        fn=build_plot,
-        inputs=[min_score, max_models_per_month, toggle_annotations, set_selector],
-        outputs=plot,
-    )
+        fn=filter_df,
+        inputs=[min_score, max_models_per_month, set_selector],
+        outputs=filtered_df,
+    ).then(fn=build_plot, inputs=[toggle_annotations, filtered_df], outputs=plot)
 
     gr.Markdown(
         """