Merge branch 'dev'

Author: mdeweerd

.pre-commit-config.yaml

@@ -146,7 +146,8 @@ repos:
         args:
           - --reports=no
           - --py-version=3.10
-        # additional_dependencies:
+        additional_dependencies:
+          - aiofiles>=0.4.0
           # - pylint-blocking-calls
           # - homeassistant-stubs>=2023.1.7
         # exclude: ^$
@@ -165,6 +166,7 @@ repos:
           - --show-error-context
         additional_dependencies:
           - zigpy==0.61.0
+          - aiofiles>=0.4.0
           # - cryptography==3.3.2  # Compatible/Available on cygwin
           #- homeassistant-stubs>=2023.1.7
           #- pydantic

custom_components/zha_toolkit/__init__.py

@@ -657,12 +657,12 @@ async def async_setup(hass, config):
         return True
 
     LOGGER.debug("Setup services from async_setup")
-    register_services(hass)
+    await register_services(hass)
 
     return True
 
 
-def register_services(hass):  # noqa: C901
+async def register_services(hass):  # noqa: C901
     global LOADED_VERSION  # pylint: disable=global-statement
     hass_ref = hass
 
@@ -710,7 +710,7 @@ async def toolkit_service(service):
         LOGGER.debug("module is %s", module)
         importlib.reload(u)
 
-        if u.getVersion() != LOADED_VERSION:
+        if await u.getVersion() != LOADED_VERSION:
             LOGGER.debug(
                 "Reload services because VERSION changed from %s to %s",
                 LOADED_VERSION,
@@ -743,7 +743,7 @@ async def toolkit_service(service):
 
         # Preload event_data
         event_data = {
-            "zha_toolkit_version": u.getVersion(),
+            "zha_toolkit_version": await u.getVersion(),
             "zigpy_version": u.getZigpyVersion(),
             "zigpy_rf_version": u.get_radio_version(app),
             "ieee_org": ieee_str,
@@ -864,7 +864,7 @@ async def toolkit_service(service):
                 schema=value,
             )
 
-    LOADED_VERSION = u.getVersion()
+    LOADED_VERSION = await u.getVersion()
 
 
 async def command_handler_default(
@@ -898,7 +898,7 @@ async def command_handler_default(
         )
 
 
-async def reload_services_yaml(hass):
+def reload_services_yaml(hass):
     import os
 
     from homeassistant.const import CONF_DESCRIPTION, CONF_NAME
@@ -922,7 +922,7 @@ async def reload_services_yaml(hass):
 
 async def _register_services(hass):
     register_services(hass)
-    await reload_services_yaml(hass)
+    await hass.async_add_executor_job(reload_services_yaml, hass)
 
 
 #

custom_components/zha_toolkit/utils.py

@@ -59,7 +59,7 @@ def getZigpyVersion() -> str:
     return ZIGPY_VERSION
 
 
-def getVersion() -> str:
+async def getVersion() -> str:
     # pylint: disable=global-variable-undefined,used-before-assignment
     # pylint: disable=global-statement
     global VERSION_TIME