Fix state for zigbee light #711

Author: AlexxIT

custom_components/yandex_station/button.py

@@ -1,6 +1,6 @@
 from homeassistant.components.button import ButtonEntity
 
-from .core.entity import YandexCustomEntity, YandexEntity
+from .core.entity import YandexCustomEntity, YandexEntity, extract_instance
 from .core.yandex_quasar import YandexQuasar
 from .hass import hass_utils
 
@@ -27,7 +27,7 @@ async def async_setup_entry(hass, entry, async_add_entities):
             for instance in device["capabilities"]:
                 if instance["type"] not in INCLUDE_CAPABILITIES:
                     continue
-                if instance["parameters"].get("instance", "on") in instances:
+                if extract_instance(instance) in instances:
                     entities.append(YandexCustomButton(quasar, device, instance))
 
     async_add_entities(entities)

custom_components/yandex_station/core/entity.py

@@ -9,18 +9,24 @@
 _LOGGER = logging.getLogger(__name__)
 
 
+def extract_instance(item: dict) -> str:
+    if item["type"] == "devices.capabilities.on_off":
+        return "on"
+    return item["parameters"].get("instance")
+
+
 def extract_parameters(items: list[dict]) -> dict:
     result = {}
     for item in items:
-        instance = item["parameters"].get("instance", "on")
+        instance = extract_instance(item)
         result[instance] = {"retrievable": item["retrievable"], **item["parameters"]}
     return result
 
 
 def extract_state(items: list[dict]) -> dict:
     result = {}
     for item in items:
-        instance = item["parameters"].get("instance", "on")
+        instance = extract_instance(item)
         value = item["state"]["value"] if item["state"] else None
         result[instance] = value
     return result
@@ -32,7 +38,8 @@ def __init__(self, quasar: YandexQuasar, device: dict, config: dict = None):
         self.device = device
         self.config = config
 
-        self._attr_available = device["state"] in ("online", "unknown")
+        # "online", "unknown" or key not exist
+        self._attr_available = device.get("state") != "offline"
         self._attr_name = device["name"]
         self._attr_should_poll = False
         self._attr_unique_id = device["id"].replace("-", "")
@@ -104,7 +111,7 @@ async def device_actions(self, **kwargs):
 
 class YandexCustomEntity(YandexEntity):
     def __init__(self, quasar: YandexQuasar, device: dict, config: dict):
-        self.instance = config["parameters"].get("instance", "on")
+        self.instance = extract_instance(config)
         super().__init__(quasar, device)
         if name := config["parameters"].get("name"):
             self._attr_name += " " + name

custom_components/yandex_station/hass/hass_utils.py

@@ -7,6 +7,7 @@
 
 from ..climate import INCLUDE_TYPES as CLIMATE
 from ..core.const import DATA_CONFIG, DOMAIN
+from ..core.entity import extract_instance
 from ..core.yandex_quasar import YandexQuasar
 from ..cover import INCLUDE_TYPES as COVER
 from ..humidifier import INCLUDE_TYPES as HUMIDIFIER
@@ -85,7 +86,7 @@ def build_include_config(device: dict) -> dict:
     else:
         return {}
 
-    caps = [i["parameters"].get("instance", "on") for i in device["capabilities"]]
+    caps = [extract_instance(i) for i in device["capabilities"]]
     props = [i["parameters"]["instance"] for i in device["properties"]]
 
     return {

custom_components/yandex_station/number.py

@@ -3,7 +3,7 @@
 from homeassistant.components.number import NumberEntity
 from homeassistant.const import UnitOfTemperature
 
-from .core.entity import YandexCustomEntity
+from .core.entity import YandexCustomEntity, extract_instance
 from .hass import hass_utils
 
 _LOGGER = logging.getLogger(__name__)
@@ -21,7 +21,7 @@ async def async_setup_entry(hass, entry, async_add_entities):
             for instance in device["capabilities"]:
                 if instance["type"] not in INCLUDE_CAPABILITIES:
                     continue
-                if instance["parameters"].get("instance", "on") in instances:
+                if extract_instance(instance) in instances:
                     entities.append(YandexCustomNumber(quasar, device, instance))
 
     async_add_entities(entities)

custom_components/yandex_station/select.py

@@ -4,7 +4,7 @@
 from homeassistant.helpers.entity import DeviceInfo
 
 from .core.const import DOMAIN
-from .core.entity import YandexCustomEntity
+from .core.entity import YandexCustomEntity, extract_instance
 from .core.yandex_quasar import YandexQuasar
 from .hass import hass_utils
 
@@ -66,7 +66,7 @@ async def async_setup_entry(hass, entry, async_add_entities):
             for instance in device["capabilities"]:
                 if instance["type"] not in INCLUDE_CAPABILITIES:
                     continue
-                if instance["parameters"].get("instance", "on") in instances:
+                if extract_instance(instance) in instances:
                     entities.append(YandexCustomSelect(quasar, device, instance))
 
     async_add_entities(entities)

custom_components/yandex_station/switch.py

@@ -2,7 +2,7 @@
 
 from homeassistant.components.switch import SwitchEntity
 
-from .core.entity import YandexCustomEntity, YandexEntity
+from .core.entity import YandexCustomEntity, YandexEntity, extract_instance
 from .core.yandex_quasar import YandexQuasar
 from .hass import hass_utils
 
@@ -28,7 +28,7 @@ async def async_setup_entry(hass, entry, async_add_entities):
             for instance in device["capabilities"]:
                 if instance["type"] not in INCLUDE_CAPABILITIES:
                     continue
-                if instance["parameters"].get("instance", "on") in instances:
+                if extract_instance(instance) in instances:
                     entities.append(YandexCustomSwitch(quasar, device, instance))
 
     async_add_entities(entities)

tests/test_light.py

@@ -544,3 +544,64 @@ def test_issue465():
         "supported_features": LightEntityFeature.EFFECT,
         # "xy_color": (0.496, 0.383),
     }
+
+
+def test_issue711():
+    device = {
+        "id": "xxx",
+        "name": "Свет на крыльце",
+        "type": "devices.types.light",
+        "icon_url": "https://avatars.mds.yandex.net/get-iot/icons-devices-devices.types.light.svg/orig",
+        "capabilities": [
+            {
+                "reportable": true,
+                "retrievable": true,
+                "type": "devices.capabilities.on_off",
+                "state_changed_at": 1761939645.3040287,
+                "last_updated": 1761977954.1980345,
+                "parameters": {"split": false},
+                "state": {"instance": "on", "value": false},
+            },
+            {
+                "reportable": true,
+                "retrievable": false,
+                "type": "devices.capabilities.zigbee_node",
+                "state_changed_at": 1761978012.2432792,
+                "last_updated": 1761978012.2432792,
+                "parameters": {"type": "router"},
+                "state": {
+                    "value": {
+                        "signal_quality": {"status": "ok", "lqi": 75, "rssi": -74}
+                    }
+                },
+            },
+        ],
+        "properties": [
+            {
+                "type": "devices.properties.float",
+                "retrievable": false,
+                "reportable": true,
+                "parameters": {
+                    "instance": "power",
+                    "name": "потребляемая мощность",
+                    "unit": "unit.watt",
+                    "range": {"min": 0, "max": 3500, "precision": 0.1},
+                },
+                "state": {"percent": null, "status": null, "value": 0},
+                "state_changed_at": "2025-10-31T19:40:46Z",
+                "last_updated": "2025-11-01T05:38:23Z",
+            }
+        ],
+        "skill_id": "YANDEX_IO",
+        "item_type": "device",
+        "groups": [],
+    }
+
+    state = update_ha_state(YandexLight, device)
+    assert state.state == "off"
+    assert state.attributes == {
+        "color_mode": None,
+        "friendly_name": "Свет на крыльце",
+        "supported_color_modes": [ColorMode.ONOFF],
+        "supported_features": 0,
+    }