Merge pull request #368 from Olen/fix/threshold-unavailable-crash

fix: handle unavailable threshold entities in _check_threshold

Author: Olen

custom_components/plant/__init__.py

@@ -989,6 +989,10 @@ def _check_threshold(self, value, min_entity, max_entity, current_status):
         When already in a problem state, require the value to cross back
         by a margin (hysteresis band) before clearing.
         """
+        if min_entity.state in (STATE_UNKNOWN, STATE_UNAVAILABLE):
+            return current_status
+        if max_entity.state in (STATE_UNKNOWN, STATE_UNAVAILABLE):
+            return current_status
         min_val = float(min_entity.state)
         max_val = float(max_entity.state)
         band = (max_val - min_val) * HYSTERESIS_FRACTION

custom_components/plant/manifest.json

@@ -17,5 +17,5 @@
   "requirements": [
     "async-timeout>=4.0.2"
   ],
-  "version": "2026.2.1-beta7"
+  "version": "2026.2.1-beta8"
 }

custom_components/plant/number.py

@@ -276,7 +276,8 @@ async def async_added_to_hass(self) -> None:
         state = await self.async_get_last_number_data()
         if not state:
             return
-        self._attr_native_value = state.native_value
+        if state.native_value is not None:
+            self._attr_native_value = state.native_value
         self._attr_native_unit_of_measurement = state.native_unit_of_measurement
         # We track changes to our own state so we can update ourselves if state is changed
         # from the UI or by other means

tests/test_init.py

@@ -1742,6 +1742,67 @@ async def test_conductivity_hysteresis(
         await update_plant_sensors(hass, init_integration.entry_id)
         assert plant.conductivity_status == STATE_OK
 
+    async def test_threshold_unavailable_preserves_status(
+        self,
+        hass: HomeAssistant,
+        init_integration: MockConfigEntry,
+    ) -> None:
+        """Test that unavailable threshold entities don't crash _check_threshold.
+
+        When a threshold number entity has state 'unavailable', the plant
+        should keep its current status rather than raising ValueError.
+        """
+        plant = hass.data[DOMAIN][init_integration.entry_id][ATTR_PLANT]
+
+        # First establish a known state
+        await set_external_sensor_states(
+            hass,
+            temperature=25.0,
+            moisture=40.0,
+            conductivity=1000.0,
+            illuminance=5000.0,
+            humidity=40.0,
+        )
+        await update_plant_sensors(hass, init_integration.entry_id)
+        assert plant.state == STATE_OK
+        assert plant.moisture_status == STATE_OK
+
+        # Make the min_moisture threshold entity unavailable
+        hass.states.async_set(plant.min_moisture.entity_id, STATE_UNAVAILABLE)
+        await hass.async_block_till_done()
+
+        # Update should not crash — moisture_status should be preserved
+        await update_plant_sensors(hass, init_integration.entry_id)
+        assert plant.moisture_status == STATE_OK
+
+    async def test_threshold_unknown_preserves_status(
+        self,
+        hass: HomeAssistant,
+        init_integration: MockConfigEntry,
+    ) -> None:
+        """Test that unknown threshold entities don't crash _check_threshold."""
+        plant = hass.data[DOMAIN][init_integration.entry_id][ATTR_PLANT]
+
+        # Establish a LOW moisture state
+        await set_external_sensor_states(
+            hass,
+            temperature=25.0,
+            moisture=5.0,  # Below min of 20
+            conductivity=1000.0,
+            illuminance=5000.0,
+            humidity=40.0,
+        )
+        await update_plant_sensors(hass, init_integration.entry_id)
+        assert plant.moisture_status == STATE_LOW
+
+        # Make the max_moisture threshold entity unknown
+        hass.states.async_set(plant.max_moisture.entity_id, STATE_UNKNOWN)
+        await hass.async_block_till_done()
+
+        # Update should not crash — moisture_status should stay LOW
+        await update_plant_sensors(hass, init_integration.entry_id)
+        assert plant.moisture_status == STATE_LOW
+
 
 class TestYamlImport:
     """Tests for YAML configuration import (async_setup)."""