Update app.py

app.py

@@ -149,7 +149,7 @@ def calculate_overall_aqi(row, aqi_breakpoints):
     else:
         return np.nan
 
-# --- New function to retrieve data from Firebase ---
+# --- Function to retrieve data from Firebase ---
 def get_firebase_data(sequence_length: int, latitude: float, longitude: float):
     """
     Retrieve data from Firebase RTDB.
@@ -178,27 +178,45 @@ def get_firebase_data(sequence_length: int, latitude: float, longitude: float):
         
         # Convert Firebase data to DataFrame
         data_list = []
-        for timestamp_str, sensor_data in firebase_data.items():
+        for key, sensor_data in firebase_data.items():
             try:
-                timestamp = datetime.strptime(timestamp_str, '%Y%m%d%H%M')
-                timestamp = pytz.utc.localize(timestamp)
+                 # Get the datetime string from inside the sensor_data dictionary
+                datetime_str = sensor_data.get('datetime')
+
+                # Check if datetime_str exists and is a string
+                if isinstance(datetime_str, str):
+                    # Parse the datetime string using the correct format 'YYYY-MM-DDTHH:MM'
+                    # We assume the datetime in Firebase is already in UTC or is timezone-naive
+                    # and we treat it as UTC based on the original code's localization attempt.
+                    timestamp = datetime.datetime.strptime(datetime_str, '%Y-%m-%dT%H:%M')
+                    timestamp = pytz.utc.localize(timestamp)
                 
-                data_point = {
-                    'time': timestamp,
-                    'pm25': sensor_data.get('pm25', np.nan),
-                    'pm10': sensor_data.get('pm10', np.nan),
-                    'co': sensor_data.get('co', np.nan),
-                    'temp': sensor_data.get('temperature', np.nan)
-                }
-                data_list.append(data_point)
+                    data_point = {
+                        'time': timestamp,
+                        'pm25': sensor_data.get('pm25', np.nan),
+                        'pm10': sensor_data.get('pm10', np.nan),
+                        'co': sensor_data.get('co', np.nan),
+                        'temp': sensor_data.get('temperature', np.nan)
+                    }
+                    data_list.append(data_point)
+
+                else:
+                    # Handle cases where 'datetime' is missing or not a string for a specific item
+                    print(f"Warning: Data item with key {key} is missing or has invalid 'datetime' field: {datetime_str}")
+                
+            except ValueError as ve:
+                # Catch errors specifically related to parsing the datetime string
+                print(f"Error parsing datetime string '{datetime_str}' for key {key}: {ve}. Expected format '%Y-%m-%dT%H:%M'")
+                continue # Skip this data point if parsing fails
             except Exception as e:
-                print(f"Error parsing Firebase data point: {e}")
+                # Catch any other unexpected errors during processing of a single item
+                print(f"An unexpected error occurred processing item with key {key}: {e}")
                 continue
         
         if not data_list:
-            print("No valid data points parsed from Firebase")
-            return None, "No valid data in Firebase"
-        
+            print("No valid data points parsed from Firebase after attempting to process.")
+            return None, "No valid data in Firebase after parsing"
+
         df = pd.DataFrame(data_list)
         df.set_index('time', inplace=True)
         df.sort_index(inplace=True)
@@ -248,7 +266,7 @@ def get_firebase_data(sequence_length: int, latitude: float, longitude: float):
         traceback.print_exc()
         return None, f"Firebase error: {str(e)}"
 
-# --- Modified data retrieval function ---
+# --- Data retrieval function ---
 def get_latest_data_sequence(sequence_length: int, latitude: float, longitude: float):
     """
     Try to get data from Firebase first, fallback to OpenMeteo if insufficient.