Update app/construction.py

app/construction.py

@@ -189,19 +189,22 @@ def initialize_construction():
         }
     if "components" not in st.session_state.project_data:
         st.session_state.project_data["components"] = {}
+    if "rerun_trigger" not in st.session_state:
+        st.session_state.rerun_trigger = ""
 
 def display_constructions_tables(construction_library: ConstructionLibrary):
     """Display library and project constructions tables."""
     st.subheader("Library Constructions")
     with st.container():
         library_constructions = list(construction_library.library_constructions.items())
-        cols = st.columns([2, 1, 1, 1])
+        cols = st.columns([2, 1, 1, 1, 1])
         cols[0].write("**Name**")
         cols[1].write("**Thermal Mass Category**")
         cols[2].write("**U-Value (W/m²·K)**")
         cols[3].write("**Copy**")
+        cols[4].write("**Preview**")
         for name, construction in library_constructions:
-            cols = st.columns([2, 1, 1, 1])
+            cols = st.columns([2, 1, 1, 1, 1])
             cols[0].write(name)
             cols[1].write(construction.get("thermal_mass_category", "Low"))
             cols[2].write(f"{construction.get('u_value', 0.0):.3f}")
@@ -222,6 +225,10 @@ def display_constructions_tables(construction_library: ConstructionLibrary):
                     if material_name in st.session_state.project_data["materials"]["library"]:
                         # Copy library material to project
                         library_material = st.session_state.project_data["materials"]["library"][material_name]
+                        if "thermal_properties" not in library_material:
+                            st.error(f"Material '{material_name}' is missing thermal properties")
+                            logger.error(f"Missing thermal properties for material: {material_name}")
+                            break
                         new_mat_name = f"{material_name}_Project"
                         counter = 1
                         while new_mat_name in st.session_state.project_data["materials"]["project"] or new_mat_name in st.session_state.project_data["materials"]["library"]:
@@ -234,12 +241,12 @@ def display_constructions_tables(construction_library: ConstructionLibrary):
                         new_material = Material(
                             name=new_mat_name,
                             category=MaterialCategory[category_str],
-                            conductivity=library_material["thermal_conductivity"],
-                            density=library_material["density"],
-                            specific_heat=library_material["specific_heat"],
+                            conductivity=library_material["thermal_properties"]["conductivity"],
+                            density=library_material["thermal_properties"]["density"],
+                            specific_heat=library_material["thermal_properties"]["specific_heat"],
                             default_thickness=library_material["thickness_range"]["default"],
                             embodied_carbon=library_material["embodied_carbon"],
-                            solar_absorption=library_material.get("solar_absorption", 0.6),
+                            solar_absorption=library_material.get("absorptivity", 0.6),
                             price=library_material["cost"]["material"],
                             emissivity=library_material.get("emissivity", 0.9),
                             is_library=False
@@ -269,6 +276,20 @@ def display_constructions_tables(construction_library: ConstructionLibrary):
                         st.session_state.construction_rerun_pending = True
                     else:
                         st.error(message)
+            if cols[4].button("Preview", key=f"preview_lib_cons_{name}"):
+                if st.session_state.get("rerun_trigger") != f"preview_cons_{name}":
+                    st.session_state.rerun_trigger = f"preview_cons_{name}"
+                    st.session_state.construction_editor = {
+                        "name": name,
+                        "layers": [{"material_name": layer["material"], "thickness": layer["thickness"]} for layer in construction["layers"]],
+                        "is_edit": False
+                    }
+                    st.session_state.construction_form_state = {
+                        "name": name,
+                        "num_layers": len(construction["layers"]),
+                        "layers": [{"material_name": layer["material"], "thickness": layer["thickness"]} for layer in construction["layers"]]
+                    }
+                    st.session_state.construction_rerun_pending = True
 
     st.subheader("Project Constructions")
     with st.container():
@@ -314,7 +335,7 @@ def display_constructions_tables(construction_library: ConstructionLibrary):
 
 def display_construction_editor(construction_library: ConstructionLibrary):
     """Display the construction editor form."""
-    is_preview = st.session_state.get("rerun_trigger", "").startswith("preview_cons_")
+    is_preview = st.session_state.get("rerun_trigger", "") and st.session_state.get("rerun_trigger", "").startswith("preview_cons_")
     materials = get_available_materials()
     material_objects = {name: m for name, m in materials.items() if isinstance(m, Material)}
     if is_preview:
@@ -331,11 +352,15 @@ def display_construction_editor(construction_library: ConstructionLibrary):
     with st.container():
         with st.form("construction_editor_form", clear_on_submit=False):
             editor_state = st.session_state.get("construction_editor", {})
-            form_state = st.session_state.get("construction_form_state", {
-                "name": "",
-                "num_layers": 1,
-                "layers": [{"material_name": material_names[0] if material_names else "", "thickness": 0.1}]
-            })
+            form_state = st.session_state.get("construction_form_state", {})
+            if not form_state or not isinstance(form_state, dict) or not form_state.get("layers"):
+                form_state = {
+                    "name": "",
+                    "num_layers": 1,
+                    "layers": [{"material_name": material_names[0] if material_names else "", "thickness": 0.1}]
+                }
+                st.session_state.construction_form_state = form_state
+            logger.debug(f"Form state: {form_state}")
             is_edit = editor_state.get("is_edit", False)
             original_name = editor_state.get("original_name", "")
             name = st.text_input(
@@ -470,7 +495,7 @@ def display_construction_editor(construction_library: ConstructionLibrary):
                                             "layers": [{"material_name": default_material, "thickness": 0.1}]
                                         }
                                         st.session_state.construction_action = {"action": None, "id": None}
-                                        st.session_state.rerun_trigger = None
+                                        st.session_state.rerun_trigger = ""
                                         st.session_state.construction_rerun_pending = True
                                     else:
                                         st.error(f"Failed to save construction: {message}")