Update app/component_selection.py

app/component_selection.py

@@ -77,7 +77,7 @@ class BuildingComponent:
 @dataclass
 class Wall(BuildingComponent):
     wall_type: str = "Brick"
-    wall_group: str = "B"
+    wall_group: str = "Wall"  # Changed from B/C to Wall for visualization
     shading_percentage: float = 0.0  # New attribute for shading percentage
 
     def __post_init__(self):
@@ -227,16 +227,16 @@ class ReferenceData:
                 "mat_005": {"name": "Wood", "conductivity": 0.15}
             },
             "wall_types": {
-                "preset_wall_001": {"id": "preset_wall_001", "name": "Brick Wall (Single Layer)", "component_type": "Wall", "u_value": 2.0, "area": 0.0, "orientation": "North", "wall_type": "Brick", "wall_group": "B", "shading_percentage": 0.0},
-                "preset_wall_002": {"id": "preset_wall_002", "name": "Insulated Brick Wall", "component_type": "Wall", "u_value": 0.5, "area": 0.0, "orientation": "North", "wall_type": "Insulated Brick", "wall_group": "B", "shading_percentage": 0.0},
-                "preset_wall_003": {"id": "preset_wall_003", "name": "Concrete Block Wall", "component_type": "Wall", "u_value": 1.8, "area": 0.0, "orientation": "North", "wall_type": "Concrete Block", "wall_group": "C", "shading_percentage": 0.0},
-                "preset_wall_004": {"id": "preset_wall_004", "name": "Insulated Concrete Wall", "component_type": "Wall", "u_value": 0.4, "area": 0.0, "orientation": "North", "wall_type": "Insulated Concrete", "wall_group": "C", "shading_percentage": 0.0},
-                "preset_wall_005": {"id": "preset_wall_005", "name": "Timber Frame Wall", "component_type": "Wall", "u_value": 0.3, "area": 0.0, "orientation": "North", "wall_type": "Timber Frame", "wall_group": "D", "shading_percentage": 0.0},
-                "preset_wall_006": {"id": "preset_wall_006", "name": "Cavity Wall (Brick + Insulation)", "component_type": "Wall", "u_value": 0.6, "area": 0.0, "orientation": "North", "wall_type": "Cavity Brick", "wall_group": "B", "shading_percentage": 0.0},
-                "preset_wall_007": {"id": "preset_wall_007", "name": "Lightweight Panel Wall", "component_type": "Wall", "u_value": 1.0, "area": 0.0, "orientation": "North", "wall_type": "Lightweight Panel", "wall_group": "E", "shading_percentage": 0.0},
-                "preset_wall_008": {"id": "preset_wall_008", "name": "Reinforced Concrete Wall", "component_type": "Wall", "u_value": 1.5, "area": 0.0, "orientation": "North", "wall_type": "Reinforced Concrete", "wall_group": "C", "shading_percentage": 0.0},
-                "preset_wall_009": {"id": "preset_wall_009", "name": "SIP Wall (Structural Insulated Panel)", "component_type": "Wall", "u_value": 0.25, "area": 0.0, "orientation": "North", "wall_type": "SIP", "wall_group": "F", "shading_percentage": 0.0},
-                "preset_wall_010": {"id": "preset_wall_010", "name": "Custom Wall", "component_type": "Wall", "u_value": 0.5, "area": 0.0, "orientation": "North", "wall_type": "Custom", "wall_group": "G", "shading_percentage": 0.0}
+                "preset_wall_001": {"id": "preset_wall_001", "name": "Brick Wall (Single Layer) (U-value: 2.0 W/m²·K)", "component_type": "Wall", "u_value": 2.0, "area": 0.0, "orientation": "North", "wall_type": "Brick", "wall_group": "Wall", "shading_percentage": 0.0},
+                "preset_wall_002": {"id": "preset_wall_002", "name": "Insulated Brick Wall (U-value: 0.5 W/m²·K)", "component_type": "Wall", "u_value": 0.5, "area": 0.0, "orientation": "North", "wall_type": "Insulated Brick", "wall_group": "Wall", "shading_percentage": 0.0},
+                "preset_wall_003": {"id": "preset_wall_003", "name": "Concrete Block Wall (U-value: 1.8 W/m²·K)", "component_type": "Wall", "u_value": 1.8, "area": 0.0, "orientation": "North", "wall_type": "Concrete Block", "wall_group": "Wall", "shading_percentage": 0.0},
+                "preset_wall_004": {"id": "preset_wall_004", "name": "Insulated Concrete Wall (U-value: 0.4 W/m²·K)", "component_type": "Wall", "u_value": 0.4, "area": 0.0, "orientation": "North", "wall_type": "Insulated Concrete", "wall_group": "Wall", "shading_percentage": 0.0},
+                "preset_wall_005": {"id": "preset_wall_005", "name": "Timber Frame Wall (U-value: 0.3 W/m²·K)", "component_type": "Wall", "u_value": 0.3, "area": 0.0, "orientation": "North", "wall_type": "Timber Frame", "wall_group": "Wall", "shading_percentage": 0.0},
+                "preset_wall_006": {"id": "preset_wall_006", "name": "Cavity Wall (Brick + Insulation) (U-value: 0.6 W/m²·K)", "component_type": "Wall", "u_value": 0.6, "area": 0.0, "orientation": "North", "wall_type": "Cavity Brick", "wall_group": "Wall", "shading_percentage": 0.0},
+                "preset_wall_007": {"id": "preset_wall_007", "name": "Lightweight Panel Wall (U-value: 1.0 W/m²·K)", "component_type": "Wall", "u_value": 1.0, "area": 0.0, "orientation": "North", "wall_type": "Lightweight Panel", "wall_group": "Wall", "shading_percentage": 0.0},
+                "preset_wall_008": {"id": "preset_wall_008", "name": "Reinforced Concrete Wall (U-value: 1.5 W/m²·K)", "component_type": "Wall", "u_value": 1.5, "area": 0.0, "orientation": "North", "wall_type": "Reinforced Concrete", "wall_group": "Wall", "shading_percentage": 0.0},
+                "preset_wall_009": {"id": "preset_wall_009", "name": "SIP Wall (Structural Insulated Panel) (U-value: 0.25 W/m²·K)", "component_type": "Wall", "u_value": 0.25, "area": 0.0, "orientation": "North", "wall_type": "SIP", "wall_group": "Wall", "shading_percentage": 0.0},
+                "preset_wall_010": {"id": "preset_wall_010", "name": "Custom Wall (U-value: 0.5 W/m²·K)", "component_type": "Wall", "u_value": 0.5, "area": 0.0, "orientation": "North", "wall_type": "Custom", "wall_group": "Wall", "shading_percentage": 0.0}
             },
             "roof_types": {
                 "preset_roof_001": {"id": "preset_roof_001", "name": "Concrete Roof", "component_type": "Roof", "u_value": 0.3, "area": 0.0, "orientation": "Horizontal", "roof_type": "Concrete", "roof_group": "C"}
@@ -371,8 +371,7 @@ class ComponentSelectionInterface:
         if components:
             st.subheader(f"Existing {type_name.capitalize()} Components")
             self._display_components_table(session_state, component_type, components)
-        else:
-            st.info(f"No {type_name} components defined yet.")
+        # Removed the misplaced Download Walls Table button from here
 
     def _display_add_wall_form(self, session_state: Any) -> None:
         # Wall-specific form with manual entry and Excel upload options
@@ -380,6 +379,9 @@ class ComponentSelectionInterface:
         wall_method = st.radio("Add Wall Method", ["Manual Entry", "Excel Upload"])
         
         if wall_method == "Manual Entry":
+            if "add_wall_submitted" not in session_state:
+                session_state.add_wall_submitted = False
+            
             with st.form("add_wall_form"):
                 col1, col2 = st.columns(2)
                 with col1:
@@ -391,14 +393,12 @@ class ComponentSelectionInterface:
                     wall_options = {comp.name: comp for comp in preset_walls}
                     selected_wall = st.selectbox("Select Wall Type", options=list(wall_options.keys()))
                     component = wall_options[selected_wall]
-                    if selected_wall == "Custom Wall":
-                        u_value = st.number_input("U-Value (W/m²·K)", min_value=0.0, max_value=9.0, value=0.5, step=0.01)
-                    else:
-                        u_value = st.number_input("U-Value (W/m²·K)", value=component.u_value, disabled=True)
-                    shading_percentage = st.number_input("Shading Percentage (%)", min_value=0.0, max_value=100.0, value=0.0, step=5.0)
+                    # Allow editing U-value for all wall types
+                    u_value = st.number_input("U-Value (W/m²·K)", min_value=0.0, max_value=9.0, value=component.u_value, step=0.01)
+                    shading_percentage = st.slider("Shading Percentage (%)", min_value=0.0, max_value=100.0, value=0.0, step=5.0)
                 
                 submitted = st.form_submit_button("Add Wall")
-                if submitted:
+                if submitted and not session_state.add_wall_submitted:
                     if not name:
                         st.error("Wall name is required!")
                     elif area <= 0:
@@ -409,19 +409,24 @@ class ComponentSelectionInterface:
                         new_wall = Wall(
                             id=str(uuid.uuid4()), name=name, u_value=u_value, area=area,
                             orientation=Orientation(orientation), wall_type=component.wall_type,
-                            wall_group=component.wall_group, shading_percentage=shading_percentage
+                            wall_group="Wall", shading_percentage=shading_percentage
                         )
                         self.component_library.add_component(new_wall)
                         session_state.components['walls'].append(new_wall)
                         st.success(f"Added {new_wall.name}")
+                        session_state.add_wall_submitted = True  # Prevent infinite addition
                         st.rerun()
+            
+            # Reset the flag after submission
+            if session_state.add_wall_submitted:
+                session_state.add_wall_submitted = False
         
         elif wall_method == "Excel Upload":
             st.info("Upload an Excel file with columns: Name, Area (m²), U-Value (W/m²·K), Orientation, Wall Type, Wall Group, Shading (%)")
             uploaded_file = st.file_uploader("Upload Walls Excel", type=["xlsx"], key="wall_upload")
+            required_cols = ["Name", "Area (m²)", "U-Value (W/m²·K)", "Orientation", "Wall Type", "Wall Group", "Shading (%)"]  # Defined before use
             if uploaded_file and st.button("Process Excel"):
                 df = pd.read_excel(uploaded_file)
-                required_cols = ["Name", "Area (m²)", "U-Value (W/m²·K)", "Orientation", "Wall Type", "Wall Group", "Shading (%)"]
                 if not all(col in df.columns for col in required_cols):
                     st.error("Excel file must contain all required columns!")
                 else:
@@ -430,7 +435,7 @@ class ComponentSelectionInterface:
                             new_wall = Wall(
                                 id=str(uuid.uuid4()), name=row["Name"], u_value=row["U-Value (W/m²·K)"],
                                 area=row["Area (m²)"], orientation=Orientation(row["Orientation"]),
-                                wall_type=row["Wall Type"], wall_group=row["Wall Group"],
+                                wall_type=row["Wall Type"], wall_group="Wall",
                                 shading_percentage=row["Shading (%)"]
                             )
                             self.component_library.add_component(new_wall)
@@ -579,47 +584,28 @@ class ComponentSelectionInterface:
         
         df = pd.DataFrame(data)
         display_cols = [col for col in df.columns if col != "ID"]
+        st.dataframe(df[display_cols], use_container_width=True)
         
-        if component_type == ComponentType.WALL:
-            # Custom table rendering for walls with delete button next to each row
-            st.write("Walls Table:")
-            for i, row in df.iterrows():
-                cols = st.columns([2, 1, 1, 1, 1, 1, 1, 1])
-                cols[0].write(row["Name"])
-                cols[1].write(row["Area (m²)"])
-                cols[2].write(row["U-Value (W/m²·K)"])
-                cols[3].write(row["Orientation"])
-                cols[4].write(row["Wall Type"])
-                cols[5].write(row["Wall Group"])
-                cols[6].write(row["Shading (%)"])
-                if cols[7].button("Delete", key=f"delete_{row['ID']}"):
+        for i, row in df.iterrows():
+            col1, col2 = st.columns(2)
+            if component_type != ComponentType.WALL:  # Edit button only for non-wall components
+                with col1:
+                    if st.button("Edit", key=f"edit_{row['ID']}"):
+                        session_state[f"edit_{type_name}"] = row["ID"]
+                        st.rerun()
+            with col2:
+                if st.button("Delete", key=f"delete_{row['ID']}"):
                     if not row["ID"].startswith("preset_"):
                         self.component_library.remove_component(row["ID"])
-                        session_state.components['walls'] = [c for c in components if c.id != row["ID"]]
+                        session_state.components[type_name + 's'] = [c for c in components if c.id != row["ID"]]
                         st.success(f"Deleted {row['Name']}")
                         st.rerun()
                     else:
                         st.warning("Cannot delete preset components.")
-            # Download walls table as CSV
+        
+        if component_type == ComponentType.WALL:
             csv = df[display_cols].to_csv(index=False)
             st.download_button(label="Download Walls Table", data=csv, file_name="walls_table.csv", mime="text/csv")
-        else:
-            st.dataframe(df[display_cols], use_container_width=True)
-            for i, row in df.iterrows():
-                col1, col2 = st.columns(2)
-                with col1:
-                    if st.button("Edit", key=f"edit_{row['ID']}"):
-                        session_state[f"edit_{type_name}"] = row["ID"]
-                        st  .rerun()
-                with col2:
-                    if st.button("Delete", key=f"delete_{row['ID']}"):
-                        if not row["ID"].startswith("preset_"):
-                            self.component_library.remove_component(row["ID"])
-                            session_state.components[type_name + 's'] = [c for c in components if c.id != row["ID"]]
-                            st.success(f"Deleted {row['Name']}")
-                            st.rerun()
-                        else:
-                            st.warning("Cannot delete preset components.")
         
         if f"edit_{type_name}" in session_state and component_type != ComponentType.WALL:
             self._display_edit_component_form(session_state, component_type, session_state[f"edit_{type_name}"])