Update app/main.py

app/main.py

@@ -201,23 +201,29 @@ class HVACCalculator:
         if not any(components.get(key, []) for key in ['walls', 'roofs', 'windows', 'skylights']):
             return False, "At least one wall, roof, window, or skylight must be defined."
         
-        # Validate climate data using climate_data.py
+        # Validate climate data
         if not climate_data:
             return False, "Climate data is missing."
         if not self.climate_data.validate_climate_data(climate_data):
             return False, "Invalid climate data format or values."
         
-        # Fix stale components with invalid groups
+        # Validate and fix component groups
         for component_type in ['walls', 'roofs']:
             for comp in components.get(component_type, []):
                 if component_type == 'walls':
-                    if getattr(comp, 'wall_group', '') not in VALID_WALL_GROUPS:
-                        st.warning(f"Invalid wall group '{comp.wall_group}' for {comp.name}. Setting to 'A'.")
+                    wall_group = str(getattr(comp, 'wall_group', 'A')).upper()
+                    if wall_group not in VALID_WALL_GROUPS:
+                        st.warning(f"Invalid wall group '{wall_group}' for {comp.name}. Setting to 'A'.")
                         comp.wall_group = 'A'
+                    if st.session_state.get('debug_mode', False):
+                        st.write(f"Debug: Wall {comp.name} group set to {comp.wall_group}")
                 if component_type == 'roofs':
-                    if getattr(comp, 'roof_group', '') not in VALID_ROOF_GROUPS:
-                        st.warning(f"Invalid roof group '{comp.roof_group}' for {comp.name}. Setting to 'A'.")
+                    roof_group = str(getattr(comp, 'roof_group', 'A')).upper()
+                    if roof_group not in VALID_ROOF_GROUPS:
+                        st.warning(f"Invalid roof group '{roof_group}' for {comp.name}. Setting to 'A'.")
                         comp.roof_group = 'A'
+                    if st.session_state.get('debug_mode', False):
+                        st.write(f"Debug: Roof {comp.name} group set to {comp.roof_group}")
         
         # Validate components
         for component_type in ['walls', 'roofs', 'windows', 'doors', 'floors', 'skylights']:
@@ -226,17 +232,14 @@ class HVACCalculator:
                     return False, f"Invalid area for {component_type}: {comp.name}"
                 if comp.u_value <= 0:
                     return False, f"Invalid U-value for {component_type}: {comp.name}"
-                # Validate ground temperature for floors
                 if component_type == 'floors' and getattr(comp, 'ground_contact', False):
                     if not -10 <= comp.ground_temperature_c <= 40:
                         return False, f"Ground temperature for {comp.name} must be between -10°C and 40°C"
                     if getattr(comp, 'perimeter', 0) < 0:
                         return False, f"Perimeter for {comp.name} cannot be negative"
-                # Validate solar absorptivity for walls and roofs
                 if component_type in ['walls', 'roofs']:
                     if not 0.1 <= getattr(comp, 'solar_absorptivity', 0.6) <= 1.0:
                         return False, f"Invalid solar absorptivity for {component_type}: {comp.name} (must be 0.1-1.0)"
-                # Validate enhanced window/skylight properties
                 if component_type in ['windows', 'skylights']:
                     if getattr(comp, 'shgc', 0) <= 0:
                         return False, f"Invalid SHGC for {component_type}: {comp.name}"
@@ -244,13 +247,6 @@ class HVACCalculator:
                         return False, f"Glazing type missing for {component_type}: {comp.name}"
                     if getattr(comp, 'frame_type', None) is None:
                         return False, f"Frame type missing for {component_type}: {comp.name}"
-                # Validate wall and roof groups
-                if component_type == 'walls':
-                    if getattr(comp, 'wall_group', '') not in VALID_WALL_GROUPS:
-                        return False, f"Invalid wall group '{comp.wall_group}' for {comp.name}. Valid groups: {', '.join(VALID_WALL_GROUPS)}"
-                if component_type == 'roofs':
-                    if getattr(comp, 'roof_group', '') not in VALID_ROOF_GROUPS:
-                        return False, f"Invalid roof group '{comp.roof_group}' for {comp.name}. Valid groups: {', '.join(VALID_ROOF_GROUPS)}"
         
         # Validate ventilation rate
         if building_info.get('ventilation_rate', 0) < 0:
@@ -258,7 +254,7 @@ class HVACCalculator:
         if building_info.get('zone_type', '') == 'Custom' and building_info.get('ventilation_rate', 0) == 0:
             return False, "Custom ventilation rate must be specified"
         
-        # Validate new inputs from Plan.txt
+        # Validate new inputs
         if not -50 <= building_info.get('winter_temp', -10) <= 20:
             return False, "Winter design temperature must be -50 to 20°C"
         if not 0 <= building_info.get('outdoor_rh', 50) <= 100: