Update app/construction.py

app/construction.py

@@ -205,41 +205,41 @@ def display_constructions_tables(construction_library: ConstructionLibrary):
 
     st.subheader("Library Constructions")
     with st.container():
-        library_constructions = list(construction_library.library_constructions.values())
+        library_constructions = list(construction_library.library_constructions.items())  # Changed to .items()
         if construction_filter != "All":
-            library_constructions = [c for c in library_constructions if c["type"] == construction_filter]
+            library_constructions = [(name, c) for name, c in library_constructions if c["type"] == construction_filter]
         cols = st.columns([2, 1, 1, 1, 1])
         cols[0].write("**Name**")
         cols[1].write("**Thermal Mass**")
         cols[2].write("**U-Value (W/m²·K)**")
         cols[3].write("**Preview**")
         cols[4].write("**Copy**")
-        for construction in library_constructions:
+        for name, construction in library_constructions:  # Changed to unpack name and construction
             cols = st.columns([2, 1, 1, 1, 1])
-            cols[0].write(name)
+            cols[0].write(name)  # Use name directly
             cols[1].write(f"{construction.get('thermal_mass', 0.0):.1f}")
             cols[2].write(f"{construction.get('u_value', 0.0):.3f}")
-            if cols[3].button("Preview", key=f"preview_lib_cons_{construction['name']}"):
-                if st.session_state.get("rerun_trigger") != f"preview_cons_{construction['name']}":
-                    st.session_state.rerun_trigger = f"preview_cons_{construction['name']}"
+            if cols[3].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": construction["name"],
+                        "name": name,
                         "component_type": construction["type"],
                         "layers": [{"material_name": layer["material"], "thickness": layer["thickness"]} for layer in construction["layers"]],
                         "is_edit": False
                     }
                     st.session_state.construction_form_state = {
-                        "name": construction["name"],
+                        "name": name,
                         "component_type": construction["type"],
                         "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
-            if cols[4].button("Copy", key=f"copy_lib_cons_{construction['name']}"):
-                new_name = f"{construction['name']}_Project"
+            if cols[4].button("Copy", key=f"copy_lib_cons_{name}"):
+                new_name = f"{name}_Project"
                 counter = 1
                 while new_name in st.session_state.project_data["constructions"]["project"] or new_name in construction_library.library_constructions:
-                    new_name = f"{construction['name']}_Project_{counter}"
+                    new_name = f"{name}_Project_{counter}"
                     counter += 1
                 new_layers = []
                 material_library = st.session_state.get("material_library", None)
@@ -298,9 +298,9 @@ def display_constructions_tables(construction_library: ConstructionLibrary):
 
     st.subheader("Project Constructions")
     with st.container():
-        project_constructions = list(st.session_state.project_data["constructions"]["project"].values())
+        project_constructions = list(st.session_state.project_data["constructions"]["project"].items())  # Changed to .items()
         if construction_filter != "All":
-            project_constructions = [c for c in project_constructions if c["type"] == construction_filter]
+            project_constructions = [(name, c) for name, c in project_constructions if c["type"] == construction_filter]
         if project_constructions:
             cols = st.columns([2, 1, 1, 1, 1])
             cols[0].write("**Name**")
@@ -308,31 +308,31 @@ def display_constructions_tables(construction_library: ConstructionLibrary):
             cols[2].write("**U-Value (W/m²·K)**")
             cols[3].write("**Edit**")
             cols[4].write("**Delete**")
-            for construction in project_constructions:
+            for name, construction in project_constructions:  # Changed to unpack name and construction
                 cols = st.columns([2, 1, 1, 1, 1])
-                cols[0].write(name)
+                cols[0].write(name)  # Use name directly
                 cols[1].write(f"{construction.get('thermal_mass', 0.0):.1f}")
                 cols[2].write(f"{construction.get('u_value', 0.0):.3f}")
-                if cols[3].button("Edit", key=f"edit_proj_cons_{construction['name']}"):
-                    if st.session_state.get("rerun_trigger") != f"edit_cons_{construction['name']}":
-                        st.session_state.rerun_trigger = f"edit_cons_{construction['name']}"
+                if cols[3].button("Edit", key=f"edit_proj_cons_{name}"):
+                    if st.session_state.get("rerun_trigger") != f"edit_cons_{name}":
+                        st.session_state.rerun_trigger = f"edit_cons_{name}"
                         st.session_state.construction_editor = {
-                            "name": construction["name"],
+                            "name": name,
                             "component_type": construction["type"],
                             "layers": [{"material_name": layer["material"], "thickness": layer["thickness"]} for layer in construction["layers"]],
                             "is_edit": True,
-                            "original_name": construction["name"]
+                            "original_name": name
                         }
                         st.session_state.construction_form_state = {
-                            "name": construction["name"],
+                            "name": name,
                             "component_type": construction["type"],
                             "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
-                if cols[4].button("Delete", key=f"delete_proj_cons_{construction['name']}"):
+                if cols[4].button("Delete", key=f"delete_proj_cons_{name}"):
                     success, message = construction_library.delete_project_construction(
-                        construction["name"], st.session_state.project_data["constructions"]["project"], st.session_state.project_data.get("components", {})
+                        name, st.session_state.project_data["constructions"]["project"], st.session_state.project_data.get("components", {})
                     )
                     if success:
                         st.success(message)