Fix model in vicare device_info (#74135)

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 {
+        return DeviceInfo(
-            "identifiers": {(DOMAIN, self._device_config.getConfig().serial)},
+            identifiers={(DOMAIN, self._device_config.getConfig().serial)},
-            "name": self._device_config.getModel(),
+            name=self._device_config.getModel(),
-            "manufacturer": "Viessmann",
+            manufacturer="Viessmann",
-            "model": (DOMAIN, self._device_config.getModel()),
+            model=self._device_config.getModel(),
-            "configuration_url": "https://developer.viessmann.com/",
+            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}"

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 {
+        return DeviceInfo(
-            "identifiers": {(DOMAIN, self._device_config.getConfig().serial)},
+            identifiers={(DOMAIN, self._device_config.getConfig().serial)},
-            "name": self._device_config.getModel(),
+            name=self._device_config.getModel(),
-            "manufacturer": "Viessmann",
+            manufacturer="Viessmann",
-            "model": (DOMAIN, self._device_config.getModel()),
+            model=self._device_config.getModel(),
-            "configuration_url": "https://developer.viessmann.com/",
+            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}"

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 {
+        return DeviceInfo(
-            "identifiers": {(DOMAIN, self._device_config.getConfig().serial)},
+            identifiers={(DOMAIN, self._device_config.getConfig().serial)},
-            "name": self._device_config.getModel(),
+            name=self._device_config.getModel(),
-            "manufacturer": "Viessmann",
+            manufacturer="Viessmann",
-            "model": (DOMAIN, self._device_config.getModel()),
+            model=self._device_config.getModel(),
-            "configuration_url": "https://developer.viessmann.com/",
+            configuration_url="https://developer.viessmann.com/",
-        }
+        )
 
     def update(self):
         """Let HA know there has been an update from the ViCare API."""

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 {
+        return DeviceInfo(
-            "identifiers": {(DOMAIN, self._device_config.getConfig().serial)},
+            identifiers={(DOMAIN, self._device_config.getConfig().serial)},
-            "name": self._device_config.getModel(),
+            name=self._device_config.getModel(),
-            "manufacturer": "Viessmann",
+            manufacturer="Viessmann",
-            "model": (DOMAIN, self._device_config.getModel()),
+            model=self._device_config.getModel(),
-            "configuration_url": "https://developer.viessmann.com/",
+            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}"

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 {
+        return DeviceInfo(
-            "identifiers": {(DOMAIN, self._device_config.getConfig().serial)},
+            identifiers={(DOMAIN, self._device_config.getConfig().serial)},
-            "name": self._device_config.getModel(),
+            name=self._device_config.getModel(),
-            "manufacturer": "Viessmann",
+            manufacturer="Viessmann",
-            "model": (DOMAIN, self._device_config.getModel()),
+            model=self._device_config.getModel(),
-            "configuration_url": "https://developer.viessmann.com/",
+            configuration_url="https://developer.viessmann.com/",
-        }
+        )
 
     @property
     def name(self):