no repeated data load. switched to gr.Blocks

v2/app.py

@@ -45,7 +45,6 @@ def recalculate(**uiParameters):
 
     solar_parameters = SolarParameters()
 
-    met_2021_data, cons_2021_data = read_datasets()
     add_production_field(met_2021_data, solar_parameters)
     all_data = interpolate_and_join(met_2021_data, cons_2021_data)
 
@@ -83,7 +82,7 @@ def recalculate(**uiParameters):
     return results
 
 
-def ui_refresh(solar_cell_num, bess_nominal_capacity, fixed_consumption):
+def ui_refresh(solar_cell_num, bess_nominal_capacity, fixed_consumption, base_price, peak_price):
     results = recalculate(solar_cell_num=solar_cell_num, bess_nominal_capacity=bess_nominal_capacity, fixed_consumption=fixed_consumption)
 
     fig1 = plotly_visualize_simulation(results, date_range=("2021-02-01", "2021-02-07"))
@@ -113,14 +112,27 @@ def ui_refresh(solar_cell_num, bess_nominal_capacity, fixed_consumption):
     return (html, fig_monthly, fig1, fig2)
 
 
-ui = gr.Interface(
-    ui_refresh,
-    inputs = [
-        gr.Slider(0, 2000, 114, label="Solar cell number"),
-        gr.Slider(0, 2000, 330, label="BESS nominal capacity in [Ah]"),
-        gr.Checkbox(value=False, label="Use fixed consumption (10 kW)")],
-    outputs = ["html", "plot", "plot", "plot"],
-    live=True,
-)
+with gr.Blocks() as ui:
+    with gr.Row():
+        solar_slider = gr.Slider(0, 2000, 114, label="Solar cell number")
+        bess_slider = gr.Slider(0, 2000, 330, label="BESS nominal capacity in [Ah]")
+        fixed_consumption = gr.Checkbox(value=False, label="Use fixed consumption (10 kW)")
 
-ui.launch(show_api=False)
+    with gr.Accordion("Advanced Pricing Settings", open=False):
+        base_price = gr.Number(value=0.1, label="Base energy price [€/kWh]")
+        peak_price = gr.Number(value=0.3, label="Peak energy price [€/kWh]")
+
+    run_btn = gr.Button("Run Simulation")
+
+    html_out = gr.HTML()
+    plot1 = gr.Plot()
+    plot2 = gr.Plot()
+    plot3 = gr.Plot()
+
+    run_btn.click(
+        ui_refresh,
+        inputs=[solar_slider, bess_slider, fixed_consumption, base_price, peak_price],
+        outputs=[html_out, plot1, plot2, plot3],
+    )
+
+ui.launch()