Check for config entities (#1841)

Author: andrew-codechimp

custom_components/battery_notes/config_flow.py

@@ -150,7 +150,7 @@ async def async_step_device(
         user_input: dict | None = None,
     ) -> config_entries.FlowResult:
         """Handle a flow for a device or discovery."""
-        _errors = {}
+        errors: dict[str, str] = {}
         if user_input is not None:
             self.data = user_input
 
@@ -205,7 +205,7 @@ async def async_step_device(
         return self.async_show_form(
             step_id="device",
             data_schema=schema,
-            errors=_errors,
+            errors=errors,
             last_step=False,
         )
 
@@ -214,7 +214,7 @@ async def async_step_entity(
         user_input: dict | None = None,
     ) -> config_entries.FlowResult:
         """Handle a flow for a device or discovery."""
-        _errors = {}
+        errors: dict[str, str] = {}
         if user_input is not None:
             self.data = user_input
 
@@ -226,52 +226,57 @@ async def async_step_entity(
             # Default battery quantity if not found in library lookup
             self.data[CONF_BATTERY_QUANTITY] = 1
 
-            if entity_entry.device_id:
+            if entity_entry:
 
-                self.data[CONF_DEVICE_ID] = entity_entry.device_id
+                if entity_entry.device_id:
 
-                if (
-                    DOMAIN in self.hass.data
-                    and DATA_LIBRARY_UPDATER in self.hass.data[DOMAIN]
-                ):
-                    library_updater: LibraryUpdater = self.hass.data[DOMAIN][
-                        DATA_LIBRARY_UPDATER
-                    ]
-                    await library_updater.get_library_updates(dt_util.utcnow())
+                    self.data[CONF_DEVICE_ID] = entity_entry.device_id
 
-                device_registry = dr.async_get(self.hass)
-                device_entry = device_registry.async_get(entity_entry.device_id)
+                    if (
+                        DOMAIN in self.hass.data
+                        and DATA_LIBRARY_UPDATER in self.hass.data[DOMAIN]
+                    ):
+                        library_updater: LibraryUpdater = self.hass.data[DOMAIN][
+                            DATA_LIBRARY_UPDATER
+                        ]
+                        await library_updater.get_library_updates(dt_util.utcnow())
 
-                _LOGGER.debug(
-                    "Looking up device %s %s %s", device_entry.manufacturer, device_entry.model, device_entry.hw_version
-                )
+                    device_registry = dr.async_get(self.hass)
+                    device_entry = device_registry.async_get(entity_entry.device_id)
 
-                model_info = ModelInfo(device_entry.manufacturer, device_entry.model, device_entry.hw_version)
+                    _LOGGER.debug(
+                        "Looking up device %s %s %s", device_entry.manufacturer, device_entry.model, device_entry.hw_version
+                    )
 
-                library = await Library.factory(self.hass)
+                    model_info = ModelInfo(device_entry.manufacturer, device_entry.model, device_entry.hw_version)
 
-                device_battery_details = await library.get_device_battery_details(
-                    model_info
-                )
+                    library = await Library.factory(self.hass)
 
-                if device_battery_details and not device_battery_details.is_manual:
-                    _LOGGER.debug(
-                        "Found device %s %s %s", device_entry.manufacturer, device_entry.model, device_entry.hw_version
+                    device_battery_details = await library.get_device_battery_details(
+                        model_info
                     )
-                    self.data[CONF_BATTERY_TYPE] = device_battery_details.battery_type
 
-                    self.data[
-                        CONF_BATTERY_QUANTITY
-                    ] = device_battery_details.battery_quantity
+                    if device_battery_details and not device_battery_details.is_manual:
+                        _LOGGER.debug(
+                            "Found device %s %s %s", device_entry.manufacturer, device_entry.model, device_entry.hw_version
+                        )
+                        self.data[CONF_BATTERY_TYPE] = device_battery_details.battery_type
 
-            return await self.async_step_battery()
+                        self.data[
+                            CONF_BATTERY_QUANTITY
+                        ] = device_battery_details.battery_quantity
+
+                return await self.async_step_battery()
+            else:
+                # No entity_registry entry, must be a config.yaml entity which we can't support
+                errors["base"] = "unconfigurable_entity"
 
         schema = ENTITY_SCHEMA_ALL
 
         return self.async_show_form(
             step_id="entity",
             data_schema=schema,
-            errors=_errors,
+            errors=errors,
             last_step=False,
         )
 

custom_components/battery_notes/translations/en.json

@@ -47,7 +47,8 @@
             "already_configured": "Device is already configured"
         },
         "error": {
-            "unknown": "Unknown error occurred."
+            "unknown": "Unknown error occurred.",
+            "unconfigurable_entity": "It is not possible to add this entity to Battery Notes."
         }
     },
     "options": {