Added support for config retry logic

dcmeglio · Jan 7, 2023 · fe3fff6 · fe3fff6
1 parent f835a8f
commit fe3fff6
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 7 deletions.
diff --git a/custom_components/petsafe/button.py b/custom_components/petsafe/button.py
@@ -1,5 +1,6 @@
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ConfigEntryNotReady
 
 from . import ButtonEntities, PetSafeCoordinator
 from .const import DOMAIN
@@ -8,8 +9,13 @@
 async def async_setup_entry(hass: HomeAssistant, config: ConfigEntry, add_entities):
     coordinator: PetSafeCoordinator = hass.data[DOMAIN][config.entry_id]
 
-    feeders = await coordinator.get_feeders()
-    litterboxes = await coordinator.get_litterboxes()
+    feeders = None
+    litterboxes = None
+    try:
+        feeders = await coordinator.get_feeders()
+        litterboxes = await coordinator.get_litterboxes()
+    except Exception as ex:
+        raise ConfigEntryNotReady("Failed to retrieve PetSafe devices") from ex
 
     entities = []
     for feeder in feeders:

diff --git a/custom_components/petsafe/manifest.json b/custom_components/petsafe/manifest.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.2.1",
+  "version": "1.2.2",
   "domain": "petsafe",
   "name": "PetSafe",
   "config_flow": true,

diff --git a/custom_components/petsafe/select.py b/custom_components/petsafe/select.py
@@ -1,5 +1,6 @@
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers.entity import EntityCategory
 
 from . import PetSafeCoordinator, SelectEntities
@@ -8,7 +9,14 @@
 
 async def async_setup_entry(hass: HomeAssistant, config: ConfigEntry, add_entities):
     coordinator: PetSafeCoordinator = hass.data[DOMAIN][config.entry_id]
-    litterboxes = await coordinator.get_litterboxes()
+
+    litterboxes = None
+    try:
+        litterboxes = await coordinator.get_litterboxes()
+    except Exception as ex:
+        raise ConfigEntryNotReady(
+            "Failed to retrieve PetSafe scoopfree devices"
+        ) from ex
 
     entities = []
     for litterbox in litterboxes:

diff --git a/custom_components/petsafe/sensor.py b/custom_components/petsafe/sensor.py
@@ -2,6 +2,7 @@
 from homeassistant.config_entries import ConfigEntry
 
 from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers.entity import EntityCategory
 
 from . import PetSafeCoordinator, SensorEntities
@@ -12,8 +13,13 @@
 
 async def async_setup_entry(hass: HomeAssistant, config: ConfigEntry, add_entities):
     coordinator: PetSafeCoordinator = hass.data[DOMAIN][config.entry_id]
-    feeders = await coordinator.get_feeders()
-    litterboxes = await coordinator.get_litterboxes()
+    feeders = None
+    litterboxes = None
+    try:
+        feeders = await coordinator.get_feeders()
+        litterboxes = await coordinator.get_litterboxes()
+    except Exception as ex:
+        raise ConfigEntryNotReady("Failed to retrieve PetSafe devices") from ex
 
     entities = []
     for feeder in feeders:

diff --git a/custom_components/petsafe/switch.py b/custom_components/petsafe/switch.py
@@ -1,5 +1,6 @@
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers.entity import EntityCategory
 
 from . import PetSafeCoordinator, SwitchEntities
@@ -8,7 +9,14 @@
 
 async def async_setup_entry(hass: HomeAssistant, config: ConfigEntry, add_entities):
     coordinator: PetSafeCoordinator = hass.data[DOMAIN][config.entry_id]
-    feeders = await coordinator.get_feeders()
+
+    feeders = None
+    try:
+        feeders = await coordinator.get_feeders()
+    except Exception as ex:
+        raise ConfigEntryNotReady(
+            "Failed to retrieve PetSafe SmartFeed devices"
+        ) from ex
 
     entities = []
     for feeder in feeders: