Update app/materials_library.py

app/materials_library.py

@@ -56,7 +56,7 @@ DEFAULT_MATERIALS = {
         "density": 1920.0,
         "specific_heat": 840.0,
         "default_thickness": 0.1,
-        "embodied_carbon": 240,
+        "embodied_carbon": 240.0,
         "cost": 180.0,
         "absorptivity": 0.65,
         "emissivity": 0.90,
@@ -345,12 +345,13 @@ def categorize_thermal_mass(thermal_mass: float) -> str:
     else:
         return "High"
 
-def get_stable_button_key(prefix: str, name: str, action: str) -> str:
-    """Generate a stable button key based on prefix, name, and action."""
+def get_stable_button_key(prefix: str, name: str, action: str, unique_id: str = None) -> str:
+    """Generate a stable button key based on prefix, name, action, and optional unique identifier."""
     import hashlib
-    key_string = f"{prefix}_{name}_{action}"
+    unique_id = unique_id or str(uuid.uuid4())[:8]  # Generate unique ID if not provided
+    key_string = f"{prefix}_{name}_{action}_{unique_id}"
     hash_key = hashlib.md5(key_string.encode()).hexdigest()[:8]
-    return f"{prefix}_{action}_{hash_key}"
+    return f"{prefix}_{action}_{name}_{hash_key}"
 
 def display_materials_page():
     """
@@ -478,14 +479,14 @@ def display_materials_tab():
                             st.session_state.material_form_state = {
                                 "name": name,
                                 "category": material["category"],
-                                "thermal_conductivity": material["thermal_conductivity"],
-                                "density": material["density"],
-                                "specific_heat": material["specific_heat"],
-                                "default_thickness": material["default_thickness"],
-                                "embodied_carbon": material["embodied_carbon"],
-                                "cost": material["cost"],
-                                "absorptivity": material["absorptivity"],
-                                "emissivity": material["emissivity"],
+                                "thermal_conductivity": float(material["thermal_conductivity"]),
+                                "density": float(material["density"]),
+                                "specific_heat": float(material["specific_heat"]),
+                                "default_thickness": float(material["default_thickness"]),
+                                "embodied_carbon": float(material["embodied_carbon"]),
+                                "cost": float(material["cost"]),
+                                "absorptivity": float(material["absorptivity"]),
+                                "emissivity": float(material["emissivity"]),
                                 "colour": material["colour"]
                             }
                             st.session_state.active_tab = "Materials"
@@ -558,14 +559,14 @@ def display_materials_tab():
                             st.session_state.material_form_state = {
                                 "name": name,
                                 "category": material["category"],
-                                "thermal_conductivity": material["thermal_conductivity"],
-                                "density": material["density"],
-                                "specific_heat": material["specific_heat"],
-                                "default_thickness": material["default_thickness"],
-                                "embodied_carbon": material["embodied_carbon"],
-                                "cost": material["cost"],
-                                "absorptivity": material["absorptivity"],
-                                "emissivity": material["emissivity"],
+                                "thermal_conductivity": float(material["thermal_conductivity"]),
+                                "density": float(material["density"]),
+                                "specific_heat": float(material["specific_heat"]),
+                                "default_thickness": float(material["default_thickness"]),
+                                "embodied_carbon": float(material["embodied_carbon"]),
+                                "cost": float(material["cost"]),
+                                "absorptivity": float(material["absorptivity"]),
+                                "emissivity": float(material["emissivity"]),
                                 "colour": material["colour"]
                             }
                             st.session_state.active_tab = "Materials"
@@ -674,12 +675,12 @@ def display_fenestrations_tab():
                             st.session_state.fenestration_form_state = {
                                 "name": name,
                                 "type": fenestration["type"],
-                                "u_value": fenestration["u_value"],
-                                "shgc": fenestration["shgc"],
-                                "visible_trans": fenestration["visible_transmittance"],
-                                "thickness": fenestration["thickness"],
-                                "embodied_carbon": fenestration["embodied_carbon"],
-                                "cost": fenestration["cost"]
+                                "u_value": float(fenestration["u_value"]),
+                                "shgc": float(fenestration["shgc"]),
+                                "visible_trans": float(fenestration["visible_transmittance"]),
+                                "thickness": float(fenestration["thickness"]),
+                                "embodied_carbon": float(fenestration["embodied_carbon"]),
+                                "cost": float(fenestration["cost"])
                             }
                             st.session_state.active_tab = "Fenestrations"
                             st.session_state.rerun_pending = True
@@ -745,12 +746,12 @@ def display_fenestrations_tab():
                             st.session_state.fenestration_form_state = {
                                 "name": name,
                                 "type": fenestration["type"],
-                                "u_value": fenestration["u_value"],
-                                "shgc": fenestration["shgc"],
-                                "visible_trans": fenestration["visible_transmittance"],
-                                "thickness": fenestration["thickness"],
-                                "embodied_carbon": fenestration["embodied_carbon"],
-                                "cost": fenestration["cost"]
+                                "u_value": float(fenestration["u_value"]),
+                                "shgc": float(fenestration["shgc"]),
+                                "visible_trans": float(fenestration["visible_transmittance"]),
+                                "thickness": float(fenestration["thickness"]),
+                                "embodied_carbon": float(fenestration["embodied_carbon"]),
+                                "cost": float(fenestration["cost"])
                             }
                             st.session_state.active_tab = "Fenestrations"
                             st.session_state.rerun_pending = True
@@ -758,13 +759,13 @@ def display_fenestrations_tab():
                     if cols[4].button("Delete", key=delete_key):
                         is_in_use = check_fenestration_in_use(name)
                         if is_in_use:
-                            st.error(f"Cannot delete fenestration_fenestration '{name}' because it is in use in components.")
+                            st.error(f"Cannot delete fenestration '{name}' because it is in use in components.")
                         else:
                             del st.session_state.project_data["fenestrations"]["project"][name]
                             st.success(f"Fenestration '{name}' deleted from project.")
-                            st.logger.info(f"Deleted fenestration '{name}' from project")
+                            logger.info(f"Deleted fenestration '{name}' from project")
                             st.session_state.rerun_pending = True
-                            
+            
             else:
                 st.info("No project fenestrations in the selected type.")
         
@@ -778,7 +779,7 @@ def display_fenestrations_tab():
                     "Type": props["type"],
                     "U-Value (W/m²·K)": props["u_value"],
                     "SHGC": props["shgc"],
-                    "VisibleLight Transmittance": props["visible_transmittance"],
+                    "Visible Transmittance": props["visible_transmittance"],
                     "Thickness (m)": props["thickness"],
                     "Embodied Carbon (kg/m²)": props["embodied_carbon"],
                     "Cost (USD/m²)": props["cost"]
@@ -814,7 +815,7 @@ def initialize_materials():
             "specific_heat": 1000.0,
             "default_thickness": 0.05,
             "embodied_carbon": 100.0,
-            "cost": 100.100,
+            "cost": 100.0,
             "absorptivity": 0.60,
             "emissivity": 0.90,
             "colour": "Medium",
@@ -831,10 +832,10 @@ def initialize_materials():
             "density": 1000.0,
             "specific_heat": 1000.0,
             "default_thickness": 0.05,
-            "embodied_carbon": "",
-            "cost": "",
-            "absorptivity": 0.6,
-            "emissivity": "",
+            "embodied_carbon": 100.0,
+            "cost": 100.0,
+            "absorptivity": 0.60,
+            "emissivity": 0.90,
             "colour": "Medium"
         }
 
@@ -850,7 +851,7 @@ def initialize_fenestrations():
     if not st.session_state.project_data["fenestrations"]["library"]:
         st.session_state.project_data["fenestrations"]["library"] = DEFAULT_FENESTRATIONS.copy()
     
-    if "fenestration_editor_form" not in st.session_state:
+    if "fenestration_editor" not in st.session_state:
         st.session_state.fenestration_editor = {
             "name": "",
             "type": FENESTRATION_TYPES[0],
@@ -873,8 +874,8 @@ def initialize_fenestrations():
             "shgc": 0.7,
             "visible_trans": 0.8,
             "thickness": 0.024,
-            "embodied_carbon": "",
-            "cost": ""
+            "embodied_carbon": 900.0,
+            "cost": 200.0
         }
 
 def display_material_editor():
@@ -907,7 +908,7 @@ def display_material_editor():
                 "Thermal Conductivity (W/m·K)",
                 min_value=0.001,
                 max_value=1000.0,
-                value=float(form_state.get("thermal_conductivity", editor_state["thermal_conductivity"])),
+                value=float(form_state.get("thermal_conductivity", editor_state.get("thermal_conductivity", 0.5))),
                 format="%.3f",
                 help="Thermal conductivity in W/m·K. Lower values indicate better insulation.",
                 disabled=is_library
@@ -917,7 +918,7 @@ def display_material_editor():
                 "Density (kg/m³)",
                 min_value=1.0,
                 max_value=20000.0,
-                value=float(form_state.get("density", editor_state["density"])),
+                value=float(form_state.get("density", editor_state.get("density", 1000.0))),
                 format="%.1f",
                 help="Material density in kg/m³.",
                 disabled=is_library
@@ -928,7 +929,7 @@ def display_material_editor():
                 "Specific Heat (J/kg·K)",
                 min_value=100.0,
                 max_value=10000.0,
-                value=float(form_state.get("specific_heat", editor_state["specific_heat"])),
+                value=float(form_state.get("specific_heat", editor_state.get("specific_heat", 1000.0))),
                 format="%.1f",
                 help="Specific heat capacity in J/kg·K. Higher values indicate better thermal mass.",
                 disabled=is_library
@@ -938,7 +939,7 @@ def display_material_editor():
                 "Thickness (m)",
                 min_value=0.001,
                 max_value=0.5,
-                value=float(form_state.get("default_thickness", editor_state["default_thickness"])),
+                value=float(form_state.get("default_thickness", editor_state.get("default_thickness", 0.05))),
                 format="%.3f",
                 help="Thickness for this material in meters.",
                 disabled=is_library
@@ -948,7 +949,7 @@ def display_material_editor():
                 "Absorptivity",
                 min_value=0.0,
                 max_value=1.0,
-                value=float(form_state.get("absorptivity", editor_state["absorptivity"])),
+                value=float(form_state.get("absorptivity", editor_state.get("absorptivity", 0.60))),
                 format="%.2f",
                 help="Solar radiation absorbed (0-1).",
                 disabled=is_library
@@ -961,14 +962,14 @@ def display_material_editor():
                 "Emissivity",
                 min_value=0.0,
                 max_value=1.0,
-                value=float(form_state.get("emissivity", editor_state["emissivity"])),
+                value=float(form_state.get("emissivity", editor_state.get("emissivity", 0.90))),
                 format="%.2f",
                 help="Ratio of radiation emitted (0-1).",
                 disabled=is_library
             )
         
         with col2:
-            colour_index = COLOUR_CATEGORIES.index(form_state.get("colour", editor_state["colour"])) if form_state.get("colour", editor_state["colour"]) in COLOUR_CATEGORIES else 0
+            colour_index = COLOUR_CATEGORIES.index(form_state.get("colour", editor_state.get("colour", "Medium"))) if form_state.get("colour", editor_state.get("colour", "Medium")) in COLOUR_CATEGORIES else 0
             colour = st.selectbox(
                 "Colour Category",
                 COLOUR_CATEGORIES,
@@ -985,7 +986,7 @@ def display_material_editor():
                 "Embodied Carbon (kg CO₂e/m³)",
                 min_value=0.0,
                 max_value=10000.0,
-                value=float(form_state.get("embodied_carbon", editor_state.get("embodied_carbon", ""))),
+                value=float(form_state.get("embodied_carbon", editor_state.get("embodied_carbon", 100.0))),
                 format="%.1f",
                 help="Embodied carbon in kg CO₂e per cubic meter.",
                 disabled=is_library
@@ -996,7 +997,7 @@ def display_material_editor():
                 "Cost (USD/m³)",
                 min_value=0.0,
                 max_value=10000.0,
-                value=float(form_state.get("cost", editor_state.get("cost", ""))),
+                value=float(form_state.get("cost", editor_state.get("cost", 100.0))),
                 format="%.1f",
                 help="Material cost in USD per cubic meter.",
                 disabled=is_library
@@ -1096,9 +1097,9 @@ def display_fenestration_editor():
                 "U-Value (W/m²·K)",
                 min_value=0.1,
                 max_value=10.0,
-                value=float(form_state.get("u_value", editor_state.get("u_value", ""))),
+                value=float(form_state.get("u_value", editor_state.get("u_value", 2.8))),
                 format="%.2f",
-                help="U-value in W/m²·K. value",
+                help="U-value in W/m²·K.",
                 disabled=is_library
             )
             
@@ -1107,7 +1108,7 @@ def display_fenestration_editor():
                 "Solar Heat Gain Coefficient (SHGC)",
                 min_value=0.0,
                 max_value=1.0,
-                value=float(form_state.get("shgc", editor_state.get("shgc", ""))),
+                value=float(form_state.get("shgc", editor_state.get("shgc", 0.7))),
                 format="%.2f",
                 help="Solar Heat Gain Coefficient (0-1).",
                 disabled=is_library
@@ -1117,7 +1118,7 @@ def display_fenestration_editor():
                 "Visible Transmittance",
                 min_value=0.0,
                 max_value=1.0,
-                value=float(form_state.get("visible_trans", editor_state.get("visible_trans", ""))),
+                value=float(form_state.get("visible_trans", editor_state.get("visible_trans", 0.8))),
                 format="%.2f",
                 help="Visible light transmission (0-1).",
                 disabled=is_library
@@ -1127,7 +1128,7 @@ def display_fenestration_editor():
                 "Thickness (m)",
                 min_value=0.001,
                 max_value=0.1,
-                value=float(form_state.get("thickness", editor_state.get("thickness", ""))),
+                value=float(form_state.get("thickness", editor_state.get("thickness", 0.024))),
                 format="%.3f",
                 help="Thickness in meters.",
                 disabled=is_library
@@ -1142,7 +1143,7 @@ def display_fenestration_editor():
                 "Embodied Carbon (kg CO₂e/m²)",
                 min_value=0.0,
                 max_value=5000.0,
-                value=float(form_state.get("embodied_carbon", editor_state.get("embodied_carbon", ""))),
+                value=float(form_state.get("embodied_carbon", editor_state.get("embodied_carbon", 900.0))),
                 format="%.1f",
                 help="Embodied carbon in kg CO₂e/m².",
                 disabled=is_library
@@ -1153,7 +1154,7 @@ def display_fenestration_editor():
                 "Cost (USD/m²)",
                 min_value=0.0,
                 max_value=5000.0,
-                value=float(form_state.get("cost", editor_state.get("cost", ""))),
+                value=float(form_state.get("cost", editor_state.get("cost", 200.0))),
                 format="%.1f",
                 help="Fenestration cost in USD/m².",
                 disabled=is_library
@@ -1199,7 +1200,7 @@ def display_fenestration_editor():
                     }
                     if editor_state["edit_mode"]:
                         original_name = editor_state["original_name"]
-                        if original_name != st.name:
+                        if original_name != name:
                             del st.session_state.project_data["fenestrations"]["project"][original_name]
                         st.session_state.project_data["fenestrations"]["project"][name] = fenestration_data
                         st.success(f"Fenestration '{name}' updated successfully.")
@@ -1280,7 +1281,8 @@ def validate_fenestration(
 ) -> Tuple[bool, str]:
     """
     Validate fenestration inputs.
-    Returns (success, message) tuple."""
+    Returns (success, message) tuple.
+    """
     if not name or name.strip() == "":
         return False, "Fenestration name is required."
     
@@ -1319,24 +1321,24 @@ def reset_material_editor():
         "density": 1000.0,
         "specific_heat": 1000.0,
         "default_thickness": 0.05,
-        "embodied_carbon": "",
-        "cost": "",
+        "embodied_carbon": 100.0,
+        "cost": 100.0,
         "absorptivity": 0.60,
-        "emissivity": "",
-        "colour": ""
+        "emissivity": 0.90,
+        "colour": "Medium"
     }
     st.session_state.material_editor = {
         "name": "",
         "category": MATERIAL_CATEGORIES[0],
-        "thermal_conductivity": "",
-        "density": 0.0,
-        "specific_heat": "",
-        "default_thickness": "",
-        "embodied_carbon": "",
-        "cost": "",
-        "absorptivity": "",
-        "emissivity": "",
-        "colour": "",
+        "thermal_conductivity": 0.5,
+        "density": 1000.0,
+        "specific_heat": 1000.0,
+        "default_thickness": 0.05,
+        "embodied_carbon": 100.0,
+        "cost": 100.0,
+        "absorptivity": 0.60,
+        "emissivity": 0.90,
+        "colour": "Medium",
         "edit_mode": False,
         "original_name": "",
         "is_library": False
@@ -1349,22 +1351,25 @@ def reset_fenestration_editor():
     st.session_state.fenestration_form_state = {
         "name": "",
         "type": FENESTRATION_TYPES[0],
-        "u_value": "",
-        "shgc": "",
-        "visible_trans": "",
-        "thickness": "",
-        "embodied_carbon": "",
-        "cost": ""
+        "u_value": 2.8,
+        "shgc": 0.7,
+        "visible_trans": 0.8,
+        "thickness": 0.024,
+        "embodied_carbon": 900.0,
+        "cost": 200.0
     }
-    st.session_state.fenestration_form_state = {
+    st.session_state.fenestration_editor = {
         "name": "",
         "type": FENESTRATION_TYPES[0],
-        "u_value": "",
-        "shgc": "",
-        "visible_trans": "",
-        "thickness": "",
-        "embodied_carbon": "",
-        "cost": ""
+        "u_value": 2.8,
+        "shgc": 0.7,
+        "visible_trans": 0.8,
+        "thickness": 0.024,
+        "embodied_carbon": 900.0,
+        "cost": 200.0,
+        "edit_mode": False,
+        "original_name": "",
+        "is_library": False
     }
     st.session_state.fenestration_action = {"action": None, "id": None}
     st.session_state.rerun_trigger = None