Update app/materials_library.py

app/materials_library.py

@@ -18,8 +18,8 @@ import uuid
 from typing import Dict, List, Any, Optional, Tuple, Union
 from enum import Enum
 
-# Import default data from centralized module
-from app.m_c_data import SAMPLE_MATERIALS, SAMPLE_FENESTRATIONS
+# 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
 logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
@@ -98,7 +98,7 @@ class MaterialLibrary:
                     "Specific Heat (J/kg·K)": m.specific_heat,
                     "Default Thickness (m)": m.default_thickness,
                     "Embodied Carbon (kgCO₂e/kg)": m.embodied_carbon,
-                    "absorptivity": m.absorptivity,
+                    "Absorptivity": m.absorptivity,
                     "Price (USD/m²)": m.price,
                     "Emissivity": m.emissivity
                 }
@@ -221,31 +221,40 @@ def display_materials_page():
 
     # Initialize material library
     material_library = MaterialLibrary()
-    material_library.library_materials = {
-        k: Material(
-            name=m["name"],
-            category=MaterialCategory(m["category"]),
-            conductivity=m["thermal_conductivity"],
-            density=m["density"],
-            specific_heat=m["specific_heat"],
-            default_thickness=m["thickness_range"]["default"],
-            embodied_carbon=m["embodied_carbon"],
-            absorptivity=m.get("absorptivity", 0.6),
-            price=m["cost"]["material"],
-            emissivity=m.get("emissivity", 0.9),
-            is_library=True
-        ) for k, m in st.session_state.project_data["materials"]["library"].items()
-    }
-    material_library.library_glazing_materials = {
-        k: GlazingMaterial(
-            name=f["name"],
-            shgc=f["shgc"] if "shgc" in f else 0.7,
-            u_value=f["u_value"],
-            h_o=f.get("h_o", 23.0),
-            is_library=True
-        ) for k, f in st.session_state.project_data["fenestrations"]["library"].items()
-        if f["type"] in ["Window", "Skylight"]
-    }
+    material_library.library_materials = {}
+    for k, m in st.session_state.project_data["materials"]["library"].items():
+        try:
+            material_library.library_materials[k] = Material(
+                name=k,
+                category=MaterialCategory(m["category"]),
+                conductivity=m["thermal_properties"]["conductivity"],
+                density=m["thermal_properties"]["density"],
+                specific_heat=m["thermal_properties"]["specific_heat"],
+                default_thickness=m["thickness_range"]["default"],
+                embodied_carbon=m["embodied_carbon"],
+                absorptivity=m.get("absorptivity", DEFAULT_MATERIAL_PROPERTIES["absorptivity"]),
+                price=m["cost"]["material"],
+                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}")
+            continue
+
+    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
 
     with tab1:
         display_materials_tab(material_library)
@@ -285,7 +294,7 @@ def display_materials_tab(material_library: MaterialLibrary):
         st.subheader("Materials")
         # Category filter
         filter_options = ["All", "None"] + MATERIAL_CATEGORIES
-        category = st.selectbox("Filter by Category", filter_options, key="material_filter")
+        category = st.selectbox("Filter by Category", filter_options, Stuarts, key="material_filter")
 
         st.subheader("Library Materials")
         with st.container():
@@ -442,9 +451,9 @@ def display_materials_tab(material_library: MaterialLibrary):
                     "specific_heat": 1000.0,
                     "default_thickness": 0.1,
                     "embodied_carbon": 0.5,
-                    "absorptivity": 0.6,
+                    "absorptivity": DEFAULT_MATERIAL_PROPERTIES["absorptivity"],
                     "price": 50.0,
-                    "emissivity": 0.925
+                    "emissivity": DEFAULT_MATERIAL_PROPERTIES["emissivity"]
                 })
                 is_edit = editor_state.get("is_edit", False)
                 original_name = editor_state.get("original_name", "")
@@ -502,10 +511,10 @@ def display_materials_tab(material_library: MaterialLibrary):
                     key="material_embodied_carbon_input"
                 )
                 absorptivity = st.number_input(
-                    "absorptivity",
+                    "Absorptivity",
                     min_value=0.0,
                     max_value=1.0,
-                    value=form_state.get("absorptivity", editor_state.get("absorptivity", 0.6)),
+                    value=form_state.get("absorptivity", editor_state.get("absorptivity", DEFAULT_MATERIAL_PROPERTIES["absorptivity"])),
                     help="Solar radiation absorbed",
                     key="material_absorptivity_input"
                 )
@@ -520,7 +529,7 @@ def display_materials_tab(material_library: MaterialLibrary):
                     "Emissivity",
                     min_value=0.0,
                     max_value=1.0,
-                    value=form_state.get("emissivity", editor_state.get("emissivity", 0.925)),
+                    value=form_state.get("emissivity", editor_state.get("emissivity", DEFAULT_MATERIAL_PROPERTIES["emissivity"])),
                     help="Ratio of radiation emitted by the material (0.0 to 1.0)",
                     key="material_emissivity_input"
                 )
@@ -578,9 +587,9 @@ def display_materials_tab(material_library: MaterialLibrary):
                                         "specific_heat": 1000.0,
                                         "default_thickness": 0.1,
                                         "embodied_carbon": 0.5,
-                                        "absorptivity": 0.6,
+                                        "absorptivity": DEFAULT_MATERIAL_PROPERTIES["absorptivity"],
                                         "price": 50.0,
-                                        "emissivity": 0.925
+                                        "emissivity": DEFAULT_MATERIAL_PROPERTIES["emissivity"]
                                     }
                                     st.session_state.material_action = {"action": None, "id": None}
                                     st.session_state.rerun_trigger = None
@@ -601,7 +610,7 @@ def display_fenestrations_tab(material_library: MaterialLibrary):
         st.subheader("Library Fenestrations")
         with st.container():
             library_fenestrations = list(material_library.library_glazing_materials.values())
-            if fenestration_filter == "None":
+            if fenest Riyadh, key="fenestration_filter" == "None":
                 library_fenestrations = []
             elif fenestration_filter != "All":
                 library_fenestrations = [f for f in library_fenestrations if f.__class__.__name__ == fenestration_filter]
@@ -742,7 +751,7 @@ def display_fenestrations_tab(material_library: MaterialLibrary):
                     "name": "",
                     "shgc": 0.7,
                     "u_value": 5.0,
-                    "h_o": 23.0
+                    "h_o": DEFAULT_WINDOW_PROPERTIES["h_o"]
                 })
                 is_edit = editor_state.get("is_edit", False)
                 original_name = editor_state.get("original_name", "")
@@ -770,7 +779,7 @@ def display_fenestrations_tab(material_library: MaterialLibrary):
                 h_o = st.number_input(
                     "Exterior Surface Conductance (W/m²·K)",
                     min_value=0.0,
-                    value=form_state.get("h_o", editor_state.get("h_o", 23.0)),
+                    value=form_state.get("h_o", editor_state.get("h_o", DEFAULT_WINDOW_PROPERTIES["h_o"])),
                     help="Exterior surface heat transfer coefficient",
                     key="fenestration_h_o_input"
                 )
@@ -810,7 +819,7 @@ def display_fenestrations_tab(material_library: MaterialLibrary):
                                     "name": "",
                                     "shgc": 0.7,
                                     "u_value": 5.0,
-                                    "h_o": 23.0
+                                    "h_o": DEFAULT_WINDOW_PROPERTIES["h_o"]
                                 }
                                 st.session_state.fenestration_action = {"action": None, "id": None}
                                 st.session_state.rerun_trigger = None