refactor: Asyncio timeout handling moved to api.py

davidrapan · Aug 8, 2024 · aa5cc95 · aa5cc95
1 parent a8152fd
commit aa5cc95
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 25 deletions.
diff --git a/custom_components/solarman/api.py b/custom_components/solarman/api.py
@@ -167,37 +167,38 @@ async def async_get(self, runtime = 0):
         self._is_reading = 1
 
         try:
-            for i, request in enumerate(requests):
-                code = get_request_code(request)
-                start = get_request_start(request)
-                end = get_request_end(request)
+            async with asyncio.timeout(TIMINGS_UPDATE_TIMEOUT):
+                for i, request in enumerate(requests):
+                    code = get_request_code(request)
+                    start = get_request_start(request)
+                    end = get_request_end(request)
 
-                _LOGGER.debug(f"Querying ({start} - {end}) ...")
+                    _LOGGER.debug(f"Querying ({start} - {end}) ...")
 
-                attempts_left = ACTION_ATTEMPTS
-                while attempts_left > 0 and results[i] == 0:
-                    attempts_left -= 1
+                    attempts_left = ACTION_ATTEMPTS
+                    while attempts_left > 0 and results[i] == 0:
+                        attempts_left -= 1
 
-                    try:
-                        await self.async_read(params, code, start, end)
-                        results[i] = 1
-                    except (V5FrameError, TimeoutError, Exception) as e:
-                        results[i] = 0
+                        try:
+                            await self.async_read(params, code, start, end)
+                            results[i] = 1
+                        except (V5FrameError, TimeoutError, Exception) as e:
+                            results[i] = 0
 
-                        if ((not isinstance(e, TimeoutError) or not attempts_left >= 1) and not (not isinstance(e, TimeoutError) or (e.__cause__ and isinstance(e.__cause__, OSError) and e.__cause__.errno == errno.EHOSTUNREACH))) or _LOGGER.isEnabledFor(logging.DEBUG):
-                            _LOGGER.warning(f"Querying ({start} - {end}) failed. #{runtime} [{format_exception(e)}]")
+                            if ((not isinstance(e, TimeoutError) or not attempts_left >= 1) and not (not isinstance(e, TimeoutError) or (e.__cause__ and isinstance(e.__cause__, OSError) and e.__cause__.errno == errno.EHOSTUNREACH))) or _LOGGER.isEnabledFor(logging.DEBUG):
+                                _LOGGER.warning(f"Querying ({start} - {end}) failed. #{runtime} [{format_exception(e)}]")
 
-                        await asyncio.sleep((ACTION_ATTEMPTS - attempts_left) * TIMINGS_WAIT_SLEEP)
+                            await asyncio.sleep((ACTION_ATTEMPTS - attempts_left) * TIMINGS_WAIT_SLEEP)
 
-                    _LOGGER.debug(f"Querying {'succeeded.' if results[i] == 1 else f'attempts left: {attempts_left}{'' if attempts_left > 0 else ', aborting.'}'}")
+                        _LOGGER.debug(f"Querying {'succeeded.' if results[i] == 1 else f'attempts left: {attempts_left}{'' if attempts_left > 0 else ', aborting.'}'}")
 
-                if results[i] == 0:
-                    break
+                    if results[i] == 0:
+                        break
 
-            if not 0 in results:
-                return self.get_result(params)
-            else:
-                await self.async_get_failed(f"Querying {self.serial} at {self.address}:{self.port} failed.")
+                if not 0 in results:
+                    return self.get_result(params)
+                else:
+                    await self.async_get_failed(f"Querying {self.serial} at {self.address}:{self.port} failed.")
 
         except UpdateFailed:
             raise

diff --git a/custom_components/solarman/coordinator.py b/custom_components/solarman/coordinator.py
@@ -26,8 +26,7 @@ def _accounting(self) -> int:
 
     async def _async_update_data(self) -> dict[str, Any]:
         try:
-            async with asyncio.timeout(TIMINGS_UPDATE_TIMEOUT):
-                return await self.inverter.async_get(self._accounting())
+            return await self.inverter.async_get(self._accounting())
         except Exception:  # Temporary fix to retrieve all data after reconnect
             self._counter = 0
             raise