Home-Assistant
/
core
mirror of https://github.com/home-assistant/core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove yr integration after a request from yr.no (#39247)

pull/39260/head
Daniel Hjelseth Høyer 2020-08-25 21:18:45 +02:00 committed by GitHub
parent 19cc168433
commit 7bc273b182
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 0 additions and 1604 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CODEOWNERS
View File

@ -492,7 +492,6 @@ homeassistant/components/yeelight/* @rytilahti @zewelor
homeassistant/components/yeelightsunflower/* @lindsaymarkward
homeassistant/components/yessssms/* @flowolf
homeassistant/components/yi/* @bachya
homeassistant/components/yr/* @danielhiversen
homeassistant/components/zeroconf/* @Kane610
homeassistant/components/zerproc/* @emlove
homeassistant/components/zha/* @dmulcahey @adminiuga

1
homeassistant/components/yr/__init__.py
View File

@ -1 +0,0 @@
"""The yr component."""

7
homeassistant/components/yr/manifest.json
View File

@ -1,7 +0,0 @@
{
"domain": "yr",
"name": "Yr",
"documentation": "https://www.home-assistant.io/integrations/yr",
"requirements": ["xmltodict==0.12.0"],
"codeowners": ["@danielhiversen"]
}

281
homeassistant/components/yr/sensor.py
View File

@ -1,281 +0,0 @@
"""Support for Yr.no weather service."""
import asyncio
import logging
from random import randrange
from xml.parsers.expat import ExpatError
import aiohttp
import async_timeout
import voluptuous as vol
import xmltodict
from homeassistant.components.sensor import PLATFORM_SCHEMA
from homeassistant.const import (
ATTR_ATTRIBUTION,
CONF_ELEVATION,
CONF_LATITUDE,
CONF_LONGITUDE,
CONF_MONITORED_CONDITIONS,
CONF_NAME,
DEGREE,
DEVICE_CLASS_HUMIDITY,
DEVICE_CLASS_PRESSURE,
DEVICE_CLASS_TEMPERATURE,
HTTP_BAD_REQUEST,
PRESSURE_HPA,
SPEED_METERS_PER_SECOND,
TEMP_CELSIUS,
UNIT_PERCENTAGE,
)
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_call_later, async_track_utc_time_change
from homeassistant.util import dt as dt_util
_LOGGER = logging.getLogger(__name__)
ATTRIBUTION = (
"Weather forecast from met.no, delivered by the Norwegian "
"Meteorological Institute."
)
# https://api.met.no/license_data.html
SENSOR_TYPES = {
"symbol": ["Symbol", None, None],
"precipitation": ["Precipitation", "mm", None],
"temperature": ["Temperature", TEMP_CELSIUS, DEVICE_CLASS_TEMPERATURE],
"windSpeed": ["Wind speed", SPEED_METERS_PER_SECOND, None],
"windGust": ["Wind gust", SPEED_METERS_PER_SECOND, None],
"pressure": ["Pressure", PRESSURE_HPA, DEVICE_CLASS_PRESSURE],
"windDirection": ["Wind direction", DEGREE, None],
"humidity": ["Humidity", UNIT_PERCENTAGE, DEVICE_CLASS_HUMIDITY],
"fog": ["Fog", UNIT_PERCENTAGE, None],
"cloudiness": ["Cloudiness", UNIT_PERCENTAGE, None],
"lowClouds": ["Low clouds", UNIT_PERCENTAGE, None],
"mediumClouds": ["Medium clouds", UNIT_PERCENTAGE, None],
"highClouds": ["High clouds", UNIT_PERCENTAGE, None],
"dewpointTemperature": [
"Dewpoint temperature",
TEMP_CELSIUS,
DEVICE_CLASS_TEMPERATURE,
],
}
CONF_FORECAST = "forecast"
DEFAULT_FORECAST = 0
DEFAULT_NAME = "yr"
PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
{
vol.Optional(CONF_ELEVATION): vol.Coerce(int),
vol.Optional(CONF_FORECAST, default=DEFAULT_FORECAST): vol.Coerce(int),
vol.Optional(CONF_LATITUDE): cv.latitude,
vol.Optional(CONF_LONGITUDE): cv.longitude,
vol.Optional(CONF_MONITORED_CONDITIONS, default=["symbol"]): vol.All(
cv.ensure_list, vol.Length(min=1), [vol.In(SENSOR_TYPES)]
),
vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
}
)
async def async_setup_platform(hass, config, async_add_entities, discovery_info=None):
"""Set up the Yr.no sensor."""
elevation = config.get(CONF_ELEVATION, hass.config.elevation or 0)
forecast = config.get(CONF_FORECAST)
latitude = config.get(CONF_LATITUDE, hass.config.latitude)
longitude = config.get(CONF_LONGITUDE, hass.config.longitude)
name = config.get(CONF_NAME)
if None in (latitude, longitude):
_LOGGER.error("Latitude or longitude not set in Home Assistant config")
return False
coordinates = {"lat": str(latitude), "lon": str(longitude), "msl": str(elevation)}
dev = []
for sensor_type in config[CONF_MONITORED_CONDITIONS]:
dev.append(YrSensor(name, sensor_type))
weather = YrData(hass, coordinates, forecast, dev)
async_track_utc_time_change(
hass, weather.updating_devices, minute=randrange(60), second=0
)
await weather.fetching_data()
async_add_entities(dev)
class YrSensor(Entity):
"""Representation of an Yr.no sensor."""
def __init__(self, name, sensor_type):
"""Initialize the sensor."""
self.client_name = name
self._name = SENSOR_TYPES[sensor_type][0]
self.type = sensor_type
self._state = None
self._unit_of_measurement = SENSOR_TYPES[self.type][1]
self._device_class = SENSOR_TYPES[self.type][2]
@property
def name(self):
"""Return the name of the sensor."""
return f"{self.client_name} {self._name}"
@property
def state(self):
"""Return the state of the device."""
return self._state
@property
def should_poll(self):
"""No polling needed."""
return False
@property
def entity_picture(self):
"""Weather symbol if type is symbol."""
if self.type != "symbol":
return None
return (
"https://api.met.no/weatherapi/weathericon/1.1/"
f"?symbol={self._state};content_type=image/png"
)
@property
def device_state_attributes(self):
"""Return the state attributes."""
return {ATTR_ATTRIBUTION: ATTRIBUTION}
@property
def unit_of_measurement(self):
"""Return the unit of measurement of this entity, if any."""
return self._unit_of_measurement
@property
def device_class(self):
"""Return the device class of this entity, if any."""
return self._device_class
class YrData:
"""Get the latest data and updates the states."""
def __init__(self, hass, coordinates, forecast, devices):
"""Initialize the data object."""
self._url = (
"https://aa015h6buqvih86i1.api.met.no/weatherapi/locationforecast/1.9/"
)
self._urlparams = coordinates
self._forecast = forecast
self.devices = devices
self.data = {}
self.hass = hass
async def fetching_data(self, *_):
"""Get the latest data from yr.no."""
def try_again(err: str):
"""Retry in 15 to 20 minutes."""
minutes = 15 + randrange(6)
_LOGGER.error("Retrying in %i minutes: %s", minutes, err)
async_call_later(self.hass, minutes * 60, self.fetching_data)
try:
websession = async_get_clientsession(self.hass)
with async_timeout.timeout(10):
resp = await websession.get(self._url, params=self._urlparams)
if resp.status >= HTTP_BAD_REQUEST:
try_again(f"{resp.url} returned {resp.status}")
return
text = await resp.text()
except (asyncio.TimeoutError, aiohttp.ClientError) as err:
try_again(err)
return
try:
self.data = xmltodict.parse(text)["weatherdata"]
except (ExpatError, IndexError) as err:
try_again(err)
return
await self.updating_devices()
async_call_later(self.hass, 60 * 60, self.fetching_data)
async def updating_devices(self, *_):
"""Find the current data from self.data."""
if not self.data:
return
now = dt_util.utcnow()
forecast_time = now + dt_util.dt.timedelta(hours=self._forecast)
# Find the correct time entry. Since not all time entries contain all
# types of data, we cannot just select one. Instead, we order them by
# distance from the desired forecast_time, and for every device iterate
# them in order of increasing distance, taking the first time_point
# that contains the desired data.
ordered_entries = []
for time_entry in self.data["product"]["time"]:
valid_from = dt_util.parse_datetime(time_entry["@from"])
valid_to = dt_util.parse_datetime(time_entry["@to"])
if now >= valid_to:
# Has already passed. Never select this.
continue
average_dist = abs((valid_to - forecast_time).total_seconds()) + abs(
(valid_from - forecast_time).total_seconds()
)
ordered_entries.append((average_dist, time_entry))
ordered_entries.sort(key=lambda item: item[0])
# Update all devices
if ordered_entries:
for dev in self.devices:
new_state = None
for (_, selected_time_entry) in ordered_entries:
loc_data = selected_time_entry["location"]
if dev.type not in loc_data:
continue
if dev.type == "precipitation":
new_state = loc_data[dev.type]["@value"]
elif dev.type == "symbol":
new_state = loc_data[dev.type]["@number"]
elif dev.type in (
"temperature",
"pressure",
"humidity",
"dewpointTemperature",
):
new_state = loc_data[dev.type]["@value"]
elif dev.type in ("windSpeed", "windGust"):
new_state = loc_data[dev.type]["@mps"]
elif dev.type == "windDirection":
new_state = float(loc_data[dev.type]["@deg"])
elif dev.type in (
"fog",
"cloudiness",
"lowClouds",
"mediumClouds",
"highClouds",
):
new_state = loc_data[dev.type]["@percent"]
break
# pylint: disable=protected-access
if new_state != dev._state:
dev._state = new_state
if dev.hass:
dev.async_write_ha_state()

1
requirements_all.txt
View File

@ -2268,7 +2268,6 @@ xknx==0.11.3
# homeassistant.components.rest
# homeassistant.components.startca
# homeassistant.components.ted5000
# homeassistant.components.yr
# homeassistant.components.zestimate
xmltodict==0.12.0

1
requirements_test_all.txt
View File

@ -1031,7 +1031,6 @@ wolf_smartset==0.1.4
# homeassistant.components.rest
# homeassistant.components.startca
# homeassistant.components.ted5000
# homeassistant.components.yr
# homeassistant.components.zestimate
xmltodict==0.12.0

1
tests/components/yr/__init__.py
View File

@ -1 +0,0 @@
"""Tests for the yr component."""

127
tests/components/yr/test_sensor.py
View File

@ -1,127 +0,0 @@
"""The tests for the Yr sensor platform."""
from datetime import datetime
from homeassistant.bootstrap import async_setup_component
from homeassistant.const import DEGREE, SPEED_METERS_PER_SECOND, UNIT_PERCENTAGE
import homeassistant.util.dt as dt_util
from tests.async_mock import patch
from tests.common import assert_setup_component, load_fixture
NOW = datetime(2016, 6, 9, 1, tzinfo=dt_util.UTC)
async def test_default_setup(hass, legacy_patchable_time, aioclient_mock):
"""Test the default setup."""
aioclient_mock.get(
"https://aa015h6buqvih86i1.api.met.no/weatherapi/locationforecast/1.9/",
text=load_fixture("yr.no.xml"),
)
config = {"platform": "yr", "elevation": 0}
hass.allow_pool = True
with patch(
"homeassistant.components.yr.sensor.dt_util.utcnow", return_value=NOW
), assert_setup_component(1):
await async_setup_component(hass, "sensor", {"sensor": config})
await hass.async_block_till_done()
state = hass.states.get("sensor.yr_symbol")
assert state.state == "3"
assert state.attributes.get("unit_of_measurement") is None
async def test_custom_setup(hass, legacy_patchable_time, aioclient_mock):
"""Test a custom setup."""
aioclient_mock.get(
"https://aa015h6buqvih86i1.api.met.no/weatherapi/locationforecast/1.9/",
text=load_fixture("yr.no.xml"),
)
config = {
"platform": "yr",
"elevation": 0,
"monitored_conditions": [
"pressure",
"windDirection",
"humidity",
"fog",
"windSpeed",
],
}
hass.allow_pool = True
with patch(
"homeassistant.components.yr.sensor.dt_util.utcnow", return_value=NOW
), assert_setup_component(1):
await async_setup_component(hass, "sensor", {"sensor": config})
await hass.async_block_till_done()
state = hass.states.get("sensor.yr_pressure")
assert state.attributes.get("unit_of_measurement") == "hPa"
assert state.state == "1009.3"
state = hass.states.get("sensor.yr_wind_direction")
assert state.attributes.get("unit_of_measurement") == DEGREE
assert state.state == "103.6"
state = hass.states.get("sensor.yr_humidity")
assert state.attributes.get("unit_of_measurement") == UNIT_PERCENTAGE
assert state.state == "55.5"
state = hass.states.get("sensor.yr_fog")
assert state.attributes.get("unit_of_measurement") == UNIT_PERCENTAGE
assert state.state == "0.0"
state = hass.states.get("sensor.yr_wind_speed")
assert state.attributes.get("unit_of_measurement") == SPEED_METERS_PER_SECOND
assert state.state == "3.5"
async def test_forecast_setup(hass, legacy_patchable_time, aioclient_mock):
"""Test a custom setup with 24h forecast."""
aioclient_mock.get(
"https://aa015h6buqvih86i1.api.met.no/weatherapi/locationforecast/1.9/",
text=load_fixture("yr.no.xml"),
)
config = {
"platform": "yr",
"elevation": 0,
"forecast": 24,
"monitored_conditions": [
"pressure",
"windDirection",
"humidity",
"fog",
"windSpeed",
],
}
hass.allow_pool = True
with patch(
"homeassistant.components.yr.sensor.dt_util.utcnow", return_value=NOW
), assert_setup_component(1):
await async_setup_component(hass, "sensor", {"sensor": config})
await hass.async_block_till_done()
state = hass.states.get("sensor.yr_pressure")
assert state.attributes.get("unit_of_measurement") == "hPa"
assert state.state == "1008.3"
state = hass.states.get("sensor.yr_wind_direction")
assert state.attributes.get("unit_of_measurement") == DEGREE
assert state.state == "148.9"
state = hass.states.get("sensor.yr_humidity")
assert state.attributes.get("unit_of_measurement") == UNIT_PERCENTAGE
assert state.state == "77.4"
state = hass.states.get("sensor.yr_fog")
assert state.attributes.get("unit_of_measurement") == UNIT_PERCENTAGE
assert state.state == "0.0"
state = hass.states.get("sensor.yr_wind_speed")
assert state.attributes.get("unit_of_measurement") == SPEED_METERS_PER_SECOND
assert state.state == "3.6"

1184
tests/fixtures/yr.no.xml vendored
View File

File diff suppressed because it is too large Load Diff