Auto-update: Tue Aug 6 21:36:05 PDT 2024
This commit is contained in:
sanj
parent
e073efb0fa
commit
e878406e3c
1 changed files with 73 additions and 73 deletions
|
|
@ -187,80 +187,80 @@ async def store_weather_to_db(date_time: dt_datetime, weather_data: dict):
|
||||||
debug(f"Prepared daily_weather_params: {daily_weather_params}")
|
debug(f"Prepared daily_weather_params: {daily_weather_params}")
|
||||||
|
|
||||||
daily_weather_query = '''
|
daily_weather_query = '''
|
||||||
INSERT INTO dailyweather (
|
INSERT INTO dailyweather (
|
||||||
sunrise, sunriseepoch, sunset, sunsetepoch, description,
|
sunrise, sunriseepoch, sunset, sunsetepoch, description,
|
||||||
tempmax, tempmin, uvindex, winddir, windspeed, icon, last_updated,
|
tempmax, tempmin, uvindex, winddir, windspeed, icon, last_updated,
|
||||||
datetime, datetimeepoch, temp, feelslikemax, feelslikemin, feelslike,
|
datetime, datetimeepoch, temp, feelslikemax, feelslikemin, feelslike,
|
||||||
dew, humidity, precip, precipprob, precipcover, preciptype,
|
dew, humidity, precip, precipprob, precipcover, preciptype,
|
||||||
snow, snowdepth, windgust, pressure, cloudcover, visibility,
|
snow, snowdepth, windgust, pressure, cloudcover, visibility,
|
||||||
solarradiation, solarenergy, severerisk, moonphase, conditions,
|
solarradiation, solarenergy, severerisk, moonphase, conditions,
|
||||||
stations, source, location
|
stations, source, location
|
||||||
) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, $21, $22, $23, $24, $25, $26, $27, $28, $29, $30, $31, $32, $33, $34, $35, $36, $37, $38)
|
) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, $21, $22, $23, $24, $25, $26, $27, $28, $29, $30, $31, $32, $33, $34, $35, $36, $37, $38)
|
||||||
RETURNING id
|
RETURNING id
|
||||||
'''
|
'''
|
||||||
|
|
||||||
await API.execute_write_query(daily_weather_query, *daily_weather_params, table_name="dailyweather")
|
daily_weather_id = await API.execute_write_query(daily_weather_query, *daily_weather_params, table_name="dailyweather")
|
||||||
debug(f"Inserted daily weather data")
|
debug(f"Inserted daily weather data with id: {daily_weather_id}")
|
||||||
|
|
||||||
if 'hours' in day_data:
|
if 'hours' in day_data:
|
||||||
debug(f"Processing {len(day_data['hours'])} hourly records")
|
debug(f"Processing {len(day_data['hours'])} hourly records")
|
||||||
for hour_data in day_data['hours']:
|
for hour_data in day_data['hours']:
|
||||||
try:
|
try:
|
||||||
hour_data['datetime'] = await gis.dt(hour_data.get('datetimeEpoch'))
|
hour_data['datetime'] = await gis.dt(hour_data.get('datetimeEpoch'))
|
||||||
hour_preciptype_array = hour_data.get('preciptype', []) or []
|
hour_preciptype_array = hour_data.get('preciptype', []) or []
|
||||||
hour_stations_array = hour_data.get('stations', []) or []
|
hour_stations_array = hour_data.get('stations', []) or []
|
||||||
hourly_weather_params = [
|
hourly_weather_params = [
|
||||||
date_time, # Use the daily weather datetime as a foreign key
|
daily_weather_id, # Use the daily weather id as a foreign key
|
||||||
hour_data['datetime'],
|
hour_data['datetime'],
|
||||||
hour_data.get('datetimeEpoch'),
|
hour_data.get('datetimeEpoch'),
|
||||||
hour_data['temp'],
|
hour_data['temp'],
|
||||||
hour_data['feelslike'],
|
hour_data['feelslike'],
|
||||||
hour_data['humidity'],
|
hour_data['humidity'],
|
||||||
hour_data['dew'],
|
hour_data['dew'],
|
||||||
hour_data['precip'],
|
hour_data['precip'],
|
||||||
hour_data['precipprob'],
|
hour_data['precipprob'],
|
||||||
hour_preciptype_array,
|
hour_preciptype_array,
|
||||||
hour_data['snow'],
|
hour_data['snow'],
|
||||||
hour_data['snowdepth'],
|
hour_data['snowdepth'],
|
||||||
hour_data['windgust'],
|
hour_data['windgust'],
|
||||||
hour_data['windspeed'],
|
hour_data['windspeed'],
|
||||||
hour_data['winddir'],
|
hour_data['winddir'],
|
||||||
hour_data['pressure'],
|
hour_data['pressure'],
|
||||||
hour_data['cloudcover'],
|
hour_data['cloudcover'],
|
||||||
hour_data['visibility'],
|
hour_data['visibility'],
|
||||||
hour_data['solarradiation'],
|
hour_data['solarradiation'],
|
||||||
hour_data['solarenergy'],
|
hour_data['solarenergy'],
|
||||||
hour_data['uvindex'],
|
hour_data['uvindex'],
|
||||||
hour_data.get('severerisk', 0),
|
hour_data.get('severerisk', 0),
|
||||||
hour_data['conditions'],
|
hour_data['conditions'],
|
||||||
hour_data['icon'],
|
hour_data['icon'],
|
||||||
hour_stations_array,
|
hour_stations_array,
|
||||||
hour_data.get('source', ''),
|
hour_data.get('source', ''),
|
||||||
]
|
]
|
||||||
|
|
||||||
# Check for None values and replace with appropriate defaults
|
# Check for None values and replace with appropriate defaults
|
||||||
hourly_weather_params = ['' if v is None else v for v in hourly_weather_params]
|
hourly_weather_params = ['' if v is None else v for v in hourly_weather_params]
|
||||||
|
|
||||||
hourly_weather_query = '''
|
hourly_weather_query = '''
|
||||||
INSERT INTO hourlyweather (daily_weather_datetime, datetime, datetimeepoch, temp, feelslike, humidity, dew, precip, precipprob,
|
INSERT INTO hourlyweather (daily_weather_id, datetime, datetimeepoch, temp, feelslike, humidity, dew, precip, precipprob,
|
||||||
preciptype, snow, snowdepth, windgust, windspeed, winddir, pressure, cloudcover, visibility, solarradiation, solarenergy,
|
preciptype, snow, snowdepth, windgust, windspeed, winddir, pressure, cloudcover, visibility, solarradiation, solarenergy,
|
||||||
uvindex, severerisk, conditions, icon, stations, source)
|
uvindex, severerisk, conditions, icon, stations, source)
|
||||||
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, $21, $22, $23, $24, $25, $26)
|
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, $21, $22, $23, $24, $25, $26)
|
||||||
'''
|
'''
|
||||||
await API.execute_write_query(hourly_weather_query, *hourly_weather_params, table_name="hourlyweather")
|
await API.execute_write_query(hourly_weather_query, *hourly_weather_params, table_name="hourlyweather")
|
||||||
debug(f"Inserted hourly weather data for {hour_data['datetime']}")
|
debug(f"Inserted hourly weather data for {hour_data['datetime']}")
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
err(f"Error processing hourly data: {e}")
|
err(f"Error processing hourly data: {e}")
|
||||||
err(f"Problematic hour_data: {hour_data}")
|
err(f"Problematic hour_data: {hour_data}")
|
||||||
raise
|
raise
|
||||||
|
|
||||||
debug("Successfully stored weather data")
|
debug("Successfully stored weather data")
|
||||||
return "SUCCESS"
|
return "SUCCESS"
|
||||||
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
err(f"Error in weather storage: {e}")
|
err(f"Error in weather storage: {e}")
|
||||||
err(f"Traceback: {traceback.format_exc()}")
|
err(f"Traceback: {traceback.format_exc()}")
|
||||||
return "FAILURE"
|
return "FAILURE"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue