Qualify exceptions during init

Author: WillCodeForCats

custom_components/solaredge_modbus_multi/hub.py

@@ -115,7 +115,7 @@ async def _async_init_solaredge(self) -> None:
                 await self._hass.async_add_executor_job(new_inverter.init_device)
                 self.inverters.append(new_inverter)
 
-            except Exception as e:
+            except DeviceInvalid as e:
                 """Inverters are required"""
                 _LOGGER.error(f"Inverter device ID {inverter_unit_id}: {e}")
                 raise HubInitFailed(f"Inverter device ID {inverter_unit_id} not found.")
@@ -139,7 +139,11 @@ async def _async_init_solaredge(self) -> None:
 
                     self.meters.append(new_meter_1)
                     _LOGGER.debug(f"Found meter 1 on inverter ID {inverter_unit_id}")
-                except Exception:
+
+                except ModbusReadError:
+                    raise HubInitFailed
+
+                except DeviceInvalid:
                     pass
 
                 try:
@@ -160,7 +164,11 @@ async def _async_init_solaredge(self) -> None:
 
                     self.meters.append(new_meter_2)
                     _LOGGER.debug(f"Found meter 2 on inverter ID {inverter_unit_id}")
-                except Exception:
+
+                except ModbusReadError:
+                    raise HubInitFailed
+
+                except DeviceInvalid:
                     pass
 
                 try:
@@ -181,7 +189,11 @@ async def _async_init_solaredge(self) -> None:
 
                     self.meters.append(new_meter_3)
                     _LOGGER.debug(f"Found meter 3 on inverter ID {inverter_unit_id}")
-                except Exception:
+
+                except ModbusReadError:
+                    raise HubInitFailed
+
+                except DeviceInvalid:
                     pass
 
             if self._detect_batteries:
@@ -203,6 +215,10 @@ async def _async_init_solaredge(self) -> None:
 
                     self.batteries.append(new_battery_1)
                     _LOGGER.debug(f"Found battery 1 inverter {inverter_unit_id}")
+
+                except ModbusReadError:
+                    raise HubInitFailed
+
                 except DeviceInvalid:
                     pass
 
@@ -224,6 +240,10 @@ async def _async_init_solaredge(self) -> None:
 
                     self.batteries.append(new_battery_2)
                     _LOGGER.debug(f"Found battery 2 inverter {inverter_unit_id}")
+
+                except ModbusReadError:
+                    raise HubInitFailed
+
                 except DeviceInvalid:
                     pass
 
@@ -556,7 +576,12 @@ def init_device(self) -> None:
                     f"meter {self.meter_id}: {meter_info}"
                 ),
             )
-            raise ModbusReadError(meter_info)
+
+            if meter_info.exception_code == ModbusExceptions.IllegalAddress:
+                raise DeviceInvalid(meter_info)
+
+            else:
+                raise ModbusReadError(meter_info)
 
         decoder = BinaryPayloadDecoder.fromRegisters(
             meter_info.registers, byteorder=Endian.Big