Update app/materials_library.py

app/materials_library.py

@@ -20,7 +20,7 @@ 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
+from app.m_c_data import SAMPLE_MATERIALS, SAMPLE_FENESTRATIONS, DEFAULT_MATERIAL_PROPERTIES, DEFAULT_WINDOW_PROPERTIES, DEFAULT_DOOR_PROPERTIES
 
 # Configure logging
 logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
@@ -255,16 +255,16 @@ def display_materials_page():
             material_library.library_materials[k] = Material(
                 name=k,
                 category=MaterialCategory[category_str],
-                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"],
+                conductivity=m["thermal_properties"].get("conductivity", 0.0),
+                density=m["thermal_properties"].get("density", 1000.0),
+                specific_heat=m["thermal_properties"].get("specific_heat", 1000.0),
+                default_thickness=m["thickness_range"].get("default", 0.05) if "thickness_range" in m else m.get("default_thickness", 0.05),
+                embodied_carbon=m.get("embodied_carbon", 0.5),
                 absorptivity=m.get("absorptivity", DEFAULT_MATERIAL_PROPERTIES["absorptivity"]),
-                price=m["cost"]["material"],
+                price=m["cost"].get("material", 50.0),
                 emissivity=m.get("emissivity", DEFAULT_MATERIAL_PROPERTIES["emissivity"]),
                 is_library=True,
-                u_value=m["performance"].get("u_value") if m.get("category") == "Door" else None
+                u_value=m.get("performance", {}).get("u_value") if m.get("category") == "Door" else None
             )
             logger.debug(f"Loaded material: {k}, Category: {m['category']}")
         except (KeyError, ValueError) as e:
@@ -325,20 +325,32 @@ def initialize_materials_and_fenestrations():
         }
         # Add doors to materials
         for k, v in doors.items():
-            st.session_state.project_data["materials"]["library"][k] = {
-                "category": "Door",
-                "thermal_properties": {
-                    "conductivity": 0.0,  # Not used for doors
-                    "density": v.get("density", 1000.0),
-                    "specific_heat": v.get("specific_heat", 1000.0)
-                },
-                "thickness_range": {"default": v.get("thickness", 0.05)},
-                "embodied_carbon": v.get("embodied_carbon", 0.5),
-                "cost": {"material": v.get("cost", 100.0)},
-                "absorptivity": v.get("absorptivity", DEFAULT_MATERIAL_PROPERTIES["absorptivity"]),
-                "emissivity": v.get("emissivity", DEFAULT_MATERIAL_PROPERTIES["emissivity"]),
-                "performance": {"u_value": v["performance"]["u_value"]}
-            }
+            try:
+                st.session_state.project_data["materials"]["library"][k] = {
+                    "category": "Door",
+                    "thermal_properties": {
+                        "conductivity": v["thermal_properties"].get("conductivity", 0.0),
+                        "density": v["thermal_properties"].get("density", 1000.0),
+                        "specific_heat": v["thermal_properties"].get("specific_heat", 1000.0)
+                    },
+                    "default_thickness": v.get("default_thickness", 0.05),
+                    "embodied_carbon": v.get("embodied_carbon", 0.5),
+                    "cost": {
+                        "material": v["cost"].get("material", 100.0),
+                        "labor": v["cost"].get("labor", 30.0),
+                        "replacement_years": v["cost"].get("replacement_years", 25)
+                    },
+                    "absorptivity": v.get("absorptivity", DEFAULT_MATERIAL_PROPERTIES["absorptivity"]),
+                    "emissivity": v.get("emissivity", DEFAULT_DOOR_PROPERTIES["emissivity"]),
+                    "performance": {
+                        "u_value": v["performance"].get("u_value", 5.0)
+                    },
+                    "description": v.get("description", f"{k} for door applications")
+                }
+                logger.debug(f"Moved door {k} to materials library")
+            except KeyError as e:
+                logger.error(f"Error moving door {k} to materials: Missing key {e}")
+                continue
         logger.info(f"Initialized fenestrations in session state with {len(windows)} fenestrations")
         logger.info(f"Moved {len(doors)} doors to materials library")
 
@@ -837,18 +849,15 @@ def display_fenestrations_tab(material_library: MaterialLibrary):
                     "h_o": DEFAULT_WINDOW_PROPERTIES["h_o"]
                 })
                 is_edit = editor_state.get("is_edit", False)
-                original_name = editor_state.get("original_name", "")
+                default_category = editor_state.get("category", "Window/Skylight")
+                category_index = (FENESTRATION_TYPES.index(default_category)
+                                 if default_category in FENESTRATION_TYPES else 0)
                 name = st.text_input(
                     "Fenestration Name",
                     value=form_state.get("name", editor_state.get("name", "")),
                     help="Unique fenestration identifier",
                     key="fenestration_name_input"
                 )
-                filter_category = st.session_state.get("fenestration_filter", "All")
-                default_category = (filter_category if filter_category in FENESTRATION_TYPES
-                                  else editor_state.get("category", "Window/Skylight"))
-                category_index = (FENESTRATION_TYPES.index(default_category)
-                                 if default_category in FENESTRATION_TYPES else 0)
                 category = st.selectbox(
                     "Category",
                     FENESTRATION_TYPES,
@@ -860,7 +869,7 @@ def display_fenestrations_tab(material_library: MaterialLibrary):
                     "Solar Heat Gain Coefficient (SHGC)",
                     min_value=0.0,
                     max_value=1.0,
-                    value=form_state.get("shgc", editor_state.get("shgc", 0.7)),
+                    value=form_state.get("shgc", editor_state.get("shgc", 0.0)),
                     help="Fraction of solar radiation admitted",
                     key="fenestration_shgc_input"
                 )
@@ -874,16 +883,16 @@ 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", DEFAULT_WINDOW_PROPERTIES["h_o"])),
+                    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"
                 )
 
                 if st.form_submit_button("Save Fenestration"):
                     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 = {
+                    if st.session_state.fenestration_action.get("action_id") != action_id:
+                        st.session_state.fenestration_action = {"action": "save", "id": action_id"}
+                        st.session_state.fenestrations_form_state = {
                             "name": name,
                             "category": category,
                             "shgc": shgc,
@@ -894,7 +903,7 @@ def display_fenestrations_tab(material_library: MaterialLibrary):
                             st.error("Fenestration name cannot be empty.")
                         elif (name in st.session_state.project_data["fenestrations"]["project"] or
                               name in st.session_state.project_data["fenestrations"]["library"]) and (not is_edit or name != original_name):
-                            st.error(f"Fenestration '{name}' already exists.")
+                            st.error(f"Fenestration '{name}'" already exists.")
                         else:
                             try:
                                 new_fenestration = GlazingMaterial(
@@ -911,17 +920,17 @@ def display_fenestrations_tab(material_library: MaterialLibrary):
                                 else:
                                     st.session_state.project_data["fenestrations"]["project"][name] = new_fenestration
                                     st.success(f"Fenestration '{name}' added successfully!")
-                                st.session_state.fenestration_editor = {}
-                                st.session_state.fenestration_form_state = {
+                                st.session_state.fenestrations_editor = {}
+                                st.session_state.fenestrations_form_state = {
                                     "name": "",
                                     "category": "Window/Skylight",
-                                    "shgc": 0.7,
+                                    "shgc""": 0.7,
                                     "u_value": 5.0,
                                     "h_o": DEFAULT_WINDOW_PROPERTIES["h_o"]
                                 }
-                                st.session_state.fenestration_action = {"action": None, "id": None}
+                                st.session_state.fenestrations_action = {"action": None, "id": None}
                                 st.session_state.rerun_trigger = None
-                                st.session_state.materials_rerun_pending = True
+                                st.session_state.materials_rerun_triggered = True
                             except Exception as e:
                                 st.error(f"Error saving fenestration: {str(e)}")
 
@@ -938,25 +947,25 @@ def get_available_fenestrations():
     fenestrations = {}
     if "fenestrations" in st.session_state.project_data:
         fenestrations.update(st.session_state.project_data["fenestrations"]["library"])
-        fenestrations.update(st.session_state.project_data["fenestrations"]["project"])
+        fenestrations.update(st.session_state.project_data["fenestrations"]["project"]))
     # Include doors from materials as fenestrations for compatibility
-    if "materials" in st.session_state.project_data:
+    if "materials" in st.session_state.project_data["materials"]:
         for k, m in st.session_state.project_data["materials"]["library"].items():
             if m.get("category") == "Door":
                 fenestrations[k] = GlazingMaterial(
                     name=k,
                     shgc=0.0,
-                    u_value=m["performance"]["u_value"],
+                    u_value=m.get("performance", {}).get("u_value", 5.0),
                     h_o=m.get("h_o", DEFAULT_WINDOW_PROPERTIES["h_o"]),
                     category="Door",
                     is_library=True
                 )
         for k, m in st.session_state.project_data["materials"]["project"].items():
-            if m.category == MaterialCategory.DOOR:
+            if isinstance(m, Material) and m.category == MaterialCategory.DOOR:
                 fenestrations[k] = GlazingMaterial(
                     name=k,
                     shgc=0.0,
-                    u_value=m.u_value,
+                    u_value=m.u_value if m.u_value is not None else 5.0,
                     h_o=DEFAULT_WINDOW_PROPERTIES["h_o"],
                     category="Door",
                     is_library=False