Update app.py

app.py

@@ -162,55 +162,72 @@ def update_oni_data():
             os.remove(temp_file)
 
 def load_data(oni_path, typhoon_path):
-    # Create default empty DataFrames
+    # Create default empty DataFrames with minimum structure
     oni_data = pd.DataFrame({'Year': [], 'Jan': [], 'Feb': [], 'Mar': [], 'Apr': [], 
                            'May': [], 'Jun': [], 'Jul': [], 'Aug': [], 'Sep': [], 
                            'Oct': [], 'Nov': [], 'Dec': []})
-    typhoon_data = pd.DataFrame()
     
-    # Try to load ONI data
-    if os.path.exists(oni_path):
-        try:
-            oni_data = pd.read_csv(oni_path)
-        except Exception as e:
-            logging.error(f"Error loading ONI data: {e}")
-            # Update ONI data if loading fails
-            update_oni_data()
-            try:
-                oni_data = pd.read_csv(oni_path)
-            except Exception as e:
-                logging.error(f"Still can't load ONI data: {e}")
-    else:
+    # Try to load ONI data or create it
+    if not os.path.exists(oni_path):
         logging.warning(f"ONI data file not found: {oni_path}")
-        # Try to download ONI data
+        update_oni_data()
+    
+    try:
+        oni_data = pd.read_csv(oni_path)
+    except Exception as e:
+        logging.error(f"Error loading ONI data: {e}")
         update_oni_data()
         try:
             oni_data = pd.read_csv(oni_path)
         except Exception as e:
-            logging.error(f"Failed to create ONI data: {e}")
+            logging.error(f"Still can't load ONI data: {e}")
     
-    # Try to load typhoon data
+    # For typhoon data, focus on getting WP data
     if os.path.exists(typhoon_path):
         try:
             typhoon_data = pd.read_csv(typhoon_path, low_memory=False)
             typhoon_data['ISO_TIME'] = pd.to_datetime(typhoon_data['ISO_TIME'], errors='coerce')
             typhoon_data = typhoon_data.dropna(subset=['ISO_TIME'])
+            # Log WP data count
+            wp_count = len(typhoon_data[typhoon_data['SID'].str.startswith('WP')])
+            logging.info(f"Loaded {wp_count} Western Pacific typhoon records")
         except Exception as e:
             logging.error(f"Error loading typhoon data: {e}")
+            typhoon_data = pd.DataFrame()
     else:
         logging.error(f"Typhoon data file not found: {typhoon_path}")
-        # Create minimal sample data to prevent crashes
-        typhoon_data = pd.DataFrame({
-            'SID': ['WP012000'], 
-            'ISO_TIME': [pd.Timestamp('2000-01-01')],
-            'NAME': ['SAMPLE'],
-            'SEASON': [2000],
-            'LAT': [20.0],
-            'LON': [140.0],
-            'USA_WIND': [50.0],
-            'USA_PRES': [990.0]
-        })
-        logging.warning("Created minimal sample typhoon data to prevent crashes")
+        # Download WP typhoon data directly from IBTrACS if available
+        try:
+            if LOCAL_IBTRACS_PATH and os.path.exists(LOCAL_IBTRACS_PATH):
+                logging.info("Loading WP data from local IBTrACS file")
+                wp_data = pd.read_csv(LOCAL_IBTRACS_PATH, low_memory=False)
+                typhoon_data = wp_data
+                logging.info(f"Loaded {len(typhoon_data)} WP records from IBTrACS")
+            else:
+                # Try to download WP file if not exists
+                logging.info("Downloading WP basin file...")
+                response = requests.get(IBTRACS_BASE_URL + BASIN_FILES['WP'])
+                if response.status_code == 200:
+                    os.makedirs(os.path.dirname(LOCAL_IBTRACS_PATH), exist_ok=True)
+                    with open(LOCAL_IBTRACS_PATH, 'wb') as f:
+                        f.write(response.content)
+                    wp_data = pd.read_csv(LOCAL_IBTRACS_PATH, low_memory=False)
+                    typhoon_data = wp_data
+                    logging.info(f"Downloaded and loaded {len(typhoon_data)} WP records")
+        except Exception as e:
+            logging.error(f"Failed to load or download WP data: {e}")
+            # Create minimal WP sample data to prevent crashes
+            typhoon_data = pd.DataFrame({
+                'SID': ['WP012000', 'WP022000', 'WP032000'], 
+                'ISO_TIME': [pd.Timestamp('2000-01-01'), pd.Timestamp('2000-02-01'), pd.Timestamp('2000-03-01')],
+                'NAME': ['SAMPLE_WP1', 'SAMPLE_WP2', 'SAMPLE_WP3'],
+                'SEASON': [2000, 2000, 2000],
+                'LAT': [20.0, 21.0, 22.0],
+                'LON': [140.0, 141.0, 142.0],
+                'USA_WIND': [50.0, 60.0, 70.0],
+                'USA_PRES': [990.0, 980.0, 970.0]
+            })
+            logging.warning("Created minimal Western Pacific sample data to prevent crashes")
     
     return oni_data, typhoon_data