fixed for HA2025.6

Author: WalterDSU

custom_components/peacefair_energy/__init__.py

@@ -69,8 +69,7 @@ async def async_setup_entry(hass: HomeAssistant, config_entry):
     coordinator = PeacefairCoordinator(hass, protocol, host, port, slave, scan_interval)
     hass.data[config_entry.entry_id][COORDINATOR] = coordinator
     await coordinator.async_config_entry_first_refresh()
-    hass.async_create_task(hass.config_entries.async_forward_entry_setup(
-        config_entry, "sensor"))
+    await hass.config_entries.async_forward_entry_setups(config_entry, ["sensor"])
     hass.data[config_entry.entry_id][UN_SUBDISCRIPT] = config_entry.add_update_listener(update_listener)
 
     def service_handle(service):
@@ -100,7 +99,7 @@ def service_handle(service):
 
 async def async_unload_entry(hass: HomeAssistant, config_entry):
 
-    await hass.config_entries.async_forward_entry_unload(config_entry, "sensor")
+    await hass.config_entries.async_forward_entry_unloads(config_entry, ["sensor"])
 
     host = config_entry.data[CONF_HOST]
     host = host.replace(".", "_")
@@ -152,7 +151,7 @@ def set_update(self, update):
 
     async def _async_update_data(self):
         data = self.data if self.data is not None else {}
-        data_update = self._hub.info_gather()
+        data_update = await self._hub.info_gather()
         if len(data_update) > 0:
             data = data_update
             _LOGGER.debug(f"Got Data {data}")

custom_components/peacefair_energy/modbus.py

@@ -1,11 +1,13 @@
 import logging
+import asyncio
 from pymodbus.client import ModbusTcpClient, ModbusUdpClient
 from pymodbus.transaction import ModbusRtuFramer, ModbusIOException
 from pymodbus.pdu import ModbusRequest
 import threading
+
 try:
     from homeassistant.const import (
-        DEVICE_CLASS_VOLTAGE ,
+        DEVICE_CLASS_VOLTAGE,
         DEVICE_CLASS_CURRENT,
         DEVICE_CLASS_POWER,
         DEVICE_CLASS_ENERGY,
@@ -18,15 +20,15 @@
     DEVICE_CLASS_ENERGY = "energy"
     DEVICE_CLASS_POWER_FACTOR = "power_factor"
 
-from .const import(
+from .const import (
     DEVICE_CLASS_FREQUENCY
 )
 
 HPG_SENSOR_TYPES = [
-    DEVICE_CLASS_VOLTAGE ,
+    DEVICE_CLASS_VOLTAGE,
     DEVICE_CLASS_CURRENT,
     DEVICE_CLASS_POWER,
-    DEVICE_CLASS_ENERGY ,
+    DEVICE_CLASS_ENERGY,
     DEVICE_CLASS_POWER_FACTOR,
     DEVICE_CLASS_FREQUENCY
 ]
@@ -52,25 +54,25 @@ class ModbusHub:
     def __init__(self, protocol, host, port, slave):
         self._lock = threading.Lock()
         self._slave = slave
-        if(protocol == "rtuovertcp"):
+        if protocol == "rtuovertcp":
             self._client = ModbusTcpClient(
-                host = host,
-                port = port,
-                framer = ModbusRtuFramer,
-                timeout = 2,
-                retry_on_empty = True,
-                retry_on_invalid = False
+                host=host,
+                port=port,
+                framer=ModbusRtuFramer,
+                timeout=2,
+                retry_on_empty=True,
+                retry_on_invalid=False
             )
-        elif (protocol == "rtuoverudp"):
+        elif protocol == "rtuoverudp":
             self._client = ModbusUdpClient(
-                host = host,
-                port = port,
-                framer = ModbusRtuFramer,
-                timeout = 2,
-                retry_on_empty = False,
-                retry_on_invalid = False
+                host=host,
+                port=port,
+                framer=ModbusRtuFramer,
+                timeout=2,
+                retry_on_empty=False,
+                retry_on_invalid=False
             )
-            
+
     def connect(self):
         with self._lock:
             self._client.connect()
@@ -79,24 +81,33 @@ def close(self):
         with self._lock:
             self._client.close()
 
-    def read_holding_register(self):
-        pass
-
-    def read_input_registers(self, address, count):
+    # 新增同步版本，供线程池调用
+    def read_input_registers_sync(self, address, count):
         with self._lock:
             kwargs = {"slave": self._slave}
             return self._client.read_input_registers(address, count, **kwargs)
 
+    # 异步版本，交给线程池执行，避免阻塞事件循环
+    async def read_input_registers(self, address, count):
+        loop = asyncio.get_running_loop()
+        return await loop.run_in_executor(
+            None,
+            self.read_input_registers_sync,
+            address,
+            count
+        )
+
     def reset_energy(self):
         with self._lock:
             kwargs = {"slave": self._slave}
             request = ModbusResetEnergyRequest(**kwargs)
             self._client.execute(request)
 
-    def info_gather(self):
+    # 异步版本info_gather
+    async def info_gather(self):
         data = {}
         try:
-            result = self.read_input_registers(0, 9)
+            result = await self.read_input_registers(0, 9)
             if result is not None and type(result) is not ModbusIOException \
                     and result.registers is not None and len(result.registers) == 9:
                 data[DEVICE_CLASS_VOLTAGE] = result.registers[0] / 10
@@ -106,7 +117,9 @@ def info_gather(self):
                 data[DEVICE_CLASS_FREQUENCY] = result.registers[7] / 10
                 data[DEVICE_CLASS_POWER_FACTOR] = result.registers[8] / 100
             else:
-                _LOGGER.debug(f"Error in gathering, timed out")
+                _LOGGER.debug("Error in gathering, timed out")
         except Exception as e:
             _LOGGER.error(f"Error in gathering, {e}")
         return data
+
+    # 如果有别的同步读写函数，也建议用类似方式异步包装