custom_components/plugwise/__init__.py (1)

145-145: ⚠️ Potential issue

Fix missing import for ConfigEntry.

The ConfigEntry type is used but not imported, causing a pipeline failure.

Add the import to the existing imports from homeassistant.config_entries:

-from homeassistant.const import CONF_TIMEOUT, Platform
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_TIMEOUT, Platform

🧰 Tools

🪛 Ruff (0.8.2)

145-145: Undefined name ConfigEntry

(F821)

🪛 GitHub Actions: Test PR against HA-core

[error] 145-145: Undefined name ConfigEntry.

custom_components/plugwise/button.py (1)

29-33: Remove commented-out code.

The old implementation has been replaced and the comments can be safely removed.

-    # async_add_entities(
-    #     PlugwiseButtonEntity(coordinator, device_id)
-    #     for device_id in coordinator.data.devices
-    #     if device_id == gateway[GATEWAY_ID] and REBOOT in gateway
-    # )

custom_components/plugwise/switch.py (2)

87-93: Remove commented-out code.

The old implementation has been replaced and the comments can be safely removed.

-        # Upstream consts
-        # async_add_entities(
-        #     PlugwiseSwitchEntity(coordinator, device_id, description)
-        #     for device_id in coordinator.new_devices
-        #     if (switches := coordinator.data.devices[device_id].get(SWITCHES))
-        #     for description in PLUGWISE_SWITCHES
-        #     if description.key in switches
-        # )

---

95-107: Consider simplifying entity creation logic.

The current implementation could be simplified using list comprehension while maintaining the debug logging.

-        entities: list[PlugwiseSwitchEntity] = []
-        for device_id in coordinator.new_devices:
-            device = coordinator.data[device_id]
-            if not (switches := device.get(SWITCHES)):
-                continue
-            for description in PLUGWISE_SWITCHES:
-                if description.key not in switches:
-                    continue
-                entities.append(PlugwiseSwitchEntity(coordinator, device_id, description))
-                LOGGER.debug(
-                    "Add %s %s switch", device["name"], description.translation_key
-                )
+        entities = [
+            entity for device_id in coordinator.new_devices
+            if (device := coordinator.data[device_id])
+            and (switches := device.get(SWITCHES))
+            for description in PLUGWISE_SWITCHES
+            if description.key in switches
+            for entity in [PlugwiseSwitchEntity(coordinator, device_id, description)]
+            if (LOGGER.debug("Add %s %s switch", device["name"], description.translation_key) or True)
+        ]

custom_components/plugwise/select.py (2)

46-47: Address the TODO comment about renaming.

The comment suggests there might be an inconsistency in naming conventions. Consider prefixing the constant to maintain consistency.

Would you like me to help rename the SELECT_TYPES constant to follow the naming convention? Let me know and I can propose a specific name that aligns with the codebase.

---

89-94: Remove commented-out code.

The old implementation has been replaced and the comments can be safely removed.

-        # Upstream consts
-        # async_add_entities(
-        #     PlugwiseSelectEntity(coordinator, device_id, description)
-        #     for device_id in coordinator.new_devices
-        #     for description in SELECT_TYPES
-        #     if description.options_key in coordinator.data.devices[device_id]
-        # )

custom_components/plugwise/number.py (1)

85-90: Consider reverting to list comprehension after debugging.

The current implementation favors debugging with detailed logging over the more concise list comprehension approach. While this is helpful during development, consider reverting to the list comprehension once debugging is complete.

-        # async_add_entities(
-        #     PlugwiseNumberEntity(coordinator, device_id, description)
-        #     for device_id in coordinator.new_devices
-        #     for description in NUMBER_TYPES
-        #     if description.key in coordinator.data.devices[device_id]
-        # )
-
-        # pw-beta alternative for debugging
-        entities: list[PlugwiseNumberEntity] = []
-        for device_id in coordinator.new_devices:
-            device = coordinator.data[device_id]
-            for description in NUMBER_TYPES:
-                if description.key in device:
-                    entities.append(
-                        PlugwiseNumberEntity(coordinator, device_id, description)
-                    )
-                    LOGGER.debug(
-                        "Add %s %s number", device["name"], description.translation_key
-                    )
-
-        async_add_entities(entities)
+        async_add_entities(
+            PlugwiseNumberEntity(coordinator, device_id, description)
+            for device_id in coordinator.new_devices
+            for description in NUMBER_TYPES
+            if description.key in coordinator.data[device_id]
+        )

Also applies to: 92-105

custom_components/plugwise/__init__.py (1)

79-83: Document platform-specific service registration.

The delete_notification service is only registered when the binary_sensor platform is loaded. Consider documenting this limitation in the service description or README.

custom_components/plugwise/binary_sensor.py (1)

171-175: Consider limiting the number of persistent notifications.

Creating a persistent notification for each message could lead to notification overload. Consider:

• Limiting the number of concurrent notifications
• Combining related notifications
• Adding a mechanism to automatically clear old notifications

custom_components/plugwise/climate.py (2)

111-111: Consider using a more descriptive type hint.

The type hint str | None could be more specific by using a literal union of possible HVAC modes.

-    _homekit_mode: str | None = None  # pw-beta homekit emulation + intentional unsort
+    _homekit_mode: HVACMode | None = None  # pw-beta homekit emulation + intentional unsort

---

294-302: Consider extracting HomeKit mode handling to a separate method.

The HomeKit mode handling logic is complex and could benefit from being extracted into a dedicated method for better maintainability.

+    async def _handle_homekit_mode(self, hvac_mode: HVACMode) -> None:
+        """Handle HomeKit specific mode changes."""
+        self._homekit_mode = hvac_mode
+        if self._homekit_mode == HVACMode.OFF:
+            await self.async_set_preset_mode(PRESET_AWAY)
+        if (
+            self._homekit_mode in [HVACMode.HEAT, HVACMode.HEAT_COOL]
+            and self.device[ACTIVE_PRESET] == PRESET_AWAY
+        ):
+            await self.async_set_preset_mode(PRESET_HOME)

     @plugwise_command
     async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
         """Set the hvac mode."""
         if hvac_mode not in self.hvac_modes:
             raise HomeAssistantError("Unsupported hvac_mode")

         if hvac_mode == self.hvac_mode:
             return

         if hvac_mode != HVACMode.OFF:
             await self.coordinator.api.set_schedule_state(
                 self._location,
                 STATE_ON if hvac_mode == HVACMode.AUTO else STATE_OFF,
             )

         if not self._homekit_enabled:
             if hvac_mode == HVACMode.OFF:
                 await self.coordinator.api.set_regulation_mode(hvac_mode)
             elif self.hvac_mode == HVACMode.OFF:
                 await self.coordinator.api.set_regulation_mode(self._previous_mode)
         else:
-            self._homekit_mode = hvac_mode
-            if self._homekit_mode == HVACMode.OFF:
-                await self.async_set_preset_mode(PRESET_AWAY)
-            if (
-                self._homekit_mode in [HVACMode.HEAT, HVACMode.HEAT_COOL]
-                and self.device[ACTIVE_PRESET] == PRESET_AWAY
-            ):
-                await self.async_set_preset_mode(PRESET_HOME)
+            await self._handle_homekit_mode(hvac_mode)

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

custom_components/plugwise/__init__.py (1)

151-156: Add safe handling when removing timeout configuration.

The current implementation might raise a KeyError if CONF_TIMEOUT is not present in the data.

Consider using dict.pop() with a default value:

-        new_data.pop(CONF_TIMEOUT)
+        new_data.pop(CONF_TIMEOUT, None)

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro