show custom message when loading results

agoenergy · Jun 10, 2024 · bac20dc · bac20dc
1 parent 0eb7216
commit bac20dc
Showing 1 changed file with 45 additions and 44 deletions.
diff --git a/ptxboa_streamlit.py b/ptxboa_streamlit.py
@@ -157,47 +157,17 @@
     "Deep-dive countries",
     "Optimization",
 ]:
-    # calculate results over different data dimensions:
-    costs_per_region = calculate_results_list(
-        api, parameter_to_change="region", parameter_list=None
-    )
-    costs_per_scenario = calculate_results_list(
-        api,
-        parameter_to_change="scenario",
-        parameter_list=None,
-    )
-    costs_per_res_gen = calculate_results_list(
-        api,
-        parameter_to_change="res_gen",
-        # TODO: here we remove PV tracking manually, this needs to be fixed in data
-        parameter_list=[
-            x
-            for x in api.get_dimension("res_gen").index.to_list()
-            if x != "PV tracking"
-        ],
-    )
-    costs_per_chain = calculate_results_list(
-        api,
-        parameter_to_change="chain",
-        parameter_list=None,
-        override_session_state={"output_unit": "USD/MWh"},
-    )
-
-    if st.session_state["user_changes_df"] is not None:
-        # calculate results over different data dimensions (without user changes):
-        costs_per_region_without_user_changes = calculate_results_list(
-            api,
-            parameter_to_change="region",
-            parameter_list=None,
-            apply_user_data=False,
+    with st.spinner("Please wait. Running optimization model..."):
+        # calculate results over different data dimensions:
+        costs_per_region = calculate_results_list(
+            api, parameter_to_change="region", parameter_list=None
         )
-        costs_per_scenario_without_user_changes = calculate_results_list(
+        costs_per_scenario = calculate_results_list(
             api,
             parameter_to_change="scenario",
             parameter_list=None,
-            apply_user_data=False,
         )
-        costs_per_res_gen_without_user_changes = calculate_results_list(
+        costs_per_res_gen = calculate_results_list(
             api,
             parameter_to_change="res_gen",
             # TODO: here we remove PV tracking manually, this needs to be fixed in data
@@ -206,20 +176,51 @@
                 for x in api.get_dimension("res_gen").index.to_list()
                 if x != "PV tracking"
             ],
-            apply_user_data=False,
         )
-        costs_per_chain_without_user_changes = calculate_results_list(
+        costs_per_chain = calculate_results_list(
             api,
             parameter_to_change="chain",
             parameter_list=None,
             override_session_state={"output_unit": "USD/MWh"},
-            apply_user_data=False,
         )
-    else:
-        costs_per_region_without_user_changes = None
-        costs_per_scenario_without_user_changes = None
-        costs_per_res_gen_without_user_changes = None
-        costs_per_chain_without_user_changes = None
+
+        if st.session_state["user_changes_df"] is not None:
+            # calculate results over different data dimensions (without user changes):
+            costs_per_region_without_user_changes = calculate_results_list(
+                api,
+                parameter_to_change="region",
+                parameter_list=None,
+                apply_user_data=False,
+            )
+            costs_per_scenario_without_user_changes = calculate_results_list(
+                api,
+                parameter_to_change="scenario",
+                parameter_list=None,
+                apply_user_data=False,
+            )
+            costs_per_res_gen_without_user_changes = calculate_results_list(
+                api,
+                parameter_to_change="res_gen",
+                # TODO: here we remove PV tracking manually, needs to be fixed in data
+                parameter_list=[
+                    x
+                    for x in api.get_dimension("res_gen").index.to_list()
+                    if x != "PV tracking"
+                ],
+                apply_user_data=False,
+            )
+            costs_per_chain_without_user_changes = calculate_results_list(
+                api,
+                parameter_to_change="chain",
+                parameter_list=None,
+                override_session_state={"output_unit": "USD/MWh"},
+                apply_user_data=False,
+            )
+        else:
+            costs_per_region_without_user_changes = None
+            costs_per_scenario_without_user_changes = None
+            costs_per_res_gen_without_user_changes = None
+            costs_per_chain_without_user_changes = None
 
 if st.session_state[st.session_state["tab_key"]] in [
     "Market scanning",