Update app/hvac_loads.py

app/hvac_loads.py

@@ -1150,7 +1150,7 @@ def display_hvac_results_ui(loads: List[Dict[str, Any]], run_id: str = "default"
 def display_hvac_loads_page():
     """
     Display the HVAC Loads page in the Streamlit application.
-    Checks for existing results in session state before recalculating.
+    Checks for existing results in session state before recalculating, ensuring only current run results are used.
     """
     try:
         st.header("HVAC Loads")
@@ -1160,18 +1160,20 @@ def display_hvac_loads_page():
         import uuid
         run_id = str(uuid.uuid4())
 
-        # Check for existing results
+        # Initialize hvac_loads in session state if not present
+        if "hvac_loads" not in st.session_state.project_data:
+            st.session_state.project_data["hvac_loads"] = {}
+
+        # Check for existing results for the current run_id
         loads = []
-        if (st.session_state.project_data.get("hvac_loads", {}).get("cooling", {}).get("hourly") or
-            st.session_state.project_data.get("hvac_loads", {}).get("heating", {}).get("hourly")):
-            cooling_loads = st.session_state.project_data["hvac_loads"]["cooling"].get("hourly", [])
-            heating_loads = st.session_state.project_data["hvac_loads"]["heating"].get("hourly", [])
+        if run_id in st.session_state.project_data["hvac_loads"]:
+            cooling_loads = st.session_state.project_data["hvac_loads"][run_id]["cooling"].get("hourly", [])
+            heating_loads = st.session_state.project_data["hvac_loads"][run_id]["heating"].get("hourly", [])
             loads.extend(cooling_loads)
             loads.extend(heating_loads)
-            # Sort loads by month, day, hour to ensure consistent display
             loads = sorted(loads, key=lambda x: (x["month"], x["day"], x["hour"]))
             if loads:
-                st.info("Displaying previously calculated HVAC load results.")
+                st.info("Displaying previously calculated HVAC load results for current session.")
                 display_hvac_results_ui(loads, run_id=run_id)
 
         # Location Information
@@ -1540,7 +1542,7 @@ def display_hvac_loads_page():
             st.info("No ground-contact components detected. Ground temperature configuration is not required.")        
         
         # Calculate HVAC Loads
-        if st.button("Calculate HVAC Loads"):
+        if st.button("Calculate HVAC Loads", key="calculate_hvac_loads"):
             try:
                 with st.spinner("Running simulation... this may take up to a minute depending on data size."):
                     components = st.session_state.project_data["components"]
@@ -1570,8 +1572,8 @@ def display_hvac_loads_page():
                             hvac_settings=hvac_settings
                         )
 
-                        # Clear previous HVAC loads from session state
-                        st.session_state.project_data["hvac_loads"] = {
+                        # Initialize hvac_loads for this run_id
+                        st.session_state.project_data["hvac_loads"][run_id] = {
                             "cooling": {"hourly": [], "peak": 0, "charts": {}, "breakdown": {}},
                             "heating": {"hourly": [], "peak": 0, "charts": {}, "breakdown": {}}
                         }
@@ -1579,12 +1581,12 @@ def display_hvac_loads_page():
                         # Update session state with new results
                         cooling_loads = [load for load in loads if load["total_cooling"] > 0]
                         heating_loads = [load for load in loads if load["total_heating"] > 0]
-                        st.session_state.project_data["hvac_loads"]["cooling"]["hourly"] = cooling_loads
-                        st.session_state.project_data["hvac_loads"]["heating"]["hourly"] = heating_loads
-                        st.session_state.project_data["hvac_loads"]["cooling"]["peak"] = max([load["total_cooling"] for load in cooling_loads], default=0)
-                        st.session_state.project_data["hvac_loads"]["heating"]["peak"] = max([load["total_heating"] for load in heating_loads], default=0)
-                        st.session_state.project_data["hvac_loads"]["cooling"]["charts"] = {}
-                        st.session_state.project_data["hvac_loads"]["heating"]["charts"] = {}
+                        st.session_state.project_data["hvac_loads"][run_id]["cooling"]["hourly"] = cooling_loads
+                        st.session_state.project_data["hvac_loads"][run_id]["heating"]["hourly"] = heating_loads
+                        st.session_state.project_data["hvac_loads"][run_id]["cooling"]["peak"] = max([load["total_cooling"] for load in cooling_loads], default=0)
+                        st.session_state.project_data["hvac_loads"][run_id]["heating"]["peak"] = max([load["total_heating"] for load in heating_loads], default=0)
+                        st.session_state.project_data["hvac_loads"][run_id]["cooling"]["charts"] = {}
+                        st.session_state.project_data["hvac_loads"][run_id]["heating"]["charts"] = {}
 
                         # Store breakdown
                         cooling_breakdown = {
@@ -1601,14 +1603,14 @@ def display_hvac_loads_page():
                             "ventilation": sum(load["ventilation_heating"] for load in heating_loads),
                             "infiltration": sum(load["infiltration_heating"] for load in heating_loads)
                         }
-                        st.session_state.project_data["hvac_loads"]["cooling"]["charts"]["pie_by_component"] = cooling_breakdown
-                        st.session_state.project_data["hvac_loads"]["heating"]["breakdown"] = heating_breakdown
+                        st.session_state.project_data["hvac_loads"][run_id]["cooling"]["charts"]["pie_by_component"] = cooling_breakdown
+                        st.session_state.project_data["hvac_loads"][run_id]["heating"]["breakdown"] = heating_breakdown
 
                         # Display Results UI with unique run_id
                         display_hvac_results_ui(loads, run_id=run_id)
 
                         st.success("HVAC loads calculated successfully.")
-                        logger.info("HVAC loads calculated and stored in session state")
+                        logger.info(f"HVAC loads calculated and stored in session state for run_id: {run_id}")
 
             except Exception as e:
                 st.error(f"Error calculating HVAC loads: {str(e)}")