Update app/materials_library.py

app/materials_library.py

@@ -348,7 +348,7 @@ def categorize_thermal_mass(thermal_mass: float) -> str:
 def get_stable_button_key(prefix: str, name: str, action: str, unique_id: str = None) -> str:
     """Generate a stable button key based on prefix, name, action, and optional unique identifier."""
     import hashlib
-    unique_id = unique_id or str(uuid.uuid4())[:8]  # Generate unique ID if not provided
+    unique_id = unique_id or str(uuid.uuid4())[:8]
     key_string = f"{prefix}_{name}_{action}_{unique_id}"
     hash_key = hashlib.md5(key_string.encode()).hexdigest()[:8]
     return f"{prefix}_{action}_{name}_{hash_key}"
@@ -359,20 +359,25 @@ def display_materials_page():
     This is the main function called by main.py when the Material Library page is selected.
     """
     # Initialize session state
-    if "rerun_pending" not in st.session_state:
-        st.session_state.rerun_pending = False
+    if "action_queue" not in st.session_state:
+        st.session_state.action_queue = []
     if "active_tab" not in st.session_state:
         st.session_state.active_tab = "Materials"
     if "material_action" not in st.session_state:
         st.session_state.material_action = {"action": None, "id": None}
     if "fenestration_action" not in st.session_state:
         st.session_state.fenestration_action = {"action": None, "id": None}
-    if "rerun_trigger" not in st.session_state:
-        st.session_state.rerun_trigger = None
 
-    # Check for rerun trigger
-    if st.session_state.rerun_pending:
-        st.session_state.rerun_pending = False
+    # Process action queue
+    if st.session_state.action_queue:
+        action = st.session_state.action_queue.pop(0)
+        if action["type"] == "page_change":
+            st.session_state.current_page = action["page"]
+            st.rerun()
+        elif action["type"] == "material_action":
+            handle_material_action(action)
+        elif action["type"] == "fenestration_action":
+            handle_fenestration_action(action)
         st.rerun()
 
     # Apply custom CSS for button styling
@@ -395,26 +400,186 @@ def display_materials_page():
     tab1, tab2 = st.tabs(["Materials", "Fenestrations"])
     
     with tab1:
-        if st.session_state.active_tab == "Materials":
-            st.session_state.active_tab = "Materials"
+        st.session_state.active_tab = "Materials"
         display_materials_tab()
     
     with tab2:
-        if st.session_state.active_tab == "Fenestrations":
-            st.session_state.active_tab = "Fenestrations"
+        st.session_state.active_tab = "Fenestrations"
         display_fenestrations_tab()
     
     col1, col2 = st.columns(2)
     
     with col1:
         if st.button("Back to Climate Data", key="back_to_climate"):
-            st.session_state.current_page = "Climate Data"
-            st.session_state.rerun_pending = True
+            st.session_state.action_queue.append({"type": "page_change", "page": "Climate Data"})
     
     with col2:
         if st.button("Continue to Construction", key="continue_to_construction"):
-            st.session_state.current_page = "Construction"
-            st.session_state.rerun_pending = True
+            st.session_state.action_queue.append({"type": "page_change", "page": "Construction"})
+
+def handle_material_action(action: Dict[str, Any]):
+    """Handle material-related actions."""
+    if action["action"] == "preview":
+        material = action["material"]
+        name = action["name"]
+        st.session_state.material_editor = {
+            "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_library": action["is_library"]
+        }
+        st.session_state.material_form_state = {
+            "name": name,
+            "category": material["category"],
+            "thermal_conductivity": float(material["thermal_conductivity"]),
+            "density": float(material["density"]),
+            "specific_heat": float(material["specific_heat"]),
+            "default_thickness": float(material["default_thickness"]),
+            "embodied_carbon": float(material["embodied_carbon"]),
+            "cost": float(material["cost"]),
+            "absorptivity": float(material["absorptivity"]),
+            "emissivity": float(material["emissivity"]),
+            "colour": material["colour"]
+        }
+    elif action["action"] == "copy":
+        name = action["name"]
+        material = action["material"]
+        new_name = f"{name}_Project"
+        counter = 1
+        library_materials = st.session_state.project_data["materials"]["library"]
+        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")
+    elif action["action"] == "edit":
+        material = action["material"]
+        name = action["name"]
+        st.session_state.material_editor = {
+            "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_library": False
+        }
+        st.session_state.material_form_state = {
+            "name": name,
+            "category": material["category"],
+            "thermal_conductivity": float(material["thermal_conductivity"]),
+            "density": float(material["density"]),
+            "specific_heat": float(material["specific_heat"]),
+            "default_thickness": float(material["default_thickness"]),
+            "embodied_carbon": float(material["embodied_carbon"]),
+            "cost": float(material["cost"]),
+            "absorptivity": float(material["absorptivity"]),
+            "emissivity": float(material["emissivity"]),
+            "colour": material["colour"]
+        }
+    elif action["action"] == "delete":
+        name = action["name"]
+        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")
+
+def handle_fenestration_action(action: Dict[str, Any]):
+    """Handle fenestration-related actions."""
+    if action["action"] == "preview":
+        fenestration = action["fenestration"]
+        name = action["name"]
+        st.session_state.fenestration_editor = {
+            "name": name,
+            "type": fenestration["type"],
+            "u_value": fenestration["u_value"],
+            "shgc": fenestration["shgc"],
+            "visible_trans": fenestration["visible_transmittance"],
+            "thickness": fenestration["thickness"],
+            "embodied_carbon": fenestration["embodied_carbon"],
+            "cost": fenestration["cost"],
+            "edit_mode": False,
+            "original_name": name,
+            "is_library": action["is_library"]
+        }
+        st.session_state.fenestration_form_state = {
+            "name": name,
+            "type": fenestration["type"],
+            "u_value": float(fenestration["u_value"]),
+            "shgc": float(fenestration["shgc"]),
+            "visible_trans": float(fenestration["visible_transmittance"]),
+            "thickness": float(fenestration["thickness"]),
+            "embodied_carbon": float(fenestration["embodied_carbon"]),
+            "cost": float(fenestration["cost"])
+        }
+    elif action["action"] == "copy":
+        name = action["name"]
+        fenestration = action["fenestration"]
+        new_name = f"{name}_Project"
+        counter = 1
+        library_fenestrations = st.session_state.project_data["fenestrations"]["library"]
+        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")
+    elif action["action"] == "edit":
+        fenestration = action["fenestration"]
+        name = action["name"]
+        st.session_state.fenestration_editor = {
+            "name": name,
+            "type": fenestration["type"],
+            "u_value": fenestration["u_value"],
+            "shgc": fenestration["shgc"],
+            "visible_trans": fenestration["visible_transmittance"],
+            "thickness": fenestration["thickness"],
+            "embodied_carbon": fenestration["embodied_carbon"],
+            "cost": fenestration["cost"],
+            "edit_mode": True,
+            "original_name": name,
+            "is_library": False
+        }
+        st.session_state.fenestration_form_state = {
+            "name": name,
+            "type": fenestration["type"],
+            "u_value": float(fenestration["u_value"]),
+            "shgc": float(fenestration["shgc"]),
+            "visible_trans": float(fenestration["visible_transmittance"]),
+            "thickness": float(fenestration["thickness"]),
+            "embodied_carbon": float(fenestration["embodied_carbon"]),
+            "cost": float(fenestration["cost"])
+        }
+    elif action["action"] == "delete":
+        name = action["name"]
+        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")
 
 def display_materials_tab():
     """Display the materials tab content."""
@@ -458,50 +623,21 @@ def display_materials_tab():
                     copy_key = get_stable_button_key("lib_mat", name, "copy")
                     
                     if cols[3].button("Preview", key=preview_key):
-                        if st.session_state.rerun_trigger != f"preview_mat_{name}":
-                            st.session_state.rerun_trigger = f"preview_mat_{name}"
-                            st.session_state.material_editor = {
-                                "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_library": True
-                            }
-                            st.session_state.material_form_state = {
-                                "name": name,
-                                "category": material["category"],
-                                "thermal_conductivity": float(material["thermal_conductivity"]),
-                                "density": float(material["density"]),
-                                "specific_heat": float(material["specific_heat"]),
-                                "default_thickness": float(material["default_thickness"]),
-                                "embodied_carbon": float(material["embodied_carbon"]),
-                                "cost": float(material["cost"]),
-                                "absorptivity": float(material["absorptivity"]),
-                                "emissivity": float(material["emissivity"]),
-                                "colour": material["colour"]
-                            }
-                            st.session_state.active_tab = "Materials"
-                            st.session_state.rerun_pending = True
-                        
+                        st.session_state.action_queue.append({
+                            "type": "material_action",
+                            "action": "preview",
+                            "name": name,
+                            "material": material,
+                            "is_library": True
+                        })
+                    
                     if cols[4].button("Copy", key=copy_key):
-                        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.rerun_pending = True
+                        st.session_state.action_queue.append({
+                            "type": "material_action",
+                            "action": "copy",
+                            "name": name,
+                            "material": material
+                        })
             
             else:
                 st.info("No materials found in the selected category.")
@@ -538,49 +674,19 @@ def display_materials_tab():
                     delete_key = get_stable_button_key("proj_mat", name, "delete")
                     
                     if cols[3].button("Edit", key=edit_key):
-                        if st.session_state.rerun_trigger != f"edit_mat_{name}":
-                            st.session_state.rerun_trigger = f"edit_mat_{name}"
-                            st.session_state.material_editor = {
-                                "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_library": False
-                            }
-                            st.session_state.material_form_state = {
-                                "name": name,
-                                "category": material["category"],
-                                "thermal_conductivity": float(material["thermal_conductivity"]),
-                                "density": float(material["density"]),
-                                "specific_heat": float(material["specific_heat"]),
-                                "default_thickness": float(material["default_thickness"]),
-                                "embodied_carbon": float(material["embodied_carbon"]),
-                                "cost": float(material["cost"]),
-                                "absorptivity": float(material["absorptivity"]),
-                                "emissivity": float(material["emissivity"]),
-                                "colour": material["colour"]
-                            }
-                            st.session_state.active_tab = "Materials"
-                            st.session_state.rerun_pending = True
-                        
+                        st.session_state.action_queue.append({
+                            "type": "material_action",
+                            "action": "edit",
+                            "name": name,
+                            "material": material
+                        })
+                    
                     if cols[4].button("Delete", key=delete_key):
-                        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.rerun_pending = True
+                        st.session_state.action_queue.append({
+                            "type": "material_action",
+                            "action": "delete",
+                            "name": name
+                        })
             
             else:
                 st.info("No project materials in the selected category.")
@@ -657,44 +763,21 @@ def display_fenestrations_tab():
                     copy_key = get_stable_button_key("lib_fen", name, "copy")
                     
                     if cols[3].button("Preview", key=preview_key):
-                        if st.session_state.rerun_trigger != f"preview_fen_{name}":
-                            st.session_state.rerun_trigger = f"preview_fen_{name}"
-                            st.session_state.fenestration_editor = {
-                                "name": name,
-                                "type": fenestration["type"],
-                                "u_value": fenestration["u_value"],
-                                "shgc": fenestration["shgc"],
-                                "visible_trans": fenestration["visible_transmittance"],
-                                "thickness": fenestration["thickness"],
-                                "embodied_carbon": fenestration["embodied_carbon"],
-                                "cost": fenestration["cost"],
-                                "edit_mode": False,
-                                "original_name": name,
-                                "is_library": True
-                            }
-                            st.session_state.fenestration_form_state = {
-                                "name": name,
-                                "type": fenestration["type"],
-                                "u_value": float(fenestration["u_value"]),
-                                "shgc": float(fenestration["shgc"]),
-                                "visible_trans": float(fenestration["visible_transmittance"]),
-                                "thickness": float(fenestration["thickness"]),
-                                "embodied_carbon": float(fenestration["embodied_carbon"]),
-                                "cost": float(fenestration["cost"])
-                            }
-                            st.session_state.active_tab = "Fenestrations"
-                            st.session_state.rerun_pending = True
-                        
+                        st.session_state.action_queue.append({
+                            "type": "fenestration_action",
+                            "action": "preview",
+                            "name": name,
+                            "fenestration": fenestration,
+                            "is_library": True
+                        })
+                    
                     if cols[4].button("Copy", key=copy_key):
-                        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.rerun_pending = True
+                        st.session_state.action_queue.append({
+                            "type": "fenestration_action",
+                            "action": "copy",
+                            "name": name,
+                            "fenestration": fenestration
+                        })
             
             else:
                 st.info("No fenestrations found in the selected type.")
@@ -728,43 +811,19 @@ def display_fenestrations_tab():
                     delete_key = get_stable_button_key("proj_fen", name, "delete")
                     
                     if cols[3].button("Edit", key=edit_key):
-                        if st.session_state.rerun_trigger != f"edit_fen_{name}":
-                            st.session_state.rerun_trigger = f"edit_fen_{name}"
-                            st.session_state.fenestration_editor = {
-                                "name": name,
-                                "type": fenestration["type"],
-                                "u_value": fenestration["u_value"],
-                                "shgc": fenestration["shgc"],
-                                "visible_trans": fenestration["visible_transmittance"],
-                                "thickness": fenestration["thickness"],
-                                "embodied_carbon": fenestration["embodied_carbon"],
-                                "cost": fenestration["cost"],
-                                "edit_mode": True,
-                                "original_name": name,
-                                "is_library": False
-                            }
-                            st.session_state.fenestration_form_state = {
-                                "name": name,
-                                "type": fenestration["type"],
-                                "u_value": float(fenestration["u_value"]),
-                                "shgc": float(fenestration["shgc"]),
-                                "visible_trans": float(fenestration["visible_transmittance"]),
-                                "thickness": float(fenestration["thickness"]),
-                                "embodied_carbon": float(fenestration["embodied_carbon"]),
-                                "cost": float(fenestration["cost"])
-                            }
-                            st.session_state.active_tab = "Fenestrations"
-                            st.session_state.rerun_pending = True
-                        
+                        st.session_state.action_queue.append({
+                            "type": "fenestration_action",
+                            "action": "edit",
+                            "name": name,
+                            "fenestration": fenestration
+                        })
+                    
                     if cols[4].button("Delete", key=delete_key):
-                        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.rerun_pending = True
+                        st.session_state.action_queue.append({
+                            "type": "fenestration_action",
+                            "action": "delete",
+                            "name": name
+                        })
             
             else:
                 st.info("No project fenestrations in the selected type.")
@@ -880,7 +939,7 @@ def initialize_fenestrations():
 
 def display_material_editor():
     """Display the material editor form."""
-    with st.form("material_editor_form"):
+    with st.form("material_editor_form", clear_on_submit=True):
         editor_state = st.session_state.material_editor
         form_state = st.session_state.material_form_state
         is_library = editor_state.get("is_library", False)
@@ -1061,15 +1120,15 @@ def display_material_editor():
                         st.success(f"Material '{name}' added to your project.")
                         logger.info(f"Added new material '{name}' to project")
                     reset_material_editor()
-                    st.session_state.rerun_pending = True
+                    st.session_state.action_queue.append({"type": "refresh"})
         
         if clear_button:
             reset_material_editor()
-            st.session_state.rerun_pending = True
+            st.session_state.action_queue.append({"type": "refresh"})
 
 def display_fenestration_editor():
     """Display the fenestration editor form."""
-    with st.form("fenestration_editor_form"):
+    with st.form("fenestration_editor_form", clear_on_submit=True):
         editor_state = st.session_state.fenestration_editor
         form_state = st.session_state.fenestration_form_state
         is_library = editor_state.get("is_library", False)
@@ -1210,11 +1269,11 @@ def display_fenestration_editor():
                         st.success(f"Fenestration '{name}' added to your project.")
                         logger.info(f"Added new fenestration '{name}' to project")
                     reset_fenestration_editor()
-                    st.session_state.rerun_pending = True
+                    st.session_state.action_queue.append({"type": "refresh"})
         
         if clear_button:
             reset_fenestration_editor()
-            st.session_state.rerun_pending = True
+            st.session_state.action_queue.append({"type": "refresh"})
 
 def validate_material(
     name: str, category: str, thermal_conductivity: float, density: float,
@@ -1344,7 +1403,6 @@ def reset_material_editor():
         "is_library": False
     }
     st.session_state.material_action = {"action": None, "id": None}
-    st.session_state.rerun_trigger = None
 
 def reset_fenestration_editor():
     """Reset the fenestration editor and form state."""
@@ -1372,7 +1430,6 @@ def reset_fenestration_editor():
         "is_library": False
     }
     st.session_state.fenestration_action = {"action": None, "id": None}
-    st.session_state.rerun_trigger = None
 
 def check_material_in_use(material_name: str) -> bool:
     """