From 6a094746231d20b86978a57691a9bd732ae59e0c Mon Sep 17 00:00:00 2001
From: Thomas55555 <59625598+Thomas55555@users.noreply.github.com>
Date: Tue, 3 Dec 2024 15:11:15 +0100
Subject: [PATCH] Catch InverterReturnedError in APSystems (#131930)

Co-authored-by: epenet <6771947+epenet@users.noreply.github.com>
---
 .../components/apsystems/coordinator.py       | 18 ++++++++++---
 .../components/apsystems/strings.json         |  5 ++++
 tests/components/apsystems/test_init.py       | 25 +++++++++++++++++++
 3 files changed, 44 insertions(+), 4 deletions(-)
 create mode 100644 tests/components/apsystems/test_init.py

diff --git a/homeassistant/components/apsystems/coordinator.py b/homeassistant/components/apsystems/coordinator.py
index b6e951343f7ef1..e56cb8268407af 100644
--- a/homeassistant/components/apsystems/coordinator.py
+++ b/homeassistant/components/apsystems/coordinator.py
@@ -5,12 +5,17 @@
 from dataclasses import dataclass
 from datetime import timedelta
 
-from APsystemsEZ1 import APsystemsEZ1M, ReturnAlarmInfo, ReturnOutputData
+from APsystemsEZ1 import (
+    APsystemsEZ1M,
+    InverterReturnedError,
+    ReturnAlarmInfo,
+    ReturnOutputData,
+)
 
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
-from .const import LOGGER
+from .const import DOMAIN, LOGGER
 
 
 @dataclass
@@ -43,6 +48,11 @@ async def _async_setup(self) -> None:
         self.api.min_power = device_info.minPower
 
     async def _async_update_data(self) -> ApSystemsSensorData:
-        output_data = await self.api.get_output_data()
-        alarm_info = await self.api.get_alarm_info()
+        try:
+            output_data = await self.api.get_output_data()
+            alarm_info = await self.api.get_alarm_info()
+        except InverterReturnedError:
+            raise UpdateFailed(
+                translation_domain=DOMAIN, translation_key="inverter_error"
+            ) from None
         return ApSystemsSensorData(output_data=output_data, alarm_info=alarm_info)
diff --git a/homeassistant/components/apsystems/strings.json b/homeassistant/components/apsystems/strings.json
index e02f86c273055c..b3a10ca49a70eb 100644
--- a/homeassistant/components/apsystems/strings.json
+++ b/homeassistant/components/apsystems/strings.json
@@ -72,5 +72,10 @@
         "name": "Inverter status"
       }
     }
+  },
+  "exceptions": {
+    "inverter_error": {
+      "message": "Inverter returned an error"
+    }
   }
 }
diff --git a/tests/components/apsystems/test_init.py b/tests/components/apsystems/test_init.py
new file mode 100644
index 00000000000000..c85c4094e30c82
--- /dev/null
+++ b/tests/components/apsystems/test_init.py
@@ -0,0 +1,25 @@
+"""Test the APSystem setup."""
+
+from unittest.mock import AsyncMock
+
+from APsystemsEZ1 import InverterReturnedError
+
+from homeassistant.components.apsystems.const import DOMAIN
+from homeassistant.config_entries import ConfigEntryState
+from homeassistant.core import HomeAssistant
+
+from . import setup_integration
+
+from tests.common import MockConfigEntry
+
+
+async def test_update_failed(
+    hass: HomeAssistant,
+    mock_apsystems: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test update failed."""
+    mock_apsystems.get_output_data.side_effect = InverterReturnedError
+    await setup_integration(hass, mock_config_entry)
+    entry = hass.config_entries.async_entries(DOMAIN)[0]
+    assert entry.state is ConfigEntryState.SETUP_RETRY