Update app/component_selection.py

app/component_selection.py

@@ -65,7 +65,7 @@ class BuildingComponent:
 @dataclass
 class Wall(BuildingComponent):
     wall_type: str = "Brick"
-    wall_group: str = "Wall"
+    wall_group: str = "A"  # Changed default to valid ASHRAE group
     absorptivity: float = 0.6
     shading_coefficient: float = 1.0
     infiltration_rate_cfm: float = 0.0
@@ -79,6 +79,11 @@ class Wall(BuildingComponent):
             raise ValueError("Shading coefficient must be between 0 and 1")
         if self.infiltration_rate_cfm < 0:
             raise ValueError("Infiltration rate cannot be negative")
+        # Validate wall_group
+        VALID_WALL_GROUPS = {"A", "B", "C", "D", "E", "F", "G", "H"}
+        if self.wall_group not in VALID_WALL_GROUPS:
+            st.warning(f"Invalid wall_group '{self.wall_group}' for wall '{self.name}'. Defaulting to 'A'.")
+            self.wall_group = "A"
 
     def to_dict(self) -> dict:
         base_dict = super().to_dict()
@@ -91,7 +96,7 @@ class Wall(BuildingComponent):
 @dataclass
 class Roof(BuildingComponent):
     roof_type: str = "Concrete"
-    roof_group: str = "C"
+    roof_group: str = "1"  # Changed default to valid ASHRAE group
     slope: str = "Flat"
     absorptivity: float = 0.6
 
@@ -102,6 +107,11 @@ class Roof(BuildingComponent):
             self.orientation = Orientation.HORIZONTAL
         if not 0 <= self.absorptivity <= 1:
             raise ValueError("Absorptivity must be between 0 and 1")
+        # Validate roof_group
+        VALID_ROOF_GROUPS = {"1", "2", "3", "4", "5", "6", "7", "8"}
+        if self.roof_group not in VALID_ROOF_GROUPS:
+            st.warning(f"Invalid roof_group '{self.roof_group}' for roof '{self.name}'. Defaulting to '1'.")
+            self.roof_group = "1"
 
     def to_dict(self) -> dict:
         base_dict = super().to_dict()
@@ -185,20 +195,20 @@ class ReferenceData:
                 "Wood": {"conductivity": 0.15}
             },
             "wall_types": {
-                "Brick Wall": {"u_value": 2.0, "absorptivity": 0.6},
-                "Insulated Brick": {"u_value": 0.5, "absorptivity": 0.6},
-                "Concrete Block": {"u_value": 1.8, "absorptivity": 0.6},
-                "Insulated Concrete": {"u_value": 0.4, "absorptivity": 0.6},
-                "Timber Frame": {"u_value": 0.3, "absorptivity": 0.6},
-                "Cavity Brick": {"u_value": 0.6, "absorptivity": 0.6},
-                "Lightweight Panel": {"u_value": 1.0, "absorptivity": 0.6},
-                "Reinforced Concrete": {"u_value": 1.5, "absorptivity": 0.6},
-                "SIP": {"u_value": 0.25, "absorptivity": 0.6},
-                "Custom": {"u_value": 0.5, "absorptivity": 0.6}
+                "Brick Wall": {"u_value": 2.0, "absorptivity": 0.6, "wall_group": "A"},
+                "Insulated Brick": {"u_value": 0.5, "absorptivity": 0.6, "wall_group": "B"},
+                "Concrete Block": {"u_value": 1.8, "absorptivity": 0.6, "wall_group": "C"},
+                "Insulated Concrete": {"u_value": 0.4, "absorptivity": 0.6, "wall_group": "D"},
+                "Timber Frame": {"u_value": 0.3, "absorptivity": 0.6, "wall_group": "E"},
+                "Cavity Brick": {"u_value": 0.6, "absorptivity": 0.6, "wall_group": "F"},
+                "Lightweight Panel": {"u_value": 1.0, "absorptivity": 0.6, "wall_group": "G"},
+                "Reinforced Concrete": {"u_value": 1.5, "absorptivity": 0.6, "wall_group": "H"},
+                "SIP": {"u_value": 0.25, "absorptivity": 0.6, "wall_group": "A"},
+                "Custom": {"u_value": 0.5, "absorptivity": 0.6, "wall_group": "A"}
             },
             "roof_types": {
-                "Concrete Roof": {"u_value": 0.3, "absorptivity": 0.6, "group": "C"},
-                "Metal Roof": {"u_value": 1.0, "absorptivity": 0.75, "group": "B"}
+                "Concrete Roof": {"u_value": 0.3, "absorptivity": 0.6, "group": "1"},
+                "Metal Roof": {"u_value": 1.0, "absorptivity": 0.75, "group": "2"}
             },
             "roof_ventilation_methods": {
                 "No Ventilation": 0.0,
@@ -331,6 +341,7 @@ class ComponentSelectionInterface:
                     wall_options = self.reference_data.data["wall_types"]
                     selected_wall = st.selectbox("Wall Type", options=list(wall_options.keys()))
                     u_value = st.number_input("U-Value (W/m²·K)", min_value=0.0, value=float(wall_options[selected_wall]["u_value"]), step=0.01)
+                    wall_group = st.selectbox("Wall Group (ASHRAE)", ["A", "B", "C", "D", "E", "F", "G", "H"], index=0)
                     absorptivity = st.selectbox("Solar Absorptivity", ["Light (0.3)", "Light to Medium (0.45)", "Medium (0.6)", "Medium to Dark (0.75)", "Dark (0.9)"], index=2)
                     shading_coefficient = st.number_input("Shading Coefficient", min_value=0.0, max_value=1.0, value=1.0, step=0.05)
                     infiltration_rate = st.number_input("Infiltration Rate (CFM)", min_value=0.0, value=0.0, step=0.1)
@@ -341,7 +352,7 @@ class ComponentSelectionInterface:
                         absorptivity_value = float(absorptivity.split("(")[1].strip(")"))
                         new_wall = Wall(
                             name=name, u_value=u_value, area=area, orientation=Orientation(orientation),
-                            wall_type=selected_wall, wall_group="Wall", absorptivity=absorptivity_value,
+                            wall_type=selected_wall, wall_group=wall_group, absorptivity=absorptivity_value,
                             shading_coefficient=shading_coefficient, infiltration_rate_cfm=infiltration_rate
                         )
                         self.component_library.add_component(new_wall)
@@ -358,16 +369,24 @@ class ComponentSelectionInterface:
         elif method == "File Upload":
             uploaded_file = st.file_uploader("Upload Walls File", type=["csv", "xlsx"], key="wall_upload")
             required_cols = ["Name", "Area (m²)", "U-Value (W/m²·K)", "Orientation", "Wall Type", "Wall Group", "Absorptivity", "Shading Coefficient", "Infiltration Rate (CFM)"]
-            st.download_button(label="Download Wall Template", data=pd.DataFrame(columns=required_cols).to_csv(index=False), file_name="wall_template.csv", mime="text/csv")
+            # Provide template with valid wall_group values
+            template_data = pd.DataFrame(columns=required_cols)
+            template_data.loc[0] = ["Example Wall", 10.0, 2.0, "North", "Brick Wall", "A", 0.6, 1.0, 0.0]
+            st.download_button(label="Download Wall Template", data=template_data.to_csv(index=False), file_name="wall_template.csv", mime="text/csv")
             if uploaded_file:
                 df = pd.read_csv(uploaded_file) if uploaded_file.name.endswith('.csv') else pd.read_excel(uploaded_file)
                 if all(col in df.columns for col in required_cols):
+                    valid_wall_groups = {"A", "B", "C", "D", "E", "F", "G", "H"}
                     for _, row in df.iterrows():
                         try:
+                            wall_group = str(row["Wall Group"])
+                            if wall_group not in valid_wall_groups:
+                                st.warning(f"Invalid Wall Group '{wall_group}' in row '{row['Name']}'. Defaulting to 'A'.")
+                                wall_group = "A"
                             new_wall = Wall(
                                 name=str(row["Name"]), u_value=float(row["U-Value (W/m²·K)"]), area=float(row["Area (m²)"]),
                                 orientation=Orientation(row["Orientation"]), wall_type=str(row["Wall Type"]),
-                                wall_group=str(row["Wall Group"]), absorptivity=float(row["Absorptivity"]),
+                                wall_group=wall_group, absorptivity=float(row["Absorptivity"]),
                                 shading_coefficient=float(row["Shading Coefficient"]), infiltration_rate_cfm=float(row["Infiltration Rate (CFM)"])
                             )
                             self.component_library.add_component(new_wall)
@@ -406,7 +425,7 @@ class ComponentSelectionInterface:
                     roof_options = self.reference_data.data["roof_types"]
                     selected_roof = st.selectbox("Roof Type", options=list(roof_options.keys()))
                     u_value = st.number_input("U-Value (W/m²·K)", min_value=0.0, value=float(roof_options[selected_roof]["u_value"]), step=0.01)
-                    roof_group = st.selectbox("Roof Group", ["A", "B", "C", "D", "E", "F", "G"], index=2)
+                    roof_group = st.selectbox("Roof Group (ASHRAE)", ["1", "2", "3", "4", "5", "6", "7", "8"], index=0)
                     slope = st.selectbox("Slope", ["Flat", "Pitched"], index=0)
                     absorptivity = st.selectbox("Solar Absorptivity", ["Light (0.3)", "Light to Medium (0.45)", "Medium (0.6)", "Medium to Dark (0.75)", "Dark (0.9)"], index=2)
 
@@ -432,16 +451,24 @@ class ComponentSelectionInterface:
         elif method == "File Upload":
             uploaded_file = st.file_uploader("Upload Roofs File", type=["csv", "xlsx"], key="roof_upload")
             required_cols = ["Name", "Area (m²)", "U-Value (W/m²·K)", "Orientation", "Roof Type", "Roof Group", "Slope", "Absorptivity"]
-            st.download_button(label="Download Roof Template", data=pd.DataFrame(columns=required_cols).to_csv(index=False), file_name="roof_template.csv", mime="text/csv")
+            # Provide template with valid roof_group values
+            template_data = pd.DataFrame(columns=required_cols)
+            template_data.loc[0] = ["Example Roof", 10.0, 0.3, "Horizontal", "Concrete Roof", "1", "Flat", 0.6]
+            st.download_button(label="Download Roof Template", data=template_data.to_csv(index=False), file_name="roof_template.csv", mime="text/csv")
             if uploaded_file:
                 df = pd.read_csv(uploaded_file) if uploaded_file.name.endswith('.csv') else pd.read_excel(uploaded_file)
                 if all(col in df.columns for col in required_cols):
+                    valid_roof_groups = {"1", "2", "3", "4", "5", "6", "7", "8"}
                     for _, row in df.iterrows():
                         try:
+                            roof_group = str(row["Roof Group"])
+                            if roof_group not in valid_roof_groups:
+                                st.warning(f"Invalid Roof Group '{roof_group}' in row '{row['Name']}'. Defaulting to '1'.")
+                                roof_group = "1"
                             new_roof = Roof(
                                 name=str(row["Name"]), u_value=float(row["U-Value (W/m²·K)"]), area=float(row["Area (m²)"]),
                                 orientation=Orientation(row["Orientation"]), roof_type=str(row["Roof Type"]),
-                                roof_group=str(row["Roof Group"]), slope=str(row["Slope"]), absorptivity=float(row["Absorptivity"])
+                                roof_group=roof_group, slope=str(row["Slope"]), absorptivity=float(row["Absorptivity"])
                             )
                             self.component_library.add_component(new_roof)
                             session_state.components['roofs'].append(new_roof)