@@ -652,12 +652,12 @@ async def async_setup(hass, config):
652
652
return True
653
653
654
654
LOGGER .debug ("Setup services from async_setup" )
655
- await register_services ( hass )
655
+ await hass . async_add_executor_job ( register_services , hass )
656
656
657
657
return True
658
658
659
659
660
- async def register_services (hass ): # noqa: C901
660
+ def register_services (hass ): # noqa: C901
661
661
global LOADED_VERSION # pylint: disable=global-statement
662
662
hass_ref = hass
663
663
@@ -705,11 +705,12 @@ async def toolkit_service(service):
705
705
LOGGER .debug ("module is %s" , module )
706
706
importlib .reload (u )
707
707
708
- if await u .getVersion () != LOADED_VERSION :
708
+ currentVersion = hass .async_add_executor_job (u .getVersion )
709
+ if currentVersion != LOADED_VERSION :
709
710
LOGGER .debug (
710
711
"Reload services because VERSION changed from %s to %s" ,
711
712
LOADED_VERSION ,
712
- u . getVersion () ,
713
+ currentVersion ,
713
714
)
714
715
await _register_services (hass )
715
716
@@ -738,7 +739,7 @@ async def toolkit_service(service):
738
739
739
740
# Preload event_data
740
741
event_data = {
741
- "zha_toolkit_version" : await u . getVersion () ,
742
+ "zha_toolkit_version" : currentVersion ,
742
743
"zigpy_version" : u .getZigpyVersion (),
743
744
"zigpy_rf_version" : u .get_radio_version (app ),
744
745
"ieee_org" : ieee_str ,
@@ -859,7 +860,7 @@ async def toolkit_service(service):
859
860
schema = value ,
860
861
)
861
862
862
- LOADED_VERSION = await u .getVersion ()
863
+ LOADED_VERSION = u .getVersion ()
863
864
864
865
865
866
async def command_handler_default (
0 commit comments