Update app/materials_library.py

app/materials_library.py

@@ -2,7 +2,7 @@
 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, doors).
+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
@@ -17,6 +17,8 @@ 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
@@ -238,8 +240,9 @@ def display_materials_page():
                 emissivity=m.get("emissivity", DEFAULT_MATERIAL_PROPERTIES["emissivity"]),
                 is_library=True
             )
-        except KeyError as e:
-            logger.error(f"Error processing material {k}: Missing key {e}")
+            logger.debug(f"Loaded material: {k}, Category: {m['category']}")
+        except (KeyError, ValueError) as e:
+            logger.error(f"Error processing material {k}: {str(e)}")
             continue
 
     material_library.library_glazing_materials = {}
@@ -252,6 +255,7 @@ def display_materials_page():
                 h_o=f.get("h_o", DEFAULT_WINDOW_PROPERTIES["h_o"]),
                 is_library=True
             )
+            logger.debug(f"Loaded fenestration: {k}, Type: {f['type']}")
         except KeyError as e:
             logger.error(f"Error processing fenestration {k}: Missing key {e}")
             continue
@@ -281,11 +285,13 @@ def initialize_materials_and_fenestrations():
             "library": dict(SAMPLE_MATERIALS),
             "project": {}
         }
+        logger.info("Initialized materials in session state with SAMPLE_MATERIALS")
     if "fenestrations" not in st.session_state.project_data:
         st.session_state.project_data["fenestrations"] = {
             "library": dict(SAMPLE_FENESTRATIONS),
             "project": {}
         }
+        logger.info("Initialized fenestrations in session state with SAMPLE_FENESTRATIONS")
 
 def display_materials_tab(material_library: MaterialLibrary):
     """Display the materials tab content with two-column layout."""
@@ -299,6 +305,8 @@ def display_materials_tab(material_library: MaterialLibrary):
         st.subheader("Library Materials")
         with st.container():
             library_materials = list(material_library.library_materials.values())
+            if not library_materials:
+                st.warning("No library materials loaded. Check data initialization.")
             if category == "None":
                 library_materials = []
             elif category != "All":
@@ -589,18 +597,18 @@ def display_materials_tab(material_library: MaterialLibrary):
                                         "embodied_carbon": 0.5,
                                         "absorptivity": DEFAULT_MATERIAL_PROPERTIES["absorptivity"],
                                         "price": 50.0,
-                                        "emissivity": DEFAULT_PROPERTIES["emissivity"]
-                                    },
-                                    st.session_state.material_action = {"action": None, "material_action_id": None}
+                                        "emissivity": DEFAULT_MATERIAL_PROPERTIES["emissivity"]
+                                    }
+                                    st.session_state.material_action = {"action": None, "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("Error saving material: {str(e)}")
+                                st.error(f"Error saving material: {str(e)}")
 
 def display_fenestrations_tab(material_library: MaterialLibrary):
-    """Display the fenestrations tab with two-column layout."""
+    """Display the fenestrations tab content with two-column layout."""
     col1, col2 = st.columns([3, 2])
     with col1:
         st.subheader("Fenestrations")
@@ -610,14 +618,17 @@ def display_fenestrations_tab(material_library: MaterialLibrary):
         st.subheader("Library Fenestrations")
         with st.container():
             library_fenestrations = list(material_library.library_glazing_materials.values())
-            if st.session_state["fenestration_filter"] == "None":
+            if not library_fenestrations:
+                st.warning("No library fenestrations loaded. Check data initialization.")
+            if fenestration_filter == "None":
                 library_fenestrations = []
             elif fenestration_filter != "All":
-                # 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])
+                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, 1, 1, 1, 1])
             cols[0].write("**Name**")
             cols[1].write("**SHGC**")
             cols[2].write("**U-Value (W/m²·K)**")
@@ -626,31 +637,31 @@ def display_fenestrations_tab(material_library: MaterialLibrary):
             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_data.u_value:.3f}")
-                if cols[3].button("Preview", key=f"preview_fen_btn_{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}":
                         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,
-                            "shgc": fenestration_h_o,
+                            "h_o": fenestration.h_o,
                             "is_edit": False,
-                            "edit": "library"
-                        },
+                            "edit_source": "library"
+                        }
                         st.session_state.fenestration_form_state = {
                             "name": fenestration.name,
-                            "shgc": fenestration_shgc,
+                            "shgc": fenestration.shgc,
                             "u_value": fenestration.u_value,
-                            "shgc": fenestration_h_o
-                        },
+                            "h_o": fenestration.h_o
+                        }
                         st.session_state.active_tab = "Fenestrations"
-                if cols[4].button("Clone", key=f"copy_fen_btn_{fenestration.name}"):
-                    new_name = f"{fenestration_name}_Project"
+                if cols[4].button("Clone", key=f"copy_lib_fen_{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,