refactor: define common steps into one function

app.py

@@ -722,16 +722,19 @@ with gr.Blocks() as demo:
 
         return fx
 
-    common_steps = chain_functions(
+    accum_func_results = lambda init, *fs: reduce(
+        lambda x, f: (f(x[0]), *x), fs, (init,)
+    )
+
+    x2z_common_steps = chain_functions(
         lambda x, *all_s: assign_fx_params(vec2fx(x), *all_s),
-        lambda fx: (fx2x(fx), fx),
-        lambda x, fx: (x2z(x), x, fx),
+        lambda fx: accum_func_results(fx, fx2x, x2z),
     )
 
     for s in peq_sliders:
         s.input(
             chain_functions(
-                lambda x, i, *args: common_steps(x, *args) + (i,),
+                lambda x, i, *args: x2z_common_steps(x, *args) + (i,),
                 lambda z, x, fx, extra_pc_idx: [z, x]
                 + [model2json(fx), plot_eq(fx)]
                 + update_pc(z, extra_pc_idx),
@@ -743,7 +746,7 @@ with gr.Blocks() as demo:
     for s, update_plot in zip(cmp_sliders, cmp_update_plot_flag):
         s.input(
             chain_functions(
-                lambda x, i, *args: common_steps(x, *args) + (i,),
+                lambda x, i, *args: x2z_common_steps(x, *args) + (i,),
                 lambda z, x, fx, e_pc_i, update_plot=update_plot: [z, x]
                 + [model2json(fx)]
                 + ([plot_comp(fx)] if update_plot else [])
@@ -758,7 +761,7 @@ with gr.Blocks() as demo:
     for s, update_plot in zip(delay_sliders, delay_update_plot_flag):
         s.input(
             chain_functions(
-                lambda x, i, *args: common_steps(x, *args) + (i,),
+                lambda x, i, *args: x2z_common_steps(x, *args) + (i,),
                 lambda z, x, fx, e_pc_i, update_plot=update_plot: (
                     [z, x]
                     + [model2json(fx)]
@@ -775,7 +778,7 @@ with gr.Blocks() as demo:
 
     reverb_send.input(
         chain_functions(
-            lambda x, i, *args: common_steps(x, *args) + (i,),
+            lambda x, i, *args: x2z_common_steps(x, *args) + (i,),
             lambda z, x, fx, e_pc_i: [z, x] + [model2json(fx)] + update_pc(z, e_pc_i),
         ),
         inputs=[fx_params, extra_pc_dropdown] + all_effect_sliders,
@@ -889,11 +892,16 @@ with gr.Blocks() as demo:
         update_pc_outputs + update_fx_outputs + update_plots_outputs + [json_output]
     )
 
+    z2x_common_steps = chain_functions(
+        lambda z: accum_func_results(z, z2x, vec2fx),
+        lambda fx, x, z: (z, x, fx),
+    )
     random_button.click(
         chain_functions(
-            lambda i: (torch.randn_like(mean).clip(SLIDER_MIN, SLIDER_MAX), i),
-            lambda z, i: (z, z2x(z), i),
-            lambda z, x, i: (z, x, vec2fx(x), i),
+            lambda i: (
+                *z2x_common_steps(torch.randn_like(mean).clip(SLIDER_MIN, SLIDER_MAX)),
+                i,
+            ),
             lambda z, x, fx, i: [z, x] + update_all(z, fx, i),
         ),
         inputs=extra_pc_dropdown,
@@ -901,9 +909,7 @@ with gr.Blocks() as demo:
     )
     reset_button.click(
         chain_functions(
-            lambda: torch.zeros_like(mean),
-            lambda z: (z, z2x(z)),
-            lambda z, x: (z, x, vec2fx(x)),
+            lambda: z2x_common_steps(torch.zeros_like(mean)),
             lambda z, x, fx: [z, x] + update_all(z, fx, NUMBER_OF_PCS),
         ),
         outputs=[z, fx_params] + update_all_outputs,
@@ -917,8 +923,7 @@ with gr.Blocks() as demo:
         slider.input(
             chain_functions(
                 lambda z, s, i=i: update_z(z, s, i),
-                lambda z: (z, z2x(z)),
-                lambda z, x: (z, x, vec2fx(x)),
+                z2x_common_steps,
                 lambda z, x, fx: [z, x, model2json(fx)]
                 + update_fx(fx)
                 + update_plots(fx),
@@ -931,8 +936,7 @@ with gr.Blocks() as demo:
     extra_slider.input(
         chain_functions(
             lambda z, s, i: update_z(z, s, i - 1),
-            lambda z: (z, z2x(z)),
-            lambda z, x: (z, x, vec2fx(x)),
+            z2x_common_steps,
             lambda z, x, fx: [z, x, model2json(fx)] + update_fx(fx) + update_plots(fx),
         ),
         inputs=[z, extra_slider, extra_pc_dropdown],