fix: implement control_no_check method for on/off switch

Author: mkuthan

custom_components/solis_cloud_control/coordinator.py

@@ -75,8 +75,8 @@ async def control(
 
         while attempt <= retry_count:
             await self._api_client.control(inverter_sn, cid, value, old_value)
-            current_value = await self._api_client.read(inverter_sn, cid)
 
+            current_value = await self._api_client.read(inverter_sn, cid)
             if current_value == value:
                 await self.async_request_refresh()
                 return
@@ -92,3 +92,13 @@ async def control(
                 await asyncio.sleep(retry_delay)
             else:
                 raise HomeAssistantError(f"Failed to set value for CID {cid}. Expected: {value}, got: {current_value}")
+
+    async def control_no_check(
+        self,
+        cid: int,
+        value: str,
+        old_value: str | None = None,
+    ) -> None:
+        inverter_sn = self._inverter.info.serial_number
+        await self._api_client.control(inverter_sn, cid, value, old_value)
+        await self.async_request_refresh()

custom_components/solis_cloud_control/switch.py

@@ -85,11 +85,13 @@ def __init__(
         self._attr_assumed_state = True
 
     async def async_turn_on(self, **kwargs: dict[str, any]) -> None:  # noqa: ARG002
-        await self.coordinator.control(self.on_off.on_cid, self.on_off.on_value)
+        _LOGGER.info("Turning on inverter")
+        await self.coordinator.control_no_check(self.on_off.on_cid, self.on_off.on_value)
         self._attr_is_on = True
 
     async def async_turn_off(self, **kwargs: dict[str, any]) -> None:  # noqa: ARG002
-        await self.coordinator.control(self.on_off.off_cid, self.on_off.off_value)
+        _LOGGER.info("Turning off inverter")
+        await self.coordinator.control_no_check(self.on_off.off_cid, self.on_off.off_value)
         self._attr_is_on = False
 
 

tests/conftest.py

@@ -46,6 +46,7 @@ def mock_api_client():
 def mock_coordinator():
     coordinator = Mock()
     coordinator.control = AsyncMock()
+    coordinator.control_no_check = AsyncMock()
     coordinator.data = {}
     coordinator.config_entry = Mock()
     coordinator.config_entry.entry_id = "any_entry_id"

tests/test_coordinator.py

@@ -102,3 +102,36 @@ async def test_control_retry_and_fail(hass: HomeAssistant, coordinator, mock_api
     assert mock_api_client.control.call_count == 2  # Initial + 1 retry
     assert mock_api_client.read.call_count == 2  # Initial + 1 retry
     mock_refresh.assert_not_called()
+
+
+async def test_control_no_check(hass: HomeAssistant, coordinator, mock_api_client, any_inverter):
+    any_cid = 123
+    any_value = "any_value"
+    any_old_value = "any_old_value"
+
+    mock_api_client.control.return_value = None
+
+    with patch.object(coordinator, "async_request_refresh", AsyncMock()) as mock_refresh:
+        await coordinator.control_no_check(any_cid, any_value, any_old_value)
+
+        mock_api_client.control.assert_called_once_with(
+            any_inverter.info.serial_number, any_cid, any_value, any_old_value
+        )
+        mock_api_client.read.assert_not_called()
+        mock_refresh.assert_called_once()
+
+
+async def test_control_no_check_api_error(hass: HomeAssistant, coordinator, mock_api_client):
+    any_cid = 123
+    any_value = "any_value"
+    any_error = "any error"
+
+    mock_api_client.control.side_effect = SolisCloudControlApiError(any_error)
+
+    with pytest.raises(SolisCloudControlApiError) as exc_info:
+        await coordinator.control_no_check(any_cid, any_value)
+
+    assert str(exc_info.value) == any_error
+
+    mock_api_client.control.assert_called_once_with(coordinator._inverter.info.serial_number, any_cid, any_value, None)
+    mock_api_client.read.assert_not_called()

tests/test_switch.py

@@ -24,14 +24,14 @@ def test_init(self, on_off_switch):
 
     async def test_turn_on(self, on_off_switch):
         await on_off_switch.async_turn_on()
-        on_off_switch.coordinator.control.assert_awaited_once_with(
+        on_off_switch.coordinator.control_no_check.assert_awaited_once_with(
             on_off_switch.on_off.on_cid, on_off_switch.on_off.on_value
         )
         assert on_off_switch.is_on is True
 
     async def test_turn_off(self, on_off_switch):
         await on_off_switch.async_turn_off()
-        on_off_switch.coordinator.control.assert_awaited_once_with(
+        on_off_switch.coordinator.control_no_check.assert_awaited_once_with(
             on_off_switch.on_off.off_cid, on_off_switch.on_off.off_value
         )
         assert on_off_switch.is_on is False