Update data/climate_data.py

data/climate_data.py

@@ -92,6 +92,7 @@ class ClimateLocation:
         self.longitude = kwargs.get("longitude")
         self.elevation = kwargs.get("elevation")
         self.time_zone = kwargs.get("time_zone", 0.0)  # Default to 0.0 if not provided
+        self.climate_zone = kwargs.get("climate_zone", "Unknown")  # Use provided climate_zone
         self.typical_extreme_periods = typical_extreme_periods
         self.ground_temperatures = ground_temperatures
         
@@ -136,9 +137,6 @@ class ClimateLocation:
         # Log wind speed diagnostics
         logger.info(f"Wind speed stats: min={wind_speed.min():.1f}, max={wind_speed.max():.1f}, mean={self.wind_speed:.1f}")
         
-        # Assign climate zone
-        self.climate_zone = ClimateData.assign_climate_zone(self.heating_degree_days, self.cooling_degree_days, np.nanmean(humidity))
-        
         # Store hourly data with enhanced fields
         self.hourly_data = []
         for i in range(len(months)):
@@ -359,6 +357,7 @@ class ClimateData:
         # Clear invalid session_state["climate_data"] to prevent validation errors
         if "climate_data" in session_state and not all(key in session_state["climate_data"] for key in ["id", "country", "city"]):
             st.warning("Clearing invalid climate data from session state.")
+            logger.warning("Invalid climate_data in session_state, clearing.")
             del session_state["climate_data"]
         
         uploaded_file = st.file_uploader("Upload EPW File", type=["epw"])
@@ -376,16 +375,18 @@ class ClimateData:
                 # Parse header
                 header = next(line for line in epw_lines if line.startswith("LOCATION"))
                 header_parts = header.split(",")
+                if len(header_parts) < 10:
+                    raise ValueError("Invalid LOCATION header: too few fields.")
                 city = header_parts[1].strip() or "Unknown"
                 # Clean city name by removing suffixes like '.Racecourse'
                 city = re.sub(r'\..*', '', city)
                 state_province = header_parts[2].strip() or "Unknown"
                 country = header_parts[3].strip() or "Unknown"
-                
-                latitude = float(header_parts[6])
-                longitude = float(header_parts[7])
-                elevation = float(header_parts[8])
+                climate_zone = header_parts[8].strip() or "Unknown"
+                latitude = float(header_parts[6]) if header_parts[6].strip() and ClimateData.is_numeric(header_parts[6]) else 0.0
+                longitude = float(header_parts[7]) if header_parts[7].strip() and ClimateData.is_numeric(header_parts[7]) else 0.0
                 time_zone = float(header_parts[5]) if header_parts[5].strip() and ClimateData.is_numeric(header_parts[5]) else 0.0
+                elevation = float(header_parts[9]) if header_parts[9].strip() and ClimateData.is_numeric(header_parts[9]) else 0.0
                 
                 # Parse TYPICAL/EXTREME PERIODS
                 typical_extreme_periods = {}
@@ -485,7 +486,8 @@ class ClimateData:
                     latitude=latitude,
                     longitude=longitude,
                     elevation=elevation,
-                    time_zone=time_zone
+                    time_zone=time_zone,
+                    climate_zone=climate_zone
                 )
                 self.add_location(location)
                 climate_data_dict = location.to_dict()
@@ -493,50 +495,64 @@ class ClimateData:
                     raise ValueError("Invalid climate data extracted from EPW file.")
                 session_state["climate_data"] = climate_data_dict
                 st.success("Climate data extracted from EPW file!")
+                logger.info("Successfully processed EPW file and stored in session_state.")
             
             except Exception as e:
                 st.error(f"Error processing EPW file: {str(e)}. Ensure it has 8760 hourly records and correct format.")
+                logger.error(f"EPW processing error: {str(e)}")
         
-        elif "climate_data" in session_state and self.validate_climate_data(session_state["climate_data"]):
+        elif "climate_data" in session_state:
             # Reconstruct from session_state
             climate_data_dict = session_state["climate_data"]
-            
-            # Rebuild epw_data from hourly_data with full EPW column structure
-            hourly_data = climate_data_dict["hourly_data"]
-            # Create a DataFrame with 35 columns (0 to 34), initialized with NaN
-            epw_data = pd.DataFrame(np.nan, index=range(len(hourly_data)), columns=range(35))
-            # Populate relevant columns with hourly_data
-            epw_data[1] = [d["month"] for d in hourly_data]  # Month
-            epw_data[2] = [d["day"] for d in hourly_data]  # Day
-            epw_data[3] = [d["hour"] for d in hourly_data]  # Hour
-            epw_data[6] = [d["dry_bulb"] for d in hourly_data]  # Dry-bulb temperature
-            epw_data[8] = [d["relative_humidity"] for d in hourly_data]  # Relative humidity
-            epw_data[9] = [d["atmospheric_pressure"] for d in hourly_data]  # Pressure
-            epw_data[13] = [d["global_horizontal_radiation"] for d in hourly_data]  # Global horizontal radiation
-            epw_data[20] = [d["wind_direction"] for d in hourly_data]  # Wind direction
-            epw_data[21] = [d["wind_speed"] for d in hourly_data]  # Wind speed
-            
-            # Create ClimateLocation with reconstructed epw_data
-            location = ClimateLocation(
-                epw_file=epw_data,
-                typical_extreme_periods=climate_data_dict["typical_extreme_periods"],
-                ground_temperatures=climate_data_dict["ground_temperatures"],
-                id=climate_data_dict["id"],
-                country=climate_data_dict["country"],
-                state_province=climate_data_dict["state_province"],
-                city=climate_data_dict["city"],
-                latitude=climate_data_dict["latitude"],
-                longitude=climate_data_dict["longitude"],
-                elevation=climate_data_dict["elevation"],
-                time_zone=climate_data_dict["time_zone"]
-            )
-            # Override hourly_data to ensure consistency
-            location.hourly_data = climate_data_dict["hourly_data"]
-            self.add_location(location)
-            st.info("Displaying previously extracted climate data.")
+            if not self.validate_climate_data(climate_data_dict):
+                st.error("Stored climate data is invalid. Please upload a new EPW file.")
+                logger.error("Validation failed for session_state.climate_data: %s", climate_data_dict.get("id", "Unknown"))
+                session_state["climate_data"] = {}  # Clear invalid data
+            else:
+                try:
+                    # Rebuild epw_data from hourly_data with full EPW column structure
+                    hourly_data = climate_data_dict["hourly_data"]
+                    # Create a DataFrame with 35 columns (0 to 34), initialized with NaN
+                    epw_data = pd.DataFrame(np.nan, index=range(len(hourly_data)), columns=range(35))
+                    # Populate relevant columns with hourly_data
+                    epw_data[1] = [d["month"] for d in hourly_data]  # Month
+                    epw_data[2] = [d["day"] for d in hourly_data]  # Day
+                    epw_data[3] = [d["hour"] for d in hourly_data]  # Hour
+                    epw_data[6] = [d["dry_bulb"] for d in hourly_data]  # Dry-bulb temperature
+                    epw_data[8] = [d["relative_humidity"] for d in hourly_data]  # Relative humidity
+                    epw_data[9] = [d["atmospheric_pressure"] for d in hourly_data]  # Pressure
+                    epw_data[13] = [d["global_horizontal_radiation"] for d in hourly_data]  # Global horizontal radiation
+                    epw_data[20] = [d["wind_direction"] for d in hourly_data]  # Wind direction
+                    epw_data[21] = [d["wind_speed"] for d in hourly_data]  # Wind speed
+                    
+                    # Create ClimateLocation with reconstructed epw_data
+                    location = ClimateLocation(
+                        epw_file=epw_data,
+                        typical_extreme_periods=climate_data_dict["typical_extreme_periods"],
+                        ground_temperatures=climate_data_dict["ground_temperatures"],
+                        id=climate_data_dict["id"],
+                        country=climate_data_dict["country"],
+                        state_province=climate_data_dict["state_province"],
+                        city=climate_data_dict["city"],
+                        latitude=climate_data_dict["latitude"],
+                        longitude=climate_data_dict["longitude"],
+                        elevation=climate_data_dict["elevation"],
+                        time_zone=climate_data_dict["time_zone"],
+                        climate_zone=climate_data_dict["climate_zone"]
+                    )
+                    # Override hourly_data to ensure consistency
+                    location.hourly_data = climate_data_dict["hourly_data"]
+                    self.add_location(location)
+                    st.info("Displaying previously extracted climate data.")
+                    logger.info("Successfully reconstructed climate data from session_state for ID: %s", climate_data_dict["id"])
+                except Exception as e:
+                    st.error(f"Error reconstructing climate data: {str(e)}. Please upload a new EPW file.")
+                    logger.error(f"Reconstruction error: {str(e)}")
+                    session_state["climate_data"] = {}  # Clear invalid data
         
         # Display tabs if location and epw_data are available
         if location and epw_data is not None:
+            logger.info("Displaying climate data tabs for location: %s", location.id)
             tab1, tab2, tab3, tab4, tab5 = st.tabs([
                 "General Information",
                 "Psychrometric Chart",
@@ -562,6 +578,7 @@ class ClimateData:
         
         else:
             st.info("No climate data available. Please upload an EPW file to proceed.")
+            logger.info("No climate data to display; prompting for EPW upload.")
         
     def display_design_conditions(self, location: ClimateLocation):
         """Display design conditions for HVAC calculations using styled HTML."""