Update app/construction.py

app/construction.py

@@ -20,15 +20,12 @@ from typing import Dict, List, Any, Optional, Tuple, Union
 
 # Import the centralized data module and materials library
 from app.m_c_data import get_default_constructions
-from app.materials_library import get_available_materials, Material
+from app.materials_library import get_available_materials, Material, MaterialCategory
 
 # Configure logging
 logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
 logger = logging.getLogger(__name__)
 
-# Define constants
-CONSTRUCTION_TYPES = ["Wall", "Roof", "Floor"]
-
 # Surface resistances (EN ISO 6946 or ASHRAE)
 R_SI = 0.12  # Internal surface resistance (m²·K/W)
 R_SE = 0.04  # External surface resistance (m²·K/W)
@@ -42,10 +39,9 @@ class ConstructionLibrary:
         data = [
             {
                 "Name": name,
-                "Component Type": props["type"],
                 "U-Value (W/m²·K)": props.get("u_value", 0.0),
                 "R-Value (m²·K/W)": props.get("r_value", 0.0),
-                "Thermal Mass (kJ/m²·K)": props.get("thermal_mass", 0.0),
+                "Thermal Mass Category": props.get("thermal_mass_category", "Low"),
                 "Embodied Carbon (kgCO₂e/m²)": props.get("embodied_carbon", 0.0),
                 "Cost (USD/m²)": props.get("cost", 0.0),
                 "Layers": len(props.get("layers", []))
@@ -162,10 +158,7 @@ def display_construction_page():
     # Display project constructions DataFrame
     st.subheader("Project Constructions")
     try:
-        construction_filter = st.session_state.get("construction_filter", "All")
         construction_df = construction_library.to_dataframe(st.session_state.project_data["constructions"]["project"])
-        if construction_filter != "All":
-            construction_df = construction_df[construction_df["Component Type"] == construction_filter]
         if not construction_df.empty:
             st.dataframe(construction_df, use_container_width=True)
         else:
@@ -199,43 +192,20 @@ def initialize_construction():
 
 def display_constructions_tables(construction_library: ConstructionLibrary):
     """Display library and project constructions tables."""
-    # Component type filter
-    filter_options = ["All"] + CONSTRUCTION_TYPES
-    construction_filter = st.selectbox("Filter by Component Type", filter_options, key="construction_filter")
-
     st.subheader("Library Constructions")
     with st.container():
-        library_constructions = list(construction_library.library_constructions.items())  # Changed to .items()
-        if construction_filter != "All":
-            library_constructions = [(name, c) for name, c in library_constructions if c["type"] == construction_filter]
-        cols = st.columns([2, 1, 1, 1, 1])
+        library_constructions = list(construction_library.library_constructions.items())
+        cols = st.columns([2, 1, 1, 1])
         cols[0].write("**Name**")
-        cols[1].write("**Thermal Mass**")
+        cols[1].write("**Thermal Mass Category**")
         cols[2].write("**U-Value (W/m²·K)**")
-        cols[3].write("**Preview**")
-        cols[4].write("**Copy**")
-        for name, construction in library_constructions:  # Changed to unpack name and construction
-            cols = st.columns([2, 1, 1, 1, 1])
-            cols[0].write(name)  # Use name directly
-            cols[1].write(f"{construction.get('thermal_mass', 0.0):.1f}")
+        cols[3].write("**Copy**")
+        for name, construction in library_constructions:
+            cols = st.columns([2, 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}")
-            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": 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": 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_{name}"):
+            if cols[3].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:
@@ -257,9 +227,13 @@ def display_constructions_tables(construction_library: ConstructionLibrary):
                         while new_mat_name in st.session_state.project_data["materials"]["project"] or new_mat_name in st.session_state.project_data["materials"]["library"]:
                             new_mat_name = f"{material_name}_Project_{counter}"
                             counter += 1
+                        category_str = library_material["category"].upper().replace("-", "_")
+                        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(library_material["category"]),
+                            category=MaterialCategory[category_str],
                             conductivity=library_material["thermal_conductivity"],
                             density=library_material["density"],
                             specific_heat=library_material["specific_heat"],
@@ -280,11 +254,11 @@ def display_constructions_tables(construction_library: ConstructionLibrary):
                     properties = calculate_construction_properties(new_layers, get_available_materials())
                     new_construction = {
                         "name": new_name,
-                        "type": construction["type"],
                         "layers": new_layers,
                         "u_value": properties["u_value"],
                         "r_value": properties["r_value"],
                         "thermal_mass": properties["thermal_mass"],
+                        "thermal_mass_category": properties["thermal_mass_category"],
                         "embodied_carbon": properties["embodied_carbon"],
                         "cost": properties["cost"],
                         "is_library": False
@@ -298,34 +272,30 @@ def display_constructions_tables(construction_library: ConstructionLibrary):
 
     st.subheader("Project Constructions")
     with st.container():
-        project_constructions = list(st.session_state.project_data["constructions"]["project"].items())  # Changed to .items()
-        if construction_filter != "All":
-            project_constructions = [(name, c) for name, c in project_constructions if c["type"] == construction_filter]
+        project_constructions = list(st.session_state.project_data["constructions"]["project"].items())
         if project_constructions:
             cols = st.columns([2, 1, 1, 1, 1])
             cols[0].write("**Name**")
-            cols[1].write("**Thermal Mass**")
+            cols[1].write("**Thermal Mass Category**")
             cols[2].write("**U-Value (W/m²·K)**")
             cols[3].write("**Edit**")
             cols[4].write("**Delete**")
-            for name, construction in project_constructions:  # Changed to unpack name and construction
+            for name, construction in project_constructions:
                 cols = st.columns([2, 1, 1, 1, 1])
-                cols[0].write(name)  # Use name directly
-                cols[1].write(f"{construction.get('thermal_mass', 0.0):.1f}")
+                cols[0].write(name)
+                cols[1].write(construction.get("thermal_mass_category", "Low"))
                 cols[2].write(f"{construction.get('u_value', 0.0):.3f}")
                 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": name,
-                            "component_type": construction["type"],
                             "layers": [{"material_name": layer["material"], "thickness": layer["thickness"]} for layer in construction["layers"]],
                             "is_edit": True,
                             "original_name": name
                         }
                         st.session_state.construction_form_state = {
                             "name": name,
-                            "component_type": construction["type"],
                             "num_layers": len(construction["layers"]),
                             "layers": [{"material_name": layer["material"], "thickness": layer["thickness"]} for layer in construction["layers"]]
                         }
@@ -363,7 +333,6 @@ def display_construction_editor(construction_library: ConstructionLibrary):
             editor_state = st.session_state.get("construction_editor", {})
             form_state = st.session_state.get("construction_form_state", {
                 "name": "",
-                "component_type": "Wall",
                 "num_layers": 1,
                 "layers": [{"material_name": material_names[0] if material_names else "", "thickness": 0.1}]
             })
@@ -375,13 +344,6 @@ def display_construction_editor(construction_library: ConstructionLibrary):
                 help="Unique construction identifier",
                 key="construction_name_input"
             )
-            component_type = st.selectbox(
-                "Component Type",
-                CONSTRUCTION_TYPES,
-                index=CONSTRUCTION_TYPES.index(form_state.get("component_type", editor_state.get("component_type", "Wall"))),
-                help="Building component type",
-                key="construction_component_type_input"
-            )
             num_layers = st.number_input(
                 "Number of Layers",
                 min_value=1,
@@ -484,11 +446,11 @@ def display_construction_editor(construction_library: ConstructionLibrary):
                                     properties = calculate_construction_properties(valid_layers, material_objects)
                                     new_construction = {
                                         "name": name,
-                                        "type": component_type,
                                         "layers": valid_layers,
                                         "u_value": properties["u_value"],
                                         "r_value": properties["r_value"],
                                         "thermal_mass": properties["thermal_mass"],
+                                        "thermal_mass_category": properties["thermal_mass_category"],
                                         "embodied_carbon": properties["embodied_carbon"],
                                         "cost": properties["cost"],
                                         "is_library": False
@@ -504,7 +466,6 @@ def display_construction_editor(construction_library: ConstructionLibrary):
                                         st.session_state.construction_editor = {}
                                         st.session_state.construction_form_state = {
                                             "name": "",
-                                            "component_type": "Wall",
                                             "num_layers": 1,
                                             "layers": [{"material_name": default_material, "thickness": 0.1}]
                                         }
@@ -521,7 +482,7 @@ def calculate_construction_properties(layers: List[Dict[str, Any]], materials: D
     Calculate the thermal properties of a construction based on its layers.
     """
     r_value = R_SI  # Internal surface resistance
-    thermal_mass = 0.0  # kJ/m²·K
+    thermal_mass = 0.0  # J/m²·K
     embodied_carbon = 0.0  # kg CO₂e/m²
     cost = 0.0  # $/m²
 
@@ -534,7 +495,7 @@ def calculate_construction_properties(layers: List[Dict[str, Any]], materials: D
             if material.conductivity > 0:
                 r_value += thickness / material.conductivity
             # Thermal mass
-            thermal_mass += material.density * material.specific_heat * thickness / 1000.0
+            thermal_mass += material.density * material.specific_heat * thickness
             # Embodied carbon
             embodied_carbon += material.embodied_carbon * material.density * thickness
             # Cost
@@ -543,10 +504,19 @@ def calculate_construction_properties(layers: List[Dict[str, Any]], materials: D
     r_value += R_SE  # External surface resistance
     u_value = 1.0 / r_value if r_value > 0 else 0.0
 
+    # Categorize thermal mass
+    if thermal_mass < 30000:
+        thermal_mass_category = "Low"
+    elif 30000 <= thermal_mass <= 90000:
+        thermal_mass_category = "Medium"
+    else:
+        thermal_mass_category = "High"
+
     return {
         "u_value": u_value,
         "r_value": r_value,
         "thermal_mass": thermal_mass,
+        "thermal_mass_category": thermal_mass_category,
         "embodied_carbon": embodied_carbon,
         "cost": cost
     }
@@ -569,7 +539,7 @@ def display_construction_help():
     st.markdown("""
     ### Construction Library Help
     
-    This section allows you to create and manage multi-layer constructions for walls, roofs, and floors.
+    This section allows you to create and manage multi-layer constructions for building envelope components.
     
     **Key Concepts:**
     
@@ -577,14 +547,14 @@ def display_construction_help():
     * **Layers**: Individual material layers that make up a construction, defined from outside to inside.
     * **U-Value**: Overall heat transfer coefficient (W/m²·K), lower is better for insulation.
     * **R-Value**: Thermal resistance (m²·K/W), higher is better for insulation.
-    * **Thermal Mass**: Heat storage capacity (kJ/m²·K), higher values provide better temperature stability.
+    * **Thermal Mass Category**: Heat storage capacity, categorized as Low (< 30,000 J/m²·K), Medium (30,000–90,000 J/m²·K), or High (> 90,000 J/m²·K).
     
     **Workflow:**
     
     1. Create new constructions or add existing ones from the library to your project.
     2. Define layers for each construction, selecting materials and specifying thicknesses.
     3. Calculate thermal properties to evaluate performance.
-    4. Use constructions in the Building Components section to define walls, roofs, and floors.
+    4. Use constructions in the Building Components section to define building elements.
     
     **Tips:**