Update app/materials_library.py

app/materials_library.py

@@ -78,11 +78,16 @@ class Material:
         return 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, 
+                 visible_transmittance: float, embodied_carbon: float, price: float, 
+                 is_library: bool = True):
         self.name = name
         self.shgc = shgc
         self.u_value = u_value
         self.h_o = h_o
+        self.visible_transmittance = visible_transmittance
+        self.embodied_carbon = embodied_carbon
+        self.price = price
         self.is_library = is_library
 
 class MaterialLibrary:
@@ -117,7 +122,10 @@ class MaterialLibrary:
                     "Name": g.name,
                     "SHGC": g.shgc,
                     "U-Value (W/m²·K)": g.u_value,
-                    "Exterior Conductance (W/m²·K)": g.h_o
+                    "Exterior Conductance (W/m²·K)": g.h_o,
+                    "Visible Transmittance": g.visible_transmittance,
+                    "Embodied Carbon (kgCO₂e/m²)": g.embodied_carbon,
+                    "Price (USD/m²)": g.price
                 }
                 for g in project_glazing_materials.values()
             ]
@@ -625,36 +633,23 @@ def display_fenestrations_tab(material_library: MaterialLibrary):
                 if raw_fenestrations:
                     st.write("Raw fenestration names available in session state:")
                     st.write(list(raw_fenestrations.keys()))
-            cols = st.columns([2, 1, 1, 1, 1])
+            cols = st.columns([2, 1, 1, 1, 1, 1, 1])
             cols[0].write("**Name**")
             cols[1].write("**SHGC**")
             cols[2].write("**U-Value (W/m²·K)**")
-            cols[3].write("**Preview**")
-            cols[4].write("**Clone**")
+            cols[3].write("**Vis. Trans.**")
+            cols[4].write("**Embodied Carbon**")
+            cols[5].write("**Price**")
+            cols[6].write("**Clone**")
             for fenestration in library_fenestrations:
-                cols = st.columns([2, 1, 1, 1, 1])
+                cols = st.columns([2, 1, 1, 1, 1, 1, 1])
                 cols[0].write(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,
-                            "u_value": fenestration.u_value,
-                            "h_o": fenestration.h_o,
-                            "is_edit": False,
-                            "edit_source": "library"
-                        }
-                        st.session_state.fenestration_form_state = {
-                            "name": fenestration.name,
-                            "shgc": fenestration.shgc,
-                            "u_value": fenestration.u_value,
-                            "h_o": fenestration.h_o
-                        }
-                        st.session_state.active_tab = "Fenestrations"
-                if cols[4].button("Clone", key=f"copy_lib_fen_{fenestration.name}"):
+                cols[3].write(f"{fenestration.visible_transmittance:.2f}")
+                cols[4].write(f"{fenestration.embodied_carbon:.2f}")
+                cols[5].write(f"{fenestration.price:.2f}")
+                if cols[6].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"]:
@@ -665,6 +660,9 @@ def display_fenestrations_tab(material_library: MaterialLibrary):
                         shgc=fenestration.shgc,
                         u_value=fenestration.u_value,
                         h_o=fenestration.h_o,
+                        visible_transmittance=fenestration.visible_transmittance,
+                        embodied_carbon=fenestration.embodied_carbon,
+                        price=fenestration.price,
                         is_library=False
                     )
                     st.session_state.project_data["fenestrations"]["project"][new_name] = new_fenestration
@@ -674,18 +672,24 @@ def display_fenestrations_tab(material_library: MaterialLibrary):
         st.subheader("Project Fenestrations")
         with st.container():
             if st.session_state.project_data["fenestrations"]["project"]:
-                cols = st.columns([2, 1, 1, 1, 1])
+                cols = st.columns([2, 1, 1, 1, 1, 1, 1, 1])
                 cols[0].write("**Name**")
                 cols[1].write("**SHGC**")
                 cols[2].write("**U-Value (W/m²·K)**")
-                cols[3].write("**Edit**")
-                cols[4].write("**Delete**")
+                cols[3].write("**Vis. Trans.**")
+                cols[4].write("**Embodied Carbon**")
+                cols[5].write("**Price**")
+                cols[6].write("**Edit**")
+                cols[7].write("**Delete**")
                 for fenestration in st.session_state.project_data["fenestrations"]["project"].values():
-                    cols = st.columns([2, 1, 1, 1, 1])
+                    cols = st.columns([2, 1, 1, 1, 1, 1, 1, 1])
                     cols[0].write(fenestration.name)
                     cols[1].write(f"{fenestration.shgc:.2f}")
                     cols[2].write(f"{fenestration.u_value:.3f}")
-                    if cols[3].button("Edit", key=f"edit_fen_{fenestration.name}"):
+                    cols[3].write(f"{fenestration.visible_transmittance:.2f}")
+                    cols[4].write(f"{fenestration.embodied_carbon:.2f}")
+                    cols[5].write(f"{fenestration.price:.2f}")
+                    if cols[6].button("Edit", key=f"edit_fen_{fenestration.name}"):
                         if st.session_state.get("rerun_trigger") != f"edit_fen_{fenestration.name}":
                             st.session_state.rerun_trigger = f"edit_fen_{fenestration.name}"
                             st.session_state.fenestration_editor = {
@@ -693,6 +697,9 @@ def display_fenestrations_tab(material_library: MaterialLibrary):
                                 "shgc": fenestration.shgc,
                                 "u_value": fenestration.u_value,
                                 "h_o": fenestration.h_o,
+                                "visible_transmittance": fenestration.visible_transmittance,
+                                "embodied_carbon": fenestration.embodied_carbon,
+                                "price": fenestration.price,
                                 "is_edit": True,
                                 "edit_source": "project",
                                 "original_name": fenestration.name
@@ -700,11 +707,14 @@ def display_fenestrations_tab(material_library: MaterialLibrary):
                             st.session_state.fenestration_form_state = {
                                 "name": fenestration.name,
                                 "shgc": fenestration.shgc,
-                                "d": fenestration.u_value,
-                                "h_o": fenestration.h_o
+                                "u_value": fenestration.u_value,
+                                "h_o": fenestration.h_o,
+                                "visible_transmittance": fenestration.visible_transmittance,
+                                "embodied_carbon": fenestration.embodied_carbon,
+                                "price": fenestration.price
                             }
                             st.session_state.active_tab = "Fenestrations"
-                    if cols[4].button("Delete", key=f"delete_fen_{fenestration.name}"):
+                    if cols[7].button("Delete", key=f"delete_fen_{fenestration.name}"):
                         if any(comp.get("fenestration_material") and comp["fenestration_material"].name == fenestration.name
                                for comp_list in st.session_state.get("components", {}).values() for comp in comp_list):
                             st.error(f"Fenestration '{fenestration.name}' is used in components and cannot be deleted.")
@@ -727,7 +737,10 @@ def display_fenestrations_tab(material_library: MaterialLibrary):
                             "Name": f.name,
                             "SHGC": f.shgc,
                             "U-Value (W/m²·K)": f.u_value,
-                            "Exterior Conductance (W/m²·K)": f.h_o
+                            "Exterior Conductance (W/m²·K)": f.h_o,
+                            "Visible Transmittance": f.visible_transmittance,
+                            "Embodied Carbon (kgCO₂e/m²)": f.embodied_carbon,
+                            "Price (USD/m²)": f.price
                         }
                         for f in st.session_state.project_data["fenestrations"]["project"].values()
                     ]
@@ -751,7 +764,10 @@ def display_fenestrations_tab(material_library: MaterialLibrary):
                     "name": "",
                     "shgc": 0.7,
                     "u_value": 5.0,
-                    "h_o": DEFAULT_WINDOW_PROPERTIES["h_o"]
+                    "h_o": DEFAULT_WINDOW_PROPERTIES["h_o"],
+                    "visible_transmittance": 0.7,
+                    "embodied_carbon": 25.0,
+                    "price": 100.0
                 })
                 is_edit = editor_state.get("is_edit", False)
                 original_name = editor_state.get("original_name", "")
@@ -783,6 +799,28 @@ def display_fenestrations_tab(material_library: MaterialLibrary):
                     help="Exterior surface heat transfer coefficient",
                     key="fenestration_h_o_input"
                 )
+                visible_transmittance = st.number_input(
+                    "Visible Transmittance",
+                    min_value=0.0,
+                    max_value=1.0,
+                    value=form_state.get("visible_transmittance", editor_state.get("visible_transmittance", 0.7)),
+                    help="Fraction of visible light transmitted",
+                    key="fenestration_visible_transmittance_input"
+                )
+                embodied_carbon = st.number_input(
+                    "Embodied Carbon (kgCO₂e/m²)",
+                    min_value=0.0,
+                    value=form_state.get("embodied_carbon", editor_state.get("embodied_carbon", 25.0)),
+                    help="Production carbon emissions per square meter",
+                    key="fenestration_embodied_carbon_input"
+                )
+                price = st.number_input(
+                    "Price (USD/m²)",
+                    min_value=0.0,
+                    value=form_state.get("price", editor_state.get("price", 100.0)),
+                    help="Cost per area",
+                    key="fenestration_price_input"
+                )
 
                 if st.form_submit_button("Save Fenestration"):
                     action_id = str(uuid.uuid4())
@@ -792,7 +830,10 @@ def display_fenestrations_tab(material_library: MaterialLibrary):
                             "name": name,
                             "shgc": shgc,
                             "u_value": u_value,
-                            "h_o": h_o
+                            "h_o": h_o,
+                            "visible_transmittance": visible_transmittance,
+                            "embodied_carbon": embodied_carbon,
+                            "price": price
                         }
                         if not name or not name.strip():
                             st.error("Fenestration name cannot be empty.")
@@ -806,10 +847,16 @@ def display_fenestrations_tab(material_library: MaterialLibrary):
                                     shgc=shgc,
                                     u_value=u_value,
                                     h_o=h_o,
+                                    visible_transmittance=visible_transmittance,
+                                    embodied_carbon=embodied_carbon,
+                                    price=price,
                                     is_library=False
                                 )
                                 if is_edit and editor_state.get("edit_source") == "project":
                                     st.session_state.project_data["fenestrations"]["project"][original_name] = new_fenestration
+                                    if name != original_name:
+                                        del st.session_state.project_data["fenestrations"]["project"][original_name]
+                                        st.session_state.project_data["fenestrations"]["project"][name] = new_fenestration
                                     st.success(f"Fenestration '{name}' updated successfully!")
                                 else:
                                     st.session_state.project_data["fenestrations"]["project"][name] = new_fenestration
@@ -819,7 +866,10 @@ def display_fenestrations_tab(material_library: MaterialLibrary):
                                     "name": "",
                                     "shgc": 0.7,
                                     "u_value": 5.0,
-                                    "h_o": DEFAULT_WINDOW_PROPERTIES["h_o"]
+                                    "h_o": DEFAULT_WINDOW_PROPERTIES["h_o"],
+                                    "visible_transmittance": 0.7,
+                                    "embodied_carbon": 25.0,
+                                    "price": 100.0
                                 }
                                 st.session_state.fenestration_action = {"action": None, "id": None}
                                 st.session_state.rerun_trigger = None