Update app/component_selection.py

app/component_selection.py

@@ -376,129 +376,129 @@ class ComponentSelectionInterface:
             st.info(f"No {type_name} components defined yet.")
 
     def _display_add_component_form(self, session_state: Any, component_type: ComponentType) -> None:
-    type_name = component_type.value.lower()
-    preset_components = self.component_library.get_preset_components_by_type(component_type)
-    
-    # Add a flag to prevent infinite rerun
-    if f"add_{type_name}_submitted" not in session_state:
-        session_state[f"add_{type_name}_submitted"] = False
-    
-    with st.form(f"add_{type_name}_form"):
-        col1, col2 = st.columns(2)
-        with col1:
-            name = st.text_input("Name", f"New {type_name.capitalize()}")
-            area = st.number_input("Area (m²)", min_value=0.0, value=1.0, step=0.1)
-            if component_type not in [ComponentType.ROOF, ComponentType.FLOOR]:
-                orientation = st.selectbox("Orientation", [o.value for o in Orientation], index=0)
-            else:
-                orientation = Orientation.HORIZONTAL.value
+        type_name = component_type.value.lower()
+        preset_components = self.component_library.get_preset_components_by_type(component_type)
         
-        with col2:
-            selection_method = st.radio(f"{type_name.capitalize()} Selection Method", ["Select from Presets", "Custom Properties"])
-            if selection_method == "Select from Presets" and preset_components:
-                preset_options = {comp.name: comp.id for comp in preset_components}
-                selected_preset = st.selectbox(f"Select Preset {type_name.capitalize()}", options=list(preset_options.keys()))
-                component = self.component_library.get_component(preset_options[selected_preset])
-                u_value = st.number_input("U-Value (W/m²·K)", value=component.u_value, disabled=True)
-                if component_type == ComponentType.WALL:
-                    st.text_input("Wall Type", value=component.wall_type, disabled=True)
-                    st.text_input("Wall Group", value=component.wall_group, disabled=True)
-                elif component_type == ComponentType.ROOF:
-                    st.text_input("Roof Type", value=component.roof_type, disabled=True)
-                    st.text_input("Roof Group", value=component.roof_group, disabled=True)
-                elif component_type == ComponentType.FLOOR:
-                    st.text_input("Floor Type", value=component.floor_type, disabled=True)
-                elif component_type == ComponentType.WINDOW:
-                    st.number_input("SHGC", value=component.shgc, disabled=True)
-                    st.number_input("VT", value=component.vt, disabled=True)
-                    st.text_input("Window Type", value=component.window_type, disabled=True)
-                elif component_type == ComponentType.DOOR:
-                    st.text_input("Door Type", value=component.door_type, disabled=True)
-            else:
-                u_value = st.number_input("U-Value (W/m²·K)", min_value=0.0, value=0.5, step=0.01)
-                if component_type == ComponentType.WALL:
-                    wall_type = st.text_input("Wall Type", "Custom")
-                    wall_group = st.selectbox("Wall Group", ["A", "B", "C", "D", "E", "F", "G", "H"], index=1)
-                elif component_type == ComponentType.ROOF:
-                    roof_type = st.text_input("Roof Type", "Custom")
-                    roof_group = st.selectbox("Roof Group", ["A", "B", "C", "D", "E", "F", "G"], index=2)
-                elif component_type == ComponentType.FLOOR:
-                    floor_type = st.text_input("Floor Type", "Custom")
-                elif component_type == ComponentType.WINDOW:
-                    shgc = st.number_input("SHGC", min_value=0.0, max_value=1.0, value=0.7, step=0.01)
-                    vt = st.number_input("VT", min_value=0.0, max_value=1.0, value=0.7, step=0.01)
-                    window_type = st.text_input("Window Type", "Custom")
-                    glazing_layers = st.selectbox("Glazing Layers", [1, 2, 3], index=1)
-                    gas_fill = st.selectbox("Gas Fill", ["Air", "Argon", "Krypton"], index=0)
-                    low_e_coating = st.checkbox("Low-E Coating")
-                    shading_options = {d.name: d.id for d in self.shading_system.shading_devices.values()}
-                    shading_device = st.selectbox("Shading Device", options=list(shading_options.keys()), index=0)
-                    coverage = st.number_input("Coverage (%)", min_value=0.0, max_value=100.0, value=100.0, step=5.0)
-                    device = self.shading_system.get_device(shading_options[shading_device])
-                    device.coverage_percentage = coverage
-                    st.write(f"Effective SHGC: {self.shading_system.calculate_effective_shgc(shgc, shading_options[shading_device]):.2f}")
-                elif component_type == ComponentType.DOOR:
-                    door_type = st.text_input("Door Type", "Custom")
+        # Add a flag to prevent infinite rerun
+        if f"add_{type_name}_submitted" not in session_state:
+            session_state[f"add_{type_name}_submitted"] = False
         
-        submitted = st.form_submit_button("Add Component")
-        if submitted and not session_state[f"add_{type_name}_submitted"]:
-            if not name:
-                st.error(f"{type_name.capitalize()} name is required!")
-            elif area <= 0:
-                st.error(f"{type_name.capitalize()} area must be greater than zero!")
-            elif u_value <= 0:
-                st.error(f"{type_name.capitalize()} U-value must be greater than zero!")
-            else:
-                try:
-                    if selection_method == "Select from Presets" and preset_components:
-                        component_id = preset_options[selected_preset]
-                        component = self.component_library.get_component(component_id)
-                        # Create a copy of __dict__ and remove 'id' before unpacking
-                        preset_attrs = component.__dict__.copy()
-                        preset_attrs.pop('id', None)  # Remove 'id' to avoid duplication
-                        new_component = component.__class__(
-                            id=str(uuid.uuid4()), name=name, area=area, 
-                            orientation=Orientation(orientation), **preset_attrs
-                        )
-                    else:
-                        if component_type == ComponentType.WALL:
-                            new_component = Wall(
-                                id=str(uuid.uuid4()), name=name, u_value=u_value, area=area, 
-                                orientation=Orientation(orientation), wall_type=wall_type, wall_group=wall_group
-                            )
-                        elif component_type == ComponentType.ROOF:
-                            new_component = Roof(
-                                id=str(uuid.uuid4()), name=name, u_value=u_value, area=area, 
-                                orientation=Orientation(orientation), roof_type=roof_type, roof_group=roof_group
-                            )
-                        elif component_type == ComponentType.FLOOR:
-                            new_component = Floor(
-                                id=str(uuid.uuid4()), name=name, u_value=u_value, area=area, 
-                                orientation=Orientation(orientation), floor_type=floor_type
-                            )
-                        elif component_type == ComponentType.WINDOW:
-                            new_component = Window(
-                                id=str(uuid.uuid4()), name=name, u_value=u_value, area=area, 
-                                orientation=Orientation(orientation), shgc=shgc, vt=vt, window_type=window_type,
-                                glazing_layers=glazing_layers, gas_fill=gas_fill, low_e_coating=low_e_coating,
-                                shading_device_id=shading_options[shading_device]
-                            )
-                        elif component_type == ComponentType.DOOR:
-                            new_component = Door(
-                                id=str(uuid.uuid4()), name=name, u_value=u_value, area=area, 
-                                orientation=Orientation(orientation), door_type=door_type
+        with st.form(f"add_{type_name}_form"):
+            col1, col2 = st.columns(2)
+            with col1:
+                name = st.text_input("Name", f"New {type_name.capitalize()}")
+                area = st.number_input("Area (m²)", min_value=0.0, value=1.0, step=0.1)
+                if component_type not in [ComponentType.ROOF, ComponentType.FLOOR]:
+                    orientation = st.selectbox("Orientation", [o.value for o in Orientation], index=0)
+                else:
+                    orientation = Orientation.HORIZONTAL.value
+            
+            with col2:
+                selection_method = st.radio(f"{type_name.capitalize()} Selection Method", ["Select from Presets", "Custom Properties"])
+                if selection_method == "Select from Presets" and preset_components:
+                    preset_options = {comp.name: comp.id for comp in preset_components}
+                    selected_preset = st.selectbox(f"Select Preset {type_name.capitalize()}", options=list(preset_options.keys()))
+                    component = self.component_library.get_component(preset_options[selected_preset])
+                    u_value = st.number_input("U-Value (W/m²·K)", value=component.u_value, disabled=True)
+                    if component_type == ComponentType.WALL:
+                        st.text_input("Wall Type", value=component.wall_type, disabled=True)
+                        st.text_input("Wall Group", value=component.wall_group, disabled=True)
+                    elif component_type == ComponentType.ROOF:
+                        st.text_input("Roof Type", value=component.roof_type, disabled=True)
+                        st.text_input("Roof Group", value=component.roof_group, disabled=True)
+                    elif component_type == ComponentType.FLOOR:
+                        st.text_input("Floor Type", value=component.floor_type, disabled=True)
+                    elif component_type == ComponentType.WINDOW:
+                        st.number_input("SHGC", value=component.shgc, disabled=True)
+                        st.number_input("VT", value=component.vt, disabled=True)
+                        st.text_input("Window Type", value=component.window_type, disabled=True)
+                    elif component_type == ComponentType.DOOR:
+                        st.text_input("Door Type", value=component.door_type, disabled=True)
+                else:
+                    u_value = st.number_input("U-Value (W/m²·K)", min_value=0.0, value=0.5, step=0.01)
+                    if component_type == ComponentType.WALL:
+                        wall_type = st.text_input("Wall Type", "Custom")
+                        wall_group = st.selectbox("Wall Group", ["A", "B", "C", "D", "E", "F", "G", "H"], index=1)
+                    elif component_type == ComponentType.ROOF:
+                        roof_type = st.text_input("Roof Type", "Custom")
+                        roof_group = st.selectbox("Roof Group", ["A", "B", "C", "D", "E", "F", "G"], index=2)
+                    elif component_type == ComponentType.FLOOR:
+                        floor_type = st.text_input("Floor Type", "Custom")
+                    elif component_type == ComponentType.WINDOW:
+                        shgc = st.number_input("SHGC", min_value=0.0, max_value=1.0, value=0.7, step=0.01)
+                        vt = st.number_input("VT", min_value=0.0, max_value=1.0, value=0.7, step=0.01)
+                        window_type = st.text_input("Window Type", "Custom")
+                        glazing_layers = st.selectbox("Glazing Layers", [1, 2, 3], index=1)
+                        gas_fill = st.selectbox("Gas Fill", ["Air", "Argon", "Krypton"], index=0)
+                        low_e_coating = st.checkbox("Low-E Coating")
+                        shading_options = {d.name: d.id for d in self.shading_system.shading_devices.values()}
+                        shading_device = st.selectbox("Shading Device", options=list(shading_options.keys()), index=0)
+                        coverage = st.number_input("Coverage (%)", min_value=0.0, max_value=100.0, value=100.0, step=5.0)
+                        device = self.shading_system.get_device(shading_options[shading_device])
+                        device.coverage_percentage = coverage
+                        st.write(f"Effective SHGC: {self.shading_system.calculate_effective_shgc(shgc, shading_options[shading_device]):.2f}")
+                    elif component_type == ComponentType.DOOR:
+                        door_type = st.text_input("Door Type", "Custom")
+            
+            submitted = st.form_submit_button("Add Component")
+            if submitted and not session_state[f"add_{type_name}_submitted"]:
+                if not name:
+                    st.error(f"{type_name.capitalize()} name is required!")
+                elif area <= 0:
+                    st.error(f"{type_name.capitalize()} area must be greater than zero!")
+                elif u_value <= 0:
+                    st.error(f"{type_name.capitalize()} U-value must be greater than zero!")
+                else:
+                    try:
+                        if selection_method == "Select from Presets" and preset_components:
+                            component_id = preset_options[selected_preset]
+                            component = self.component_library.get_component(component_id)
+                            # Create a copy of __dict__ and remove 'id' before unpacking
+                            preset_attrs = component.__dict__.copy()
+                            preset_attrs.pop('id', None)  # Remove 'id' to avoid duplication
+                            new_component = component.__class__(
+                                id=str(uuid.uuid4()), name=name, area=area, 
+                                orientation=Orientation(orientation), **preset_attrs
                             )
-                    self.component_library.add_component(new_component)
-                    session_state.components[type_name + 's'].append(new_component)
-                    st.success(f"Added {new_component.name}")
-                    session_state[f"add_{type_name}_submitted"] = True  # Set flag to prevent rerun loop
-                    st.rerun()
-                except ValueError as e:
-                    st.error(f"Error: {str(e)}")
-    
-    # Reset the flag after rerun to allow new submissions
-    if session_state[f"add_{type_name}_submitted"]:
-        session_state[f"add_{type_name}_submitted"] = False
+                        else:
+                            if component_type == ComponentType.WALL:
+                                new_component = Wall(
+                                    id=str(uuid.uuid4()), name=name, u_value=u_value, area=area, 
+                                    orientation=Orientation(orientation), wall_type=wall_type, wall_group=wall_group
+                                )
+                            elif component_type == ComponentType.ROOF:
+                                new_component = Roof(
+                                    id=str(uuid.uuid4()), name=name, u_value=u_value, area=area, 
+                                    orientation=Orientation(orientation), roof_type=roof_type, roof_group=roof_group
+                                )
+                            elif component_type == ComponentType.FLOOR:
+                                new_component = Floor(
+                                    id=str(uuid.uuid4()), name=name, u_value=u_value, area=area, 
+                                    orientation=Orientation(orientation), floor_type=floor_type
+                                )
+                            elif component_type == ComponentType.WINDOW:
+                                new_component = Window(
+                                    id=str(uuid.uuid4()), name=name, u_value=u_value, area=area, 
+                                    orientation=Orientation(orientation), shgc=shgc, vt=vt, window_type=window_type,
+                                    glazing_layers=glazing_layers, gas_fill=gas_fill, low_e_coating=low_e_coating,
+                                    shading_device_id=shading_options[shading_device]
+                                )
+                            elif component_type == ComponentType.DOOR:
+                                new_component = Door(
+                                    id=str(uuid.uuid4()), name=name, u_value=u_value, area=area, 
+                                    orientation=Orientation(orientation), door_type=door_type
+                                )
+                        self.component_library.add_component(new_component)
+                        session_state.components[type_name + 's'].append(new_component)
+                        st.success(f"Added {new_component.name}")
+                        session_state[f"add_{type_name}_submitted"] = True  # Set flag to prevent rerun loop
+                        st.rerun()
+                    except ValueError as e:
+                        st.error(f"Error: {str(e)}")
+        
+        # Reset the flag after rerun to allow new submissions
+        if session_state[f"add_{type_name}_submitted"]:
+            session_state[f"add_{type_name}_submitted"] = False
 
     def _display_components_table(self, session_state: Any, component_type: ComponentType, components: List[BuildingComponent]) -> None:
         type_name = component_type.value.lower()