Update app/materials_library.py

app/materials_library.py

@@ -2,8 +2,8 @@
 BuildSustain - Material Library Module
 
 This module handles the material library functionality of the BuildSustain application,
-allowing users to manage building materials and fenestrations (windows, skylights).
-It provides both predefined library materials and the ability to create custom materials.
+allowing users to manage building materials and fenestrations (windows/skylights, doors).
+It provides both predefined library materials and the ability to create project-specific materials.
 
 Developed by: Dr Majed Abuseif, Deakin University
 © 2025
@@ -17,8 +17,6 @@ import logging
 import uuid
 from typing import Dict, List, Any, Optional, Tuple, Union
 from enum import Enum
-
-# Import default data and constants from centralized module
 from app.m_c_data import SAMPLE_MATERIALS, SAMPLE_FENESTRATIONS, DEFAULT_MATERIAL_PROPERTIES, DEFAULT_WINDOW_PROPERTIES
 
 # Configure logging
@@ -27,27 +25,22 @@ logger = logging.getLogger(__name__)
 
 # Define constants
 MATERIAL_CATEGORIES = [
-    "Masonry",
     "Insulation",
-    "Metal",
-    "Wood",
+    "Structural",
     "Finishing",
-    "Custom"
+    "Sub-Structural"
 ]
 
 FENESTRATION_TYPES = [
-    "Window",
-    "Skylight",
-    "Custom"
+    "Window/Skylight",
+    "Door"
 ]
 
 class MaterialCategory(Enum):
-    MASONRY = "Masonry"
     INSULATION = "Insulation"
-    METAL = "Metal"
-    WOOD = "Wood"
+    STRUCTURAL = "Structural"
     FINISHING = "Finishing"
-    CUSTOM = "Custom"
+    SUB_STRUCTURAL = "Sub-Structural"
 
 class Material:
     def __init__(self, name: str, category: MaterialCategory, conductivity: float, density: float,
@@ -65,12 +58,19 @@ class Material:
         self.emissivity = emissivity
         self.is_library = is_library
 
-    def get_thermal_mass(self):
-        class ThermalMass:
-            def __init__(self, value): self.value = value
-        return ThermalMass(self.density * self.specific_heat * self.default_thickness)
+    def get_thermal_mass(self) -> str:
+        # Calculate areal heat capacity: ρ * cp * d (J/m²·K)
+        thermal_mass = self.density * self.specific_heat * self.default_thickness
+        # Categorize based on thresholds
+        if thermal_mass < 30000:
+            return "Low"
+        elif 30000 <= thermal_mass <= 90000:
+            return "Medium"
+        else:
+            return "High"
 
-    def get_u_value(self):
+    def get_u_value(self) -> float:
+        # Calculate U-value: λ / d (W/m²·K)
         return self.conductivity / self.default_thickness if self.default_thickness > 0 else 0.0
 
 class GlazingMaterial:
@@ -100,7 +100,8 @@ class MaterialLibrary:
                     "Embodied Carbon (kgCO₂e/kg)": m.embodied_carbon,
                     "Absorptivity": m.absorptivity,
                     "Price (USD/m²)": m.price,
-                    "Emissivity": m.emissivity
+                    "Emissivity": m.emissivity,
+                    "Thermal Mass Category": m.get_thermal_mass()
                 }
                 for m in project_materials.values()
             ]
@@ -226,7 +227,7 @@ def display_materials_page():
         try:
             material_library.library_materials[k] = Material(
                 name=k,
-                category=MaterialCategory(m["category"]),
+                category=MaterialCategory(m["category"].upper().replace("-", "_")),
                 conductivity=m["thermal_properties"]["conductivity"],
                 density=m["thermal_properties"]["density"],
                 specific_heat=m["thermal_properties"]["specific_heat"],
@@ -243,18 +244,17 @@ def display_materials_page():
 
     material_library.library_glazing_materials = {}
     for k, f in st.session_state.project_data["fenestrations"]["library"].items():
-        if f["type"] in ["window", "skylight"]:
-            try:
-                material_library.library_glazing_materials[k] = GlazingMaterial(
-                    name=k,
-                    shgc=f["performance"]["shgc"],
-                    u_value=f["performance"]["u_value"],
-                    h_o=f.get("h_o", DEFAULT_WINDOW_PROPERTIES["h_o"]),
-                    is_library=True
-                )
-            except KeyError as e:
-                logger.error(f"Error processing fenestration {k}: Missing key {e}")
-                continue
+        try:
+            material_library.library_glazing_materials[k] = GlazingMaterial(
+                name=k,
+                shgc=f["performance"]["shgc"],
+                u_value=f["performance"]["u_value"],
+                h_o=f.get("h_o", DEFAULT_WINDOW_PROPERTIES["h_o"]),
+                is_library=True
+            )
+        except KeyError as e:
+            logger.error(f"Error processing fenestration {k}: Missing key {e}")
+            continue
 
     with tab1:
         display_materials_tab(material_library)
@@ -308,11 +308,11 @@ def display_materials_tab(material_library: MaterialLibrary):
             cols[1].write("**Thermal Mass**")
             cols[2].write("**U-Value (W/m²·K)**")
             cols[3].write("**Preview**")
-            cols[4].write("**Copy**")
+            cols[4].write("**Clone**")
             for material in library_materials:
                 cols = st.columns([2, 1, 1, 1, 1])
                 cols[0].write(material.name)
-                cols[1].write(f"{material.get_thermal_mass().value:.0f}")
+                cols[1].write(material.get_thermal_mass())
                 cols[2].write(f"{material.get_u_value():.3f}")
                 if cols[3].button("Preview", key=f"preview_lib_mat_{material.name}"):
                     if st.session_state.get("rerun_trigger") != f"preview_mat_{material.name}":
@@ -344,7 +344,7 @@ def display_materials_tab(material_library: MaterialLibrary):
                             "emissivity": material.emissivity
                         }
                         st.session_state.active_tab = "Materials"
-                if cols[4].button("Copy", key=f"copy_lib_mat_{material.name}"):
+                if cols[4].button("Clone", key=f"copy_lib_mat_{material.name}"):
                     new_name = f"{material.name}_Project"
                     counter = 1
                     while new_name in st.session_state.project_data["materials"]["project"] or new_name in st.session_state.project_data["materials"]["library"]:
@@ -382,9 +382,9 @@ def display_materials_tab(material_library: MaterialLibrary):
                 for material in st.session_state.project_data["materials"]["project"].values():
                     cols = st.columns([2, 1, 1, 1, 1])
                     cols[0].write(material.name)
-                    cols[1].write(f"{material.get_thermal_mass().value:.0f}")
+                    cols[1].write(material.get_thermal_mass())
                     cols[2].write(f"{material.get_u_value():.3f}")
-                    if cols[3].button("Edit", key=f"edit_proj_mat_{material.name}"):
+                    if cols[3].button("Edit", key=f"edit_mat_{material.name}"):
                         if st.session_state.get("rerun_trigger") != f"edit_mat_{material.name}":
                             st.session_state.rerun_trigger = f"edit_mat_{material.name}"
                             st.session_state.material_editor = {
@@ -415,7 +415,7 @@ def display_materials_tab(material_library: MaterialLibrary):
                                 "emissivity": material.emissivity
                             }
                             st.session_state.active_tab = "Materials"
-                    if cols[4].button("Delete", key=f"delete_proj_mat_{material.name}"):
+                    if cols[4].button("Delete", key=f"delete_mat_{material.name}"):
                         success, message = material_library.delete_project_material(
                             material.name, st.session_state.project_data["materials"]["project"], st.session_state.get("components", {})
                         )
@@ -459,7 +459,7 @@ def display_materials_tab(material_library: MaterialLibrary):
                 original_name = editor_state.get("original_name", "")
                 name = st.text_input(
                     "Material Name",
-                    value=form_state.get("name", editor_state.get("name", "")),
+                    value=form_state.get("name", editor_state.get("name", ""),
                     help="Unique material identifier",
                     key="material_name_input"
                 )
@@ -559,7 +559,7 @@ def display_materials_tab(material_library: MaterialLibrary):
                             try:
                                 new_material = Material(
                                     name=name,
-                                    category=MaterialCategory(category),
+                                    category=MaterialCategory(category.upper().replace("-", "_")),
                                     conductivity=conductivity,
                                     density=density,
                                     specific_heat=specific_heat,
@@ -589,18 +589,18 @@ def display_materials_tab(material_library: MaterialLibrary):
                                         "embodied_carbon": 0.5,
                                         "absorptivity": DEFAULT_MATERIAL_PROPERTIES["absorptivity"],
                                         "price": 50.0,
-                                        "emissivity": DEFAULT_MATERIAL_PROPERTIES["emissivity"]
-                                    }
-                                    st.session_state.material_action = {"action": None, "id": None}
+                                        "emissivity": DEFAULT_PROPERTIES["emissivity"]
+                                    },
+                                    st.session_state.material_action = {"action": None, "material_action_id": None}
                                     st.session_state.rerun_trigger = None
                                     st.session_state.materials_rerun_pending = True
                                 else:
                                     st.error(f"Failed to save material: {message}")
                             except Exception as e:
-                                st.error(f"Error saving material: {str(e)}")
+                                st.error("Error saving material: {str(e)}")
 
 def display_fenestrations_tab(material_library: MaterialLibrary):
-    """Display the fenestrations tab content with two-column layout."""
+    """Display the fenestrations tab with two-column layout."""
     col1, col2 = st.columns([3, 2])
     with col1:
         st.subheader("Fenestrations")
@@ -613,41 +613,44 @@ def display_fenestrations_tab(material_library: MaterialLibrary):
             if st.session_state["fenestration_filter"] == "None":
                 library_fenestrations = []
             elif fenestration_filter != "All":
-                library_fenestrations = [f for f in library_fenestrations if f.__class__.__name__ == fenestration_filter]
-            cols = st.columns([2, 1, 1, 1, 1])
+                # Map fenestration types for filtering
+                fen_type = "window" if fenestration_filter == "Window/Skylight" else "door"
+                library_fenestrations = [f for f in library_fenestrations if 
+                    st.session_state.project_data["fenestrations"]["library"][f.name]["type"] == fen_type]
+            cols = st.columns([2, cols, 1, 1, 1, 1])
             cols[0].write("**Name**")
             cols[1].write("**SHGC**")
             cols[2].write("**U-Value (W/m²·K)**")
             cols[3].write("**Preview**")
-            cols[4].write("**Copy**")
+            cols[4].write("**Clone**")
             for fenestration in library_fenestrations:
                 cols = st.columns([2, 1, 1, 1, 1])
                 cols[0].write(fenestration.name)
-                cols[1].write(f"{fenestration.shgc:.2f}")
-                cols[2].write(f"{fenestration.u_value:.3f}")
-                if cols[3].button("Preview", key=f"preview_lib_fen_{fenestration.name}"):
-                    if st.session_state.get("rerun_trigger") != f"preview_fen_{fenestration.name}":
+                cols[1].write(f"{fenestration_shgc:.2f}")
+                cols[2].write(f"{fenestration_data.u_value:.3f}")
+                if cols[3].button("Preview", key=f"preview_fen_btn_{fenestration.name}"):
+                    if st.session_state.get("rerun_trigger") != f"preview_fen_{fenestration.name}"):
                         st.session_state.rerun_trigger = f"preview_fen_{fenestration.name}"
                         st.session_state.fenestration_editor = {
-                            "name": fenestration.name,
-                            "shgc": fenestration.shgc,
+                            "name": fenestration_name,
+                            "shgc": fenestration_shgc,
                             "u_value": fenestration.u_value,
-                            "h_o": fenestration.h_o,
+                            "shgc": fenestration_h_o,
                             "is_edit": False,
-                            "edit_source": "library"
-                        }
+                            "edit": "library"
+                        },
                         st.session_state.fenestration_form_state = {
                             "name": fenestration.name,
-                            "shgc": fenestration.shgc,
+                            "shgc": fenestration_shgc,
                             "u_value": fenestration.u_value,
-                            "h_o": fenestration.h_o
-                        }
+                            "shgc": fenestration_h_o
+                        },
                         st.session_state.active_tab = "Fenestrations"
-                if cols[4].button("Copy", key=f"copy_lib_fen_{fenestration.name}"):
-                    new_name = f"{fenestration.name}_Project"
+                if cols[4].button("Clone", key=f"copy_fen_btn_{fenestration.name}"):
+                    new_name = f"{fenestration_name}_Project"
                     counter = 1
                     while new_name in st.session_state.project_data["fenestrations"]["project"] or new_name in st.session_state.project_data["fenestrations"]["library"]:
-                        new_name = f"{fenestration.name}_Project_{counter}"
+                        new_name = f"{fenestration_name}_Project_{counter}"
                         counter += 1
                     new_fenestration = GlazingMaterial(
                         name=new_name,
@@ -657,7 +660,7 @@ def display_fenestrations_tab(material_library: MaterialLibrary):
                         is_library=False
                     )
                     st.session_state.project_data["fenestrations"]["project"][new_name] = new_fenestration
-                    st.success(f"Fenestration '{new_name}' copied!")
+                    st.success(f"Fenestration '{new_name}' cloned successfully!")
                     st.session_state.materials_rerun_pending = True
 
         st.subheader("Project Fenestrations")
@@ -674,7 +677,7 @@ def display_fenestrations_tab(material_library: MaterialLibrary):
                     cols[0].write(fenestration.name)
                     cols[1].write(f"{fenestration.shgc:.2f}")
                     cols[2].write(f"{fenestration.u_value:.3f}")
-                    if cols[3].button("Edit", key=f"edit_proj_fen_{fenestration.name}"):
+                    if cols[3].button("Edit", key=f"edit_fen_{fenestration.name}"):
                         if st.session_state.get("rerun_trigger") != f"edit_fen_{fenestration.name}":
                             st.session_state.rerun_trigger = f"edit_fen_{fenestration.name}"
                             st.session_state.fenestration_editor = {
@@ -693,13 +696,13 @@ def display_fenestrations_tab(material_library: MaterialLibrary):
                                 "h_o": fenestration.h_o
                             }
                             st.session_state.active_tab = "Fenestrations"
-                    if cols[4].button("Delete", key=f"delete_proj_fen_{fenestration.name}"):
+                    if cols[4].button("Delete", key=f"delete_fen_{fenestration.name}"):
                         if any(comp.get("fenestration_material") and comp["fenestration_material"].name == fenestration.name
                                for comp_list in st.session_state.get("components", {}).values() for comp in comp_list):
                             st.error(f"Fenestration '{fenestration.name}' is used in components and cannot be deleted.")
                         else:
                             del st.session_state.project_data["fenestrations"]["project"][fenestration.name]
-                            st.success(f"Fenestration '{fenestration.name}' deleted!")
+                            st.success(f"Fenestration '{fenestration.name}' deleted successfully!")
                             st.session_state.materials_rerun_pending = True
             else:
                 st.write("No project fenestrations added.")
@@ -810,10 +813,10 @@ def display_fenestrations_tab(material_library: MaterialLibrary):
                                 )
                                 if is_edit and editor_state.get("edit_source") == "project" and name == original_name:
                                     st.session_state.project_data["fenestrations"]["project"][original_name] = new_fenestration
-                                    st.success(f"Fenestration '{name}' updated!")
+                                    st.success(f"Fenestration '{name}' updated successfully!")
                                 else:
                                     st.session_state.project_data["fenestrations"]["project"][name] = new_fenestration
-                                    st.success(f"Fenestration '{name}' added!")
+                                    st.success(f"Fenestration '{name}' added successfully!")
                                 st.session_state.fenestration_editor = {}
                                 st.session_state.fenestration_form_state = {
                                     "name": "",