Update data/climate_data.py

data/climate_data.py

@@ -25,9 +25,9 @@ import logging
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 
-# Define paths
-DATA_DIR = os.path.dirname(os.path.abspath(__file__))
-AU_CCH_DIR = os.path.join(DATA_DIR, "au_cch")  # Path to climate projection files
+# Define paths at module level
+DATA_DIR = os.path.dirname(os.path.abspath(__file__))  # Directory of climate_data.py (/home/user/app/data/)
+AU_CCH_DIR = os.path.join(os.path.dirname(DATA_DIR), "au_cch")  # Path to au_cch in repository root (/home/user/app/au_cch/)
 
 # CSS for consistent formatting
 STYLE = """
@@ -824,91 +824,84 @@ class ClimateData:
             if location and epw_data is not None:
                 self.display_design_conditions(location)
         
-        # Climate Projection tab
-        with tabs[1]:
-            st.markdown("""
-            <div class="markdown-text">
-                <h3>Climate Projection</h3>
-                <p>At this stage, this section is focused on some locations in Australia, and the provided data is based on "Projected weather files for building energy modelling" from CSIRO 2022.</p>
-            </div>
-            """, unsafe_allow_html=True)
-            
-            # Dropdown menus
-            country = st.selectbox("Country", ["Australia"], key="projection_country")
-            states = ["ACT", "NSW", "NT", "QLD", "SA", "TAS", "VIC", "WA"]
-            state = st.selectbox("State", states, key="projection_state")
-            
-            # Get locations for selected state
-            locations = self.get_locations_by_state(state)
-            location_options = [f"{loc['city']} ({loc['number']})" for loc in locations]
-            location_display = st.selectbox("Location", location_options, key="projection_location")
-            
-            # Extract location number from selection
-            location_num = ""
-            if location_display:
-                location_num = next(loc["number"] for loc in locations if f"{loc['city']} ({loc['number']})" == location_display)
-            
-            rcp_options = ["RCP2.6", "RCP4.5", "RCP8.5"]
-            rcp = st.selectbox("RCP Scenario", rcp_options, key="projection_rcp")
-            
-            year_options = ["2030", "2050", "2070", "2090"]
-            year = st.selectbox("Year", year_options, key="projection_year")
-            
-            if st.button("Extract Data"):
-                with st.spinner("Extracting climate projection data..."):
-
-# Define paths
-DATA_DIR = os.path.dirname(os.path.abspath(__file__))  # Directory of climate_data.py (/<root>/data/)
-AU_CCH_DIR = os.path.join(os.path.dirname(DATA_DIR), "au_cch")  # Path to au_cch in repository root (/<root>/au_cch/)
-
-            if st.button("Extract Data"):
-                with st.spinner("Extracting climate projection data..."):
-                    # Construct file path
-                    file_path = os.path.join(AU_CCH_DIR, location_num, rcp, year)
-                    logger.debug(f"Attempting to access directory: {file_path}")
-                    
-                    # Initialize epw_files to avoid NameError
-                    epw_files = []
-                    if not os.path.exists(file_path):
-                        st.error(f"No directory found at {file_path}. Please ensure the 'au_cch' folder is in the repository root alongside 'data' and 'utils', with the structure {location_num}/{rcp}/{year} containing a single file with a .epw extension (e.g., canberra_rcp2.6_2070.epw).")
-                        logger.error(f"Directory does not exist: {file_path}")
-                    else:
-                        try:
-                            epw_files = [f for f in os.listdir(file_path) if f.endswith(".epw")]
-                            
-                            if not epw_files:
-                                st.error(f"No EPW file found in {file_path}. Please check that the directory contains a single file with a .epw extension (e.g., canberra_rcp2.6_2070.epw, not '2070' without .epw).")
-                                logger.error(f"No EPW file found in {file_path}")
-                            elif len(epw_files) > 1:
-                                st.error(f"Multiple EPW files found in {file_path}: {epw_files}. Please ensure exactly one .epw file per directory.")
-                                logger.error(f"Multiple EPW files found: {epw_files}")
-                            else:
-                                epw_file_path = os.path.join(file_path, epw_files[0])
-                                try:
-                                    with open(epw_file_path, 'r') as f:
-                                        epw_content = f.read()
-                                    
-                                    location = self.process_epw_file(epw_content, location_num, rcp, year)
-                                    if location:
-                                        self.add_location(location)
-                                        climate_data_dict = location.to_dict()
-                                        if self.validate_climate_data(climate_data_dict):
-                                            session_state["climate_data"] = climate_data_dict
-                                            st.success(f"Climate projection data extracted for {location.city}, {location.country}, {rcp}, {year}!")
-                                            logger.info("Successfully processed projection EPW file: %s", climate_data_dict["id"])
-                                            session_state["active_tab"] = "General Information"
-                                        else:
-                                            st.warning(f"Climate projection data validation failed for {location.city}, {location.country}. Displaying data anyway.")
-                                            logger.warning("Validation failed for projection EPW data: %s", climate_data_dict["id"])
-                                            session_state["climate_data"] = climate_data_dict
-                                            session_state["active_tab"] = "General Information"
-                                except Exception as e:
-                                    st.error(f"Error reading EPW file {epw_file_path}: {str(e)}")
-                                    logger.error(f"Error reading EPW file {epw_file_path}: {str(e)}")
-                                    session_state["climate_data"] = {}
-                        except Exception as e:
-                            st.error(f"Error accessing directory {file_path}: {str(e)}")
-                            logger.error(f"Error accessing directory {file_path}: {str(e)}")
+            # Climate Projection tab
+            with tabs[1]:
+                st.markdown("""
+                <div class="markdown-text">
+                    <h3>Climate Projection</h3>
+                    <p>At this stage, this section is focused on some locations in Australia, and the provided data is based on "Projected weather files for building energy modelling" from CSIRO 2022.</p>
+                </div>
+                """, unsafe_allow_html=True)
+                
+                # Dropdown menus
+                country = st.selectbox("Country", ["Australia"], key="projection_country")
+                states = ["ACT", "NSW", "NT", "QLD", "SA", "TAS", "VIC", "WA"]
+                state = st.selectbox("State", states, key="projection_state")
+                
+                # Get locations for selected state
+                locations = self.get_locations_by_state(state)
+                location_options = [f"{loc['city']} ({loc['number']})" for loc in locations]
+                location_display = st.selectbox("Location", location_options, key="location")
+                
+                # Extract location number from selection
+                location_num = ""
+                if location_display:
+                    location_num = next(loc["number"] for loc in locations if f"{loc['city']} ({loc['number']})" == location_display)
+                
+                rcp_options = ["RCP2.6", "RCP4.5", "RCP8.5"]
+                rcp = st.selectbox("RCP Scenario", rcp_options, key="rcp")
+                
+                year_options = ["2030", "2050", "2070", "2090"]
+                year = st.selectbox("Year", year_options, key="year")
+                
+                if st.button("Extract Data"):
+                    with st.spinner("Extracting climate projection data..."):
+                        # Construct file path
+                        file_path = os_join.path(AU_CCH_DIR, location_num, rcp, year)
+                        logger.debug(f"Attempting to access directory: {file_path}")
+                        
+                        # Initialize epw_files to avoid NameError
+                        epw_files = []
+                        if not os.path.exists(file_path):
+                            st.error(f"No directory found at {file_path}. Please ensure the 'au_cch' folder is in the repository root (/home/user/app/au_cch/) alongside 'data' and 'utils', with the structure {location_num}/{rcp}/{year} containing a single file with a .epw extension (e.g., canberra_rcp2.6_2070.epw).")
+                            logger.error(f"Directory does not exist: {file_path}")
+                        else:
+                            try:
+                                epw_files = [f for f in os.listdir(file_path) if f.endswith(".epw")]
+                                
+                                if not epw_files:
+                                    st.error(f"No EPW file found in {file_path}. Please check that the directory contains a single file with a .epw extension (e.g., canberra_rcp2.6_2070.epw, not '2070' without .epw).")
+                                    logger.error(f"No EPW file found in {file_path}")
+                                elif len(epw_files) > 1:
+                                    st.error(f"Multiple EPW files found in {file_path}: {epw_files}. Please ensure exactly one .epw file per directory.")
+                                    logger.error(f"Multiple EPW files found: {epw_files}")
+                                else:
+                                    epw_file_path = os_join.path_join(file_path, epw_files[0])
+                                    try:
+                                        with open(epw_file_path, 'r') as f:
+                                            epw_content = f.read()
+                                        
+                                        location = self.process_epw_file(epw_content, location_num, rcp, year)
+                                        if location:
+                                            self.add_location(location)
+                                            climate_data_dict = location.to_dict()
+                                            if self.validate_climate_data(climate_data_dict):
+                                                session_state["climate_data"] = climate_data_dict
+                                                st.success(f"Climate projection data extracted for {location.city}, {location.country}, {rcp}, {year}!")
+                                                logger.info(f"Successfully processed projection EPW file: {climate_data_dict['id']}")
+                                                session_state["active_tab"] = "General Information"
+                                            else:
+                                                st.warning(f"Climate projection data validation failed for {location.city}, {location.country}. Displaying data anyway.")
+                                                logger.warning(f"Validation failed for projection EPW data: {climate_data_dict['id']}")
+                                                session_state["climate_data"] = climate_data_dict
+                                                session_state["active_tab"] = "General Information"
+                                    except Exception as e:
+                                        st.error(f"Error reading EPW file {epw_file_path}: {str(e)}")
+                                        logger.error(f"Error reading EPW file {epw_file_path}: {str(e)}")
+                                        session_state["climate_data"] = {}
+                            except Exception as e:
+                                st.error(f"Error accessing directory {file_path}: {str(e)}")
+                                logger.error(f"Error accessing directory {file_path}: {str(e)}")
         
         # Other tabs (unchanged)
         if location and epw_data is not None: