Bump aiocomelit to 3.0.0 (#182193)

homeassistant/components/comelit/climate.py

@@ -3,7 +3,7 @@
 from enum import StrEnum
 from typing import Any, TypedDict, cast, override
 
-from aiocomelit import ComelitSerialBridgeObject
+from aiocomelit import ComelitDeviceObject
 from aiocomelit.const import CLIMATE
 
 from homeassistant.components.climate import (
@@ -128,7 +128,7 @@ class ComelitClimateEntity(ComelitBridgeBaseEntity, ClimateEntity):
     def __init__(
         self,
         coordinator: ComelitSerialBridge,
-        device: ComelitSerialBridgeObject,
+        device: ComelitDeviceObject,
         config_entry_entry_id: str,
     ) -> None:
         """Init light entity."""

homeassistant/components/comelit/const.py

@@ -3,7 +3,7 @@
 import logging
 
 from aiocomelit.api import (
-    ComelitSerialBridgeObject,
+    ComelitDeviceObject,
     ComelitVedoAreaObject,
     ComelitVedoZoneObject,
 )
@@ -12,7 +12,7 @@ from aiocomelit.const import BRIDGE, VEDO
 LOGGER = logging.getLogger(__package__)
 
 type ObjectClassType = (
-    ComelitSerialBridgeObject | ComelitVedoAreaObject | ComelitVedoZoneObject
+    ComelitDeviceObject | ComelitVedoAreaObject | ComelitVedoZoneObject
 )
 
 

homeassistant/components/comelit/coordinator.py

@@ -5,7 +5,8 @@ from collections.abc import Mapping
 from datetime import timedelta
 from typing import TypeVar, cast, override
 
-from aiocomelit.api import ComelitCommonApi, ComeliteSerialBridgeApi, ComelitVedoApi
+from aiocomelit import ComeliteSerialBridgeApi, ComelitVedoApi
+from aiocomelit.api import ComelitHttpApi
 from aiocomelit.const import (
     ALARM_AREA,
     ALARM_ZONE,
@@ -51,7 +52,7 @@ class ComelitBaseCoordinator(DataUpdateCoordinator[T]):
 
     _hw_version: str
     config_entry: ComelitConfigEntry
-    api: ComelitCommonApi
+    api: ComelitHttpApi
 
     def __init__(
         self, hass: HomeAssistant, entry: ComelitConfigEntry, device: str, host: str

homeassistant/components/comelit/cover.py

@@ -2,7 +2,7 @@
 
 from typing import Any, cast, override
 
-from aiocomelit import ComelitSerialBridgeObject
+from aiocomelit import ComelitDeviceObject
 from aiocomelit.const import COVER, STATE_COVER, STATE_OFF, STATE_ON
 
 from homeassistant.components.cover import CoverDeviceClass, CoverEntity, CoverState
@@ -52,7 +52,7 @@ class ComelitCoverEntity(ComelitBridgeBaseEntity, RestoreEntity, CoverEntity):
     def __init__(
         self,
         coordinator: ComelitSerialBridge,
-        device: ComelitSerialBridgeObject,
+        device: ComelitDeviceObject,
         config_entry_entry_id: str,
     ) -> None:
         """Init cover entity."""

homeassistant/components/comelit/diagnostics.py

@@ -2,11 +2,7 @@
 
 from typing import Any
 
-from aiocomelit import (
-    ComelitSerialBridgeObject,
-    ComelitVedoAreaObject,
-    ComelitVedoZoneObject,
-)
+from aiocomelit import ComelitDeviceObject, ComelitVedoAreaObject, ComelitVedoZoneObject
 from aiocomelit.const import BRIDGE
 
 from homeassistant.components.diagnostics import async_redact_data
@@ -31,7 +27,7 @@ async def async_get_config_entry_diagnostics(
     for dev_type in coordinator.data:
         dev_type_list = []
         for sensor_data in coordinator.data[dev_type].values():
-            if isinstance(sensor_data, ComelitSerialBridgeObject):
+            if isinstance(sensor_data, ComelitDeviceObject):
                 dev_type_list.append(
                     {
                         sensor_data.index: {

homeassistant/components/comelit/entity.py

@@ -1,6 +1,6 @@
 """Base entity for Comelit."""
 
-from aiocomelit import ComelitSerialBridgeObject
+from aiocomelit import ComelitDeviceObject
 
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
@@ -15,7 +15,7 @@ class ComelitBridgeBaseEntity(CoordinatorEntity[ComelitSerialBridge]):
     def __init__(
         self,
         coordinator: ComelitSerialBridge,
-        device: ComelitSerialBridgeObject,
+        device: ComelitDeviceObject,
         config_entry_entry_id: str,
     ) -> None:
         """Init cover entity."""

homeassistant/components/comelit/humidifier.py

@@ -3,7 +3,7 @@
 from enum import StrEnum
 from typing import Any, cast, override
 
-from aiocomelit import ComelitSerialBridgeObject
+from aiocomelit import ComelitDeviceObject
 from aiocomelit.const import CLIMATE
 
 from homeassistant.components.humidifier import (
@@ -120,7 +120,7 @@ class ComelitHumidifierEntity(ComelitBridgeBaseEntity, HumidifierEntity):
     def __init__(
         self,
         coordinator: ComelitSerialBridge,
-        device: ComelitSerialBridgeObject,
+        device: ComelitDeviceObject,
         config_entry_entry_id: str,
         active_mode: HumidifierComelitMode,
         active_action: HumidifierAction,

homeassistant/components/comelit/manifest.json

@@ -8,5 +8,5 @@
   "iot_class": "local_polling",
   "loggers": ["aiocomelit"],
   "quality_scale": "platinum",
-  "requirements": ["aiocomelit==2.0.7"]
+  "requirements": ["aiocomelit==3.0.0"]
 }

homeassistant/components/comelit/sensor.py

@@ -2,7 +2,7 @@
 
 from typing import TYPE_CHECKING, Final, cast, override
 
-from aiocomelit.api import ComelitSerialBridgeObject, ComelitVedoZoneObject
+from aiocomelit.api import ComelitDeviceObject, ComelitVedoZoneObject
 from aiocomelit.const import ALARM_ZONE, OTHER, AlarmZoneState
 
 from homeassistant.components.sensor import (
@@ -111,7 +111,7 @@ class ComelitBridgeSensorEntity(ComelitBridgeBaseEntity, SensorEntity):
     def __init__(
         self,
         coordinator: ComelitSerialBridge,
-        device: ComelitSerialBridgeObject,
+        device: ComelitDeviceObject,
         config_entry_entry_id: str,
         description: SensorEntityDescription,
     ) -> None:

homeassistant/components/comelit/switch.py

@@ -2,7 +2,7 @@
 
 from typing import Any, cast, override
 
-from aiocomelit import ComelitSerialBridgeObject
+from aiocomelit import ComelitDeviceObject
 from aiocomelit.const import IRRIGATION, OTHER, STATE_OFF, STATE_ON
 
 from homeassistant.components.switch import SwitchDeviceClass, SwitchEntity
@@ -51,7 +51,7 @@ class ComelitSwitchEntity(ComelitBridgeBaseEntity, SwitchEntity):
     def __init__(
         self,
         coordinator: ComelitSerialBridge,
-        device: ComelitSerialBridgeObject,
+        device: ComelitDeviceObject,
         config_entry_entry_id: str,
     ) -> None:
         """Init switch entity."""

homeassistant/components/comelit/utils.py

@@ -4,7 +4,7 @@ from collections.abc import Awaitable, Callable, Coroutine
 from functools import wraps
 from typing import TYPE_CHECKING, Any, Concatenate, Literal
 
-from aiocomelit.api import ComelitSerialBridgeObject
+from aiocomelit.api import ComelitDeviceObject
 from aiocomelit.exceptions import (
     CannotAuthenticate,
     CannotConnect,
@@ -36,7 +36,7 @@ async def async_client_session(hass: HomeAssistant) -> ClientSession:
 
 
 def load_api_data(
-    device: ComelitSerialBridgeObject,
+    device: ComelitDeviceObject,
     domain: Literal["climate", "humidifier"],
 ) -> list[Any]:
     """Load data from the API."""
@@ -54,7 +54,7 @@ async def cleanup_stale_entity(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
     entry_unique_id: str,
-    device: ComelitSerialBridgeObject,
+    device: ComelitDeviceObject,
 ) -> None:
     """Cleanup stale entity."""
     entity_reg: er.EntityRegistry = er.async_get(hass)

requirements_all.txt

@@ -233,7 +233,7 @@ aiobotocore==3.7.0
 aiocentriconnect==0.2.3
 
 # homeassistant.components.comelit
-aiocomelit==2.0.7
+aiocomelit==3.0.0
 
 # homeassistant.components.dhcp
 aiodhcpwatcher==1.2.7

tests/components/comelit/const.py

@@ -1,7 +1,7 @@
 """Common stuff for Comelit SimpleHome tests."""
 
 from aiocomelit.api import (
-    ComelitSerialBridgeObject,
+    ComelitDeviceObject,
     ComelitVedoAreaObject,
     ComelitVedoZoneObject,
 )
@@ -31,7 +31,7 @@ VEDO_PIN = "5678"
 FAKE_PIN = "0000"
 BAD_PIN = "abcd"
 
-LIGHT0 = ComelitSerialBridgeObject(
+LIGHT0 = ComelitDeviceObject(
     index=0,
     name="Light0",
     status=0,
@@ -45,7 +45,7 @@ LIGHT0 = ComelitSerialBridgeObject(
 )
 BRIDGE_DEVICE_QUERY = {
     CLIMATE: {
-        0: ComelitSerialBridgeObject(
+        0: ComelitDeviceObject(
             index=0,
             name="Climate0",
             status=0,
@@ -63,7 +63,7 @@ BRIDGE_DEVICE_QUERY = {
         ),
     },
     COVER: {
-        0: ComelitSerialBridgeObject(
+        0: ComelitDeviceObject(
             index=0,
             name="Cover0",
             status=0,
@@ -80,7 +80,7 @@ BRIDGE_DEVICE_QUERY = {
         0: LIGHT0,
     },
     OTHER: {
-        0: ComelitSerialBridgeObject(
+        0: ComelitDeviceObject(
             index=0,
             name="Switch0",
             status=0,

tests/components/comelit/test_climate.py

@@ -3,7 +3,7 @@
 from typing import Any
 from unittest.mock import AsyncMock, patch
 
-from aiocomelit.api import ComelitSerialBridgeObject
+from aiocomelit.api import ComelitDeviceObject
 from aiocomelit.const import CLIMATE, WATT
 from freezegun.api import FrozenDateTimeFactory
 import pytest
@@ -103,7 +103,7 @@ async def test_climate_data_update(
     assert state.attributes[ATTR_TEMPERATURE] == 5.0
 
     mock_serial_bridge.get_all_devices.return_value[CLIMATE] = {
-        0: ComelitSerialBridgeObject(
+        0: ComelitDeviceObject(
             index=0,
             name="Climate0",
             status=0,
@@ -331,7 +331,7 @@ async def test_climate_remove_stale(
     assert state.attributes[ATTR_TEMPERATURE] == 5.0
 
     mock_serial_bridge.get_all_devices.return_value[CLIMATE] = {
-        0: ComelitSerialBridgeObject(
+        0: ComelitDeviceObject(
             index=0,
             name="Climate0",
             status=0,

tests/components/comelit/test_coordinator.py

@@ -3,7 +3,7 @@
 from unittest.mock import AsyncMock
 
 from aiocomelit.api import (
-    ComelitSerialBridgeObject,
+    ComelitDeviceObject,
     ComelitVedoAreaObject,
     ComelitVedoZoneObject,
 )
@@ -90,7 +90,7 @@ async def test_coordinator_stale_device_serial_bridge(
         COVER: {},
         LIGHT: {
             0: LIGHT0,
-            1: ComelitSerialBridgeObject(
+            1: ComelitDeviceObject(
                 index=1,
                 name="Light1",
                 status=0,

tests/components/comelit/test_cover.py

@@ -2,7 +2,7 @@
 
 from unittest.mock import AsyncMock, patch
 
-from aiocomelit.api import ComelitSerialBridgeObject
+from aiocomelit.api import ComelitDeviceObject
 from aiocomelit.const import COVER, WATT
 from freezegun.api import FrozenDateTimeFactory
 import pytest
@@ -79,7 +79,7 @@ async def test_cover_open(
 
     # Finish opening, update status
     mock_serial_bridge.get_all_devices.return_value[COVER] = {
-        0: ComelitSerialBridgeObject(
+        0: ComelitDeviceObject(
             index=0,
             name="Cover0",
             status=0,
@@ -203,7 +203,7 @@ async def test_cover_dynamic(
     entity_id_2 = "cover.cover1"
 
     mock_serial_bridge.get_all_devices.return_value[COVER] = {
-        0: ComelitSerialBridgeObject(
+        0: ComelitDeviceObject(
             index=0,
             name="Cover0",
             status=0,
@@ -215,7 +215,7 @@ async def test_cover_dynamic(
             power=0.0,
             power_unit=WATT,
         ),
-        1: ComelitSerialBridgeObject(
+        1: ComelitDeviceObject(
             index=1,
             name="Cover1",
             status=0,

tests/components/comelit/test_humidifier.py

@@ -3,7 +3,7 @@
 from typing import Any
 from unittest.mock import AsyncMock, patch
 
-from aiocomelit.api import ComelitSerialBridgeObject
+from aiocomelit.api import ComelitDeviceObject
 from aiocomelit.const import CLIMATE, WATT
 from freezegun.api import FrozenDateTimeFactory
 import pytest
@@ -103,7 +103,7 @@ async def test_humidifier_data_update(
     assert state.attributes[ATTR_HUMIDITY] == 50.0
 
     mock_serial_bridge.get_all_devices.return_value[CLIMATE] = {
-        0: ComelitSerialBridgeObject(
+        0: ComelitDeviceObject(
             index=0,
             name="Climate0",
             status=0,
@@ -269,7 +269,7 @@ async def test_humidifier_dehumidifier_remove_stale(
     assert state.attributes[ATTR_HUMIDITY] == 50.0
 
     mock_serial_bridge.get_all_devices.return_value[CLIMATE] = {
-        0: ComelitSerialBridgeObject(
+        0: ComelitDeviceObject(
             index=0,
             name="Climate0",
             status=0,

tests/components/comelit/test_light.py

@@ -2,7 +2,7 @@
 
 from unittest.mock import AsyncMock, patch
 
-from aiocomelit.api import ComelitSerialBridgeObject
+from aiocomelit.api import ComelitDeviceObject
 from aiocomelit.const import LIGHT, WATT
 from freezegun.api import FrozenDateTimeFactory
 import pytest
@@ -96,7 +96,7 @@ async def test_light_dynamic(
     entity_id_2 = "light.light1"
 
     mock_serial_bridge.get_all_devices.return_value[LIGHT] = {
-        0: ComelitSerialBridgeObject(
+        0: ComelitDeviceObject(
             index=0,
             name="Light0",
             status=0,
@@ -108,7 +108,7 @@ async def test_light_dynamic(
             power=0.0,
             power_unit=WATT,
         ),
-        1: ComelitSerialBridgeObject(
+        1: ComelitDeviceObject(
             index=1,
             name="Light1",
             status=0,

tests/components/comelit/test_sensor.py

@@ -3,7 +3,7 @@
 from unittest.mock import AsyncMock, patch
 
 from aiocomelit.api import (
-    ComelitSerialBridgeObject,
+    ComelitDeviceObject,
     ComelitVedoAreaObject,
     ComelitVedoZoneObject,
 )
@@ -117,7 +117,7 @@ async def test_serial_bridge_sensor_dynamic(
     assert hass.states.get(entity_id)
 
     mock_serial_bridge.get_all_devices.return_value[OTHER] = {
-        0: ComelitSerialBridgeObject(
+        0: ComelitDeviceObject(
             index=0,
             name="Switch0",
             status=0,
@@ -129,7 +129,7 @@ async def test_serial_bridge_sensor_dynamic(
             power=0.0,
             power_unit=WATT,
         ),
-        1: ComelitSerialBridgeObject(
+        1: ComelitDeviceObject(
             index=1,
             name="Switch1",
             status=0,

tests/components/comelit/test_switch.py

@@ -2,7 +2,7 @@
 
 from unittest.mock import AsyncMock, patch
 
-from aiocomelit.api import ComelitSerialBridgeObject
+from aiocomelit.api import ComelitDeviceObject
 from aiocomelit.const import IRRIGATION, WATT
 from freezegun.api import FrozenDateTimeFactory
 import pytest
@@ -96,7 +96,7 @@ async def test_switch_dynamic(
     assert hass.states.get(entity_id)
 
     mock_serial_bridge.get_all_devices.return_value[IRRIGATION] = {
-        0: ComelitSerialBridgeObject(
+        0: ComelitDeviceObject(
             index=0,
             name="Switch0",
             status=0,
@@ -108,7 +108,7 @@ async def test_switch_dynamic(
             power=0.0,
             power_unit=WATT,
         ),
-        1: ComelitSerialBridgeObject(
+        1: ComelitDeviceObject(
             index=1,
             name="Switch1",
             status=0,

tests/components/comelit/test_utils.py

@@ -2,7 +2,7 @@
 
 from unittest.mock import AsyncMock
 
-from aiocomelit.api import ComelitSerialBridgeObject
+from aiocomelit.api import ComelitDeviceObject
 from aiocomelit.const import CLIMATE, WATT
 from aiocomelit.exceptions import (
     CannotAuthenticate,
@@ -53,7 +53,7 @@ async def test_device_remove_stale(
     assert state.attributes[ATTR_HUMIDITY] == 50.0
 
     mock_serial_bridge.get_all_devices.return_value[CLIMATE] = {
-        0: ComelitSerialBridgeObject(
+        0: ComelitDeviceObject(
             index=0,
             name="Climate0",
             status=0,