From b9c135870a4bb7de38451bf9e9dbfadaa26c5be4 Mon Sep 17 00:00:00 2001 From: epenet <6771947+epenet@users.noreply.github.com> Date: Tue, 28 Jun 2022 17:54:07 +0200 Subject: [PATCH] Fix model in vicare device_info (#74135) --- .../components/vicare/binary_sensor.py | 19 +++++++++--------- homeassistant/components/vicare/button.py | 20 +++++++++---------- homeassistant/components/vicare/climate.py | 19 +++++++++--------- homeassistant/components/vicare/sensor.py | 19 +++++++++--------- .../components/vicare/water_heater.py | 19 +++++++++--------- 5 files changed, 50 insertions(+), 46 deletions(-) diff --git a/homeassistant/components/vicare/binary_sensor.py b/homeassistant/components/vicare/binary_sensor.py index 01cfff59357..3f54e5bd7e7 100644 --- a/homeassistant/components/vicare/binary_sensor.py +++ b/homeassistant/components/vicare/binary_sensor.py @@ -19,6 +19,7 @@ from homeassistant.components.binary_sensor import ( ) from homeassistant.config_entries import ConfigEntry from homeassistant.core import HomeAssistant +from homeassistant.helpers.entity import DeviceInfo from homeassistant.helpers.entity_platform import AddEntitiesCallback from . import ViCareRequiredKeysMixin @@ -198,15 +199,15 @@ class ViCareBinarySensor(BinarySensorEntity): self._state = None @property - def device_info(self): + def device_info(self) -> DeviceInfo: """Return device info for this device.""" - return { - "identifiers": {(DOMAIN, self._device_config.getConfig().serial)}, - "name": self._device_config.getModel(), - "manufacturer": "Viessmann", - "model": (DOMAIN, self._device_config.getModel()), - "configuration_url": "https://developer.viessmann.com/", - } + return DeviceInfo( + identifiers={(DOMAIN, self._device_config.getConfig().serial)}, + name=self._device_config.getModel(), + manufacturer="Viessmann", + model=self._device_config.getModel(), + configuration_url="https://developer.viessmann.com/", + ) @property def available(self): @@ -214,7 +215,7 @@ class ViCareBinarySensor(BinarySensorEntity): return self._state is not None @property - def unique_id(self): + def unique_id(self) -> str: """Return unique ID for this device.""" tmp_id = ( f"{self._device_config.getConfig().serial}-{self.entity_description.key}" diff --git a/homeassistant/components/vicare/button.py b/homeassistant/components/vicare/button.py index e1d6bc4223c..b691c01796b 100644 --- a/homeassistant/components/vicare/button.py +++ b/homeassistant/components/vicare/button.py @@ -15,7 +15,7 @@ import requests from homeassistant.components.button import ButtonEntity, ButtonEntityDescription from homeassistant.config_entries import ConfigEntry from homeassistant.core import HomeAssistant -from homeassistant.helpers.entity import EntityCategory +from homeassistant.helpers.entity import DeviceInfo, EntityCategory from homeassistant.helpers.entity_platform import AddEntitiesCallback from . import ViCareRequiredKeysMixin @@ -94,18 +94,18 @@ class ViCareButton(ButtonEntity): _LOGGER.error("Invalid data from Vicare server: %s", invalid_data_exception) @property - def device_info(self): + def device_info(self) -> DeviceInfo: """Return device info for this device.""" - return { - "identifiers": {(DOMAIN, self._device_config.getConfig().serial)}, - "name": self._device_config.getModel(), - "manufacturer": "Viessmann", - "model": (DOMAIN, self._device_config.getModel()), - "configuration_url": "https://developer.viessmann.com/", - } + return DeviceInfo( + identifiers={(DOMAIN, self._device_config.getConfig().serial)}, + name=self._device_config.getModel(), + manufacturer="Viessmann", + model=self._device_config.getModel(), + configuration_url="https://developer.viessmann.com/", + ) @property - def unique_id(self): + def unique_id(self) -> str: """Return unique ID for this device.""" tmp_id = ( f"{self._device_config.getConfig().serial}-{self.entity_description.key}" diff --git a/homeassistant/components/vicare/climate.py b/homeassistant/components/vicare/climate.py index fb8e60c3318..8f00f9e6c3b 100644 --- a/homeassistant/components/vicare/climate.py +++ b/homeassistant/components/vicare/climate.py @@ -31,6 +31,7 @@ from homeassistant.const import ( from homeassistant.core import HomeAssistant from homeassistant.helpers import entity_platform import homeassistant.helpers.config_validation as cv +from homeassistant.helpers.entity import DeviceInfo from homeassistant.helpers.entity_platform import AddEntitiesCallback from .const import ( @@ -161,20 +162,20 @@ class ViCareClimate(ClimateEntity): self._current_action = None @property - def unique_id(self): + def unique_id(self) -> str: """Return unique ID for this device.""" return f"{self._device_config.getConfig().serial}-{self._circuit.id}" @property - def device_info(self): + def device_info(self) -> DeviceInfo: """Return device info for this device.""" - return { - "identifiers": {(DOMAIN, self._device_config.getConfig().serial)}, - "name": self._device_config.getModel(), - "manufacturer": "Viessmann", - "model": (DOMAIN, self._device_config.getModel()), - "configuration_url": "https://developer.viessmann.com/", - } + return DeviceInfo( + identifiers={(DOMAIN, self._device_config.getConfig().serial)}, + name=self._device_config.getModel(), + manufacturer="Viessmann", + model=self._device_config.getModel(), + configuration_url="https://developer.viessmann.com/", + ) def update(self): """Let HA know there has been an update from the ViCare API.""" diff --git a/homeassistant/components/vicare/sensor.py b/homeassistant/components/vicare/sensor.py index 06ed618ec86..e1deef0df00 100644 --- a/homeassistant/components/vicare/sensor.py +++ b/homeassistant/components/vicare/sensor.py @@ -30,6 +30,7 @@ from homeassistant.const import ( VOLUME_CUBIC_METERS, ) from homeassistant.core import HomeAssistant +from homeassistant.helpers.entity import DeviceInfo from homeassistant.helpers.entity_platform import AddEntitiesCallback from . import ViCareRequiredKeysMixin @@ -597,15 +598,15 @@ class ViCareSensor(SensorEntity): self._state = None @property - def device_info(self): + def device_info(self) -> DeviceInfo: """Return device info for this device.""" - return { - "identifiers": {(DOMAIN, self._device_config.getConfig().serial)}, - "name": self._device_config.getModel(), - "manufacturer": "Viessmann", - "model": (DOMAIN, self._device_config.getModel()), - "configuration_url": "https://developer.viessmann.com/", - } + return DeviceInfo( + identifiers={(DOMAIN, self._device_config.getConfig().serial)}, + name=self._device_config.getModel(), + manufacturer="Viessmann", + model=self._device_config.getModel(), + configuration_url="https://developer.viessmann.com/", + ) @property def available(self): @@ -613,7 +614,7 @@ class ViCareSensor(SensorEntity): return self._state is not None @property - def unique_id(self): + def unique_id(self) -> str: """Return unique ID for this device.""" tmp_id = ( f"{self._device_config.getConfig().serial}-{self.entity_description.key}" diff --git a/homeassistant/components/vicare/water_heater.py b/homeassistant/components/vicare/water_heater.py index 6f9262200ec..ae8456cac6f 100644 --- a/homeassistant/components/vicare/water_heater.py +++ b/homeassistant/components/vicare/water_heater.py @@ -21,6 +21,7 @@ from homeassistant.const import ( TEMP_CELSIUS, ) from homeassistant.core import HomeAssistant +from homeassistant.helpers.entity import DeviceInfo from homeassistant.helpers.entity_platform import AddEntitiesCallback from .const import ( @@ -140,20 +141,20 @@ class ViCareWater(WaterHeaterEntity): _LOGGER.error("Invalid data from Vicare server: %s", invalid_data_exception) @property - def unique_id(self): + def unique_id(self) -> str: """Return unique ID for this device.""" return f"{self._device_config.getConfig().serial}-{self._circuit.id}" @property - def device_info(self): + def device_info(self) -> DeviceInfo: """Return device info for this device.""" - return { - "identifiers": {(DOMAIN, self._device_config.getConfig().serial)}, - "name": self._device_config.getModel(), - "manufacturer": "Viessmann", - "model": (DOMAIN, self._device_config.getModel()), - "configuration_url": "https://developer.viessmann.com/", - } + return DeviceInfo( + identifiers={(DOMAIN, self._device_config.getConfig().serial)}, + name=self._device_config.getModel(), + manufacturer="Viessmann", + model=self._device_config.getModel(), + configuration_url="https://developer.viessmann.com/", + ) @property def name(self):