Update app/component_selection.py

app/component_selection.py

@@ -5,6 +5,7 @@ All dependencies are included within this file for standalone operation.
 Updated 2025-04-28: Added surface color selection, expanded component types, and skylight support.
 Updated 2025-05-02: Added crack dimensions for walls/doors, drapery properties for windows/skylights, and roof height per enhancement plan.
 Updated 2025-05-03: Removed surface_color field, using solar absorptivity (Light 0.3, Light to Medium 0.45, Medium 0.6, Medium to Dark 0.75, Dark 0.9) exclusively.
+Updated 2025-05-09: Changed 'absorptivity' to 'solar_absorptivity' to align with building_components.py.
 
 Author: Dr Majed Abuseif
 """
@@ -97,7 +98,7 @@ class BuildingComponent:
 class Wall(BuildingComponent):
     wall_type: str = "Brick"
     wall_group: str = "A"  # ASHRAE group
-    absorptivity: float = 0.6
+    solar_absorptivity: float = 0.6
     shading_coefficient: float = 1.0
     infiltration_rate_cfm: float = 0.0
     crack_length: float = 0.0  # Added for infiltration (m)
@@ -106,8 +107,8 @@ class Wall(BuildingComponent):
     def __post_init__(self):
         super().__post_init__()
         self.component_type = ComponentType.WALL
-        if not 0 <= self.absorptivity <= 1:
-            raise ValueError("Absorptivity must be between 0 and 1")
+        if not 0 <= self.solar_absorptivity <= 1:
+            raise ValueError("Solar absorptivity must be between 0 and 1")
         if not 0 <= self.shading_coefficient <= 1:
             raise ValueError("Shading coefficient must be between 0 and 1")
         if self.infiltration_rate_cfm < 0:
@@ -124,7 +125,7 @@ class Wall(BuildingComponent):
     def to_dict(self) -> dict:
         base_dict = super().to_dict()
         base_dict.update({
-            "wall_type": self.wall_type, "wall_group": self.wall_group, "absorptivity": self.absorptivity,
+            "wall_type": self.wall_type, "wall_group": self.wall_group, "solar_absorptivity": self.solar_absorptivity,
             "shading_coefficient": self.shading_coefficient, "infiltration_rate_cfm": self.infiltration_rate_cfm,
             "crack_length": self.crack_length, "crack_width": self.crack_width
         })
@@ -135,7 +136,7 @@ class Roof(BuildingComponent):
     roof_type: str = "Concrete"
     roof_group: str = "A"  # ASHRAE group
     slope: str = "Flat"
-    absorptivity: float = 0.6
+    solar_absorptivity: float = 0.6
     roof_height: float = 3.0    # Added for stack effect (m)
 
     def __post_init__(self):
@@ -143,8 +144,8 @@ class Roof(BuildingComponent):
         self.component_type = ComponentType.ROOF
         if not self.orientation == Orientation.HORIZONTAL:
             self.orientation = Orientation.HORIZONTAL
-        if not 0 <= self.absorptivity <= 1:
-            raise ValueError("Absorptivity must be between 0 and 1")
+        if not 0 <= self.solar_absorptivity <= 1:
+            raise ValueError("Solar absorptivity must be between 0 and 1")
         if not 0 <= self.roof_height <= 100:
             raise ValueError("Roof height must be between 0 and 100 meters")
         VALID_ROOF_GROUPS = {"A", "B", "C", "D", "E", "F", "G"}
@@ -156,7 +157,7 @@ class Roof(BuildingComponent):
         base_dict = super().to_dict()
         base_dict.update({
             "roof_type": self.roof_type, "roof_group": self.roof_group, "slope": self.slope, 
-            "absorptivity": self.absorptivity, "roof_height": self.roof_height
+            "solar_absorptivity": self.solar_absorptivity, "roof_height": self.roof_height
         })
         return base_dict
 
@@ -316,24 +317,24 @@ class ReferenceData:
                 "Wood": {"conductivity": 0.15}
             },
             "wall_types": {
-                "Brick Wall": {"u_value": 2.0, "absorptivity": 0.6, "wall_group": "A"},
-                "Insulated Brick": {"u_value": 0.5, "absorptivity": 0.6, "wall_group": "B"},
-                "Concrete Block": {"u_value": 1.8, "absorptivity": 0.6, "wall_group": "C"},
-                "Insulated Concrete": {"u_value": 0.4, "absorptivity": 0.6, "wall_group": "D"},
-                "Timber Frame": {"u_value": 0.3, "absorptivity": 0.6, "wall_group": "E"},
-                "Cavity Brick": {"u_value": 0.6, "absorptivity": 0.6, "wall_group": "F"},
-                "Lightweight Panel": {"u_value": 1.0, "absorptivity": 0.6, "wall_group": "G"},
-                "Reinforced Concrete": {"u_value": 1.5, "absorptivity": 0.6, "wall_group": "H"},
-                "SIP": {"u_value": 0.25, "absorptivity": 0.6, "wall_group": "A"},
-                "Custom": {"u_value": 0.5, "absorptivity": 0.6, "wall_group": "A"}
+                "Brick Wall": {"u_value": 2.0, "solar_absorptivity": 0.6, "wall_group": "A"},
+                "Insulated Brick": {"u_value": 0.5, "solar_absorptivity": 0.6, "wall_group": "B"},
+                "Concrete Block": {"u_value": 1.8, "solar_absorptivity": 0.6, "wall_group": "C"},
+                "Insulated Concrete": {"u_value": 0.4, "solar_absorptivity": 0.6, "wall_group": "D"},
+                "Timber Frame": {"u_value": 0.3, "solar_absorptivity": 0.6, "wall_group": "E"},
+                "Cavity Brick": {"u_value": 0.6, "solar_absorptivity": 0.6, "wall_group": "F"},
+                "Lightweight Panel": {"u_value": 1.0, "solar_absorptivity": 0.6, "wall_group": "G"},
+                "Reinforced Concrete": {"u_value": 1.5, "solar_absorptivity": 0.6, "wall_group": "H"},
+                "SIP": {"u_value": 0.25, "solar_absorptivity": 0.6, "wall_group": "A"},
+                "Custom": {"u_value": 0.5, "solar_absorptivity": 0.6, "wall_group": "A"}
             },
             "roof_types": {
-                "Concrete Roof": {"u_value": 0.3, "absorptivity": 0.6, "group": "A"},
-                "Metal Roof": {"u_value": 1.0, "absorptivity": 0.75, "group": "B"},
-                "Built-up Roof": {"u_value": 0.5, "absorptivity": 0.8, "group": "C"},
-                "Insulated Metal Deck": {"u_value": 0.4, "absorptivity": 0.7, "group": "D"},
-                "Wood Shingle": {"u_value": 0.6, "absorptivity": 0.5, "group": "E"},
-                "Custom": {"u_value": 0.5, "absorptivity": 0.6, "group": "A"}
+                "Concrete Roof": {"u_value": 0.3, "solar_absorptivity": 0.6, "group": "A"},
+                "Metal Roof": {"u_value": 1.0, "solar_absorptivity": 0.75, "group": "B"},
+                "Built-up Roof": {"u_value": 0.5, "solar_absorptivity": 0.8, "group": "C"},
+                "Insulated Metal Deck": {"u_value": 0.4, "solar_absorptivity": 0.7, "group": "D"},
+                "Wood Shingle": {"u_value": 0.6, "solar_absorptivity": 0.5, "group": "E"},
+                "Custom": {"u_value": 0.5, "solar_absorptivity": 0.6, "group": "A"}
             },
             "roof_ventilation_methods": {
                 "No Ventilation": 0.0,
@@ -502,7 +503,7 @@ class ComponentSelectionInterface:
                     selected_wall = st.selectbox("Wall Type", options=list(wall_options.keys()))
                     u_value = st.number_input("U-Value (W/m²·K)", min_value=0.0, value=float(wall_options[selected_wall]["u_value"]), step=0.01)
                     wall_group = st.selectbox("Wall Group (ASHRAE)", ["A", "B", "C", "D", "E", "F", "G", "H"], index=0)
-                    absorptivity = st.selectbox("Solar Absorptivity", ["Light (0.3)", "Light to Medium (0.45)", "Medium (0.6)", "Medium to Dark (0.75)", "Dark (0.9)"], index=2)
+                    solar_absorptivity = st.selectbox("Solar Absorptivity", ["Light (0.3)", "Light to Medium (0.45)", "Medium (0.6)", "Medium to Dark (0.75)", "Dark (0.9)"], index=2)
                     shading_coefficient = st.number_input("Shading Coefficient", min_value=0.0, max_value=1.0, value=1.0, step=0.05)
                     infiltration_rate = st.number_input("Infiltration Rate (CFM)", min_value=0.0, value=0.0, step=0.1)
                     crack_width = st.number_input("Crack Width (m)", min_value=0.0, max_value=0.1, value=0.0, step=0.001)
@@ -510,10 +511,10 @@ class ComponentSelectionInterface:
                 submitted = st.form_submit_button("Add Wall")
                 if submitted and not session_state.add_wall_submitted:
                     try:
-                        absorptivity_value = float(absorptivity.split("(")[1].strip(")"))
+                        solar_absorptivity_value = float(solar_absorptivity.split("(")[1].strip(")"))
                         new_wall = Wall(
                             name=name, u_value=u_value, area=area, orientation=Orientation(orientation),
-                            wall_type=selected_wall, wall_group=wall_group, absorptivity=absorptivity_value,
+                            wall_type=selected_wall, wall_group=wall_group, solar_absorptivity=solar_absorptivity_value,
                             shading_coefficient=shading_coefficient, infiltration_rate_cfm=infiltration_rate,
                             crack_length=crack_length, crack_width=crack_width
                         )
@@ -532,7 +533,7 @@ class ComponentSelectionInterface:
             uploaded_file = st.file_uploader("Upload Walls File", type=["csv", "xlsx"], key="wall_upload")
             required_cols = [
                 "Name", "Area (m²)", "U-Value (W/m²·K)", "Orientation", "Wall Type", "Wall Group",
-                "Absorptivity", "Shading Coefficient", "Infiltration Rate (CFM)",
+                "Solar Absorptivity", "Shading Coefficient", "Infiltration Rate (CFM)",
                 "Crack Length (m)", "Crack Width (m)"
             ]
             template_data = pd.DataFrame(columns=required_cols)
@@ -553,7 +554,7 @@ class ComponentSelectionInterface:
                             new_wall = Wall(
                                 name=str(row["Name"]), u_value=float(row["U-Value (W/m²·K)"]), area=float(row["Area (m²)"]),
                                 orientation=Orientation(row["Orientation"]), wall_type=str(row["Wall Type"]),
-                                wall_group=str(row["Wall Group"]), absorptivity=float(row["Absorptivity"]),
+                                wall_group=str(row["Wall Group"]), solar_absorptivity=float(row["Solar Absorptivity"]),
                                 shading_coefficient=float(row["Shading Coefficient"]),
                                 infiltration_rate_cfm=float(row["Infiltration Rate (CFM)"]),
                                 crack_length=float(row["Crack Length (m)"]),
@@ -587,16 +588,16 @@ class ComponentSelectionInterface:
                     u_value = st.number_input("U-Value (W/m²·K)", min_value=0.0, value=float(roof_options[selected_roof]["u_value"]), step=0.01)
                     roof_group = st.selectbox("Roof Group (ASHRAE)", ["A", "B", "C", "D", "E", "F", "G"], index=0)
                     slope = st.selectbox("Roof Slope", ["Flat", "Low Slope", "Steep Slope"], index=0)
-                    absorptivity = st.selectbox("Solar Absorptivity", ["Light (0.3)", "Light to Medium (0.45)", "Medium (0.6)", "Medium to Dark (0.75)", "Dark (0.9)"], index=2)
+                    solar_absorptivity = st.selectbox("Solar Absorptivity", ["Light (0.3)", "Light to Medium (0.45)", "Medium (0.6)", "Medium to Dark (0.75)", "Dark (0.9)"], index=2)
 
                 submitted = st.form_submit_button("Add Roof")
                 if submitted and not session_state.add_roof_submitted:
                     try:
-                        absorptivity_value = float(absorptivity.split("(")[1].strip(")"))
+                        solar_absorptivity_value = float(solar_absorptivity.split("(")[1].strip(")"))
                         new_roof = Roof(
                             name=name, u_value=u_value, area=area, orientation=Orientation.HORIZONTAL,
                             roof_type=selected_roof, roof_group=roof_group, slope=slope,
-                            absorptivity=absorptivity_value, roof_height=roof_height
+                            solar_absorptivity=solar_absorptivity_value, roof_height=roof_height
                         )
                         self.component_library.add_component(new_roof)
                         session_state.components['roofs'].append(new_roof)
@@ -628,7 +629,7 @@ class ComponentSelectionInterface:
             uploaded_file = st.file_uploader("Upload Roofs File", type=["csv", "xlsx"], key="roof_upload")
             required_cols = [
                 "Name", "Area (m²)", "U-Value (W/m²·K)", "Roof Type", "Roof Group", "Slope",
-                "Absorptivity", "Roof Height (m)"
+                "Solar Absorptivity", "Roof Height (m)"
             ]
             template_data = pd.DataFrame(columns=required_cols)
             template_data.loc[0] = [
@@ -649,7 +650,7 @@ class ComponentSelectionInterface:
                                 name=str(row["Name"]), u_value=float(row["U-Value (W/m²·K)"]), area=float(row["Area (m²)"]),
                                 orientation=Orientation.HORIZONTAL, roof_type=str(row["Roof Type"]),
                                 roof_group=str(row["Roof Group"]), slope=str(row["Slope"]),
-                                absorptivity=float(row["Absorptivity"]), roof_height=float(row["Roof Height (m)"])
+                                solar_absorptivity=float(row["Solar Absorptivity"]), roof_height=float(row["Roof Height (m)"])
                             )
                             self.component_library.add_component(new_roof)
                             session_state.components['roofs'].append(new_roof)
@@ -1068,11 +1069,11 @@ class ComponentSelectionInterface:
             headers = {
                 ComponentType.WALL: [
                     "Name", "Area (m²)", "U-Value (W/m²·K)", "Orientation", "Wall Type", "Wall Group",
-                    "Absorptivity", "Crack Length (m)", "Crack Width (m)", "Edit", "Delete"
+                    "Solar Absorptivity", "Crack Length (m)", "Crack Width (m)", "Edit", "Delete"
                 ],
                 ComponentType.ROOF: [
                     "Name", "Area (m²)", "U-Value (W/m²·K)", "Roof Type", "Roof Group", "Slope",
-                    "Absorptivity", "Roof Height (m)", "Edit", "Delete"
+                    "Solar Absorptivity", "Roof Height (m)", "Edit", "Delete"
                 ],
                 ComponentType.FLOOR: [
                     "Name", "Area (m²)", "U-Value (W/m²·K)", "Floor Type", "Ground Contact",
@@ -1105,7 +1106,7 @@ class ComponentSelectionInterface:
                     cols[3].write(comp.orientation.value)
                     cols[4].write(comp.wall_type)
                     cols[5].write(comp.wall_group)
-                    cols[6].write(comp.absorptivity)
+                    cols[6].write(comp.solar_absorptivity)
                     cols[7].write(comp.crack_length)
                     cols[8].write(comp.crack_width)
                     edit_col = 9
@@ -1113,7 +1114,7 @@ class ComponentSelectionInterface:
                     cols[3].write(comp.roof_type)
                     cols[4].write(comp.roof_group)
                     cols[5].write(comp.slope)
-                    cols[6].write(comp.absorptivity)
+                    cols[6].write(comp.solar_absorptivity)
                     cols[7].write(comp.roof_height)
                     edit_col = 8
                 elif component_type == ComponentType.FLOOR:
@@ -1189,37 +1190,28 @@ class ComponentSelectionInterface:
                 selected_wall = st.selectbox("Wall Type", options=list(wall_options.keys()), index=list(wall_options.keys()).index(wall.wall_type) if wall.wall_type in wall_options else 0)
                 u_value = st.number_input("U-Value (W/m²·K)", min_value=0.0, value=wall.u_value, step=0.01)
                 wall_group = st.selectbox("Wall Group (ASHRAE)", ["A", "B", "C", "D", "E", "F", "G", "H"], index=["A", "B", "C", "D", "E", "F", "G", "H"].index(wall.wall_group))
-                absorptivity = st.selectbox("Solar Absorptivity", ["Light (0.3)", "Light to Medium (0.45)", "Medium (0.6)", "Medium to Dark (0.75)", "Dark (0.9)"], index=["Light (0.3)", "Light to Medium (0.45)", "Medium (0.6)", "Medium to Dark (0.75)", "Dark (0.9)"].index(f"{['Light (0.3)', 'Light to Medium (0.45)', 'Medium (0.6)', 'Medium to Dark (0.75)', 'Dark (0.9)'][np.argmin([abs(float(opt.split('(')[1].strip(')')) - wall.absorptivity) for opt in ['Light (0.3)', 'Light to Medium (0.45)', 'Medium (0.6)', 'Medium to Dark (0.75)', 'Dark (0.9)']])]}"))
+                solar_absorptivity = st.selectbox("Solar Absorptivity", ["Light (0.3)", "Light to Medium (0.45)", "Medium (0.6)", "Medium to Dark (0.75)", "Dark (0.9)"], index=["Light (0.3)", "Light to Medium (0.45)", "Medium (0.6)", "Medium to Dark (0.75)", "Dark (0.9)"].index(f"{'Light (0.3)' if wall.solar_absorptivity == 0.3 else 'Light to Medium (0.45)' if wall.solar_absorptivity == 0.45 else 'Medium (0.6)' if wall.solar_absorptivity == 0.6 else 'Medium to Dark (0.75)' if wall.solar_absorptivity == 0.75 else 'Dark (0.9)'}"))
                 shading_coefficient = st.number_input("Shading Coefficient", min_value=0.0, max_value=1.0, value=wall.shading_coefficient, step=0.05)
                 infiltration_rate = st.number_input("Infiltration Rate (CFM)", min_value=0.0, value=wall.infiltration_rate_cfm, step=0.1)
                 crack_width = st.number_input("Crack Width (m)", min_value=0.0, max_value=0.1, value=wall.crack_width, step=0.001)
 
-                col3, col4 = st.columns(2)
-                with col3:
-                    submitted = st.form_submit_button("Update Wall")
-                with col4:
-                    cancelled = st.form_submit_button("Cancel")
-
-                if submitted:
-                    try:
-                        absorptivity_value = float(absorptivity.split("(")[1].strip(")"))
-                        updated_wall = Wall(
-                            id=wall.id, name=name, u_value=u_value, area=area, orientation=Orientation(orientation),
-                            wall_type=selected_wall, wall_group=wall_group, absorptivity=absorptivity_value,
-                            shading_coefficient=shading_coefficient, infiltration_rate_cfm=infiltration_rate,
-                            crack_length=crack_length, crack_width=crack_width
-                        )
-                        self.component_library.components[wall.id] = updated_wall
-                        session_state.components['walls'][index] = updated_wall
-                        st.success(f"Updated {name}")
-                        session_state[f"edit_wall"] = None
-                        st.rerun()
-                    except ValueError as e:
-                        st.error(f"Error: {str(e)}")
-                
-                if cancelled:
+            submitted = st.form_submit_button("Update Wall")
+            if submitted:
+                try:
+                    solar_absorptivity_value = float(solar_absorptivity.split("(")[1].strip(")"))
+                    updated_wall = Wall(
+                        id=wall.id, name=name, u_value=u_value, area=area, orientation=Orientation(orientation),
+                        wall_type=selected_wall, wall_group=wall_group, solar_absorptivity=solar_absorptivity_value,
+                        shading_coefficient=shading_coefficient, infiltration_rate_cfm=infiltration_rate,
+                        crack_length=crack_length, crack_width=crack_width
+                    )
+                    self.component_library.components[wall.id] = updated_wall
+                    session_state.components['walls'][index] = updated_wall
                     session_state[f"edit_wall"] = None
+                    st.success(f"Updated {name}")
                     st.rerun()
+                except ValueError as e:
+                    st.error(f"Error: {str(e)}")
 
     def _display_edit_roof_form(self, session_state: Any, roof: Roof, index: int) -> None:
         with st.form(f"edit_roof_form_{index}", clear_on_submit=True):
@@ -1234,33 +1226,24 @@ class ComponentSelectionInterface:
                 u_value = st.number_input("U-Value (W/m²·K)", min_value=0.0, value=roof.u_value, step=0.01)
                 roof_group = st.selectbox("Roof Group (ASHRAE)", ["A", "B", "C", "D", "E", "F", "G"], index=["A", "B", "C", "D", "E", "F", "G"].index(roof.roof_group))
                 slope = st.selectbox("Roof Slope", ["Flat", "Low Slope", "Steep Slope"], index=["Flat", "Low Slope", "Steep Slope"].index(roof.slope))
-                absorptivity = st.selectbox("Solar Absorptivity", ["Light (0.3)", "Light to Medium (0.45)", "Medium (0.6)", "Medium to Dark (0.75)", "Dark (0.9)"], index=["Light (0.3)", "Light to Medium (0.45)", "Medium (0.6)", "Medium to Dark (0.75)", "Dark (0.9)"].index(f"{['Light (0.3)', 'Light to Medium (0.45)', 'Medium (0.6)', 'Medium to Dark (0.75)', 'Dark (0.9)'][np.argmin([abs(float(opt.split('(')[1].strip(')')) - roof.absorptivity) for opt in ['Light (0.3)', 'Light to Medium (0.45)', 'Medium (0.6)', 'Medium to Dark (0.75)', 'Dark (0.9)']])]}"))
-
-            col3, col4 = st.columns(2)
-            with col3:
-                submitted = st.form_submit_button("Update Roof")
-            with col4:
-                cancelled = st.form_submit_button("Cancel")
+                solar_absorptivity = st.selectbox("Solar Absorptivity", ["Light (0.3)", "Light to Medium (0.45)", "Medium (0.6)", "Medium to Dark (0.75)", "Dark (0.9)"], index=["Light (0.3)", "Light to Medium (0.45)", "Medium (0.6)", "Medium to Dark (0.75)", "Dark (0.9)"].index(f"{'Light (0.3)' if roof.solar_absorptivity == 0.3 else 'Light to Medium (0.45)' if roof.solar_absorptivity == 0.45 else 'Medium (0.6)' if roof.solar_absorptivity == 0.6 else 'Medium to Dark (0.75)' if roof.solar_absorptivity == 0.75 else 'Dark (0.9)'}"))
 
+            submitted = st.form_submit_button("Update Roof")
             if submitted:
                 try:
-                    absorptivity_value = float(absorptivity.split("(")[1].strip(")"))
+                    solar_absorptivity_value = float(solar_absorptivity.split("(")[1].strip(")"))
                     updated_roof = Roof(
                         id=roof.id, name=name, u_value=u_value, area=area, orientation=Orientation.HORIZONTAL,
                         roof_type=selected_roof, roof_group=roof_group, slope=slope,
-                        absorptivity=absorptivity_value, roof_height=roof_height
+                        solar_absorptivity=solar_absorptivity_value, roof_height=roof_height
                     )
                     self.component_library.components[roof.id] = updated_roof
                     session_state.components['roofs'][index] = updated_roof
-                    st.success(f"Updated {name}")
                     session_state[f"edit_roof"] = None
+                    st.success(f"Updated {name}")
                     st.rerun()
                 except ValueError as e:
                     st.error(f"Error: {str(e)}")
-            
-            if cancelled:
-                session_state[f"edit_roof"] = None
-                st.rerun()
 
     def _display_edit_floor_form(self, session_state: Any, floor: Floor, index: int) -> None:
         with st.form(f"edit_floor_form_{index}", clear_on_submit=True):
@@ -1274,15 +1257,10 @@ class ComponentSelectionInterface:
                 selected_floor = st.selectbox("Floor Type", options=list(floor_options.keys()), index=list(floor_options.keys()).index(floor.floor_type) if floor.floor_type in floor_options else 0)
                 u_value = st.number_input("U-Value (W/m²·K)", min_value=0.0, value=floor.u_value, step=0.01)
                 ground_contact = st.selectbox("Ground Contact", ["Yes", "No"], index=0 if floor.ground_contact else 1)
-                ground_temp = st.number_input("Ground Temperature (°C)", min_value=-10.0, max_value=40.0, value=floor.ground_temperature_c, step=0.1) if ground_contact == "Yes" else floor.ground_temperature_c
+                ground_temp = st.number_input("Ground Temperature (°C)", min_value=-10.0, max_value=40.0, value=floor.ground_temperature_c, step=0.1) if ground_contact == "Yes" else 25.0
                 insulated = st.checkbox("Insulated Floor (e.g., R-10)", value=floor.insulated)
 
-            col3, col4 = st.columns(2)
-            with col3:
-                submitted = st.form_submit_button("Update Floor")
-            with col4:
-                cancelled = st.form_submit_button("Cancel")
-
+            submitted = st.form_submit_button("Update Floor")
             if submitted:
                 try:
                     updated_floor = Floor(
@@ -1292,15 +1270,11 @@ class ComponentSelectionInterface:
                     )
                     self.component_library.components[floor.id] = updated_floor
                     session_state.components['floors'][index] = updated_floor
-                    st.success(f"Updated {name}")
                     session_state[f"edit_floor"] = None
+                    st.success(f"Updated {name}")
                     st.rerun()
                 except ValueError as e:
                     st.error(f"Error: {str(e)}")
-            
-            if cancelled:
-                session_state[f"edit_floor"] = None
-                st.rerun()
 
     def _display_edit_window_form(self, session_state: Any, window: Window, index: int) -> None:
         with st.form(f"edit_window_form_{index}", clear_on_submit=True):
@@ -1326,12 +1300,7 @@ class ComponentSelectionInterface:
                 drapery_color = st.selectbox("Drapery Color", [c.value for c in DraperyColor], index=[c.value for c in DraperyColor].index(window.drapery_color))
                 drapery_fullness = st.number_input("Drapery Fullness", min_value=1.0, max_value=2.0, value=window.drapery_fullness, step=0.1)
 
-            col3, col4 = st.columns(2)
-            with col3:
-                submitted = st.form_submit_button("Update Window")
-            with col4:
-                cancelled = st.form_submit_button("Cancel")
-
+            submitted = st.form_submit_button("Update Window")
             if submitted:
                 try:
                     updated_window = Window(
@@ -1343,15 +1312,11 @@ class ComponentSelectionInterface:
                     )
                     self.component_library.components[window.id] = updated_window
                     session_state.components['windows'][index] = updated_window
-                    st.success(f"Updated {name}")
                     session_state[f"edit_window"] = None
+                    st.success(f"Updated {name}")
                     st.rerun()
                 except ValueError as e:
                     st.error(f"Error: {str(e)}")
-            
-            if cancelled:
-                session_state[f"edit_window"] = None
-                st.rerun()
 
     def _display_edit_door_form(self, session_state: Any, door: Door, index: int) -> None:
         with st.form(f"edit_door_form_{index}", clear_on_submit=True):
@@ -1368,12 +1333,7 @@ class ComponentSelectionInterface:
                 infiltration_rate = st.number_input("Infiltration Rate (CFM)", min_value=0.0, value=door.infiltration_rate_cfm, step=0.1)
                 crack_width = st.number_input("Crack Width (m)", min_value=0.0, max_value=0.1, value=door.crack_width, step=0.001)
 
-            col3, col4 = st.columns(2)
-            with col3:
-                submitted = st.form_submit_button("Update Door")
-            with col4:
-                cancelled = st.form_submit_button("Cancel")
-
+            submitted = st.form_submit_button("Update Door")
             if submitted:
                 try:
                     updated_door = Door(
@@ -1383,15 +1343,11 @@ class ComponentSelectionInterface:
                     )
                     self.component_library.components[door.id] = updated_door
                     session_state.components['doors'][index] = updated_door
-                    st.success(f"Updated {name}")
                     session_state[f"edit_door"] = None
+                    st.success(f"Updated {name}")
                     st.rerun()
                 except ValueError as e:
                     st.error(f"Error: {str(e)}")
-            
-            if cancelled:
-                session_state[f"edit_door"] = None
-                st.rerun()
 
     def _display_edit_skylight_form(self, session_state: Any, skylight: Skylight, index: int) -> None:
         with st.form(f"edit_skylight_form_{index}", clear_on_submit=True):
@@ -1416,12 +1372,7 @@ class ComponentSelectionInterface:
                 drapery_color = st.selectbox("Drapery Color", [c.value for c in DraperyColor], index=[c.value for c in DraperyColor].index(skylight.drapery_color))
                 drapery_fullness = st.number_input("Drapery Fullness", min_value=1.0, max_value=2.0, value=skylight.drapery_fullness, step=0.1)
 
-            col3, col4 = st.columns(2)
-            with col3:
-                submitted = st.form_submit_button("Update Skylight")
-            with col4:
-                cancelled = st.form_submit_button("Cancel")
-
+            submitted = st.form_submit_button("Update Skylight")
             if submitted:
                 try:
                     updated_skylight = Skylight(
@@ -1433,38 +1384,29 @@ class ComponentSelectionInterface:
                     )
                     self.component_library.components[skylight.id] = updated_skylight
                     session_state.components['skylights'][index] = updated_skylight
-                    st.success(f"Updated {name}")
                     session_state[f"edit_skylight"] = None
+                    st.success(f"Updated {name}")
                     st.rerun()
                 except ValueError as e:
                     st.error(f"Error: {str(e)}")
-            
-            if cancelled:
-                session_state[f"edit_skylight"] = None
-                st.rerun()
 
     def _save_components(self, session_state: Any) -> None:
         components_data = {
-            "walls": [comp.to_dict() for comp in session_state.components.get('walls', [])],
-            "roofs": [comp.to_dict() for comp in session_state.components.get('roofs', [])],
-            "floors": [comp.to_dict() for comp in session_state.components.get('floors', [])],
-            "windows": [comp.to_dict() for comp in session_state.components.get('windows', [])],
-            "doors": [comp.to_dict() for comp in session_state.components.get('doors', [])],
-            "skylights": [comp.to_dict() for comp in session_state.components.get('skylights', [])],
+            "walls": [comp.to_dict() for comp in session_state.components['walls']],
+            "roofs": [comp.to_dict() for comp in session_state.components['roofs']],
+            "floors": [comp.to_dict() for comp in session_state.components['floors']],
+            "windows": [comp.to_dict() for comp in session_state.components['windows']],
+            "doors": [comp.to_dict() for comp in session_state.components['doors']],
+            "skylights": [comp.to_dict() for comp in session_state.components['skylights']],
             "roof_air_volume_m3": session_state.roof_air_volume_m3,
             "roof_ventilation_ach": session_state.roof_ventilation_ach
         }
-        output = io.StringIO()
-        json.dump(components_data, output, indent=4)
+        buffer = io.StringIO()
+        json.dump(components_data, buffer, indent=2)
         st.download_button(
             label="Download Components JSON",
-            data=output.getvalue(),
-            file_name="components.json",
+            data=buffer.getvalue(),
+            file_name="building_components.json",
             mime="application/json"
         )
-        st.success("Components saved! Click the button to download the JSON file.")
-
-# --- Main Execution ---
-if __name__ == "__main__":
-    interface = ComponentSelectionInterface()
-    interface.display_component_selection(st.session_state)
+        st.success("Components saved to JSON file for download.")