diff --git a/homeassistant/components/airvisual/__init__.py b/homeassistant/components/airvisual/__init__.py index 73c39a450b8..4079f739824 100644 --- a/homeassistant/components/airvisual/__init__.py +++ b/homeassistant/components/airvisual/__init__.py @@ -169,7 +169,7 @@ async def async_setup_entry(hass, config_entry): _standardize_geography_config_entry(hass, config_entry) airvisual = AirVisualGeographyData( hass, - Client(websession, api_key=config_entry.data[CONF_API_KEY]), + Client(api_key=config_entry.data[CONF_API_KEY], session=websession), config_entry, ) @@ -177,7 +177,7 @@ async def async_setup_entry(hass, config_entry): config_entry.add_update_listener(async_update_options) else: _standardize_node_pro_config_entry(hass, config_entry) - airvisual = AirVisualNodeProData(hass, Client(websession), config_entry) + airvisual = AirVisualNodeProData(hass, Client(session=websession), config_entry) await airvisual.async_update() diff --git a/homeassistant/components/airvisual/air_quality.py b/homeassistant/components/airvisual/air_quality.py index 9da5b83d79f..71f9f9d9fbe 100644 --- a/homeassistant/components/airvisual/air_quality.py +++ b/homeassistant/components/airvisual/air_quality.py @@ -2,14 +2,12 @@ from homeassistant.components.air_quality import AirQualityEntity from homeassistant.const import CONCENTRATION_MICROGRAMS_PER_CUBIC_METER from homeassistant.core import callback -from homeassistant.util import slugify from . import AirVisualEntity from .const import DATA_CLIENT, DOMAIN, INTEGRATION_TYPE_GEOGRAPHY ATTR_HUMIDITY = "humidity" ATTR_SENSOR_LIFE = "{0}_sensor_life" -ATTR_TREND = "{0}_trend" ATTR_VOC = "voc" @@ -94,15 +92,6 @@ class AirVisualNodeProSensor(AirVisualEntity, AirQualityEntity): @callback def update_from_latest_data(self): """Update from the Node/Pro's data.""" - trends = { - ATTR_TREND.format(slugify(pollutant)): trend - for pollutant, trend in self._airvisual.data["trends"].items() - } - if self._airvisual.data["current"]["settings"]["is_aqi_usa"]: - trends.pop(ATTR_TREND.format("aqi_cn")) - else: - trends.pop(ATTR_TREND.format("aqi_us")) - self._attrs.update( { ATTR_VOC: self._airvisual.data["current"]["measurements"].get("voc"), @@ -112,6 +101,5 @@ class AirVisualNodeProSensor(AirVisualEntity, AirQualityEntity): "status" ]["sensor_life"].items() }, - **trends, } ) diff --git a/homeassistant/components/airvisual/config_flow.py b/homeassistant/components/airvisual/config_flow.py index 22a8c776027..691fa19504a 100644 --- a/homeassistant/components/airvisual/config_flow.py +++ b/homeassistant/components/airvisual/config_flow.py @@ -101,7 +101,7 @@ class AirVisualFlowHandler(config_entries.ConfigFlow, domain=DOMAIN): return self.async_abort(reason="already_configured") websession = aiohttp_client.async_get_clientsession(self.hass) - client = Client(websession, api_key=user_input[CONF_API_KEY]) + client = Client(session=websession, api_key=user_input[CONF_API_KEY]) # If this is the first (and only the first) time we've seen this API key, check # that it's valid: @@ -142,7 +142,7 @@ class AirVisualFlowHandler(config_entries.ConfigFlow, domain=DOMAIN): await self._async_set_unique_id(user_input[CONF_IP_ADDRESS]) websession = aiohttp_client.async_get_clientsession(self.hass) - client = Client(websession) + client = Client(session=websession) try: await client.node.from_samba( diff --git a/homeassistant/components/airvisual/manifest.json b/homeassistant/components/airvisual/manifest.json index d97fcfb78ef..93b57a4804e 100644 --- a/homeassistant/components/airvisual/manifest.json +++ b/homeassistant/components/airvisual/manifest.json @@ -3,6 +3,6 @@ "name": "AirVisual", "config_flow": true, "documentation": "https://www.home-assistant.io/integrations/airvisual", - "requirements": ["pyairvisual==4.3.0"], + "requirements": ["pyairvisual==4.4.0"], "codeowners": ["@bachya"] } diff --git a/requirements_all.txt b/requirements_all.txt index df8e3f15252..906c658a631 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -1173,7 +1173,7 @@ pyaehw4a1==0.3.4 pyaftership==0.1.2 # homeassistant.components.airvisual -pyairvisual==4.3.0 +pyairvisual==4.4.0 # homeassistant.components.almond pyalmond==0.0.2 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index 307b0de5b1e..57bdfc76ef0 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -470,7 +470,7 @@ py_nextbusnext==0.1.4 pyaehw4a1==0.3.4 # homeassistant.components.airvisual -pyairvisual==4.3.0 +pyairvisual==4.4.0 # homeassistant.components.almond pyalmond==0.0.2