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,
+        "embodied_carbon": 240.0,
         "cost": 180.0,
         "absorptivity": 0.65,
         "emissivity": 0.90,
@@ -350,9 +350,67 @@ 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
+    # Initialize session state flags
+    if "material_form_action" not in st.session_state:
+        st.session_state.material_form_action = None
+    if "fenestration_form_action" not in st.session_state:
+        st.session_state.fenestration_form_action = None
+    if "table_action" not in st.session_state:
+        st.session_state.table_action = None
+
+    # Process table actions before rendering UI
+    if st.session_state.table_action:
+        action = st.session_state.table_action
+        action_type = action.get("type")
+        name = action.get("name")
+        is_material = action.get("is_material", True)
+
+        if action_type == "preview":
+            editor_key = "material_editor" if is_material else "fenestration_editor"
+            data = (st.session_state.project_data["materials" if is_material else "fenestrations"]
+                    ["library" if action["is_library"] else "project"][name])
+            st.session_state[editor_key] = {
+                **data,
+                "name": name,
+                "edit_mode": False,
+                "original_name": name,
+                "is_library": action["is_library"]
+            }
+            st.session_state.active_tab = "Materials" if is_material else "Fenestrations"
+            st.session_state.table_action = None
+
+        elif action_type == "copy":
+            library_data = st.session_state.project_data["materials" if is_material else "fenestrations"]["library"]
+            project_data = st.session_state.project_data["materials" if is_material else "fenestrations"]["project"]
+            new_name = f"{name}_Project"
+            counter = 1
+            while new_name in project_data or new_name in library_data:
+                new_name = f"{name}_Project_{counter}"
+                counter += 1
+            project_data[new_name] = library_data[name].copy()
+            logger.info(f"Copied library {'material' if is_material else 'fenestration'} '{name}' as '{new_name}' to project")
+            st.session_state.table_action = None
+
+        elif action_type == "edit":
+            st.session_state.material_editor = {
+                **st.session_state.project_data["materials"]["project"][name],
+                "name": name,
+                "edit_mode": True,
+                "original_name": name,
+                "is_library": False
+            }
+            st.session_state.active_tab = "Materials" if is_material else "Fenestrations"
+            st.session_state.table_action = None
+
+        elif action_type == "delete":
+            check_fn = check_material_in_use if is_material else check_fenestration_in_use
+            project_data = st.session_state.project_data["materials" if is_material else "fenestrations"]["project"]
+            if check_fn(name):
+                st.error(f"Cannot delete {'material' if is_material else 'fenestration'} '{name}' because it is in use.")
+            else:
+                del project_data[name]
+                logger.info(f"Deleted {'material' if is_material else 'fenestration'} '{name}' from project")
+            st.session_state.table_action = None
 
     st.title("Material Library")
     
@@ -377,16 +435,24 @@ 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.session_state.needs_rerun = True
+            st.session_state.material_form_action = None
+            st.session_state.fenestration_form_action = None
+            st.session_state.table_action = None
+            st.rerun()
     
     with col2:
         if st.button("Continue to Construction", key="continue_to_construction"):
             st.session_state.current_page = "Construction"
-            st.session_state.needs_rerun = True
+            st.session_state.material_form_action = None
+            st.session_state.fenestration_form_action = None
+            st.session_state.table_action = None
+            st.rerun()
     
-    # Trigger rerun if needed
-    if st.session_state.needs_rerun:
-        st.session_state.needs_rerun = False
+    # Trigger rerun if form actions are pending
+    if st.session_state.material_form_action or st.session_state.fenestration_form_action or st.session_state.table_action:
+        st.session_state.material_form_action = None
+        st.session_state.fenestration_form_action = None
+        st.session_state.table_action = None
         st.rerun()
 
 def display_materials_tab():
@@ -430,35 +496,20 @@ def display_materials_tab():
                     cols[2].write(f"{u_value:.3f}")
                     unique_id = str(uuid.uuid4())
                     if cols[3].button("Preview", key=f"preview_lib_mat_{name}_{unique_id}"):
-                        st.session_state.material_editor = {
+                        st.session_state.table_action = {
+                            "type": "preview",
                             "name": name,
-                            "category": material["category"],
-                            "thermal_conductivity": material["thermal_conductivity"],
-                            "density": material["density"],
-                            "specific_heat": material["specific_heat"],
-                            "default_thickness": material["default_thickness"],
-                            "embodied_carbon": material["embodied_carbon"],
-                            "cost": material["cost"],
-                            "absorptivity": material["absorptivity"],
-                            "emissivity": material["emissivity"],
-                            "colour": material["colour"],
-                            "edit_mode": False,
-                            "original_name": name,
+                            "is_material": True,
                             "is_library": True
                         }
-                        st.session_state.active_tab = "Materials"
-                        st.success(f"Previewing material '{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:
-                            new_name = f"{name}_Project_{counter}"
-                            counter += 1
-                        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.session_state.needs_rerun = True
+                        st.session_state.table_action = {
+                            "type": "copy",
+                            "name": name,
+                            "is_material": True,
+                            "is_library": True
+                        }
             else:
                 st.info("No materials found in the selected category.")
         
@@ -492,34 +543,20 @@ def display_materials_tab():
                     cols[2].write(f"{u_value:.3f}")
                     unique_id = str(uuid.uuid4())
                     if cols[3].button("Edit", key=f"edit_proj_mat_{name}_{unique_id}"):
-                        st.session_state.material_editor = {
+                        st.session_state.table_action = {
+                            "type": "edit",
                             "name": name,
-                            "category": material["category"],
-                            "thermal_conductivity": material["thermal_conductivity"],
-                            "density": material["density"],
-                            "specific_heat": material["specific_heat"],
-                            "default_thickness": material["default_thickness"],
-                            "embodied_carbon": material["embodied_carbon"],
-                            "cost": material["cost"],
-                            "absorptivity": material["absorptivity"],
-                            "emissivity": material["emissivity"],
-                            "colour": material["colour"],
-                            "edit_mode": True,
-                            "original_name": name,
+                            "is_material": True,
                             "is_library": False
                         }
-                        st.session_state.active_tab = "Materials"
-                        st.success(f"Editing material '{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.")
-                        else:
-                            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.session_state.needs_rerun = True
+                        st.session_state.table_action = {
+                            "type": "delete",
+                            "name": name,
+                            "is_material": True,
+                            "is_library": False
+                        }
             else:
                 st.info("No project materials in the selected category.")
         
@@ -590,40 +627,26 @@ 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}")
                     unique_id = str(uuid.uuid4())
                     if cols[3].button("Preview", key=f"preview_lib_fen_{name}_{unique_id}"):
-                        st.session_state.fenestration_editor = {
+                        st.session_state.table_action = {
+                            "type": "preview",
                             "name": name,
-                            "type": fenestration["type"],
-                            "u_value": fenestration["u_value"],
-                            "shgc": fenestration["shgc"],
-                            "visible_transmittance": fenestration["visible_transmittance"],
-                            "thickness": fenestration["thickness"],
-                            "embodied_carbon": fenestration["embodied_carbon"],
-                            "cost": fenestration["cost"],
-                            "edit_mode": False,
-                            "original_name": name,
+                            "is_material": False,
                             "is_library": True
                         }
-                        st.session_state.active_tab = "Fenestrations"
-                        st.success(f"Previewing fenestration '{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:
-                            new_name = f"{name}_Project_{counter}"
-                            counter += 1
-                        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.session_state.needs_rerun = True
+                        st.session_state.table_action = {
+                            "type": "copy",
+                            "name": name,
+                            "is_material": False,
+                            "is_library": True
+                        }
             else:
                 st.info("No fenestrations found in the selected type.")
         
@@ -654,31 +677,20 @@ def display_fenestrations_tab():
                     cols[2].write(f"{fenestration['u_value']:.2f}")
                     unique_id = str(uuid.uuid4())
                     if cols[3].button("Edit", key=f"edit_proj_fen_{name}_{unique_id}"):
-                        st.session_state.fenestration_editor = {
+                        st.session_state.table_action = {
+                            "type": "edit",
                             "name": name,
-                            "type": fenestration["type"],
-                            "u_value": fenestration["u_value"],
-                            "shgc": fenestration["shgc"],
-                            "visible_transmittance": fenestration["visible_transmittance"],
-                            "thickness": fenestration["thickness"],
-                            "embodied_carbon": fenestration["embodied_carbon"],
-                            "cost": fenestration["cost"],
-                            "edit_mode": True,
-                            "original_name": name,
+                            "is_material": False,
                             "is_library": False
                         }
-                        st.session_state.active_tab = "Fenestrations"
-                        st.success(f"Editing fenestration '{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.")
-                        else:
-                            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.session_state.needs_rerun = True
+                        st.session_state.table_action = {
+                            "type": "delete",
+                            "name": name,
+                            "is_material": False,
+                            "is_library": False
+                        }
             else:
                 st.info("No project fenestrations in the selected type.")
         
@@ -955,14 +967,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 and flag for rerun
+                # Reset editor and flag action
                 reset_material_editor()
-                st.session_state.needs_rerun = True
+                st.session_state.material_form_action = "save"
         
         # Handle clear button
         if clear_button:
             reset_material_editor()
-            st.session_state.needs_rerun = True
+            st.session_state.material_form_action = "clear"
 
 def display_fenestration_editor():
     """Display the fenestration editor form."""
@@ -1109,14 +1121,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 and flag for rerun
+                # Reset editor and flag action
                 reset_fenestration_editor()
-                st.session_state.needs_rerun = True
+                st.session_state.fenestration_form_action = "save"
         
         # Handle clear button
         if clear_button:
             reset_fenestration_editor()
-            st.session_state.needs_rerun = True
+            st.session_state.fenestration_form_action = "clear"
 
 def validate_material(
     name: str, category: str, thermal_conductivity: float, density: float,