Don't restore unavailable/unknown sentinel as native value (#594)

RestoreEntity restored state.state unconditionally, so a shutdown while
the sensor was unavailable restored the literal 'unavailable' string as
the native value. Recent HA core raises ValueError from SensorEntity.state
when a numeric-indicating sensor (unit but no device/state class) holds a
non-numeric value, crashing entity setup on add_to_platform_finish.

Guard the restore against STATE_UNAVAILABLE/STATE_UNKNOWN in the base
entity so sensor, binary_sensor and button all start as unknown until the
first scrape. Bump version to 9.0.3.

Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Author: danieldotnl

custom_components/multiscrape/entity.py

@@ -4,6 +4,7 @@
 import logging
 from abc import abstractmethod
 
+from homeassistant.const import STATE_UNAVAILABLE, STATE_UNKNOWN
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import TemplateError
 from homeassistant.helpers.restore_state import RestoreEntity
@@ -97,7 +98,8 @@ async def async_added_to_hass(self) -> None:
         if not (state := await self.async_get_last_state()):
             return
         _LOGGER.debug("%s # %s # Restoring previous state: %s", self.scraper.name, self._name, state.state)
-        self._attr_native_value = state.state
+        if state.state not in (STATE_UNAVAILABLE, STATE_UNKNOWN):
+            self._attr_native_value = state.state
 
         for name in self._attribute_selectors:
             if state.attributes.get(name) is not None:

custom_components/multiscrape/manifest.json

@@ -8,5 +8,5 @@
   "iot_class": "local_polling",
   "issue_tracker": "https://github.com/danieldotnl/ha-multiscrape/issues",
   "requirements": ["lxml>=4.9.1", "beautifulsoup4>=4.12.2"],
-  "version": "9.0.2"
+  "version": "9.0.3"
 }

tests/test_entity.py

@@ -3,7 +3,7 @@
 from unittest.mock import AsyncMock, MagicMock, patch
 
 import pytest
-from homeassistant.const import CONF_NAME
+from homeassistant.const import CONF_NAME, STATE_UNAVAILABLE, STATE_UNKNOWN
 from homeassistant.core import HomeAssistant, State
 from homeassistant.helpers.template import Template
 
@@ -554,6 +554,30 @@ async def test_async_added_to_hass_restores_state_and_attributes(
     assert sensor._attr_extra_state_attributes["test_attr"] == "saved_value"
 
 
+@pytest.mark.integration
+@pytest.mark.async_test
+@pytest.mark.timeout(10)
+@pytest.mark.parametrize("sentinel", [STATE_UNAVAILABLE, STATE_UNKNOWN])
+async def test_async_added_to_hass_does_not_restore_sentinel_states(
+    hass: HomeAssistant, coordinator, scraper, sentinel
+):
+    """Sentinel states must not be restored as a native value.
+
+    A numeric sensor (unit but no device/state class) would otherwise
+    crash on add_to_platform_finish trying to float('unavailable').
+    """
+    sensor = _create_sensor(hass, coordinator, scraper)
+    initial_value = sensor._attr_native_value
+
+    mock_state = State("sensor.test", sentinel)
+    with patch.object(sensor, "async_get_last_state", new=AsyncMock(return_value=mock_state)):
+        await sensor.async_added_to_hass()
+
+    # Assert - sentinel not restored, value left at its default
+    assert sensor._attr_native_value == initial_value
+    assert sensor._attr_native_value not in (STATE_UNAVAILABLE, STATE_UNKNOWN)
+
+
 @pytest.mark.integration
 @pytest.mark.async_test
 @pytest.mark.timeout(10)