Update app/components.py

app/components.py

@@ -212,30 +212,42 @@ def display_component_tab(comp_type: str):
             
             # Construction or fenestration selection
             if comp_type in ["walls", "roofs", "floors"]:
+                construction_options = list(available_items.keys())
+                if not construction_options:
+                    st.error("No constructions available. Please create constructions first.")
+                    construction_options = [""]
+                
                 construction = st.selectbox(
                     "Construction",
-                    list(available_items.keys()),
-                    index=list(available_items.keys()).index(editor_state.get("construction", "")) if editor_state.get("construction", "") in available_items else 0,
+                    construction_options,
+                    index=construction_options.index(editor_state.get("construction", "")) if editor_state.get("construction", "") in construction_options else 0,
                     help="Select the construction assembly for this component."
                 )
             else:  # Windows, doors, skylights
                 # For fenestrations, we need to select a parent component
                 parent_components = get_parent_components(comp_type)
                 
-                if not parent_components:
+                parent_options = list(parent_components.keys())
+                if not parent_options:
                     st.error(f"No parent components available. Please create walls/roofs first.")
+                    parent_options = [""]
                 
                 parent_component = st.selectbox(
                     "Parent Component",
-                    list(parent_components.keys()),
-                    index=list(parent_components.keys()).index(editor_state.get("parent_component", "")) if editor_state.get("parent_component", "") in parent_components else 0,
+                    parent_options,
+                    index=parent_options.index(editor_state.get("parent_component", "")) if editor_state.get("parent_component", "") in parent_options else 0,
                     help="Select the wall or roof component this fenestration belongs to."
                 )
                 
+                fenestration_options = list(available_items.keys())
+                if not fenestration_options:
+                    st.error("No fenestrations available. Please create fenestrations first.")
+                    fenestration_options = [""]
+                
                 fenestration = st.selectbox(
                     "Fenestration",
-                    list(available_items.keys()),
-                    index=list(available_items.keys()).index(editor_state.get("fenestration", "")) if editor_state.get("fenestration", "") in available_items else 0,
+                    fenestration_options,
+                    index=fenestration_options.index(editor_state.get("fenestration", "")) if editor_state.get("fenestration", "") in fenestration_options else 0,
                     help="Select the fenestration type for this component."
                 )
             
@@ -268,18 +280,29 @@ def display_component_tab(comp_type: str):
             
             if comp_type in ["walls", "roofs", "floors"]:
                 component_data["construction"] = construction
-                # Get U-value from construction
-                component_data["u_value"] = available_items[construction].get("u_value", 0.0)
+                # Get U-value from construction if available
+                if construction in available_items:
+                    component_data["u_value"] = available_items[construction].get("u_value", 0.0)
+                else:
+                    component_data["u_value"] = 0.0
             else:
                 component_data["fenestration"] = fenestration
                 component_data["parent_component"] = parent_component
-                # Get U-value and other properties from fenestration
-                component_data["u_value"] = available_items[fenestration].get("u_value", 0.0)
-                if comp_type == "doors":
-                    component_data["solar_absorptivity"] = available_items[fenestration].get("solar_absorptivity", 0.7)
+                # Get U-value and other properties from fenestration if available
+                if fenestration in available_items:
+                    component_data["u_value"] = available_items[fenestration].get("u_value", 0.0)
+                    if comp_type == "doors":
+                        component_data["solar_absorptivity"] = available_items[fenestration].get("solar_absorptivity", 0.7)
+                    else:
+                        component_data["shgc"] = available_items[fenestration].get("shgc", 0.7)
+                        component_data["visible_transmittance"] = available_items[fenestration].get("visible_transmittance", 0.7)
                 else:
-                    component_data["shgc"] = available_items[fenestration].get("shgc", 0.7)
-                    component_data["visible_transmittance"] = available_items[fenestration].get("visible_transmittance", 0.7)
+                    component_data["u_value"] = 0.0
+                    if comp_type == "doors":
+                        component_data["solar_absorptivity"] = 0.7
+                    else:
+                        component_data["shgc"] = 0.7
+                        component_data["visible_transmittance"] = 0.7
             
             # Handle edit mode
             if is_edit:
@@ -513,10 +536,16 @@ def get_available_constructions() -> Dict[str, Any]:
     """
     available_constructions = {}
     
-    # Add constructions from session state
+    # Add library constructions
     if "constructions" in st.session_state.project_data:
-        for construction in st.session_state.project_data["constructions"]:
-            available_constructions[construction["name"]] = construction
+        if "library" in st.session_state.project_data["constructions"]:
+            for name, construction in st.session_state.project_data["constructions"]["library"].items():
+                available_constructions[name] = construction
+        
+        # Add project constructions
+        if "project" in st.session_state.project_data["constructions"]:
+            for name, construction in st.session_state.project_data["constructions"]["project"].items():
+                available_constructions[name] = construction
     
     return available_constructions
 
@@ -529,11 +558,16 @@ def get_available_fenestrations() -> Dict[str, Any]:
     """
     available_fenestrations = {}
     
-    # Add fenestrations from session state
-    if "materials" in st.session_state.project_data:
-        for material in st.session_state.project_data["materials"]:
-            if material.get("type") in ["window", "door", "skylight"]:
-                available_fenestrations[material["name"]] = material
+    # Add library fenestrations
+    if "fenestrations" in st.session_state.project_data:
+        if "library" in st.session_state.project_data["fenestrations"]:
+            for name, fenestration in st.session_state.project_data["fenestrations"]["library"].items():
+                available_fenestrations[name] = fenestration
+        
+        # Add project fenestrations
+        if "project" in st.session_state.project_data["fenestrations"]:
+            for name, fenestration in st.session_state.project_data["fenestrations"]["project"].items():
+                available_fenestrations[name] = fenestration
     
     return available_fenestrations