Update app/components.py

app/components.py

@@ -18,6 +18,7 @@ import logging
 import uuid
 from typing import Dict, List, Any, Optional, Tuple, Union
 from app.m_c_data import DEFAULT_WINDOW_PROPERTIES  # Import DEFAULT_WINDOW_PROPERTIES
+from app.materials_library import GlazingMaterial  # Added import for GlazingMaterial
 
 # Configure logging
 logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
@@ -152,7 +153,6 @@ def display_component_tab(comp_type: str):
             name = st.text_input(
                 "Name",
                 value=editor_state.get("name", ""),
-                
                 help="Enter a unique name for this component."
             )
             
@@ -347,14 +347,21 @@ def display_component_tab(comp_type: str):
                 component_data["parent_component"] = parent_component
                 component_data["function_type"] = function_type
                 component_data["shading_coefficient"] = shading_coefficient
-                # Get fenestration properties (SHGC, U-Value, h_o) if available
+                # Fix: Handle both GlazingMaterial and dictionary for fenestration_data
                 if fenestration in available_items:
                     fenestration_data = available_items[fenestration]
-                    component_data["shgc"] = fenestration_data.get("shgc", 0.7)
-                    component_data["u_value"] = fenestration_data.get("u_value", 5.0)
-                    component_data["h_o"] = fenestration_data.get("h_o", DEFAULT_WINDOW_PROPERTIES["h_o"])
-                    component_data["visible_transmittance"] = fenestration_data.get("visible_transmittance", 0.7)
+                    if isinstance(fenestration_data, GlazingMaterial):
+                        component_data["shgc"] = fenestration_data.shgc
+                        component_data["u_value"] = fenestration_data.u_value
+                        component_data["h_o"] = fenestration_data.h_o or DEFAULT_WINDOW_PROPERTIES["h_o"]
+                        component_data["visible_transmittance"] = fenestration_data.visible_transmittance
+                    else:
+                        component_data["shgc"] = fenestration_data.get("shgc", 0.7)
+                        component_data["u_value"] = fenestration_data.get("u_value", 5.0)
+                        component_data["h_o"] = fenestration_data.get("h_o", DEFAULT_WINDOW_PROPERTIES["h_o"])
+                        component_data["visible_transmittance"] = fenestration_data.get("visible_transmittance", 0.7)
                 else:
+                    logger.warning(f"Fenestration '{fenestration}' not found for {name}. Using defaults.")
                     component_data["shgc"] = 0.7
                     component_data["u_value"] = 5.0
                     component_data["h_o"] = DEFAULT_WINDOW_PROPERTIES["h_o"]
@@ -429,6 +436,7 @@ def display_wall_window_table(comp_type: str, components: List[Dict[str, Any]]):
                     editor_data["fenestration"] = comp.get("fenestration", "")
                     editor_data["parent_component"] = comp.get("parent_component", "")
                     editor_data["shading_coefficient"] = comp.get("shading_coefficient", 1.0)
+                    editor_data["function_type"] = comp.get("function_type", "Fixed")
                 
                 st.session_state[f"{comp_type}_editor"] = editor_data
                 st.session_state[f"{comp_type}_action"] = {"action": "edit", "id": str(uuid.uuid4())}
@@ -493,6 +501,7 @@ def display_roof_skylight_table(comp_type: str, components: List[Dict[str, Any]]
                     editor_data["fenestration"] = comp.get("fenestration", "")
                     editor_data["parent_component"] = comp.get("parent_component", "")
                     editor_data["shading_coefficient"] = comp.get("shading_coefficient", 1.0)
+                    editor_data["function_type"] = comp.get("function_type", "Fixed")
                 
                 st.session_state[f"{comp_type}_editor"] = editor_data
                 st.session_state[f"{comp_type}_action"] = {"action": "edit", "id": str(uuid.uuid4())}