Update app/materials_library.py

app/materials_library.py

@@ -76,11 +76,12 @@ class Material:
         return self.conductivity / self.default_thickness if self.default_thickness > 0 else 0.0
 
 class GlazingMaterial:
-    def __init__(self, name: str, shgc: float, u_value: float, h_o: float, is_library: bool = True):
+    def __init__(self, name: str, shgc: float, u_value: float, h_o: float, category: str, is_library: bool = True):
         self.name = name
         self.shgc = shgc
         self.u_value = u_value
         self.h_o = h_o
+        self.category = category
         self.is_library = is_library
 
 class MaterialLibrary:
@@ -113,6 +114,7 @@ class MaterialLibrary:
             data = [
                 {
                     "Name": g.name,
+                    "Category": g.category,
                     "SHGC": g.shgc,
                     "U-Value (W/m²·K)": g.u_value,
                     "Exterior Conductance (W/m²·K)": g.h_o
@@ -227,9 +229,13 @@ def display_materials_page():
     material_library.library_materials = {}
     for k, m in st.session_state.project_data["materials"]["library"].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
             material_library.library_materials[k] = Material(
                 name=k,
-                category=MaterialCategory(m["category"].upper().replace("-", "_")),
+                category=MaterialCategory[category_str],
                 conductivity=m["thermal_properties"]["conductivity"],
                 density=m["thermal_properties"]["density"],
                 specific_heat=m["thermal_properties"]["specific_heat"],
@@ -248,14 +254,16 @@ def display_materials_page():
     material_library.library_glazing_materials = {}
     for k, f in st.session_state.project_data["fenestrations"]["library"].items():
         try:
+            category = "Window/Skylight" if f["type"] == "window" else "Door"
             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"]),
+                category=category,
                 is_library=True
             )
-            logger.debug(f"Loaded fenestration: {k}, Type: {f['type']}")
+            logger.debug(f"Loaded fenestration: {k}, Type: {f['type']}, Category: {category}")
         except KeyError as e:
             logger.error(f"Error processing fenestration {k}: Missing key {e}")
             continue
@@ -285,13 +293,13 @@ def initialize_materials_and_fenestrations():
             "library": dict(SAMPLE_MATERIALS),
             "project": {}
         }
-        logger.info("Initialized materials in session state with SAMPLE_MATERIALS")
+        logger.info(f"Initialized materials in session state with {len(SAMPLE_MATERIALS)} 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")
+        logger.info(f"Initialized fenestrations in session state with {len(SAMPLE_FENESTRATIONS)} fenestrations")
 
 def display_materials_tab(material_library: MaterialLibrary):
     """Display the materials tab content with two-column layout."""
@@ -307,6 +315,11 @@ def display_materials_tab(material_library: MaterialLibrary):
             library_materials = list(material_library.library_materials.values())
             if not library_materials:
                 st.warning("No library materials loaded. Check data initialization.")
+                # Fallback: Display raw material names from session state
+                raw_materials = st.session_state.project_data["materials"]["library"]
+                if raw_materials:
+                    st.write("Raw material names available in session state:")
+                    st.write(list(raw_materials.keys()))
             if category == "None":
                 library_materials = []
             elif category != "All":
@@ -567,7 +580,7 @@ def display_materials_tab(material_library: MaterialLibrary):
                             try:
                                 new_material = Material(
                                     name=name,
-                                    category=MaterialCategory(category.upper().replace("-", "_")),
+                                    category=MaterialCategory[category.upper().replace("-", "_")],
                                     conductivity=conductivity,
                                     density=density,
                                     specific_heat=specific_heat,
@@ -578,7 +591,7 @@ def display_materials_tab(material_library: MaterialLibrary):
                                     emissivity=emissivity,
                                     is_library=False
                                 )
-                                if is_edit and editor_state.get("edit_source") == "project" and name == original_name:
+                                if is_edit and editor_state.get("edit_source") == "project":
                                     success, message = material_library.edit_project_material(
                                         original_name, new_material, st.session_state.project_data["materials"]["project"], st.session_state.get("components", {})
                                     )
@@ -620,14 +633,14 @@ def display_fenestrations_tab(material_library: MaterialLibrary):
             library_fenestrations = list(material_library.library_glazing_materials.values())
             if not library_fenestrations:
                 st.warning("No library fenestrations loaded. Check data initialization.")
+                raw_fenestrations = st.session_state.project_data["fenestrations"]["library"]
+                if raw_fenestrations:
+                    st.write("Raw fenestration names available in session state:")
+                    st.write(list(raw_fenestrations.keys()))
             if fenestration_filter == "None":
                 library_fenestrations = []
             elif fenestration_filter != "All":
-                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
-                ]
+                library_fenestrations = [f for f in library_fenestrations if f.category == fenestration_filter]
             cols = st.columns([2, 1, 1, 1, 1])
             cols[0].write("**Name**")
             cols[1].write("**SHGC**")
@@ -644,6 +657,7 @@ def display_fenestrations_tab(material_library: MaterialLibrary):
                         st.session_state.rerun_trigger = f"preview_fen_{fenestration.name}"
                         st.session_state.fenestration_editor = {
                             "name": fenestration.name,
+                            "category": fenestration.category,
                             "shgc": fenestration.shgc,
                             "u_value": fenestration.u_value,
                             "h_o": fenestration.h_o,
@@ -652,6 +666,7 @@ def display_fenestrations_tab(material_library: MaterialLibrary):
                         }
                         st.session_state.fenestration_form_state = {
                             "name": fenestration.name,
+                            "category": fenestration.category,
                             "shgc": fenestration.shgc,
                             "u_value": fenestration.u_value,
                             "h_o": fenestration.h_o
@@ -668,6 +683,7 @@ def display_fenestrations_tab(material_library: MaterialLibrary):
                         shgc=fenestration.shgc,
                         u_value=fenestration.u_value,
                         h_o=fenestration.h_o,
+                        category=fenestration.category,
                         is_library=False
                     )
                     st.session_state.project_data["fenestrations"]["project"][new_name] = new_fenestration
@@ -693,6 +709,7 @@ def display_fenestrations_tab(material_library: MaterialLibrary):
                             st.session_state.rerun_trigger = f"edit_fen_{fenestration.name}"
                             st.session_state.fenestration_editor = {
                                 "name": fenestration.name,
+                                "category": fenestration.category,
                                 "shgc": fenestration.shgc,
                                 "u_value": fenestration.u_value,
                                 "h_o": fenestration.h_o,
@@ -702,6 +719,7 @@ def display_fenestrations_tab(material_library: MaterialLibrary):
                             }
                             st.session_state.fenestration_form_state = {
                                 "name": fenestration.name,
+                                "category": fenestration.category,
                                 "shgc": fenestration.shgc,
                                 "u_value": fenestration.u_value,
                                 "h_o": fenestration.h_o
@@ -722,10 +740,13 @@ def display_fenestrations_tab(material_library: MaterialLibrary):
         if st.session_state.project_data["fenestrations"]["project"]:
             try:
                 fenestration_df = material_library.to_dataframe("glazing", project_glazing_materials=st.session_state.project_data["fenestrations"]["project"])
-                if fenestration_df.empty:
+                if not fenestration_df.empty:
+                    st.dataframe(fenestration_df, use_container_width=True)
+                else:
                     fenestration_data = [
                         {
                             "Name": f.name,
+                            "Category": f.category,
                             "SHGC": f.shgc,
                             "U-Value (W/m²·K)": f.u_value,
                             "Exterior Conductance (W/m²·K)": f.h_o
@@ -733,26 +754,13 @@ def display_fenestrations_tab(material_library: MaterialLibrary):
                         for f in st.session_state.project_data["fenestrations"]["project"].values()
                     ]
                     fenestration_df = pd.DataFrame(fenestration_data)
-                if not fenestration_df.empty:
-                    st.dataframe(fenestration_df, use_container_width=True)
-                else:
-                    st.write("No project fenestrations to display.")
+                    if not fenestration_df.empty:
+                        st.dataframe(fenestration_df, use_container_width=True)
+                    else:
+                        st.write("No project fenestrations to display.")
             except Exception as e:
-                fenestration_data = [
-                    {
-                        "Name": f.name,
-                        "SHGC": f.shgc,
-                        "U-Value (W/m²·K)": f.u_value,
-                        "Exterior Conductance (W/m²·K)": f.h_o
-                    }
-                    for f in st.session_state.project_data["fenestrations"]["project"].values()
-                ]
-                fenestration_df = pd.DataFrame(fenestration_data)
-                if not fenestration_df.empty:
-                    st.dataframe(fenestration_df, use_container_width=True)
-                else:
-                    st.error(f"Error displaying project fenestrations: {str(e)}")
-                    st.write("No project fenestrations to display.")
+                st.error(f"Error displaying project fenestrations: {str(e)}")
+                st.write("No project fenestrations to display.")
         else:
             st.write("No project fenestrations to display.")
 
@@ -763,6 +771,7 @@ def display_fenestrations_tab(material_library: MaterialLibrary):
                 editor_state = st.session_state.get("fenestration_editor", {})
                 form_state = st.session_state.get("fenestration_form_state", {
                     "name": "",
+                    "category": "Window/Skylight",
                     "shgc": 0.7,
                     "u_value": 5.0,
                     "h_o": DEFAULT_WINDOW_PROPERTIES["h_o"]
@@ -775,6 +784,18 @@ def display_fenestrations_tab(material_library: MaterialLibrary):
                     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,
+                    index=category_index,
+                    help="Fenestration type (Window/Skylight or Door)",
+                    key="fenestration_category_input"
+                )
                 shgc = st.number_input(
                     "Solar Heat Gain Coefficient (SHGC)",
                     min_value=0.0,
@@ -804,6 +825,7 @@ def display_fenestrations_tab(material_library: MaterialLibrary):
                         st.session_state.fenestration_action = {"action": "save", "id": action_id}
                         st.session_state.fenestration_form_state = {
                             "name": name,
+                            "category": category,
                             "shgc": shgc,
                             "u_value": u_value,
                             "h_o": h_o
@@ -820,9 +842,10 @@ def display_fenestrations_tab(material_library: MaterialLibrary):
                                     shgc=shgc,
                                     u_value=u_value,
                                     h_o=h_o,
+                                    category=category,
                                     is_library=False
                                 )
-                                if is_edit and editor_state.get("edit_source") == "project" and name == original_name:
+                                if is_edit and editor_state.get("edit_source") == "project":
                                     st.session_state.project_data["fenestrations"]["project"][original_name] = new_fenestration
                                     st.success(f"Fenestration '{name}' updated successfully!")
                                 else:
@@ -831,6 +854,7 @@ def display_fenestrations_tab(material_library: MaterialLibrary):
                                 st.session_state.fenestration_editor = {}
                                 st.session_state.fenestration_form_state = {
                                     "name": "",
+                                    "category": "Window/Skylight",
                                     "shgc": 0.7,
                                     "u_value": 5.0,
                                     "h_o": DEFAULT_WINDOW_PROPERTIES["h_o"]