Update app/component_selection.py

app/component_selection.py

@@ -371,18 +371,16 @@ class ComponentSelectionInterface:
         if components:
             st.subheader(f"Existing {type_name.capitalize()} Components")
             self._display_components_table(session_state, component_type, components)
-        # 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
-        st.write("Add walls manually or upload an Excel file.")
-        wall_method = st.radio("Add Wall Method", ["Manual Entry", "Excel Upload"])
+        st.write("Add walls manually or upload a file.")
+        wall_method = st.radio("Add Wall Method", ["Manual Entry", "File 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"):
+            with st.form("add_wall_form", clear_on_submit=True):  # Clear form on submit
                 col1, col2 = st.columns(2)
                 with col1:
                     name = st.text_input("Name", "New Wall")
@@ -391,10 +389,13 @@ class ComponentSelectionInterface:
                 with col2:
                     preset_walls = self.component_library.get_preset_components_by_type(ComponentType.WALL)
                     wall_options = {comp.name: comp for comp in preset_walls}
-                    selected_wall = st.selectbox("Select Wall Type", options=list(wall_options.keys()))
+                    selected_wall = st.selectbox("Select Wall Type", options=list(wall_options.keys()), key="wall_type_select")
                     component = wall_options[selected_wall]
-                    # 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)
+                    # Update U-value immediately when wall type changes
+                    if "selected_wall" not in session_state or session_state.selected_wall != selected_wall:
+                        session_state.selected_wall = selected_wall
+                        session_state.u_value = component.u_value
+                    u_value = st.number_input("U-Value (W/m²·K)", min_value=0.0, max_value=9.0, value=session_state.get("u_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")
@@ -414,22 +415,29 @@ class ComponentSelectionInterface:
                         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
+                        session_state.add_wall_submitted = True
                         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)
+        elif wall_method == "File Upload":
+            st.info("Upload a CSV or Excel file with columns: Name, Area (m²), U-Value (W/m²·K), Orientation, Wall Type, Group, Shading (%)")
+            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", "Group", "Shading (%)"]
+            if uploaded_file and st.button("Process File"):
+                if uploaded_file.name.endswith('.csv'):
+                    df = pd.read_csv(uploaded_file)
+                else:  # .xlsx
+                    df = pd.read_excel(uploaded_file)
                 if not all(col in df.columns for col in required_cols):
-                    st.error("Excel file must contain all required columns!")
+                    st.error("File must contain all required columns!")
                 else:
+                    # Overwrite existing walls
+                    session_state.components['walls'] = []
+                    for comp_id in list(self.component_library.components.keys()):
+                        if not comp_id.startswith("preset_") and self.component_library.components[comp_id].component_type == ComponentType.WALL:
+                            self.component_library.remove_component(comp_id)
                     for _, row in df.iterrows():
                         try:
                             new_wall = Wall(
@@ -442,18 +450,17 @@ class ComponentSelectionInterface:
                             session_state.components['walls'].append(new_wall)
                         except ValueError as e:
                             st.error(f"Error in row: {row['Name']} - {str(e)}")
-                    st.success("Walls uploaded successfully!")
+                    st.success("Walls uploaded and overwritten successfully!")
                     st.rerun()
             # Provide a downloadable template
             template_df = pd.DataFrame(columns=required_cols)
             buffer = io.BytesIO()
-            with pd.ExcelWriter(buffer, engine='xlsxwriter') as writer:
-                template_df.to_excel(writer, index=False)
+            template_df.to_csv(buffer, index=False)
             st.download_button(
-                label="Download Wall Template",
+                label="Download Wall Template (CSV)",
                 data=buffer.getvalue(),
-                file_name="wall_template.xlsx",
-                mime="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+                file_name="wall_template.csv",
+                mime="text/csv"
             )
 
     def _display_add_component_form(self, session_state: Any, component_type: ComponentType) -> None:
@@ -463,7 +470,7 @@ class ComponentSelectionInterface:
         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"):
+        with st.form(f"add_{type_name}_form", clear_on_submit=True):  # Clear form on submit
             col1, col2 = st.columns(2)
             with col1:
                 name = st.text_input("Name", f"New {type_name.capitalize()}")
@@ -570,7 +577,7 @@ class ComponentSelectionInterface:
         for comp in components:
             row = {"Name": comp.name, "Area (m²)": comp.area, "U-Value (W/m²·K)": comp.u_value, "Orientation": comp.orientation.value, "ID": comp.id}
             if component_type == ComponentType.WALL:
-                row.update({"Wall Type": comp.wall_type, "Wall Group": comp.wall_group, "Shading (%)": comp.shading_percentage})
+                row.update({"Wall Type": comp.wall_type, "Group": comp.wall_group, "Shading (%)": comp.shading_percentage})
             elif component_type == ComponentType.ROOF:
                 row.update({"Roof Type": comp.roof_type, "Roof Group": comp.roof_group})
             elif component_type == ComponentType.FLOOR:
@@ -587,12 +594,9 @@ class ComponentSelectionInterface:
         st.dataframe(df[display_cols], use_container_width=True)
         
         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()
+            col1, col2 = st.columns([5, 1])  # Adjusted column widths for better alignment
+            with col1:
+                st.write("")  # Placeholder to align with table row
             with col2:
                 if st.button("Delete", key=f"delete_{row['ID']}"):
                     if not row["ID"].startswith("preset_"):
@@ -604,7 +608,7 @@ class ComponentSelectionInterface:
                         st.warning("Cannot delete preset components.")
         
         if component_type == ComponentType.WALL:
-            csv = df[display_cols].to_csv(index=False)
+            csv = df[display_cols].to_csv(index=False, encoding='utf-8')
             st.download_button(label="Download Walls Table", data=csv, file_name="walls_table.csv", mime="text/csv")
         
         if f"edit_{type_name}" in session_state and component_type != ComponentType.WALL: