Update app/materials_library.py

app/materials_library.py

@@ -359,27 +359,14 @@ def display_materials_page():
     This is the main function called by main.py when the Material Library page is selected.
     """
     # Initialize session state
-    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}
-
-    # Process all actions in the queue without immediate rerun
-    while st.session_state.action_queue:
-        action = st.session_state.action_queue.pop(0)
-        logger.info(f"Processing action: {action}")
-        if action["type"] == "page_change":
-            st.session_state.current_page = action["page"]
-            st.session_state.module_rerun_flags["materials"] = True  # Request rerun via main.py
-        elif action["type"] == "material_action":
-            handle_material_action(action)
-        elif action["type"] == "fenestration_action":
-            handle_fenestration_action(action)
-        # No rerun here to allow UI to update naturally
+    if "project_data" not in st.session_state:
+        st.session_state.project_data = {}
 
     # Apply custom CSS for button styling
     st.markdown("""
@@ -412,15 +399,14 @@ def display_materials_page():
     
     with col1:
         if st.button("Back to Climate Data", key="back_to_climate"):
-            st.session_state.action_queue.append({"type": "page_change", "page": "Climate Data"})
+            st.session_state.current_page = "Climate Data"
     
     with col2:
         if st.button("Continue to Construction", key="continue_to_construction"):
-            st.session_state.action_queue.append({"type": "page_change", "page": "Construction"})
+            st.session_state.current_page = "Construction"
 
 def handle_material_action(action: Dict[str, Any]):
     """Handle material-related actions."""
-    logger.info(f"Handling material action: {action}")
     if action["action"] == "preview":
         material = action["material"]
         name = action["name"]
@@ -511,7 +497,6 @@ def handle_material_action(action: Dict[str, Any]):
 
 def handle_fenestration_action(action: Dict[str, Any]):
     """Handle fenestration-related actions."""
-    logger.info(f"Handling fenestration action: {action}")
     if action["action"] == "preview":
         fenestration = action["fenestration"]
         name = action["name"]
@@ -629,22 +614,18 @@ def display_materials_tab():
                     preview_key = get_stable_button_key("lib_mat", name, "preview")
                     copy_key = get_stable_button_key("lib_mat", name, "copy")
                     
-                    if cols[3].button("Preview", key=preview_key):
-                        st.session_state.action_queue.append({
-                            "type": "material_action",
-                            "action": "preview",
-                            "name": name,
-                            "material": material,
-                            "is_library": True
-                        })
+                    cols[3].button("Preview", key=preview_key, on_click=handle_material_action, args=([{
+                        "action": "preview",
+                        "name": name,
+                        "material": material,
+                        "is_library": True
+                    }],))
                     
-                    if cols[4].button("Copy", key=copy_key):
-                        st.session_state.action_queue.append({
-                            "type": "material_action",
-                            "action": "copy",
-                            "name": name,
-                            "material": material
-                        })
+                    cols[4].button("Copy", key=copy_key, on_click=handle_material_action, args=([{
+                        "action": "copy",
+                        "name": name,
+                        "material": material
+                    }],))
             
             else:
                 st.info("No materials found in the selected category.")
@@ -680,20 +661,16 @@ def display_materials_tab():
                     edit_key = get_stable_button_key("proj_mat", name, "edit")
                     delete_key = get_stable_button_key("proj_mat", name, "delete")
                     
-                    if cols[3].button("Edit", key=edit_key):
-                        st.session_state.action_queue.append({
-                            "type": "material_action",
-                            "action": "edit",
-                            "name": name,
-                            "material": material
-                        })
+                    cols[3].button("Edit", key=edit_key, on_click=handle_material_action, args=([{
+                        "action": "edit",
+                        "name": name,
+                        "material": material
+                    }],))
                     
-                    if cols[4].button("Delete", key=delete_key):
-                        st.session_state.action_queue.append({
-                            "type": "material_action",
-                            "action": "delete",
-                            "name": name
-                        })
+                    cols[4].button("Delete", key=delete_key, on_click=handle_material_action, args=([{
+                        "action": "delete",
+                        "name": name
+                    }],))
             
             else:
                 st.info("No project materials in the selected category.")
@@ -722,8 +699,8 @@ def display_materials_tab():
                     "U-Value (W/m²·K)": u_value
                 })
             df = pd.DataFrame(data)
-            st.session_state.project_data["materials"]["table"] = df  # Update table before rendering
             st.dataframe(df, use_container_width=True, hide_index=True)
+            st.session_state.project_data["materials"]["table"] = df
         else:
             st.info("No project materials to display.")
     
@@ -769,22 +746,18 @@ def display_fenestrations_tab():
                     preview_key = get_stable_button_key("lib_fen", name, "preview")
                     copy_key = get_stable_button_key("lib_fen", name, "copy")
                     
-                    if cols[3].button("Preview", key=preview_key):
-                        st.session_state.action_queue.append({
-                            "type": "fenestration_action",
-                            "action": "preview",
-                            "name": name,
-                            "fenestration": fenestration,
-                            "is_library": True
-                        })
+                    cols[3].button("Preview", key=preview_key, on_click=handle_fenestration_action, args=([{
+                        "action": "preview",
+                        "name": name,
+                        "fenestration": fenestration,
+                        "is_library": True
+                    }],))
                     
-                    if cols[4].button("Copy", key=copy_key):
-                        st.session_state.action_queue.append({
-                            "type": "fenestration_action",
-                            "action": "copy",
-                            "name": name,
-                            "fenestration": fenestration
-                        })
+                    cols[4].button("Copy", key=copy_key, on_click=handle_fenestration_action, args=([{
+                        "action": "copy",
+                        "name": name,
+                        "fenestration": fenestration
+                    }],))
             
             else:
                 st.info("No fenestrations found in the selected type.")
@@ -817,20 +790,16 @@ def display_fenestrations_tab():
                     edit_key = get_stable_button_key("proj_fen", name, "edit")
                     delete_key = get_stable_button_key("proj_fen", name, "delete")
                     
-                    if cols[3].button("Edit", key=edit_key):
-                        st.session_state.action_queue.append({
-                            "type": "fenestration_action",
-                            "action": "edit",
-                            "name": name,
-                            "fenestration": fenestration
-                        })
+                    cols[3].button("Edit", key=edit_key, on_click=handle_fenestration_action, args=([{
+                        "action": "edit",
+                        "name": name,
+                        "fenestration": fenestration
+                    }],))
                     
-                    if cols[4].button("Delete", key=delete_key):
-                        st.session_state.action_queue.append({
-                            "type": "fenestration_action",
-                            "action": "delete",
-                            "name": name
-                        })
+                    cols[4].button("Delete", key=delete_key, on_click=handle_fenestration_action, args=([{
+                        "action": "delete",
+                        "name": name
+                    }],))
             
             else:
                 st.info("No project fenestrations in the selected type.")
@@ -851,8 +820,8 @@ def display_fenestrations_tab():
                     "Cost (USD/m²)": props["cost"]
                 })
             df = pd.DataFrame(data)
-            st.session_state.project_data["fenestrations"]["table"] = df  # Update table before rendering
             st.dataframe(df, use_container_width=True, hide_index=True)
+            st.session_state.project_data["fenestrations"]["table"] = df
         else:
             st.info("No project fenestrations to display.")
     
@@ -1078,11 +1047,29 @@ def display_material_editor():
             clear_button = st.form_submit_button("Clear Form")
         
         if submit_button and not is_library:
-            action_id = str(uuid.uuid4())
-            if st.session_state.material_action.get("id") != action_id:
-                st.session_state.material_action = {"action": "save", "id": action_id}
-                st.session_state.material_form_state = {
-                    "name": name,
+            st.session_state.material_form_state = {
+                "name": name,
+                "category": category,
+                "thermal_conductivity": thermal_conductivity,
+                "density": density,
+                "specific_heat": specific_heat,
+                "default_thickness": default_thickness,
+                "embodied_carbon": embodied_carbon,
+                "cost": cost,
+                "absorptivity": absorptivity,
+                "emissivity": emissivity,
+                "colour": colour
+            }
+            success, message = validate_material(
+                name, category, thermal_conductivity, density, specific_heat,
+                default_thickness, embodied_carbon, cost,
+                editor_state["edit_mode"], editor_state["original_name"],
+                absorptivity, emissivity, colour
+            )
+            if not success:
+                st.error(message)
+            else:
+                material_data = {
                     "category": category,
                     "thermal_conductivity": thermal_conductivity,
                     "density": density,
@@ -1094,44 +1081,21 @@ def display_material_editor():
                     "emissivity": emissivity,
                     "colour": colour
                 }
-                success, message = validate_material(
-                    name, category, thermal_conductivity, density, specific_heat,
-                    default_thickness, embodied_carbon, cost,
-                    editor_state["edit_mode"], editor_state["original_name"],
-                    absorptivity, emissivity, colour
-                )
-                if not success:
-                    st.error(message)
+                if editor_state["edit_mode"]:
+                    original_name = editor_state["original_name"]
+                    if original_name != name:
+                        del st.session_state.project_data["materials"]["project"][original_name]
+                    st.session_state.project_data["materials"]["project"][name] = material_data
+                    st.success(f"Material '{name}' updated successfully.")
+                    logger.info(f"Updated material '{name}' in project")
                 else:
-                    material_data = {
-                        "category": category,
-                        "thermal_conductivity": thermal_conductivity,
-                        "density": density,
-                        "specific_heat": specific_heat,
-                        "default_thickness": default_thickness,
-                        "embodied_carbon": embodied_carbon,
-                        "cost": cost,
-                        "absorptivity": absorptivity,
-                        "emissivity": emissivity,
-                        "colour": colour
-                    }
-                    if editor_state["edit_mode"]:
-                        original_name = editor_state["original_name"]
-                        if original_name != name:
-                            del st.session_state.project_data["materials"]["project"][original_name]
-                        st.session_state.project_data["materials"]["project"][name] = material_data
-                        st.success(f"Material '{name}' updated successfully.")
-                        logger.info(f"Updated material '{name}' in project")
-                    else:
-                        st.session_state.project_data["materials"]["project"][name] = material_data
-                        st.success(f"Material '{name}' added to your project.")
-                        logger.info(f"Added new material '{name}' to project")
-                    reset_material_editor()
-                    # Removed refresh action to allow natural re-render
+                    st.session_state.project_data["materials"]["project"][name] = material_data
+                    st.success(f"Material '{name}' added to your project.")
+                    logger.info(f"Added new material '{name}' to project")
+                reset_material_editor()
         
         if clear_button:
             reset_material_editor()
-            # Removed refresh action to allow natural re-render
 
 def display_fenestration_editor():
     """Display the fenestration editor form."""
@@ -1235,52 +1199,47 @@ def display_fenestration_editor():
             clear_button = st.form_submit_button("Clear Form")
         
         if submit_button and not is_library:
-            action_id = str(uuid.uuid4())
-            if st.session_state.fenestration_action.get("id") != action_id:
-                st.session_state.fenestration_action = {"action": "save", "id": action_id}
-                st.session_state.fenestration_form_state = {
-                    "name": name,
+            st.session_state.fenestration_form_state = {
+                "name": name,
+                "type": fenestration_type,
+                "u_value": u_value,
+                "shgc": shgc,
+                "visible_trans": visible_trans,
+                "thickness": thickness,
+                "embodied_carbon": embodied_carbon,
+                "cost": cost
+            }
+            success, message = validate_fenestration(
+                name, fenestration_type, u_value, shgc, visible_trans, thickness,
+                embodied_carbon, cost, editor_state["edit_mode"], editor_state["original_name"]
+            )
+            if not success:
+                st.error(message)
+            else:
+                fenestration_data = {
                     "type": fenestration_type,
                     "u_value": u_value,
                     "shgc": shgc,
-                    "visible_trans": visible_trans,
+                    "visible_transmittance": visible_trans,
                     "thickness": thickness,
                     "embodied_carbon": embodied_carbon,
                     "cost": cost
                 }
-                success, message = validate_fenestration(
-                    name, fenestration_type, u_value, shgc, visible_trans, thickness,
-                    embodied_carbon, cost, editor_state["edit_mode"], editor_state["original_name"]
-                )
-                if not success:
-                    st.error(message)
+                if editor_state["edit_mode"]:
+                    original_name = editor_state["original_name"]
+                    if original_name != name:
+                        del st.session_state.project_data["fenestrations"]["project"][original_name]
+                    st.session_state.project_data["fenestrations"]["project"][name] = fenestration_data
+                    st.success(f"Fenestration '{name}' updated successfully.")
+                    logger.info(f"Updated fenestration '{name}' in project")
                 else:
-                    fenestration_data = {
-                        "type": fenestration_type,
-                        "u_value": u_value,
-                        "shgc": shgc,
-                        "visible_transmittance": visible_trans,
-                        "thickness": thickness,
-                        "embodied_carbon": embodied_carbon,
-                        "cost": cost
-                    }
-                    if editorpiel["edit_mode"]:
-                        original_name = editor_state["original_name"]
-                        if original_name != name:
-                            del st.session_state.project_data["fenestrations"]["project"][original_name]
-                        st.session_state.project_data["fenestrations"]["project"][name] = fenestration_data
-                        st.success(f"Fenestration '{name}' updated successfully.")
-                        logger.info(f"Updated fenestration '{name}' in project")
-                    else:
-                        st.session_state.project_data["fenestrations"]["project"][name] = fenestration_data
-                        st.success(f"Fenestration '{name}' added to your project.")
-                        logger.info(f"Added new fenestration '{name}' to project")
-                    reset_fenestration_editor()
-                    # Removed refresh action to allow natural re-render
+                    st.session_state.project_data["fenestrations"]["project"][name] = fenestration_data
+                    st.success(f"Fenestration '{name}' added to your project.")
+                    logger.info(f"Added new fenestration '{name}' to project")
+                reset_fenestration_editor()
         
         if clear_button:
             reset_fenestration_editor()
-            # Removed refresh action to allow natural re-render
 
 def validate_material(
     name: str, category: str, thermal_conductivity: float, density: float,
@@ -1331,8 +1290,8 @@ def validate_material(
     colour_ranges = {
         "Light": (0.30, 0.50),
         "Medium": (0.60, 0.70),
-        "Dark": (0.95),
-        "Reflective": (0.20)
+        "Dark": (0.85, 0.95),
+        "Reflective": (0.10, 0.20)
     }
     min_abs, max_abs = colour_ranges[colour]
     if not (min_abs <= absorptivity <= max_abs):
@@ -1365,7 +1324,7 @@ def validate_fenestration(
         return False, "SHGC must be between 0 and 1."
     
     if visible_trans < 0 or visible_trans > 1:
-        return False, "Visible transmittence must be between {0} and {1}."
+        return False, "Visible transmittance must be between 0 and 1."
     
     if thickness <= 0:
         return False, "Thickness must be greater than zero."
@@ -1378,8 +1337,8 @@ def validate_fenestration(
     
     return True, ""
 
-def reset_materials_editor():
-    """Reset the material editor and reset form state."""
+def reset_material_editor():
+    """Reset the material editor and form state."""
     st.session_state.material_form_state = {
         "name": "",
         "category": MATERIAL_CATEGORIES[0],