Merge branch 'master' into valetudo-room-preferences

.HA_VERSION

@@ -0,0 +1 @@
+2024.5.5

.gitignore

@@ -2,7 +2,6 @@ secrets.yaml
 known_devices.yaml
 home-assistant.log
 home-assistant_v2.db
-.HA_VERSION
 .uuid
 emulated_hue_ids.json
 deconz.conf

custom_components/alexa_media/__init__.py

@@ -624,8 +624,8 @@ async def async_update_data() -> Optional[AlexaEntityData]:
                     _LOGGER.debug("Loading config entry for %s", component)
                     config_entry.async_create_task(
                         hass,
-                        hass.config_entries.async_forward_entry_setup(
-                            config_entry, component
+                        hass.config_entries.async_forward_entry_setups(
+                            config_entry, [component]
                         )
                     )
                 else:

custom_components/alexa_media/const.py

@@ -14,7 +14,7 @@
     PERCENTAGE,
 )
 
-__version__ = "4.10.2"
+__version__ = "4.10.3"
 PROJECT_URL = "https://github.com/alandtse/alexa_media_player/"
 ISSUE_URL = f"{PROJECT_URL}issues"
 NOTIFY_URL = f"{PROJECT_URL}wiki/Configuration%3A-Notification-Component#use-the-notifyalexa_media-service"

custom_components/alexa_media/manifest.json

@@ -9,5 +9,5 @@
   "issue_tracker": "https://github.com/alandtse/alexa_media_player/issues",
   "loggers": ["alexapy", "authcaptureproxy"],
   "requirements": ["alexapy==1.27.10", "packaging>=20.3", "wrapt>=1.14.0"],
-  "version": "4.10.2"
+  "version": "4.10.3"
 }

custom_components/alexa_media/media_player.py

@@ -187,8 +187,8 @@ async def async_setup_entry(hass, config_entry, async_add_devices):
                 )
                 config_entry.async_create_task(
                     hass,
-                    hass.config_entries.async_forward_entry_setup(
-                        config_entry, component
+                    hass.config_entries.async_forward_entry_setups(
+                        config_entry, [component]
                     )
                 )
         return True

custom_components/mypyllant/__init__.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import logging
-from datetime import datetime as dt, timedelta
+from datetime import datetime as dt, timedelta, datetime
 import voluptuous as vol
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
@@ -133,6 +133,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
     async def handle_export(call: ServiceCall) -> ServiceResponse:
+        _LOGGER.debug("Exporting data with params %s", call.data)
         return {
             "export": await export.main(
                 user=username,
@@ -163,7 +164,7 @@ async def handle_report(call: ServiceCall) -> ServiceResponse:
                 password=password,
                 brand=brand,
                 country=country,
-                year=call.data.get("year"),
+                year=int(call.data.get("year", datetime.now().year)),
                 write_results=False,
             )
         }

custom_components/mypyllant/binary_sensor.py

@@ -17,7 +17,7 @@
 
 from . import SystemCoordinator
 from .const import DOMAIN
-from .utils import EntityList
+from .utils import EntityList, ZoneCoordinatorEntity
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -39,12 +39,20 @@ async def async_setup_entry(
         sensors.append(lambda: ControlOnline(index, coordinator))
         sensors.append(lambda: FirmwareUpdateRequired(index, coordinator))
         sensors.append(lambda: FirmwareUpdateEnabled(index, coordinator))
-        for circuit_index, circuit in enumerate(system.circuits):
+        if system.eebus:
+            sensors.append(lambda: EebusEnabled(index, coordinator))
+            sensors.append(lambda: EebusCapable(index, coordinator))
+        for circuit_index, _ in enumerate(system.circuits):
             sensors.append(
                 lambda: CircuitIsCoolingAllowed(index, circuit_index, coordinator)
             )
+        for zone_index, zone in enumerate(system.zones):
+            if zone.is_manual_cooling_active is not None:
+                sensors.append(
+                    lambda: ZoneIsManualCoolingActive(index, zone_index, coordinator)
+                )
 
-    async_add_entities(sensors)
+    async_add_entities(sensors)  # type: ignore
 
 
 class SystemControlEntity(CoordinatorEntity, BinarySensorEntity):
@@ -180,6 +188,60 @@ def unique_id(self) -> str:
         return f"{DOMAIN}_{self.id_infix}_firmware_update_enabled"
 
 
+class EebusCapable(SystemControlEntity):
+    _attr_icon = "mdi:check-network"
+
+    def __init__(
+        self,
+        system_index: int,
+        coordinator: SystemCoordinator,
+    ):
+        super().__init__(system_index, coordinator)
+
+    @property
+    def is_on(self) -> bool | None:
+        return (
+            self.system.eebus.get("spine_capable", False)
+            if self.system.eebus
+            else False
+        )
+
+    @property
+    def name(self) -> str:
+        return f"{self.name_prefix} EEBUS Capable"
+
+    @property
+    def unique_id(self) -> str:
+        return f"{DOMAIN}_{self.id_infix}_eebus_capable"
+
+
+class EebusEnabled(SystemControlEntity):
+    _attr_icon = "mdi:check-network"
+
+    def __init__(
+        self,
+        system_index: int,
+        coordinator: SystemCoordinator,
+    ):
+        super().__init__(system_index, coordinator)
+
+    @property
+    def is_on(self) -> bool | None:
+        return (
+            self.system.eebus.get("spine_enabled", False)
+            if self.system.eebus
+            else False
+        )
+
+    @property
+    def name(self) -> str:
+        return f"{self.name_prefix} EEBUS Enabled"
+
+    @property
+    def unique_id(self) -> str:
+        return f"{DOMAIN}_{self.id_infix}_eebus_enabled"
+
+
 class CircuitEntity(CoordinatorEntity, BinarySensorEntity):
     def __init__(
         self,
@@ -236,3 +298,17 @@ def name(self) -> str:
     @property
     def unique_id(self) -> str:
         return f"{DOMAIN} {self.id_infix}_cooling_allowed"
+
+
+class ZoneIsManualCoolingActive(ZoneCoordinatorEntity, BinarySensorEntity):
+    @property
+    def is_on(self) -> bool | None:
+        return self.zone.is_manual_cooling_active
+
+    @property
+    def name(self) -> str:
+        return f"{self.name_prefix} Manual Cooling Active"
+
+    @property
+    def unique_id(self) -> str:
+        return f"{DOMAIN} {self.id_infix}_manual_cooling_active"