Update app/construction.py

app/construction.py

@@ -238,19 +238,24 @@ def display_constructions_tables(construction_library: ConstructionLibrary):
                         if category_str not in MaterialCategory.__members__:
                             st.error(f"Invalid category for material {material_name}: {library_material['category']}")
                             break
-                        new_material = Material(
-                            name=new_mat_name,
-                            category=MaterialCategory[category_str],
-                            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("absorptivity", 0.6),
-                            price=library_material["cost"]["material"],
-                            emissivity=library_material.get("emissivity", 0.9),
-                            is_library=False
-                        )
+                        try:
+                            new_material = Material(
+                                name=new_mat_name,
+                                category=MaterialCategory[category_str],
+                                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"],
+                                absorptivity=library_material.get("absorptivity", 0.6),
+                                price=library_material["cost"]["material"],
+                                emissivity=library_material.get("emissivity", 0.9),
+                                is_library=False
+                            )
+                        except Exception as e:
+                            st.error(f"Failed to create material '{new_mat_name}': {str(e)}")
+                            logger.error(f"Error creating material {new_mat_name}: {str(e)}")
+                            break
                         success, message = material_library.add_project_material(new_material, st.session_state.project_data["materials"]["project"])
                         if not success:
                             st.error(f"Failed to copy material '{material_name}': {message}")
@@ -339,7 +344,35 @@ def display_construction_editor(construction_library: ConstructionLibrary):
     materials = get_available_materials()
     material_objects = {name: m for name, m in materials.items() if isinstance(m, Material)}
     if is_preview:
-        material_objects.update(st.session_state.project_data["materials"]["library"])
+        for name, mat_dict in st.session_state.project_data["materials"]["library"].items():
+            if name not in material_objects:
+                if "thermal_properties" not in mat_dict:
+                    st.error(f"Material '{name}' is missing thermal properties")
+                    logger.error(f"Missing thermal properties for material: {name}")
+                    continue
+                category_str = mat_dict["category"].upper().replace("-", "_")
+                if category_str not in MaterialCategory.__members__:
+                    st.error(f"Invalid category for material {name}: {mat_dict['category']}")
+                    logger.error(f"Invalid category for material {name}: {mat_dict['category']}")
+                    continue
+                try:
+                    material_objects[name] = Material(
+                        name=name,
+                        category=MaterialCategory[category_str],
+                        conductivity=mat_dict["thermal_properties"]["conductivity"],
+                        density=mat_dict["thermal_properties"]["density"],
+                        specific_heat=mat_dict["thermal_properties"]["specific_heat"],
+                        default_thickness=mat_dict["thickness_range"]["default"],
+                        embodied_carbon=mat_dict["embodied_carbon"],
+                        absorptivity=mat_dict.get("absorptivity", 0.6),
+                        price=mat_dict["cost"]["material"],
+                        emissivity=mat_dict.get("emissivity", 0.9),
+                        is_library=True
+                    )
+                except Exception as e:
+                    st.error(f"Failed to convert material '{name}' to Material object: {str(e)}")
+                    logger.error(f"Error converting material {name}: {str(e)}")
+                    continue
     material_names = list(material_objects.keys())
     
     if not material_names and not is_preview:
@@ -434,12 +467,23 @@ def display_construction_editor(construction_library: ConstructionLibrary):
                                 material_name = layer.get("material_name")
                                 thickness = layer.get("thickness", 0.1)
                                 if material_name in material_objects:
-                                    material = material_objects[material_name]
-                                    valid_layers.append({"material": material, "thickness": thickness})
+                                    valid_layers.append({"material": material_objects[material_name], "thickness": thickness})
+                                else:
+                                    st.warning(f"Material '{material_name}' not found in material objects.")
                             if valid_layers:
-                                r_total = R_SI + sum(layer["thickness"] / layer["material"].conductivity for layer in valid_layers) + R_SE
-                                u_value = 1.0 / r_total if r_total > 0 else 0.1
-                                st.write(f"Calculated U-Value: {u_value:.3f} W/m²·K")
+                                try:
+                                    r_total = R_SI
+                                    for layer in valid_layers:
+                                        if layer["material"].conductivity > 0:
+                                            r_total += layer["thickness"] / layer["material"].conductivity
+                                        else:
+                                            logger.warning(f"Invalid conductivity for material {layer['material'].name}: {layer['material'].conductivity}")
+                                    r_total += R_SE
+                                    u_value = 1.0 / r_total if r_total > 0 else 0.1
+                                    st.write(f"Calculated U-Value: {u_value:.3f} W/m²·K")
+                                except Exception as e:
+                                    st.error(f"Error calculating U-Value: {str(e)}")
+                                    logger.error(f"U-Value calculation error: {str(e)}")
                             else:
                                 st.warning("No valid materials selected for U-Value calculation.")
                         else:
@@ -501,6 +545,7 @@ def display_construction_editor(construction_library: ConstructionLibrary):
                                         st.error(f"Failed to save construction: {message}")
                             except Exception as e:
                                 st.error(f"Error saving construction: {str(e)}")
+                                logger.error(f"Construction save error: {str(e)}")
 
 def calculate_construction_properties(layers: List[Dict[str, Any]], materials: Dict[str, Any]) -> Dict[str, float]:
     """
@@ -519,12 +564,16 @@ def calculate_construction_properties(layers: List[Dict[str, Any]], materials: D
             # Thermal resistance
             if material.conductivity > 0:
                 r_value += thickness / material.conductivity
+            else:
+                logger.warning(f"Invalid conductivity for material {material_name}: {material.conductivity}")
             # Thermal mass
             thermal_mass += material.density * material.specific_heat * thickness
             # Embodied carbon
             embodied_carbon += material.embodied_carbon * material.density * thickness
             # Cost
             cost += material.price * thickness
+        else:
+            logger.warning(f"Material {material_name} not found in materials dictionary")
 
     r_value += R_SE  # External surface resistance
     u_value = 1.0 / r_value if r_value > 0 else 0.0
@@ -537,6 +586,8 @@ def calculate_construction_properties(layers: List[Dict[str, Any]], materials: D
     else:
         thermal_mass_category = "High"
 
+    logger.debug(f"Calculated properties: U={u_value:.3f}, R={r_value:.3f}, Thermal Mass={thermal_mass:.1f}, Category={thermal_mass_category}")
+
     return {
         "u_value": u_value,
         "r_value": r_value,