Group optimizer sensors under site device

custom_components/solaredge_optimizers/__init__.py

@@ -7,16 +7,57 @@ from datetime import timedelta
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_URL, Platform
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
 from .api import SolarEdgeOptimizerApiClient
-from .const import CONF_SCAN_INTERVAL, DEFAULT_SCAN_INTERVAL
+from .const import (
+    CONF_SCAN_INTERVAL,
+    CONFIG_ENTRY_VERSION,
+    DEFAULT_SCAN_INTERVAL,
+    DOMAIN,
+    LOGGER,
+)
 from .coordinator import SolarEdgeOptimizerCoordinator
 
 PLATFORMS = [Platform.SENSOR]
 type SolarEdgeOptimizerConfigEntry = ConfigEntry[SolarEdgeOptimizerCoordinator]
 
 
+async def async_migrate_entry(
+    hass: HomeAssistant, entry: SolarEdgeOptimizerConfigEntry
+) -> bool:
+    """Migrate optimizer devices to one site device."""
+    if entry.version > CONFIG_ENTRY_VERSION:
+        LOGGER.error(
+            "Cannot migrate config entry from version %s to %s",
+            entry.version,
+            CONFIG_ENTRY_VERSION,
+        )
+        return False
+
+    if entry.version < 2:
+        site_id = entry.unique_id
+        if site_id:
+            device_registry = dr.async_get(hass)
+            legacy_prefix = f"{site_id}_"
+            for device in dr.async_entries_for_config_entry(
+                device_registry, entry.entry_id
+            ):
+                if any(
+                    domain == DOMAIN and identifier.startswith(legacy_prefix)
+                    for domain, identifier in device.identifiers
+                ):
+                    device_registry.async_remove_device(device.id)
+
+        hass.config_entries.async_update_entry(
+            entry,
+            version=CONFIG_ENTRY_VERSION,
+        )
+
+    return True
+
+
 async def async_setup_entry(
     hass: HomeAssistant, entry: SolarEdgeOptimizerConfigEntry
 ) -> bool:

custom_components/solaredge_optimizers/config_flow.py

@@ -20,6 +20,7 @@ from .api import (
 )
 from .const import (
     CONF_SCAN_INTERVAL,
+    CONFIG_ENTRY_VERSION,
     DEFAULT_PORT,
     DEFAULT_SCAN_INTERVAL,
     DOMAIN,
@@ -61,7 +62,7 @@ def _schema(defaults: dict[str, Any]) -> vol.Schema:
 class SolarEdgeOptimizersConfigFlow(ConfigFlow, domain=DOMAIN):
     """Handle a config flow for SolarEdge Optimizers."""
 
-    VERSION = 1
+    VERSION = CONFIG_ENTRY_VERSION
 
     def __init__(self) -> None:
         """Initialize the flow."""

custom_components/solaredge_optimizers/const.py

@@ -5,6 +5,7 @@ from datetime import timedelta
 
 DOMAIN = "solaredge_optimizers"
 LOGGER = logging.getLogger(__package__)
+CONFIG_ENTRY_VERSION = 2
 
 CONF_SCAN_INTERVAL = "scan_interval"
 DEFAULT_SCAN_INTERVAL = timedelta(minutes=10)

custom_components/solaredge_optimizers/manifest.json

@@ -8,5 +8,5 @@
   "iot_class": "local_polling",
   "issue_tracker": "https://git.jensneuber.de/jens/ha-solaredge-optimizers/issues",
   "requirements": [],
-  "version": "0.1.0"
+  "version": "0.2.0"
 }

custom_components/solaredge_optimizers/sensor.py

@@ -102,6 +102,10 @@ class SolarEdgeOptimizerSensor(
         self.entity_description = description
         self._serial = serial
         self._attr_unique_id = f"{coordinator.data.site_id}_{serial}_{description.key}"
+        optimizer = coordinator.data.optimizers_by_serial[serial]
+        self._attr_translation_placeholders = {
+            "optimizer_id": optimizer.optimizer_id or serial
+        }
 
     @property
     def _optimizer(self) -> OptimizerData | None:
@@ -121,15 +125,13 @@ class SolarEdgeOptimizerSensor(
 
     @property
     def device_info(self) -> DeviceInfo:
-        """Return optimizer device information."""
-        optimizer = self._optimizer
-        optimizer_id = optimizer.optimizer_id if optimizer else None
+        """Return the shared SolarEdge site device information."""
+        site_id = self.coordinator.data.site_id
         return DeviceInfo(
-            identifiers={(DOMAIN, f"{self.coordinator.data.site_id}_{self._serial}")},
+            identifiers={(DOMAIN, site_id)},
             manufacturer="SolarEdge",
-            model="Power Optimizer",
-            name=f"Optimizer {optimizer_id or self._serial}",
-            serial_number=self._serial,
+            model="Optimizer Monitoring Site",
+            name=f"SolarEdge Site {site_id}",
         )
 
     @property

custom_components/solaredge_optimizers/strings.json

@@ -46,12 +46,11 @@
   "entity": {
     "sensor": {
       "daily_energy": {
-        "name": "Daily energy"
+        "name": "{optimizer_id} daily energy"
       },
       "current_power": {
-        "name": "Current power"
+        "name": "{optimizer_id} current power"
       }
     }
   }
 }
-

custom_components/solaredge_optimizers/translations/de.json

@@ -46,12 +46,11 @@
   "entity": {
     "sensor": {
       "daily_energy": {
-        "name": "Tagesenergie"
+        "name": "{optimizer_id} Tagesenergie"
       },
       "current_power": {
-        "name": "Aktuelle Leistung"
+        "name": "{optimizer_id} aktuelle Leistung"
       }
     }
   }
 }
-

custom_components/solaredge_optimizers/translations/en.json

@@ -46,12 +46,11 @@
   "entity": {
     "sensor": {
       "daily_energy": {
-        "name": "Daily energy"
+        "name": "{optimizer_id} daily energy"
       },
       "current_power": {
-        "name": "Current power"
+        "name": "{optimizer_id} current power"
       }
     }
   }
 }
-