Now reconfigure flow fires an event!

Author: bookman-dius

custom_components/powersensor/PowersensorHouseholdEntity.py

@@ -93,7 +93,7 @@ def device_info(self) -> DeviceInfo:
             'identifiers': {(DOMAIN, "vhh")},
             'manufacturer': "Powersensor",
             'model': "Virtual",
-            'name': "Powersensor Household View",
+            'name': "Powersensor Household View 🏠",
         }
 
     async def async_added_to_hass(self):

custom_components/powersensor/PowersensorSensorEntity.py

@@ -78,19 +78,19 @@ def _ensure_matching_prefix(self):
     def _rename_based_on_role(self):
         if self._device_name == self._default_device_name():
             if self.role =='house-net':
-                self._device_name = "Powersensor Mains Sensor"
+                self._device_name = "Powersensor Mains Sensor ⚡"
                 self._ensure_matching_prefix()
                 return True
             elif self.role == 'water':
-                self._device_name = "Powersensor Water Sensor"
+                self._device_name = "Powersensor Water Sensor ⚡"
                 self._ensure_matching_prefix()
                 return True
             elif self.role == 'solar':
-                self._device_name = "Powersensor Solar Sensor"
+                self._device_name = "Powersensor Solar Sensor ⚡"
                 self._ensure_matching_prefix()
                 return True
         return False
 
     def _default_device_name(self):
-        return f'Powersensor Sensor (ID: {self._mac})'
+        return f'Powersensor Sensor (ID: {self._mac}) ⚡'
 

custom_components/powersensor/config_flow.py

@@ -5,8 +5,10 @@
 from homeassistant import config_entries
 from homeassistant.config_entries import ConfigFlowResult
 from homeassistant.data_entry_flow import FlowResult
+from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.service_info import zeroconf
 from homeassistant.const import CONF_HOST, CONF_PORT
+from homeassistant.helpers.selector import selector
 
 from .const import DEFAULT_PORT, DOMAIN
 
@@ -92,6 +94,12 @@ async def async_step_reconfigure(self, user_input: dict | None = None)->FlowResu
         entry = self.hass.config_entries.async_get_entry(self.context["entry_id"])
 
         if user_input is not None:
+            # @todo: better handling of mac association
+            for key, role in user_input.items():
+                mac= key[33:-2]
+                _LOGGER.debug(f"Sending {mac}, {role} to {DOMAIN}_update_role")
+                async_dispatcher_send(self.hass, f"{DOMAIN}_update_role",
+                                      mac, role)  # default role
             await self.hass.config_entries.async_reload(entry.entry_id)
             return self.async_abort(reason="Powersensor role updates successful!")
 
@@ -100,19 +108,26 @@ async def async_step_reconfigure(self, user_input: dict | None = None)->FlowResu
         for sensor_mac in dispatcher.sensors:
             role = entry.data.get('roles', {}).get(sensor_mac, None)
             if not role:
-                sensor_roles[vol.Optional(f"device_type_{sensor_mac}")] =  vol.In(
-                    ["house-net", "solar", "water", "appliance", "none"]  # Your supported types
+                sensor_roles[vol.Optional(f"Powersensor Sensor [Mac Address: {sensor_mac}]")] =  vol.In(
+                    ["house-net", "solar", "water", "appliance", "none"]
                 )
             else:
-                sensor_roles[vol.Optional(f"device_type_{sensor_mac}", description={"suggested_value": role})] = vol.In(
-                    ["house-net", "solar", "water", "appliance", "none"]  # Your supported types
-                )
+                sensor_roles[vol.Optional(f"Powersensor Sensor [Mac Address: {sensor_mac}]", description={"suggested_value": role})] = selector({
+                    "select" : {
+                    "options" : ["house-net", "solar", "water", "appliance", "none"] ,
+                        "mode" : "dropdown"
+                    }
+                })
+
+        # if not sensor_roles:
+        #     return self.async_abort(reason="no_sensors_found_without_roles")
 
         return self.async_show_form(
             step_id="reconfigure",
             data_schema=vol.Schema(sensor_roles),
             description_placeholders={
-                "device_count": str(len(sensor_roles))
+                "device_count": str(len(sensor_roles)),
+                "docs_url" : "https://dius.github.io/homeassistant-powersensor/data.html#virtual-household"
             }
         )
 

custom_components/powersensor/translations/en.json

@@ -12,6 +12,10 @@
       "discovery_confirm": {
         "description": "Do you want to add Powersensor to Home Assistant?",
         "title": "Powersensor plugs discovered"
+      },
+      "reconfigure" : {
+        "title" : "Update sensor roles",
+        "description": "Note: Roles provided by sensors will override user settings"
       }
     },
     "error": {
@@ -22,7 +26,8 @@
       "no_devices_found": "No devices found on the network",
       "single_instance_allowed": "Already configured. Only a single configuration possible.",
       "already_configured": "Device is already configured",
-      "cannot_connect": "Failed to connect"
+      "cannot_connect": "Failed to connect",
+      "no_sensors_found_without_roles": "All sensors have roles provided!"
     }
   }
 }