MQTT entity upgrade

Author: kellerza

.github/workflows/ci.yml

@@ -25,8 +25,8 @@ on:
       - ".github/workflows/ci.yml"
 
 env:
-  RUFF_VERSION: 0.15.4
-  UV_VERSION: 0.10.2
+  RUFF_VERSION: 0.16.5
+  UV_VERSION: 0.12.1
 
 jobs:
   ruff:

pyproject.toml

@@ -1,6 +1,6 @@
 [build-system]
 build-backend = "uv_build"
-requires = [ "uv-build>=0.11,<0.12" ]
+requires = [ "uv-build>=0.12,<0.14" ]
 
 [project]
 name = "sunsynk"
@@ -31,7 +31,7 @@ classifiers = [
 dependencies = [
   "cattrs>=25,<27",
   "modbus-connection[pymodbus,tmodbus]>=4.7",
-  "mqtt-entity[options]>=1.1",
+  "mqtt-entity[options]>=1.2.5",
   "prettytable>=3.17,<4",
   "whenever>=0.10,<11",
 ]

scripts/copy2local.sh

@@ -18,7 +18,7 @@ print() {
 
 # rsync patterns equivalent to scripts/copyexclude.txt (xcopy substring match)
 rsync_excl() {
-    rsync -a \
+    rsync -a --inplace \
         --exclude '__pycache__' \
         --exclude '*.egg-info' \
         --exclude '.*' \
@@ -57,7 +57,7 @@ copy_builder() {
     print "Copy builder files for '$1'"
     mkdir -p "$DEST/$1"
     cp -f hass-addon-sunsynk-edge/Dockerfile "$DEST/$1/"
-    rsync -a hass-addon-sunsynk-edge/rootfs/ "$DEST/$1/rootfs/"
+    rsync -a --inplace hass-addon-sunsynk-edge/rootfs/ "$DEST/$1/rootfs/"
     echo 0.0.0 > "$DEST/$1/VERSION"
 }
 

src/ha_addon_sunsynk_multi/__main__.py

@@ -6,7 +6,6 @@
 from collections import defaultdict
 from pathlib import Path
 
-from ha_addon_sunsynk_multi.driver import HASS_DISCOVERY_INFO_UPDATE_QUEUE
 from sunsynk import VERSION
 from sunsynk.utils import pretty_table_sensors
 
@@ -55,8 +54,6 @@ async def main_loop() -> int:
     for ist in STATE:
         ist.init_sensors()
 
-    HASS_DISCOVERY_INFO_UPDATE_QUEUE.clear()
-
     asyncio.get_event_loop().set_debug(OPT.debug > 0)
 
     # MQTT broker LWT + connect "online": SS/availability_<sorted HA_PREFIX list joined by _>
@@ -69,10 +66,10 @@ async def main_loop() -> int:
         AsyncCallback(name="discovery_info", every=5, callback=callback_discovery_info)
     )
 
-    for ist in STATE:
+    for idx, ist in enumerate(STATE):
         try:
             await ist.connect()
-            await ist.hass_discover_sensors()
+            await ist.hass_discover_sensors(mqtt_connect=idx == 0)
             build_callback_schedule(ist)
             CALLBACKS.append(ist.cb)
 

src/ha_addon_sunsynk_multi/a_inverter.py

@@ -353,11 +353,12 @@ def hass_create_discovery_info(self) -> None:
             except Exception as err:
                 _LOG.error("Could not create MQTT entity for %s: %s", s, err)
 
-    async def hass_discover_sensors(self) -> bool:
+    async def hass_discover_sensors(self, *, mqtt_connect: bool = False) -> bool:
         """Discover all sensors."""
         self.hass_create_discovery_info()
-        await MQTT.connect(OPT)
-        MQTT.monitor_homeassistant_status()
+        if mqtt_connect:
+            await MQTT.connect(OPT)
+            await MQTT.monitor_homeassistant_status()
         if self.entity_near_realtime is not None:
             await self.entity_near_realtime.send_state(MQTT, "OFF", retain=True)
         return True

src/ha_addon_sunsynk_multi/driver.py

@@ -10,27 +10,14 @@
 from sunsynk.sunsynk import HoldingUnit
 
 from .a_inverter import STATE, AInverter
-from .a_sensor import MQTT
 from .options import InverterOptions, Options, is_solarman_port
 from .sensor_options import SOPT
 
 _LOG = logging.getLogger(":")
 
 
-HASS_DISCOVERY_INFO_UPDATE_QUEUE: set[Sensor] = set()
-"""Update Sensor discovery info."""
-
-
 async def callback_discovery_info(now: int) -> None:
-    """Update HASS discovery & write RWSensors."""
-    # Flush any pending discovery info updates
-    if HASS_DISCOVERY_INFO_UPDATE_QUEUE:
-        for ist in STATE:
-            ist.hass_create_discovery_info()
-        await MQTT.publish_discovery_info()
-        HASS_DISCOVERY_INFO_UPDATE_QUEUE.clear()
-
-    # Publish statistics
+    """Publish inverter callback statistics."""
     if now % 120 == 0:
         for ist in STATE:
             await ist.publish_stats(120)
@@ -41,11 +28,15 @@ def sensor_on_update(sen: Sensor, _new: ValType, _old: ValType) -> None:
     if sen not in SOPT or not SOPT[sen].affects:
         return
     _LOG.debug(
-        "%s changed: Enqueue discovery info updates for %s",
+        "%s changed: Rebuild discovery for %s",
         sen.name,
         ", ".join(s.id for s in SOPT[sen].affects),
     )
-    HASS_DISCOVERY_INFO_UPDATE_QUEUE.update(SOPT[sen].affects)
+    for ist in STATE:
+        if ist.mqtt_dev.id == "":
+            continue
+        ist.hass_create_discovery_info()
+        ist.mqtt_dev.flag_discovery()
 
 
 def _shared_modbus_connection(opt: Options, *, port: str) -> ModbusConnection: