Update app.py

app.py

@@ -17,44 +17,43 @@ def get_raw_data(station_id):
         'Accept': 'application/json'
     }
     
-    # Base URL for NWS API
-    base_url = "https://api.weather.gov"
+    # Calculate correct date range for last 3 days
+    end_time = datetime.utcnow()
+    start_time = end_time - timedelta(hours=72)  # Last 3 days
+    
+    params = {
+        'start': start_time.isoformat() + 'Z',
+        'end': end_time.isoformat() + 'Z'
+    }
+    
+    url = f"https://api.weather.gov/stations/{station_id}/observations"
     
     try:
-        # First get the station metadata
-        station_url = f"{base_url}/stations/{station_id}"
-        print(f"\nFetching station metadata from: {station_url}")
-        
-        station_response = requests.get(station_url, headers=headers)
-        station_response.raise_for_status()
-        
-        # Get observations with expanded parameters
-        obs_url = f"{base_url}/stations/{station_id}/observations"
-        params = {
-            'limit': 720,
-            'start': (datetime.utcnow() - timedelta(hours=720)).isoformat() + 'Z'
-        }
+        print("\nFetching observations...")
+        print(f"URL: {url}")
+        print(f"Time range: {start_time} to {end_time}")
+        response = requests.get(url, headers=headers, params=params)
+        print(f"Response status: {response.status_code}")
         
-        print(f"\nFetching observations from: {obs_url}")
-        print(f"Parameters: {params}")
+        if response.status_code != 200:
+            print(f"Response content: {response.text}")
+            response.raise_for_status()
         
-        obs_response = requests.get(obs_url, headers=headers, params=params)
-        obs_response.raise_for_status()
-        
-        data = obs_response.json()
+        data = response.json()
         
         if 'features' in data:
-            print(f"\nFound {len(data['features'])} observations")
-            
-            # Print sample of available fields
+            print(f"\nNumber of observations: {len(data['features'])}")
             if len(data['features']) > 0:
-                print("\nFirst observation fields:")
-                properties = data['features'][0]['properties']
-                for key, value in properties.items():
-                    print(f"{key}: {value}")
+                print("\nFirst observation properties:")
+                print(json.dumps(data['features'][0]['properties'], indent=2))
+                
+                print("\nAll available property keys:")
+                keys = set()
+                for feature in data['features']:
+                    keys.update(feature['properties'].keys())
+                print(sorted(list(keys)))
         
         return data
-        
     except Exception as e:
         print(f"Error fetching data: {e}")
         print("Full error details:")
@@ -64,39 +63,43 @@ def get_raw_data(station_id):
 
 def parse_raw_data(data):
     """
-    Parse the raw data from WRH timeseries into a DataFrame
+    Parse the raw JSON data into a DataFrame
     """
-    if not data or 'data' not in data:
+    if not data or 'features' not in data:
         return None
 
-    # Convert list of dictionaries to DataFrame
-    df = pd.DataFrame(data['data'])
-    
-    # Print the columns we found
-    print("\nColumns in raw data:")
-    print(df.columns.tolist())
-    
-    # Convert timestamp
-    df['timestamp'] = pd.to_datetime(df['Date/Time'])
-    
-    # Convert numeric columns
-    numeric_columns = ['Temp.', 'Wind Speed', 'Snow Depth']
-    for col in numeric_columns:
-        if col in df.columns:
-            df[col] = pd.to_numeric(df[col].str.split().str[0], errors='coerce')
-    
-    # Rename columns to match our expected format
-    column_mapping = {
-        'Temp.': 'temperature',
-        'Wind Speed': 'wind_speed',
-        'Wind Direction': 'wind_direction',
-        'Snow Depth': 'snow_depth'
-    }
-    df = df.rename(columns=column_mapping)
+    records = []
+    for feature in data['features']:
+        props = feature['properties']
+        
+        # Extract all properties starting with 'snow'
+        snow_fields = {k: v for k, v in props.items() if 'snow' in k.lower()}
+        if snow_fields:
+            print("\nFound snow-related fields:")
+            for k, v in snow_fields.items():
+                print(f"{k}: {v}")
+        
+        record = {
+            'timestamp': props['timestamp'],
+            'temperature': props.get('temperature', {}).get('value'),
+            'wind_speed': props.get('windSpeed', {}).get('value'),
+            'wind_direction': props.get('windDirection', {}).get('value')
+        }
+        
+        # Add all snow-related fields to the record
+        for k, v in snow_fields.items():
+            if isinstance(v, dict) and 'value' in v:
+                record[k] = v['value']
+            else:
+                record[k] = v
+        
+        records.append(record)
+
+    df = pd.DataFrame(records)
     
-    print("\nProcessed DataFrame columns:")
+    print("\nDataFrame columns:")
     print(df.columns.tolist())
-    print("\nSample of processed data:")
+    print("\nSample of raw data:")
     print(df.head())
     
     return df
@@ -290,4 +293,4 @@ with gr.Blocks() as demo:
 # Launch the app
 demo.launch()
 
-# 
+# requirements.txt