Update app/materials_library.py

app/materials_library.py

@@ -332,9 +332,12 @@ def calculate_u_value(thermal_conductivity: float, thickness: float) -> float:
     r_total = R_SI + r_material + R_SE
     return 1 / r_total if r_total > 0 else 0.0
 
-def calculate_thermal_mass(density: float, specific_heat: float, thickness: float) -> str:
-    """Calculate areal thermal mass for a material and return category."""
-    thermal_mass = density * specific_heat * thickness
+def calculate_thermal_mass(density: float, specific_heat: float, thickness: float) -> float:
+    """Calculate areal thermal mass for a material."""
+    return density * specific_heat * thickness
+
+def categorize_thermal_mass(thermal_mass: float) -> str:
+    """Categorize thermal mass based on given ranges."""
     if thermal_mass < 30000:
         return "Low"
     elif 30000 <= thermal_mass <= 90000:
@@ -411,9 +414,10 @@ def display_materials_tab():
                     cols = st.columns([2, 1, 1, 1, 1])
                     name = [k for k, v in library_materials.items() if v == material][0]
                     thermal_mass = calculate_thermal_mass(material["density"], material["specific_heat"], material["default_thickness"])
+                    thermal_mass_category = categorize_thermal_mass(thermal_mass)
                     u_value = calculate_u_value(material["thermal_conductivity"], material["default_thickness"])
                     cols[0].write(name)
-                    cols[1].write(thermal_mass)
+                    cols[1].write(thermal_mass_category)
                     cols[2].write(f"{u_value:.3f}")
                     if cols[3].button("Preview", key=f"preview_lib_mat_{name}"):
                         st.session_state.material_editor = {
@@ -434,7 +438,6 @@ def display_materials_tab():
                         }
                         st.session_state.active_tab = "Materials"
                         st.success(f"Previewing material '{name}'")
-                        logger.info(f"Previewed library material '{name}'")
                     if cols[4].button("Copy", key=f"copy_lib_mat_{name}"):
                         new_name = f"{name}_Project"
                         counter = 1
@@ -471,9 +474,10 @@ def display_materials_tab():
                     cols = st.columns([2, 1, 1, 1, 1])
                     name = [k for k, v in project_materials.items() if v == material][0]
                     thermal_mass = calculate_thermal_mass(material["density"], material["specific_heat"], material["default_thickness"])
+                    thermal_mass_category = categorize_thermal_mass(thermal_mass)
                     u_value = calculate_u_value(material["thermal_conductivity"], material["default_thickness"])
                     cols[0].write(name)
-                    cols[1].write(thermal_mass)
+                    cols[1].write(thermal_mass_category)
                     cols[2].write(f"{u_value:.3f}")
                     if cols[3].button("Edit", key=f"edit_proj_mat_{name}"):
                         st.session_state.material_editor = {
@@ -494,7 +498,6 @@ def display_materials_tab():
                         }
                         st.session_state.active_tab = "Materials"
                         st.success(f"Editing material '{name}'")
-                        logger.info(f"Editing project material '{name}'")
                     if cols[4].button("Delete", key=f"delete_proj_mat_{name}"):
                         is_in_use = check_material_in_use(name)
                         if is_in_use:
@@ -514,6 +517,7 @@ def display_materials_tab():
             data = []
             for name, props in project_materials.items():
                 thermal_mass = calculate_thermal_mass(props["density"], props["specific_heat"], props["default_thickness"])
+                thermal_mass_category = categorize_thermal_mass(thermal_mass)
                 u_value = calculate_u_value(props["thermal_conductivity"], props["default_thickness"])
                 data.append({
                     "Name": name,
@@ -527,7 +531,7 @@ def display_materials_tab():
                     "Absorptivity": props["absorptivity"],
                     "Emissivity": props["emissivity"],
                     "Colour": props["colour"],
-                    "Thermal Mass": thermal_mass,
+                    "Thermal Mass": thermal_mass_category,
                     "U-Value (W/m²·K)": u_value
                 })
             df = pd.DataFrame(data)
@@ -593,7 +597,6 @@ def display_fenestrations_tab():
                         }
                         st.session_state.active_tab = "Fenestrations"
                         st.success(f"Previewing fenestration '{name}'")
-                        logger.info(f"Previewed library fenestration '{name}'")
                     if cols[4].button("Copy", key=f"copy_lib_fen_{name}"):
                         new_name = f"{name}_Project"
                         counter = 1
@@ -648,7 +651,6 @@ def display_fenestrations_tab():
                         }
                         st.session_state.active_tab = "Fenestrations"
                         st.success(f"Editing fenestration '{name}'")
-                        logger.info(f"Editing project fenestration '{name}'")
                     if cols[4].button("Delete", key=f"delete_proj_fen_{name}"):
                         is_in_use = check_fenestration_in_use(name)
                         if is_in_use:
@@ -893,55 +895,55 @@ def display_material_editor():
         with col2:
             clear_button = st.form_submit_button("Clear Form")
     
-    # Handle form submission
-    if submit_button and not is_library:
-        # Validate inputs
-        validation_errors = validate_material(
-            name, category, thermal_conductivity, density, specific_heat,
-            default_thickness, embodied_carbon, cost,
-            editor_state["edit_mode"], editor_state["original_name"],
-            absorptivity, emissivity, colour
-        )
-        
-        if validation_errors:
-            for error in validation_errors:
-                st.error(error)
-        else:
-            # Create material data
-            material_data = {
-                "category": category,
-                "thermal_conductivity": thermal_conductivity,
-                "density": density,
-                "specific_heat": specific_heat,
-                "default_thickness": default_thickness,
-                "embodied_carbon": embodied_carbon,
-                "cost": cost,
-                "absorptivity": absorptivity,
-                "emissivity": emissivity,
-                "colour": colour
-            }
+        # Handle form submission
+        if submit_button and not is_library:
+            # Validate inputs
+            validation_errors = validate_material(
+                name, category, thermal_conductivity, density, specific_heat,
+                default_thickness, embodied_carbon, cost,
+                editor_state["edit_mode"], editor_state["original_name"],
+                absorptivity, emissivity, colour
+            )
             
-            # Handle edit mode
-            if editor_state["edit_mode"]:
-                original_name = editor_state["original_name"]
-                if original_name != name:
-                    del st.session_state.project_data["materials"]["project"][original_name]
-                st.session_state.project_data["materials"]["project"][name] = material_data
-                st.success(f"Material '{name}' updated successfully.")
-                logger.info(f"Updated material '{name}' in project")
+            if validation_errors:
+                for error in validation_errors:
+                    st.error(error)
             else:
-                st.session_state.project_data["materials"]["project"][name] = material_data
-                st.success(f"Material '{name}' added to your project.")
-                logger.info(f"Added new material '{name}' to project")
-            
-            # Reset editor
+                # Create material data
+                material_data = {
+                    "category": category,
+                    "thermal_conductivity": thermal_conductivity,
+                    "density": density,
+                    "specific_heat": specific_heat,
+                    "default_thickness": default_thickness,
+                    "embodied_carbon": embodied_carbon,
+                    "cost": cost,
+                    "absorptivity": absorptivity,
+                    "emissivity": emissivity,
+                    "colour": colour
+                }
+                
+                # Handle edit mode
+                if editor_state["edit_mode"]:
+                    original_name = editor_state["original_name"]
+                    if original_name != name:
+                        del st.session_state.project_data["materials"]["project"][original_name]
+                    st.session_state.project_data["materials"]["project"][name] = material_data
+                    st.success(f"Material '{name}' updated successfully.")
+                    logger.info(f"Updated material '{name}' in project")
+                else:
+                    st.session_state.project_data["materials"]["project"][name] = material_data
+                    st.success(f"Material '{name}' added to your project.")
+                    logger.info(f"Added new material '{name}' to project")
+                
+                # Reset editor
+                reset_material_editor()
+                st.rerun()
+    
+        # Handle clear button
+        if clear_button:
             reset_material_editor()
             st.rerun()
-    
-    # Handle clear button
-    if clear_button:
-        reset_material_editor()
-        st.rerun()
 
 def display_fenestration_editor():
     """Display the fenestration editor form."""
@@ -1052,50 +1054,50 @@ def display_fenestration_editor():
         with col2:
             clear_button = st.form_submit_button("Clear Form")
     
-    # Handle form submission
-    if submit_button and not is_library:
-        # Validate inputs
-        validation_errors = validate_fenestration(
-            name, fenestration_type, u_value, shgc, visible_transmittance, thickness,
-            embodied_carbon, cost, editor_state["edit_mode"], editor_state["original_name"]
-        )
-        
-        if validation_errors:
-            for error in validation_errors:
-                st.error(error)
-        else:
-            # Create fenestration data
-            fenestration_data = {
-                "type": fenestration_type,
-                "u_value": u_value,
-                "shgc": shgc,
-                "visible_transmittance": visible_transmittance,
-                "thickness": thickness,
-                "embodied_carbon": embodied_carbon,
-                "cost": cost
-            }
+        # Handle form submission
+        if submit_button and not is_library:
+            # Validate inputs
+            validation_errors = validate_fenestration(
+                name, fenestration_type, u_value, shgc, visible_transmittance, thickness,
+                embodied_carbon, cost, editor_state["edit_mode"], editor_state["original_name"]
+            )
             
-            # Handle edit mode
-            if editor_state["edit_mode"]:
-                original_name = editor_state["original_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.")
-                logger.info(f"Updated fenestration '{name}' in project")
+            if validation_errors:
+                for error in validation_errors:
+                    st.error(error)
             else:
-                st.session_state.project_data["fenestrations"]["project"][name] = fenestration_data
-                st.success(f"Fenestration '{name}' added to your project.")
-                logger.info(f"Added new fenestration '{name}' to project")
-            
-            # Reset editor
+                # Create fenestration data
+                fenestration_data = {
+                    "type": fenestration_type,
+                    "u_value": u_value,
+                    "shgc": shgc,
+                    "visible_transmittance": visible_transmittance,
+                    "thickness": thickness,
+                    "embodied_carbon": embodied_carbon,
+                    "cost": cost
+                }
+                
+                # Handle edit mode
+                if editor_state["edit_mode"]:
+                    original_name = editor_state["original_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.")
+                    logger.info(f"Updated fenestration '{name}' in project")
+                else:
+                    st.session_state.project_data["fenestrations"]["project"][name] = fenestration_data
+                    st.success(f"Fenestration '{name}' added to your project.")
+                    logger.info(f"Added new fenestration '{name}' to project")
+                
+                # Reset editor
+                reset_fenestration_editor()
+                st.rerun()
+    
+        # Handle clear button
+        if clear_button:
             reset_fenestration_editor()
             st.rerun()
-    
-    # Handle clear button
-    if clear_button:
-        reset_fenestration_editor()
-        st.rerun()
 
 def validate_material(
     name: str, category: str, thermal_conductivity: float, density: float,
@@ -1114,8 +1116,8 @@ def validate_material(
     
     # Check for name uniqueness
     if not edit_mode or (edit_mode and name != original_name):
-        if name in st.session_state.project_data["materials"]["project"] or name in st.session_state.project_data["materials"]["library"]:
-            errors.append(f"Material name '{name}' already exists in your project or library.")
+        if name in st.session_state.project_data["materials"]["project"]:
+            errors.append(f"Material name '{name}' already exists in your project.")
     
     # Validate category
     if category not in MATERIAL_CATEGORIES:
@@ -1186,8 +1188,8 @@ def validate_fenestration(
     
     # Check for name uniqueness
     if not edit_mode or (edit_mode and name != original_name):
-        if name in st.session_state.project_data["fenestrations"]["project"] or name in st.session_state.project_data["fenestrations"]["library"]:
-            errors.append(f"Fenestration name '{name}' already exists in your project or library.")
+        if name in st.session_state.project_data["fenestrations"]["project"]:
+            errors.append(f"Fenestration name '{name}' already exists in your project.")
     
     # Validate type
     if fenestration_type not in FENESTRATION_TYPES: