Update app/internal_loads.py

app/internal_loads.py

@@ -222,15 +222,10 @@ def display_internal_loads_page():
     with st.expander("Help & Information"):
         display_internal_loads_help()
     
-    # Initialize internal loads in session state if not present
-    initialize_internal_loads()
-    
     # Check if rerun is pending
-    if 'internal_loads_rerun_pending' not in st.session_state:
-        st.session_state.internal_loads_rerun_pending = False
-    
-    if st.session_state.internal_loads_rerun_pending:
-        st.session_state.internal_loads_rerun_pending = False
+    # [FIX]: Use module_rerun_flags instead of internal_loads_rerun_pending
+    if st.session_state.module_rerun_flags.get("internal_loads", False):
+        st.session_state.module_rerun_flags["internal_loads"] = False
         st.rerun()
     
     # Create tabs for different load types
@@ -263,8 +258,13 @@ def display_internal_loads_page():
             st.rerun()
 
 def initialize_internal_loads():
-    """Initialize internal loads in session state if not present."""
+    """
+    Initialize internal loads in session state if not present.
+    [FIX]: Removed redundant initialization as main.py handles this.
+    Logging a warning if initialization is needed for debugging.
+    """
     if "internal_loads" not in st.session_state.project_data:
+        logger.warning("Internal loads not initialized by main.py, using fallback initialization")
         st.session_state.project_data["internal_loads"] = {
             "people": [],
             "lighting": [],
@@ -419,13 +419,15 @@ def display_people_tab():
                 
                 # Clear editor state
                 st.session_state.people_editor = {}
-                st.session_state.internal_loads_rerun_pending = True
+                # [FIX]: Use module_rerun_flags instead of internal_loads_rerun_pending
+                st.session_state.module_rerun_flags["internal_loads"] = True
                 st.rerun()
         
         if cancel:
             # Clear editor state
             st.session_state.people_editor = {}
-            st.session_state.internal_loads_rerun_pending = True
+            # [FIX]: Use module_rerun_flags instead of internal_loads_rerun_pending
+            st.session_state.module_rerun_flags["internal_loads"] = True
             st.rerun()
 
 def display_lighting_tab():
@@ -468,11 +470,12 @@ def display_lighting_tab():
             )
             
             # Area
+            # [FIX]: Corrected session state reference from st.session_state.building_info to st.session_state.project_data["building_info"]
             area = st.number_input(
                 "Area (m²)",
                 min_value=1.0,
                 max_value=100000.0,
-                value=float(editor_state.get("area", st.session_state.building_info.get("floor_area", 100.0))),
+                value=float(editor_state.get("area", st.session_state.project_data["building_info"].get("floor_area", 100.0))),
                 format="%.2f",
                 help="Floor area served by this lighting system."
             )
@@ -580,13 +583,15 @@ def display_lighting_tab():
                 
                 # Clear editor state
                 st.session_state.lighting_editor = {}
-                st.session_state.internal_loads_rerun_pending = True
+                # [FIX]: Use module_rerun_flags instead of internal_loads_rerun_pending
+                st.session_state.module_rerun_flags["internal_loads"] = True
                 st.rerun()
         
         if cancel:
             # Clear editor state
             st.session_state.lighting_editor = {}
-            st.session_state.internal_loads_rerun_pending = True
+            # [FIX]: Use module_rerun_flags instead of internal_loads_rerun_pending
+            st.session_state.module_rerun_flags["internal_loads"] = True
             st.rerun()
 
 def display_equipment_tab():
@@ -629,11 +634,12 @@ def display_equipment_tab():
             )
             
             # Area
+            # [FIX]: Corrected session state reference from st.session_state.building_info to st.session_state.project_data["building_info"]
             area = st.number_input(
                 "Area (m²)",
                 min_value=1.0,
                 max_value=100000.0,
-                value=float(editor_state.get("area", st.session_state.building_info.get("floor_area", 100.0))),
+                value=float(editor_state.get("area", st.session_state.project_data["building_info"].get("floor_area", 100.0))),
                 format="%.2f",
                 help="Floor area served by this equipment."
             )
@@ -757,13 +763,15 @@ def display_equipment_tab():
                 
                 # Clear editor state
                 st.session_state.equipment_editor = {}
-                st.session_state.internal_loads_rerun_pending = True
+                # [FIX]: Use module_rerun_flags instead of internal_loads_rerun_pending
+                st.session_state.module_rerun_flags["internal_loads"] = True
                 st.rerun()
         
         if cancel:
             # Clear editor state
             st.session_state.equipment_editor = {}
-            st.session_state.internal_loads_rerun_pending = True
+            # [FIX]: Use module_rerun_flags instead of internal_loads_rerun_pending
+            st.session_state.module_rerun_flags["internal_loads"] = True
             st.rerun()
 
 def display_ventilation_infiltration_tab():
@@ -814,11 +822,12 @@ def display_ventilation_infiltration_tab():
             )
             
             # Area
+            # [FIX]: Corrected session state reference from st.session_state.building_info to st.session_state.project_data["building_info"]
             area = st.number_input(
                 "Area (m²)",
                 min_value=1.0,
                 max_value=100000.0,
-                value=float(editor_state.get("area", st.session_state.building_info.get("floor_area", 100.0))),
+                value=float(editor_state.get("area", st.session_state.project_data["building_info"].get("floor_area", 100.0))),
                 format="%.2f",
                 help="Floor area served by this system."
             )
@@ -910,13 +919,15 @@ def display_ventilation_infiltration_tab():
                 
                 # Clear editor state
                 st.session_state.vent_inf_editor = {}
-                st.session_state.internal_loads_rerun_pending = True
+                # [FIX]: Use module_rerun_flags instead of internal_loads_rerun_pending
+                st.session_state.module_rerun_flags["internal_loads"] = True
                 st.rerun()
         
         if cancel:
             # Clear editor state
             st.session_state.vent_inf_editor = {}
-            st.session_state.internal_loads_rerun_pending = True
+            # [FIX]: Use module_rerun_flags instead of internal_loads_rerun_pending
+            st.session_state.module_rerun_flags["internal_loads"] = True
             st.rerun()
 
 def display_schedules_tab():
@@ -1062,15 +1073,43 @@ def display_schedules_tab():
                 
                 # Clear editor state
                 st.session_state.schedule_editor = {}
-                st.session_state.internal_loads_rerun_pending = True
+                # [FIX]: Use module_rerun_flags instead of internal_loads_rerun_pending
+                st.session_state.module_rerun_flags["internal_loads"] = True
                 st.rerun()
         
         if cancel:
             # Clear editor state
             st.session_state.schedule_editor = {}
-            st.session_state.internal_loads_rerun_pending = True
+            # [FIX]: Use module_rerun_flags instead of internal_loads_rerun_pending
+            st.session_state.module_rerun_flags["internal_loads"] = True
             st.rerun()
 
+def is_schedule_in_use(schedule_name: str) -> bool:
+    """
+    Check if a schedule is in use by any people, lighting, equipment, or ventilation/infiltration systems.
+    [FIX]: Added to prevent deletion of schedules that are referenced elsewhere.
+    
+    Args:
+        schedule_name: Name of the schedule to check.
+        
+    Returns:
+        bool: True if the schedule is in use, False otherwise.
+    """
+    internal_loads = st.session_state.project_data["internal_loads"]
+    for group in internal_loads.get("people", []):
+        if group.get("schedule") == schedule_name:
+            return True
+    for system in internal_loads.get("lighting", []):
+        if system.get("schedule") == schedule_name:
+            return True
+    for system in internal_loads.get("equipment", []):
+        if system.get("schedule") == schedule_name:
+            return True
+    for system in internal_loads.get("ventilation_infiltration", []):
+        if system.get("schedule") == schedule_name:
+            return True
+    return False
+
 def display_people_table(people_groups: List[Dict[str, Any]]):
     """Display people groups in a table format with edit/delete buttons."""
     if not people_groups:
@@ -1123,7 +1162,8 @@ def display_people_table(people_groups: List[Dict[str, Any]]):
                             "schedule": group.get("schedule", "Continuous"),
                             "zone": group.get("zone", "Whole Building")
                         }
-                        st.session_state.internal_loads_rerun_pending = True
+                        # [FIX]: Use module_rerun_flags instead of internal_loads_rerun_pending
+                        st.session_state.module_rerun_flags["internal_loads"] = True
                         st.rerun()
             
             with col3:
@@ -1133,7 +1173,8 @@ def display_people_table(people_groups: List[Dict[str, Any]]):
                         g for g in people_groups if g.get("id") != group_id
                     ]
                     st.success(f"People group '{group_name}' deleted!")
-                    st.session_state.internal_loads_rerun_pending = True
+                    # [FIX]: Use module_rerun_flags instead of internal_loads_rerun_pending
+                    st.session_state.module_rerun_flags["internal_loads"] = True
                     st.rerun()
 
 def display_lighting_table(lighting_systems: List[Dict[str, Any]]):
@@ -1187,7 +1228,8 @@ def display_lighting_table(lighting_systems: List[Dict[str, Any]]):
                             "schedule": system.get("schedule", "Continuous"),
                             "zone": system.get("zone", "Whole Building")
                         }
-                        st.session_state.internal_loads_rerun_pending = True
+                        # [FIX]: Use module_rerun_flags instead of internal_loads_rerun_pending
+                        st.session_state.module_rerun_flags["internal_loads"] = True
                         st.rerun()
             
             with col3:
@@ -1197,7 +1239,8 @@ def display_lighting_table(lighting_systems: List[Dict[str, Any]]):
                         s for s in lighting_systems if s.get("id") != system_id
                     ]
                     st.success(f"Lighting system '{system_name}' deleted!")
-                    st.session_state.internal_loads_rerun_pending = True
+                    # [FIX]: Use module_rerun_flags instead of internal_loads_rerun_pending
+                    st.session_state.module_rerun_flags["internal_loads"] = True
                     st.rerun()
 
 def display_equipment_table(equipment_systems: List[Dict[str, Any]]):
@@ -1252,7 +1295,8 @@ def display_equipment_table(equipment_systems: List[Dict[str, Any]]):
                             "schedule": system.get("schedule", "Continuous"),
                             "zone": system.get("zone", "Whole Building")
                         }
-                        st.session_state.internal_loads_rerun_pending = True
+                        # [FIX]: Use module_rerun_flags instead of internal_loads_rerun_pending
+                        st.session_state.module_rerun_flags["internal_loads"] = True
                         st.rerun()
             
             with col3:
@@ -1262,7 +1306,8 @@ def display_equipment_table(equipment_systems: List[Dict[str, Any]]):
                         s for s in equipment_systems if s.get("id") != system_id
                     ]
                     st.success(f"Equipment '{system_name}' deleted!")
-                    st.session_state.internal_loads_rerun_pending = True
+                    # [FIX]: Use module_rerun_flags instead of internal_loads_rerun_pending
+                    st.session_state.module_rerun_flags["internal_loads"] = True
                     st.rerun()
 
 def display_ventilation_infiltration_table(vent_inf_systems: List[Dict[str, Any]]):
@@ -1321,7 +1366,8 @@ def display_ventilation_infiltration_table(vent_inf_systems: List[Dict[str, Any]
                             "schedule": system.get("schedule", "Continuous"),
                             "zone": system.get("zone", "Whole Building")
                         }
-                        st.session_state.internal_loads_rerun_pending = True
+                        # [FIX]: Use module_rerun_flags instead of internal_loads_rerun_pending
+                        st.session_state.module_rerun_flags["internal_loads"] = True
                         st.rerun()
             
             with col3:
@@ -1331,7 +1377,8 @@ def display_ventilation_infiltration_table(vent_inf_systems: List[Dict[str, Any]
                         s for s in vent_inf_systems if s.get("id") != system_id
                     ]
                     st.success(f"{system.get('system_type', 'System')} '{system_name}' deleted!")
-                    st.session_state.internal_loads_rerun_pending = True
+                    # [FIX]: Use module_rerun_flags instead of internal_loads_rerun_pending
+                    st.session_state.module_rerun_flags["internal_loads"] = True
                     st.rerun()
 
 def display_schedules_table(schedules: Dict[str, Any]):
@@ -1387,18 +1434,23 @@ def display_schedules_table(schedules: Dict[str, Any]):
                         "weekday": schedule_data.get("weekday", [0.0] * 24),
                         "weekend": schedule_data.get("weekend", [0.0] * 24)
                     }
-                    st.session_state.internal_loads_rerun_pending = True
+                    # [FIX]: Use module_rerun_flags instead of internal_loads_rerun_pending
+                    st.session_state.module_rerun_flags["internal_loads"] = True
                     st.rerun()
             
             with col4:
-                # Don't allow deletion of default templates
+                # [FIX]: Check if schedule is in use or a default template before allowing deletion
                 if schedule_name not in DEFAULT_SCHEDULE_TEMPLATES:
-                    if st.button("Delete", key=f"delete_schedule_{schedule_name}_{i}"):
-                        # Delete schedule
-                        del schedules[schedule_name]
-                        st.success(f"Schedule '{schedule_name}' deleted!")
-                        st.session_state.internal_loads_rerun_pending = True
-                        st.rerun()
+                    if is_schedule_in_use(schedule_name):
+                        st.write("(In Use)")
+                    else:
+                        if st.button("Delete", key=f"delete_schedule_{schedule_name}_{i}"):
+                            # Delete schedule
+                            del schedules[schedule_name]
+                            st.success(f"Schedule '{schedule_name}' deleted!")
+                            # [FIX]: Use module_rerun_flags instead of internal_loads_rerun_pending
+                            st.session_state.module_rerun_flags["internal_loads"] = True
+                            st.rerun()
                 else:
                     st.write("(Default)")
 
@@ -1451,7 +1503,7 @@ def display_internal_loads_help():
     - Schedules control when people are present
     
     #### Lighting
-    - Define lighting systems with power densities
+    - Define lighting systems with power density
     - Heat distribution between radiative and convective components
     - Schedules control lighting operation
     
@@ -1478,57 +1530,4 @@ def display_internal_loads_help():
     4. Validate total loads against design expectations
     """)
 
-# Helper functions for backward compatibility
-def get_internal_loads_summary():
-    """Get a summary of all internal loads for use in other modules."""
-    summary = {
-        "people": {
-            "total_sensible": 0.0,
-            "total_latent": 0.0,
-            "count": 0
-        },
-        "lighting": {
-            "total_power": 0.0,
-            "count": 0
-        },
-        "equipment": {
-            "total_sensible": 0.0,
-            "total_latent": 0.0,
-            "count": 0
-        },
-        "ventilation_infiltration": {
-            "total_ventilation": 0.0,
-            "total_infiltration": 0.0,
-            "count": 0
-        }
-    }
-    
-    if "internal_loads" in st.session_state.project_data:
-        internal_loads = st.session_state.project_data["internal_loads"]
-        
-        # People summary
-        for group in internal_loads.get("people", []):
-            summary["people"]["total_sensible"] += group.get("total_sensible_heat", 0.0)
-            summary["people"]["total_latent"] += group.get("total_latent_heat", 0.0)
-            summary["people"]["count"] += 1
-        
-        # Lighting summary
-        for system in internal_loads.get("lighting", []):
-            summary["lighting"]["total_power"] += system.get("total_power", 0.0)
-            summary["lighting"]["count"] += 1
-        
-        # Equipment summary
-        for system in internal_loads.get("equipment", []):
-            summary["equipment"]["total_sensible"] += system.get("total_sensible_power", 0.0)
-            summary["equipment"]["total_latent"] += system.get("total_latent_power", 0.0)
-            summary["equipment"]["count"] += 1
-        
-        # Ventilation/Infiltration summary
-        for system in internal_loads.get("ventilation_infiltration", []):
-            if system.get("system_type") == "Ventilation":
-                summary["ventilation_infiltration"]["total_ventilation"] += system.get("ventilation_rate", 0.0) * system.get("area", 0.0)
-            else:
-                summary["ventilation_infiltration"]["total_infiltration"] += system.get("air_change_rate", 0.0)
-            summary["ventilation_infiltration"]["count"] += 1
-    
-    return summary
+#