Fix buienradar component and add smoke tests (#27965)
* Fixes the buienradar component and add smoke tests * Fix errors due to circular imports after imports were moved. * Add smoke test so this situation will be caught in the future. * Add buienradar.util to coveragerc * Refactor tests to standalone pytest test function style * Add __init__ to buienradar tests
This commit is contained in:
Ties de Kock
cgtobi
parent
ea1401d0b6
commit
a05144bb8b
8 changed files with 294 additions and 211 deletions
|
|
@ -1,38 +1,23 @@
|
|||
"""Support for Buienradar.nl weather service."""
|
||||
import asyncio
|
||||
from datetime import datetime, timedelta
|
||||
import logging
|
||||
|
||||
import aiohttp
|
||||
import async_timeout
|
||||
from buienradar.buienradar import parse_data
|
||||
from buienradar.constants import (
|
||||
ATTRIBUTION,
|
||||
CONDCODE,
|
||||
CONDITION,
|
||||
CONTENT,
|
||||
DATA,
|
||||
DETAILED,
|
||||
EXACT,
|
||||
EXACTNL,
|
||||
FORECAST,
|
||||
HUMIDITY,
|
||||
IMAGE,
|
||||
MEASURED,
|
||||
MESSAGE,
|
||||
PRECIPITATION_FORECAST,
|
||||
PRESSURE,
|
||||
STATIONNAME,
|
||||
STATUS_CODE,
|
||||
SUCCESS,
|
||||
TEMPERATURE,
|
||||
TIMEFRAME,
|
||||
VISIBILITY,
|
||||
WINDAZIMUTH,
|
||||
WINDGUST,
|
||||
WINDSPEED,
|
||||
)
|
||||
from buienradar.urls import JSON_FEED_URL, json_precipitation_forecast_url
|
||||
import voluptuous as vol
|
||||
|
||||
from homeassistant.components.sensor import PLATFORM_SCHEMA
|
||||
|
|
@ -44,13 +29,14 @@ from homeassistant.const import (
|
|||
CONF_NAME,
|
||||
TEMP_CELSIUS,
|
||||
)
|
||||
from homeassistant.helpers.aiohttp_client import async_get_clientsession
|
||||
import homeassistant.helpers.config_validation as cv
|
||||
from homeassistant.helpers.entity import Entity
|
||||
from homeassistant.helpers.event import async_track_point_in_utc_time
|
||||
from homeassistant.util import dt as dt_util
|
||||
|
||||
from .weather import DEFAULT_TIMEFRAME
|
||||
|
||||
from .const import DEFAULT_TIMEFRAME
|
||||
from .util import BrData
|
||||
|
||||
|
||||
_LOGGER = logging.getLogger(__name__)
|
||||
|
||||
|
|
@ -465,194 +451,3 @@ class BrSensor(Entity):
|
|||
def force_update(self):
|
||||
"""Return true for continuous sensors, false for discrete sensors."""
|
||||
return self._force_update
|
||||
|
||||
|
||||
class BrData:
|
||||
"""Get the latest data and updates the states."""
|
||||
|
||||
def __init__(self, hass, coordinates, timeframe, devices):
|
||||
"""Initialize the data object."""
|
||||
self.devices = devices
|
||||
self.data = {}
|
||||
self.hass = hass
|
||||
self.coordinates = coordinates
|
||||
self.timeframe = timeframe
|
||||
|
||||
async def update_devices(self):
|
||||
"""Update all devices/sensors."""
|
||||
if self.devices:
|
||||
tasks = []
|
||||
# Update all devices
|
||||
for dev in self.devices:
|
||||
if dev.load_data(self.data):
|
||||
tasks.append(dev.async_update_ha_state())
|
||||
|
||||
if tasks:
|
||||
await asyncio.wait(tasks)
|
||||
|
||||
async def schedule_update(self, minute=1):
|
||||
"""Schedule an update after minute minutes."""
|
||||
_LOGGER.debug("Scheduling next update in %s minutes.", minute)
|
||||
nxt = dt_util.utcnow() + timedelta(minutes=minute)
|
||||
async_track_point_in_utc_time(self.hass, self.async_update, nxt)
|
||||
|
||||
async def get_data(self, url):
|
||||
"""Load data from specified url."""
|
||||
|
||||
_LOGGER.debug("Calling url: %s...", url)
|
||||
result = {SUCCESS: False, MESSAGE: None}
|
||||
resp = None
|
||||
try:
|
||||
websession = async_get_clientsession(self.hass)
|
||||
with async_timeout.timeout(10):
|
||||
resp = await websession.get(url)
|
||||
|
||||
result[STATUS_CODE] = resp.status
|
||||
result[CONTENT] = await resp.text()
|
||||
if resp.status == 200:
|
||||
result[SUCCESS] = True
|
||||
else:
|
||||
result[MESSAGE] = "Got http statuscode: %d" % (resp.status)
|
||||
|
||||
return result
|
||||
except (asyncio.TimeoutError, aiohttp.ClientError) as err:
|
||||
result[MESSAGE] = "%s" % err
|
||||
return result
|
||||
finally:
|
||||
if resp is not None:
|
||||
await resp.release()
|
||||
|
||||
async def async_update(self, *_):
|
||||
"""Update the data from buienradar."""
|
||||
|
||||
content = await self.get_data(JSON_FEED_URL)
|
||||
|
||||
if content.get(SUCCESS) is not True:
|
||||
# unable to get the data
|
||||
_LOGGER.warning(
|
||||
"Unable to retrieve json data from Buienradar."
|
||||
"(Msg: %s, status: %s,)",
|
||||
content.get(MESSAGE),
|
||||
content.get(STATUS_CODE),
|
||||
)
|
||||
# schedule new call
|
||||
await self.schedule_update(SCHEDULE_NOK)
|
||||
return
|
||||
|
||||
# rounding coordinates prevents unnecessary redirects/calls
|
||||
lat = self.coordinates[CONF_LATITUDE]
|
||||
lon = self.coordinates[CONF_LONGITUDE]
|
||||
rainurl = json_precipitation_forecast_url(lat, lon)
|
||||
raincontent = await self.get_data(rainurl)
|
||||
|
||||
if raincontent.get(SUCCESS) is not True:
|
||||
# unable to get the data
|
||||
_LOGGER.warning(
|
||||
"Unable to retrieve raindata from Buienradar." "(Msg: %s, status: %s,)",
|
||||
raincontent.get(MESSAGE),
|
||||
raincontent.get(STATUS_CODE),
|
||||
)
|
||||
# schedule new call
|
||||
await self.schedule_update(SCHEDULE_NOK)
|
||||
return
|
||||
|
||||
result = parse_data(
|
||||
content.get(CONTENT),
|
||||
raincontent.get(CONTENT),
|
||||
self.coordinates[CONF_LATITUDE],
|
||||
self.coordinates[CONF_LONGITUDE],
|
||||
self.timeframe,
|
||||
False,
|
||||
)
|
||||
|
||||
_LOGGER.debug("Buienradar parsed data: %s", result)
|
||||
if result.get(SUCCESS) is not True:
|
||||
if int(datetime.now().strftime("%H")) > 0:
|
||||
_LOGGER.warning(
|
||||
"Unable to parse data from Buienradar." "(Msg: %s)",
|
||||
result.get(MESSAGE),
|
||||
)
|
||||
await self.schedule_update(SCHEDULE_NOK)
|
||||
return
|
||||
|
||||
self.data = result.get(DATA)
|
||||
await self.update_devices()
|
||||
await self.schedule_update(SCHEDULE_OK)
|
||||
|
||||
@property
|
||||
def attribution(self):
|
||||
"""Return the attribution."""
|
||||
|
||||
return self.data.get(ATTRIBUTION)
|
||||
|
||||
@property
|
||||
def stationname(self):
|
||||
"""Return the name of the selected weatherstation."""
|
||||
|
||||
return self.data.get(STATIONNAME)
|
||||
|
||||
@property
|
||||
def condition(self):
|
||||
"""Return the condition."""
|
||||
|
||||
return self.data.get(CONDITION)
|
||||
|
||||
@property
|
||||
def temperature(self):
|
||||
"""Return the temperature, or None."""
|
||||
|
||||
try:
|
||||
return float(self.data.get(TEMPERATURE))
|
||||
except (ValueError, TypeError):
|
||||
return None
|
||||
|
||||
@property
|
||||
def pressure(self):
|
||||
"""Return the pressure, or None."""
|
||||
|
||||
try:
|
||||
return float(self.data.get(PRESSURE))
|
||||
except (ValueError, TypeError):
|
||||
return None
|
||||
|
||||
@property
|
||||
def humidity(self):
|
||||
"""Return the humidity, or None."""
|
||||
|
||||
try:
|
||||
return int(self.data.get(HUMIDITY))
|
||||
except (ValueError, TypeError):
|
||||
return None
|
||||
|
||||
@property
|
||||
def visibility(self):
|
||||
"""Return the visibility, or None."""
|
||||
|
||||
try:
|
||||
return int(self.data.get(VISIBILITY))
|
||||
except (ValueError, TypeError):
|
||||
return None
|
||||
|
||||
@property
|
||||
def wind_speed(self):
|
||||
"""Return the windspeed, or None."""
|
||||
|
||||
try:
|
||||
return float(self.data.get(WINDSPEED))
|
||||
except (ValueError, TypeError):
|
||||
return None
|
||||
|
||||
@property
|
||||
def wind_bearing(self):
|
||||
"""Return the wind bearing, or None."""
|
||||
|
||||
try:
|
||||
return int(self.data.get(WINDAZIMUTH))
|
||||
except (ValueError, TypeError):
|
||||
return None
|
||||
|
||||
@property
|
||||
def forecast(self):
|
||||
"""Return the forecast data."""
|
||||
|
||||
return self.data.get(FORECAST)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue