Update app/materials_library.py

app/materials_library.py

@@ -56,7 +56,7 @@ DEFAULT_MATERIALS = {
         "density": 1920.0,
         "specific_heat": 840.0,
         "default_thickness": 0.1,
-        "embodied_carbon": 240.0,
+        "embodied_carbon": 240,
         "cost": 180.0,
         "absorptivity": 0.65,
         "emissivity": 0.90,
@@ -350,6 +350,10 @@ def display_materials_page():
     Display the material library page.
     This is the main function called by main.py when the Material Library page is selected.
     """
+    # Initialize rerun flag
+    if "needs_rerun" not in st.session_state:
+        st.session_state.needs_rerun = False
+
     st.title("Material Library")
     
     # Display help information in an expandable section
@@ -373,12 +377,17 @@ def display_materials_page():
     with col1:
         if st.button("Back to Climate Data", key="back_to_climate"):
             st.session_state.current_page = "Climate Data"
-            st.rerun()
+            st.session_state.needs_rerun = True
     
     with col2:
         if st.button("Continue to Construction", key="continue_to_construction"):
             st.session_state.current_page = "Construction"
-            st.rerun()
+            st.session_state.needs_rerun = True
+    
+    # Trigger rerun if needed
+    if st.session_state.needs_rerun:
+        st.session_state.needs_rerun = False
+        st.rerun()
 
 def display_materials_tab():
     """Display the materials tab content."""
@@ -419,7 +428,8 @@ def display_materials_tab():
                     cols[0].write(name)
                     cols[1].write(thermal_mass_category)
                     cols[2].write(f"{u_value:.3f}")
-                    if cols[3].button("Preview", key=f"preview_lib_mat_{name}"):
+                    unique_id = str(uuid.uuid4())
+                    if cols[3].button("Preview", key=f"preview_lib_mat_{name}_{unique_id}"):
                         st.session_state.material_editor = {
                             "name": name,
                             "category": material["category"],
@@ -438,7 +448,8 @@ def display_materials_tab():
                         }
                         st.session_state.active_tab = "Materials"
                         st.success(f"Previewing material '{name}'")
-                    if cols[4].button("Copy", key=f"copy_lib_mat_{name}"):
+                    unique_id = str(uuid.uuid4())
+                    if cols[4].button("Copy", key=f"copy_lib_mat_{name}_{unique_id}"):
                         new_name = f"{name}_Project"
                         counter = 1
                         while new_name in st.session_state.project_data["materials"]["project"] or new_name in library_materials:
@@ -447,7 +458,7 @@ def display_materials_tab():
                         st.session_state.project_data["materials"]["project"][new_name] = material.copy()
                         st.success(f"Material '{new_name}' copied to project.")
                         logger.info(f"Copied library material '{name}' as '{new_name}' to project")
-                        st.rerun()
+                        st.session_state.needs_rerun = True
             else:
                 st.info("No materials found in the selected category.")
         
@@ -479,7 +490,8 @@ def display_materials_tab():
                     cols[0].write(name)
                     cols[1].write(thermal_mass_category)
                     cols[2].write(f"{u_value:.3f}")
-                    if cols[3].button("Edit", key=f"edit_proj_mat_{name}"):
+                    unique_id = str(uuid.uuid4())
+                    if cols[3].button("Edit", key=f"edit_proj_mat_{name}_{unique_id}"):
                         st.session_state.material_editor = {
                             "name": name,
                             "category": material["category"],
@@ -498,7 +510,8 @@ def display_materials_tab():
                         }
                         st.session_state.active_tab = "Materials"
                         st.success(f"Editing material '{name}'")
-                    if cols[4].button("Delete", key=f"delete_proj_mat_{name}"):
+                    unique_id = str(uuid.uuid4())
+                    if cols[4].button("Delete", key=f"delete_proj_mat_{name}_{unique_id}"):
                         is_in_use = check_material_in_use(name)
                         if is_in_use:
                             st.error(f"Cannot delete material '{name}' because it is in use in constructions.")
@@ -506,7 +519,7 @@ def display_materials_tab():
                             del st.session_state.project_data["materials"]["project"][name]
                             st.success(f"Material '{name}' deleted from project.")
                             logger.info(f"Deleted material '{name}' from project")
-                            st.rerun()
+                            st.session_state.needs_rerun = True
             else:
                 st.info("No project materials in the selected category.")
         
@@ -577,11 +590,14 @@ def display_fenestrations_tab():
                 
                 for fenestration in filtered_fenestrations:
                     cols = st.columns([2, 1, 1, 1, 1])
-                    name = [k for k, v in library_fenestrations.items() if v == fenestration][0]
+                    name = [k for k
+
+, v in library_fenestrations.items() if v == fenestration][0]
                     cols[0].write(name)
                     cols[1].write(fenestration["type"])
                     cols[2].write(f"{fenestration['u_value']:.2f}")
-                    if cols[3].button("Preview", key=f"preview_lib_fen_{name}"):
+                    unique_id = str(uuid.uuid4())
+                    if cols[3].button("Preview", key=f"preview_lib_fen_{name}_{unique_id}"):
                         st.session_state.fenestration_editor = {
                             "name": name,
                             "type": fenestration["type"],
@@ -597,7 +613,8 @@ def display_fenestrations_tab():
                         }
                         st.session_state.active_tab = "Fenestrations"
                         st.success(f"Previewing fenestration '{name}'")
-                    if cols[4].button("Copy", key=f"copy_lib_fen_{name}"):
+                    unique_id = str(uuid.uuid4())
+                    if cols[4].button("Copy", key=f"copy_lib_fen_{name}_{unique_id}"):
                         new_name = f"{name}_Project"
                         counter = 1
                         while new_name in st.session_state.project_data["fenestrations"]["project"] or new_name in library_fenestrations:
@@ -606,7 +623,7 @@ def display_fenestrations_tab():
                         st.session_state.project_data["fenestrations"]["project"][new_name] = fenestration.copy()
                         st.success(f"Fenestration '{new_name}' copied to project.")
                         logger.info(f"Copied library fenestration '{name}' as '{new_name}' to project")
-                        st.rerun()
+                        st.session_state.needs_rerun = True
             else:
                 st.info("No fenestrations found in the selected type.")
         
@@ -635,7 +652,8 @@ def display_fenestrations_tab():
                     cols[0].write(name)
                     cols[1].write(fenestration["type"])
                     cols[2].write(f"{fenestration['u_value']:.2f}")
-                    if cols[3].button("Edit", key=f"edit_proj_fen_{name}"):
+                    unique_id = str(uuid.uuid4())
+                    if cols[3].button("Edit", key=f"edit_proj_fen_{name}_{unique_id}"):
                         st.session_state.fenestration_editor = {
                             "name": name,
                             "type": fenestration["type"],
@@ -651,7 +669,8 @@ def display_fenestrations_tab():
                         }
                         st.session_state.active_tab = "Fenestrations"
                         st.success(f"Editing fenestration '{name}'")
-                    if cols[4].button("Delete", key=f"delete_proj_fen_{name}"):
+                    unique_id = str(uuid.uuid4())
+                    if cols[4].button("Delete", key=f"delete_proj_fen_{name}_{unique_id}"):
                         is_in_use = check_fenestration_in_use(name)
                         if is_in_use:
                             st.error(f"Cannot delete fenestration '{name}' because it is in use in components.")
@@ -659,7 +678,7 @@ def display_fenestrations_tab():
                             del st.session_state.project_data["fenestrations"]["project"][name]
                             st.success(f"Fenestration '{name}' deleted from project.")
                             logger.info(f"Deleted fenestration '{name}' from project")
-                            st.rerun()
+                            st.session_state.needs_rerun = True
             else:
                 st.info("No project fenestrations in the selected type.")
         
@@ -894,7 +913,7 @@ def display_material_editor():
         
         with col2:
             clear_button = st.form_submit_button("Clear Form")
-    
+        
         # Handle form submission
         if submit_button and not is_library:
             # Validate inputs
@@ -936,14 +955,14 @@ def display_material_editor():
                     st.success(f"Material '{name}' added to your project.")
                     logger.info(f"Added new material '{name}' to project")
                 
-                # Reset editor
+                # Reset editor and flag for rerun
                 reset_material_editor()
-                st.rerun()
-    
+                st.session_state.needs_rerun = True
+        
         # Handle clear button
         if clear_button:
             reset_material_editor()
-            st.rerun()
+            st.session_state.needs_rerun = True
 
 def display_fenestration_editor():
     """Display the fenestration editor form."""
@@ -1053,7 +1072,7 @@ def display_fenestration_editor():
         
         with col2:
             clear_button = st.form_submit_button("Clear Form")
-    
+        
         # Handle form submission
         if submit_button and not is_library:
             # Validate inputs
@@ -1090,14 +1109,14 @@ def display_fenestration_editor():
                     st.success(f"Fenestration '{name}' added to your project.")
                     logger.info(f"Added new fenestration '{name}' to project")
                 
-                # Reset editor
+                # Reset editor and flag for rerun
                 reset_fenestration_editor()
-                st.rerun()
-    
+                st.session_state.needs_rerun = True
+        
         # Handle clear button
         if clear_button:
             reset_fenestration_editor()
-            st.rerun()
+            st.session_state.needs_rerun = True
 
 def validate_material(
     name: str, category: str, thermal_conductivity: float, density: float,