More cleanup, next step debouncing logic to suppress spurious removals

Author: bookman-dius

custom_components/powersensor/PowersensorEntity.py

@@ -28,7 +28,7 @@ def __init__(self, hass: HomeAssistant, mac : str,
         self._hass = hass
         self._mac = mac
         self._model = f"PowersensorDevice"
-        self._device_name = f'Powersensor Device (MAC address: {self._mac})'
+        self._device_name = f'Powersensor Device (ID: {self._mac})'
         self._measurement_name= None
         self._remove_unavailability_tracker = None
         self._timeout = timedelta(seconds=timeout_seconds)  # Adjust as needed

custom_components/powersensor/PowersensorHouseholdEntity.py

@@ -22,6 +22,18 @@ class HouseholdMeasurements(Enum):
     ENERGY_TO_GRID = 7
     ENERGY_SOLAR_GENERATION = 8
 
+ConsumptionMeasurements = [
+    HouseholdMeasurements.POWER_HOME_USE,
+    HouseholdMeasurements.POWER_FROM_GRID,
+    HouseholdMeasurements.ENERGY_HOME_USE,
+    HouseholdMeasurements.ENERGY_FROM_GRID
+]
+ProductionMeasurements = [
+    HouseholdMeasurements.POWER_TO_GRID,
+    HouseholdMeasurements.POWER_SOLAR_GENERATION,
+    HouseholdMeasurements.ENERGY_TO_GRID,
+    HouseholdMeasurements.ENERGY_SOLAR_GENERATION
+]
 @dataclass
 class EntityConfig:
     name : str

custom_components/powersensor/PowersensorMessageDispatacher.py

@@ -208,8 +208,7 @@ async def _plug_remove(self,name, info):
             mac = self._known_plug_names[name]
             if mac in self.plugs:
                 await self.plugs[mac].disconnect()
-
-            del self.plugs[mac]
+                del self.plugs[mac]
         else:
             _LOGGER.warning(f"Received request to delete api for gateway with name [{name}], but this name"
                             f"is not associated with an existing PlugAPI. Ignoring...")

custom_components/powersensor/PowersensorPlugEntity.py

@@ -90,6 +90,5 @@ def device_info(self) -> DeviceInfo:
         }
 
     def _default_device_name(self) -> str:
-        # f'🔌 MAC address: ({self._mac})'
-        return f"Powersensor Plug (MAC Address: {self._mac})"
+        return f"Powersensor Plug (ID: {self._mac}) 🔌"
 

custom_components/powersensor/PowersensorSensorEntity.py

@@ -86,5 +86,5 @@ def _rename_based_on_role(self):
         return False
 
     def _default_device_name(self):
-        return f'Powersensor Sensor (MAC address: {self._mac})'
+        return f'Powersensor Sensor (ID: {self._mac})'
 

custom_components/powersensor/__init__.py

@@ -27,18 +27,18 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     manifest  = integration.manifest
 
     # Establish create the zeroconf discovery service
-    my_data["zeroconf"] = PowersensorDiscoveryService(hass, manifest["zeroconf"][0])
-    await my_data["zeroconf"].start()
+    zeroconf_listener = PowersensorDiscoveryService(hass, manifest["zeroconf"][0])
+    await zeroconf_listener.start()
 
     # Establish our virtual household
     vhh = VirtualHousehold(my_data["with_solar"] if "with_solar" in my_data else False)
-    entry.runtime_data = { "vhh": vhh }
+    
 
     # TODO: can we move the dispatcher into the entry.runtime_data dict?
-    my_data["dispatcher"] = PowersensorMessageDispatcher(hass, vhh)
+    dispatcher = PowersensorMessageDispatcher(hass, vhh)
     for mac, network_info in entry.data.items():
-        await my_data["dispatcher"].enqueue_plug_for_adding(network_info)
-
+        await dispatcher.enqueue_plug_for_adding(network_info)
+    entry.runtime_data = {"vhh": vhh, "zeroconf": zeroconf_listener, "dispatcher": dispatcher}
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
     return True
 
@@ -47,13 +47,11 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload a config entry."""
     _LOGGER.debug("Started unloading for %s", entry.entry_id)
     if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
-        if DOMAIN in hass.data.keys():
-            if entry.entry_id in hass.data[DOMAIN].keys():
-                my_data = hass.data[DOMAIN][entry.entry_id]
-                if "dispatcher" in my_data.keys():
-                    await my_data["dispatcher"].disconnect()
-                if "zeroconf" in my_data.keys():
-                    await my_data["zeroconf"].stop()
+        if entry.runtime_data:
+            if "dispatcher" in entry.runtime_data.keys():
+                    await entry.runtime_data["dispatcher"].disconnect()
+            if "zeroconf" in entry.runtime_data.keys():
+                await entry.runtime_data["zeroconf"].stop()
 
     return unload_ok
 

custom_components/powersensor/sensor.py

@@ -10,7 +10,7 @@
 
 from . import PowersensorMessageDispatcher
 from .PlugMeasurements import PlugMeasurements
-from .PowersensorHouseholdEntity import HouseholdMeasurements, PowersensorHouseholdEntity
+from .PowersensorHouseholdEntity import ConsumptionMeasurements, ProductionMeasurements, PowersensorHouseholdEntity
 from .PowersensorPlugEntity import PowersensorPlugEntity
 from .PowersensorSensorEntity import PowersensorSensorEntity
 from .SensorMeasurements import SensorMeasurements
@@ -26,7 +26,7 @@ async def async_setup_entry(
     """Set up the Powersensor sensors."""
     vhh = entry.runtime_data["vhh"]
     my_data = hass.data[DOMAIN][entry.entry_id]
-    dispatcher: PowersensorMessageDispatcher = my_data['dispatcher']
+    dispatcher: PowersensorMessageDispatcher =  entry.runtime_data['dispatcher']
 
 
     async def create_plug(plug_mac_address: str):
@@ -73,13 +73,19 @@ async def handle_discovered_sensor(sensor_mac: str, sensor_role: str):
 
     # Possibly unnecessary but will add sensors where the messages came in early.
     # Hopefully keeps wait time less than 30s
-    for mac, role in my_data['dispatcher'].on_start_sensor_queue.items():
+    for mac, role in dispatcher.on_start_sensor_queue.items():
         await handle_discovered_sensor(mac, role)
 
     # Register the virtual household entities
     household_entities = []
-    for measurement_type in HouseholdMeasurements:
+    for measurement_type in ConsumptionMeasurements:
         household_entities.append(PowersensorHouseholdEntity(vhh, measurement_type))
+
+    if "with_solar" in my_data.keys():
+        if my_data["with_solar"]:
+            for measurement_type in ProductionMeasurements:
+                household_entities.append(PowersensorHouseholdEntity(vhh, measurement_type))
+
     async_add_entities(household_entities)
 
     async_dispatcher_send(hass, f"{DOMAIN}_setup_complete", True)