Update app/main.py

app/main.py

@@ -92,7 +92,19 @@ class HVACCalculator:
         self.data_export = DataExport()
         self.cooling_calculator = CoolingLoadCalculator()
         self.heating_calculator = HeatingLoadCalculator()
-        self.climate_data = ClimateData()
+        
+        # Persist ClimateData in session_state
+        if 'climate_data_obj' not in st.session_state:
+            st.session_state.climate_data_obj = ClimateData()
+        self.climate_data = st.session_state.climate_data_obj
+        
+        # Load default climate data if locations are empty
+        try:
+            if not self.climate_data.locations:
+                self.climate_data = ClimateData.from_json("/home/user/app/climate_data.json")
+                st.session_state.climate_data_obj = self.climate_data
+        except FileNotFoundError:
+            st.warning("Default climate data file not found. Please enter climate data manually.")
         
         self.setup_layout()
     
@@ -375,7 +387,6 @@ class HVACCalculator:
             # Gather inputs
             building_components = st.session_state.get('components', {})
             internal_loads = st.session_state.get('internal_loads', {})
-            climate_data = st.session_state.get('climate_data', {})
             building_info = st.session_state.get('building_info', {})
             
             # Validate inputs
@@ -383,48 +394,42 @@ class HVACCalculator:
                 return False, "Floor area is missing in building information.", {}
             if not building_components.get('walls') and not building_components.get('roofs') and not building_components.get('windows'):
                 return False, "No building components defined. Please add walls, roofs, or windows.", {}
-            if not climate_data:
-                return False, "No climate data provided. Please specify climate data.", {}
             
-            # Validate wall_group and roof_group
-            for wall in building_components.get('walls', []):
-                if not hasattr(wall, 'wall_group') or wall.wall_group not in WallModel.VALID_WALL_GROUPS:
-                    st.warning(f"Invalid wall_group '{getattr(wall, 'wall_group', None)}' for wall '{wall.name}'. Defaulting to 'A'.")
-                    wall.wall_group = "A"
-            for roof in building_components.get('roofs', []):
-                if not hasattr(roof, 'roof_group') or roof.roof_group not in RoofModel.VALID_ROOF_GROUPS:
-                    st.warning(f"Invalid roof_group '{getattr(roof, 'roof_group', None)}' for roof '{roof.name}'. Defaulting to 'A'.")
-                    roof.roof_group = "A"
+            # Check climate data
+            if "climate_data" not in st.session_state or not st.session_state["climate_data"]:
+                return False, "Please enter climate data in the 'Climate Data' page.", {}
+            
+            # Extract climate data using ClimateData.get_location_by_id
+            country = building_info.get('country', '').strip().title()
+            city = building_info.get('city', '').strip().title()
+            if not country or not city:
+                return False, "Country and city must be set in Building Information.", {}
+            climate_id = f"{country[:2].upper()}-{city[:3].upper()}"
             
-            # Extract climate data
-            climate_id = f"{building_info.get('country', 'XX')[:2].upper()}-{building_info.get('city', 'XXX')[:3].upper()}"
-            location = climate_data.get(climate_id, None)
+            # Debug
+            st.write("Debug: Climate Data Retrieval", {
+                'climate_id': climate_id,
+                'building_info': building_info,
+                'session_state_climate_data': st.session_state.get('climate_data', 'Not set'),
+                'climate_locations': list(self.climate_data.locations.keys())
+            })
+            
+            location = self.climate_data.get_location_by_id(climate_id, st.session_state)
             if not location:
                 return False, f"No climate data found for {climate_id}. Please provide valid climate data.", {}
             
             # Validate climate data
-            if not hasattr(location, 'summer_design_temp_db') or not hasattr(location, 'summer_design_temp_wb'):
-                return False, f"Invalid climate data for {climate_id}. Missing summer design temperatures.", {}
-            
-            # Validate and map latitude
-            valid_latitudes = ['24N', '36N', '48N']
-            try:
-                lat_value = float(location.latitude)
-                differences = [abs(lat_value - float(lat[:-1])) for lat in valid_latitudes]
-                nearest_idx = differences.index(min(differences))
-                latitude = valid_latitudes[nearest_idx]
-            except (ValueError, TypeError):
-                st.warning(f"Invalid latitude '{location.latitude}'. Defaulting to '24N'.")
-                latitude = '24N'
+            if not all(k in location for k in ['summer_design_temp_db', 'summer_design_temp_wb', 'monthly_temps', 'latitude']):
+                return False, f"Invalid climate data for {climate_id}. Missing required fields.", {}
             
             # Format conditions
             outdoor_conditions = {
-                'temperature': location.summer_design_temp_db,
-                'relative_humidity': location.summer_design_temp_wb,
-                'ground_temperature': location.monthly_temps.get('Jul', 20.0),
+                'temperature': location['summer_design_temp_db'],
+                'relative_humidity': location['monthly_humidity'].get('Jul', 50.0),
+                'ground_temperature': location['monthly_temps'].get('Jul', 20.0),
                 'month': 'Jul',
-                'latitude': latitude,
-                'wind_speed': climate_data.get('wind_speed', 4.0),
+                'latitude': f"{location['latitude']}N" if location['latitude'] >= 0 else f"{abs(location['latitude'])}S",
+                'wind_speed': 4.0,  # Default as not provided in climate data
                 'day_of_year': 204  # Approx. July 23
             }
             indoor_conditions = {
@@ -688,7 +693,6 @@ class HVACCalculator:
             # Gather inputs
             building_components = st.session_state.get('components', {})
             internal_loads = st.session_state.get('internal_loads', {})
-            climate_data = st.session_state.get('climate_data', {})
             building_info = st.session_state.get('building_info', {})
             
             # Validate inputs
@@ -696,34 +700,40 @@ class HVACCalculator:
                 return False, "Floor area is missing in building information.", {}
             if not building_components.get('walls') and not building_components.get('roofs') and not building_components.get('windows'):
                 return False, "No building components defined. Please add walls, roofs, or windows.", {}
-            if not climate_data:
-                return False, "No climate data provided. Please specify climate data.", {}
             
-            # Validate wall_group and roof_group
-            for wall in building_components.get('walls', []):
-                if not hasattr(wall, 'wall_group') or wall.wall_group not in WallModel.VALID_WALL_GROUPS:
-                    st.warning(f"Invalid wall_group '{getattr(wall, 'wall_group', None)}' for wall '{wall.name}'. Defaulting to 'A'.")
-                    wall.wall_group = "A"
-            for roof in building_components.get('roofs', []):
-                if not hasattr(roof, 'roof_group') or roof.roof_group not in RoofModel.VALID_ROOF_GROUPS:
-                    st.warning(f"Invalid roof_group '{getattr(roof, 'roof_group', None)}' for roof '{roof.name}'. Defaulting to 'A'.")
-                    roof.roof_group = "A"
+            # Check climate data
+            if "climate_data" not in st.session_state or not st.session_state["climate_data"]:
+                return False, "Please enter climate data in the 'Climate Data' page.", {}
+            
+            # Extract climate data using ClimateData.get_location_by_id
+            country = building_info.get('country', '').strip().title()
+            city = building_info.get('city', '').strip().title()
+            if not country or not city:
+                return False, "Country and city must be set in Building Information.", {}
+            climate_id = f"{country[:2].upper()}-{city[:3].upper()}"
+            
+            # Debug
+            st.write("Debug: Climate Data Retrieval", {
+                'climate_id': climate_id,
+                'building_info': building_info,
+                'session_state_climate_data': st.session_state.get('climate_data', 'Not set'),
+                'climate_locations': list(self.climate_data.locations.keys())
+            })
             
-            # Extract climate data
-            climate_id = f"{building_info.get('country', 'XX')[:2].upper()}-{building_info.get('city', 'XXX')[:3].upper()}"
-            location = climate_data.get(climate_id, None)
+            location = self.climate_data.get_location_by_id(climate_id, st.session_state)
             if not location:
                 return False, f"No climate data found for {climate_id}. Please provide valid climate data.", {}
             
             # Validate climate data
-            if not hasattr(location, 'winter_design_temp'):
-                return False, f"Invalid climate data for {climate_id}. Missing winter design temperature.", {}
+            if not all(k in location for k in ['winter_design_temp', 'monthly_temps', 'monthly_humidity']):
+                return False, f"Invalid climate data for {climate_id}. Missing required fields.", {}
             
             # Format conditions
             outdoor_conditions = {
-                'design_temperature': location.winter_design_temp,
-                'design_relative_humidity': location.monthly_humidity.get('Jan', 80.0),
-                'ground_temperature': location.monthly_temps.get('Jan', 10.0)
+                'design_temperature': location['winter_design_temp'],
+                'design_relative_humidity': location['monthly_humidity'].get('Jan', 80.0),
+                'ground_temperature': location['monthly_temps'].get('Jan', 10.0),
+                'wind_speed': 4.0  # Default as not provided in climate data
             }
             indoor_conditions = {
                 'temperature': building_info.get('indoor_temp', 21.0),