code review changes

Author: rickboy

custom_components/sigenergy_cloud/api.py

@@ -429,19 +429,26 @@ async def get_custom_energy_stats(
 
         last_error: SigenCloudApiError | None = None
         for params in deduped_candidates:
-            try:
-                return await self._request(
-                    "GET",
-                    ENDPOINT_ENERGY_STATS_CUSTOM,
-                    params=params,
-                )
-            except SigenCloudApiError as err:
-                last_error = err
-                _LOGGER.debug(
-                    "Custom energy stats failed method=GET params=%s: %s",
-                    params,
-                    err,
-                )
+            # For transient backend failures, retry once with the same request
+            # before moving to compatibility variants.
+            for attempt in (1, 2):
+                try:
+                    return await self._request(
+                        "GET",
+                        ENDPOINT_ENERGY_STATS_CUSTOM,
+                        params=params,
+                    )
+                except SigenCloudApiError as err:
+                    last_error = err
+                    _LOGGER.debug(
+                        "Custom energy stats failed method=GET attempt=%s params=%s: %s",
+                        attempt,
+                        params,
+                        err,
+                    )
+                    if attempt == 1 and "HTTP 500" in str(err):
+                        continue
+                    break
 
         if last_error is not None:
             last_message = str(last_error)

test_auth_live.py

@@ -20,6 +20,7 @@
 import json
 import logging
 import os
+import re
 import sys
 
 import aiohttp
@@ -313,7 +314,13 @@ async def run() -> None:
                 lowered = message.lower()
                 if (
                     "unsupported for this account/region" in lowered
-                    or ("http 500" in lowered and ("system error" in lowered or '"code":1' in lowered))
+                    or (
+                        "http 500" in lowered
+                        and (
+                            "system error" in lowered
+                            or re.search(r'"code"\s*:\s*1\b', lowered) is not None
+                        )
+                    )
                 ):
                     print("UNAVAILABLE")
                     print("    Endpoint appears unsupported for this account/region")

tests/test_api.py

@@ -390,7 +390,7 @@ async def test_get_custom_energy_stats(self, mock_session):
         }
 
     @pytest.mark.asyncio
-    async def test_get_custom_energy_stats_fallback_params(self, mock_session):
+    async def test_get_custom_energy_stats_retries_on_500(self, mock_session):
         client = await self._make_authed_client(mock_session)
 
         fail_resp = make_mock_response(
@@ -419,9 +419,10 @@ async def test_get_custom_energy_stats_fallback_params(self, mock_session):
         first_call = mock_session.request.call_args_list[0]
         second_call = mock_session.request.call_args_list[1]
         assert first_call[0][0] == "GET"
+        assert second_call[0][0] == "GET"
+        assert first_call[1]["params"] == second_call[1]["params"]
         assert first_call[1]["params"]["stationId"] == "STATION001"
         assert first_call[1]["params"]["resourceIds"] == "energy_card"
-        assert second_call[0][0] == "GET"
 
     @pytest.mark.asyncio
     async def test_set_operational_mode(self, mock_session):