Upload data_persistence.py

app/data_persistence.py

@@ -15,7 +15,7 @@ import pickle
 from datetime import datetime
 
 # Import data models
-from data.building_components import Wall, Roof, Floor, Window, Door, Orientation, ComponentType
+from data.building_components import Wall, Roof, Floor, Window, Door, Orientation, ComponentType, Skylight
 
 
 class DataPersistence:
@@ -114,7 +114,8 @@ class DataPersistence:
             "roofs": [],
             "floors": [],
             "windows": [],
-            "doors": []
+            "doors": [],
+            "skylights": []
         }
         
         # Serialize walls
@@ -179,6 +180,19 @@ class DataPersistence:
             
             serialized_components["doors"].append(serialized_door)
         
+        # Serialize skylights
+        for skylight in components.get("skylights", []):
+            serialized_skylight = skylight.__dict__.copy()
+            
+            # Convert enums to strings
+            if hasattr(serialized_skylight["orientation"], "name"):
+                serialized_skylight["orientation"] = serialized_skylight["orientation"].name
+            
+            if hasattr(serialized_skylight["component_type"], "name"):
+                serialized_skylight["component_type"] = serialized_skylight["component_type"].name
+            
+            serialized_components["skylights"].append(serialized_skylight)
+        
         return serialized_components
     
     @staticmethod
@@ -197,7 +211,8 @@ class DataPersistence:
             "roofs": [],
             "floors": [],
             "windows": [],
-            "doors": []
+            "doors": [],
+            "skylights": []
         }
         
         # Deserialize walls
@@ -210,7 +225,8 @@ class DataPersistence:
                 area=wall_dict.get("area", 0.0),
                 orientation=Orientation[wall_dict.get("orientation", "NORTH")],
                 wall_type=wall_dict.get("wall_type", ""),
-                wall_group=wall_dict.get("wall_group", "")
+                wall_group=wall_dict.get("wall_group", ""),
+                solar_absorptivity=wall_dict.get("solar_absorptivity", 0.6)
             )
             components["walls"].append(wall)
         
@@ -224,7 +240,8 @@ class DataPersistence:
                 area=roof_dict.get("area", 0.0),
                 orientation=Orientation[roof_dict.get("orientation", "HORIZONTAL")],
                 roof_type=roof_dict.get("roof_type", ""),
-                roof_group=roof_dict.get("roof_group", "")
+                roof_group=roof_dict.get("roof_group", ""),
+                solar_absorptivity=roof_dict.get("solar_absorptivity", 0.6)
             )
             components["roofs"].append(roof)
         
@@ -236,7 +253,8 @@ class DataPersistence:
                 component_type=ComponentType[floor_dict.get("component_type", "FLOOR")],
                 u_value=floor_dict.get("u_value", 0.0),
                 area=floor_dict.get("area", 0.0),
-                floor_type=floor_dict.get("floor_type", "")
+                floor_type=floor_dict.get("floor_type", ""),
+                solar_absorptivity=floor_dict.get("solar_absorptivity", 0.6)
             )
             components["floors"].append(floor)
         
@@ -254,7 +272,8 @@ class DataPersistence:
                 window_type=window_dict.get("window_type", ""),
                 glazing_layers=window_dict.get("glazing_layers", 1),
                 gas_fill=window_dict.get("gas_fill", ""),
-                low_e_coating=window_dict.get("low_e_coating", False)
+                low_e_coating=window_dict.get("low_e_coating", False),
+                solar_absorptivity=window_dict.get("solar_absorptivity", 0.6)
             )
             components["windows"].append(window)
         
@@ -267,10 +286,29 @@ class DataPersistence:
                 u_value=door_dict.get("u_value", 0.0),
                 area=door_dict.get("area", 0.0),
                 orientation=Orientation[door_dict.get("orientation", "NORTH")],
-                door_type=door_dict.get("door_type", "")
+                door_type=door_dict.get("door_type", ""),
+                solar_absorptivity=door_dict.get("solar_absorptivity", 0.6)
             )
             components["doors"].append(door)
         
+        # Deserialize skylights
+        for skylight_dict in serialized_components.get("skylights", []):
+            skylight = Skylight(
+                id=skylight_dict.get("id", ""),
+                name=skylight_dict.get("name", ""),
+                component_type=ComponentType[skylight_dict.get("component_type", "SKYLIGHT")],
+                u_value=skylight_dict.get("u_value", 0.0),
+                area=skylight_dict.get("area", 0.0),
+                orientation=Orientation[skylight_dict.get("orientation", "HORIZONTAL")],
+                shgc=skylight_dict.get("shgc", 0.0),
+                vt=skylight_dict.get("vt", 0.0),
+                skylight_type=skylight_dict.get("skylight_type", ""),
+                frame_type=skylight_dict.get("frame_type", ""),
+                drapery_openness=skylight_dict.get("drapery_openness", "Open"),
+                solar_absorptivity=skylight_dict.get("solar_absorptivity", 0.6)
+            )
+            components["skylights"].append(skylight)
+        
         return components
     
     @staticmethod
@@ -537,4 +575,4 @@ if __name__ == "__main__":
         }
     
     # Display project management interface
-    data_persistence.display_project_management(st.session_state)
+    data_persistence.display_project_management(st.session_state)