Update main.py

main.py

@@ -26,7 +26,7 @@ sys.path.append(os.path.dirname(os.path.abspath(__file__)))
 from app.intro import display_intro_page
 from app.building_information import display_building_info_page
 from app.climate_data import display_climate_page
-from app.materials_library import display_materials_page
+from app.materials_library import display_materials_page, Material, GlazingMaterial, MaterialCategory
 from app.construction import display_construction_page
 from app.components import display_components_page
 from app.internal_loads import display_internal_loads_page
@@ -73,6 +73,46 @@ class BuildSustain:
         
         # Initialize project data structure if not set
         if 'project_data' not in st.session_state:
+            # Initialize materials library with Material objects
+            materials_library = {}
+            for k, m in SAMPLE_MATERIALS.items():
+                try:
+                    category_str = m["category"].upper().replace("-", "_")
+                    if category_str not in MaterialCategory.__members__:
+                        logger.error(f"Invalid category for material {k}: {category_str}")
+                        continue
+                    materials_library[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"],
+                        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, ValueError) as e:
+                    logger.error(f"Error processing material {k}: {str(e)}")
+                    continue
+            
+            # Initialize fenestrations library with GlazingMaterial objects
+            fenestrations_library = {}
+            for k, f in SAMPLE_FENESTRATIONS.items():
+                try:
+                    fenestrations_library[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
+            
             st.session_state.project_data = {
                 "project_name": "",
                 "building_info": {
@@ -88,11 +128,11 @@ class BuildSustain:
                 },
                 "climate_data": {},
                 "materials": {
-                    "library": dict(SAMPLE_MATERIALS),
+                    "library": materials_library,
                     "project": {}
                 },
                 "fenestrations": {
-                    "library": dict(SAMPLE_FENESTRATIONS),
+                    "library": fenestrations_library,
                     "project": {}
                 },
                 "constructions": {
@@ -247,12 +287,17 @@ class BuildSustain:
         """
         # Clear materials library specific states when leaving that page
         if previous_page == "Material Library":
-            # Only clear materials library editor states
+            # Clear materials and fenestrations editor states
             keys_to_clear = [
-                "material_editor", 
+                "material_editor",
                 "fenestration_editor",
-                "material_saved",
-                "fenestration_saved"
+                "material_form_state",
+                "fenestration_form_state",
+                "material_action",
+                "fenestration_action",
+                "materials_rerun_pending",
+                "rerun_trigger",
+                "active_tab"
             ]
             for key in keys_to_clear:
                 if key in st.session_state:
@@ -331,5 +376,4 @@ if __name__ == "__main__":
         st.error(f"An error occurred: {str(e)}")
         logger.exception("Application error")
 
-
 sys.path.append(os.path.join(os.path.dirname(__file__), 'data'))