fix file load blocking call

mk-maddin · Jun 18, 2024 · d7ad72a · d7ad72a
1 parent 4da3277
commit d7ad72a
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 12 deletions.
diff --git a/custom_components/wattpilot/button.py b/custom_components/wattpilot/button.py
@@ -4,6 +4,7 @@
 from typing import Final
 import logging
 import asyncio
+import aiofiles
 import yaml
 import os
 
@@ -42,8 +43,8 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry, async_add_e
     entites=[]
     try:
         _LOGGER.debug("%s - async_setup_entry %s: Reading static yaml configuration", entry.entry_id, platform)
-        with open(os.path.dirname(os.path.realpath(__file__))+'/'+platform+'.yaml', 'r') as stream:
-            yaml_cfg=yaml.safe_load(stream)
+        async with aiofiles.open(os.path.dirname(os.path.realpath(__file__))+'/'+platform+'.yaml', 'r') as y: 
+            yaml_cfg=yaml.safe_load(await y.read())
     except Exception as e:
         _LOGGER.error("%s - async_setup_entry %s: Reading static yaml configuration failed: %s (%s.%s)", entry.entry_id, platform, str(e), e.__class__.__module__, type(e).__name__)
         return False

diff --git a/custom_components/wattpilot/manifest.json b/custom_components/wattpilot/manifest.json
@@ -1,10 +1,10 @@
 {
   "domain": "wattpilot",
   "name": "Fronius Wattpilot",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "config_flow": true,
   "documentation": "https://github.com/mk-maddin/wattpilot-HA",
-  "requirements": ["wattpilot>=0.1","pyyaml>=5.3.0", "importlib_metadata>=4.0.0"],
+  "requirements": ["wattpilot>=0.1", "pyyaml>=5.3.0", "importlib_metadata>=4.0.0", "aiofiles>=23.2.1"],
   "dependencies": ["sensor","switch","select","number","button","diagnostics"],
   "codeowners": ["@mk-maddin"],
   "iot_class": "local_polling"

diff --git a/custom_components/wattpilot/number.py b/custom_components/wattpilot/number.py
@@ -4,6 +4,7 @@
 from typing import Final
 import logging
 import asyncio
+import aiofiles
 import yaml
 import os
 
@@ -42,8 +43,8 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry, async_add_e
     entites=[]
     try:
         _LOGGER.debug("%s - async_setup_entry %s: Reading static yaml configuration", entry.entry_id, platform)
-        with open(os.path.dirname(os.path.realpath(__file__))+'/'+platform+'.yaml', 'r') as stream:
-            yaml_cfg=yaml.safe_load(stream)
+        async with aiofiles.open(os.path.dirname(os.path.realpath(__file__))+'/'+platform+'.yaml', 'r') as y: 
+            yaml_cfg=yaml.safe_load(await y.read())
     except Exception as e:
         _LOGGER.error("%s - async_setup_entry %s: Reading static yaml configuration failed: %s (%s.%s)", entry.entry_id, platform, str(e), e.__class__.__module__, type(e).__name__)
         return False

diff --git a/custom_components/wattpilot/select.py b/custom_components/wattpilot/select.py
@@ -4,6 +4,7 @@
 from typing import Final
 import logging
 import asyncio
+import aiofiles
 import yaml
 import os
 
@@ -42,8 +43,8 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry, async_add_e
     entites=[]
     try:
         _LOGGER.debug("%s - async_setup_entry %s: Reading static yaml configuration", entry.entry_id, platform)
-        with open(os.path.dirname(os.path.realpath(__file__))+'/'+platform+'.yaml', 'r') as stream:
-            yaml_cfg=yaml.safe_load(stream)
+        async with aiofiles.open(os.path.dirname(os.path.realpath(__file__))+'/'+platform+'.yaml', 'r') as y: 
+            yaml_cfg=yaml.safe_load(await y.read())
     except Exception as e:
         _LOGGER.error("%s - async_setup_entry %s: Reading static yaml configuration failed: %s (%s.%s)", entry.entry_id, platform, str(e), e.__class__.__module__, type(e).__name__)
         return False

diff --git a/custom_components/wattpilot/sensor.py b/custom_components/wattpilot/sensor.py
@@ -4,6 +4,7 @@
 from typing import Final
 import logging
 import asyncio
+import aiofiles
 import yaml
 import os
 
@@ -41,8 +42,8 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry, async_add_e
     entites=[]
     try:
         _LOGGER.debug("%s - async_setup_entry %s: Reading static yaml configuration", entry.entry_id, platform)
-        with open(os.path.dirname(os.path.realpath(__file__))+'/'+platform+'.yaml', 'r') as stream:
-            yaml_cfg=yaml.safe_load(stream)
+        async with aiofiles.open(os.path.dirname(os.path.realpath(__file__))+'/'+platform+'.yaml', 'r') as y: 
+            yaml_cfg=yaml.safe_load(await y.read())
     except Exception as e:
         _LOGGER.error("%s - async_setup_entry %s: Reading static yaml configuration failed: %s (%s.%s)", entry.entry_id, platform, str(e), e.__class__.__module__, type(e).__name__)
         return False

diff --git a/custom_components/wattpilot/switch.py b/custom_components/wattpilot/switch.py
@@ -4,6 +4,7 @@
 from typing import Final
 import logging
 import asyncio
+import aiofiles
 import yaml
 import os
 
@@ -43,8 +44,8 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry, async_add_e
     entites=[]
     try:
         _LOGGER.debug("%s - async_setup_entry %s: Reading static yaml configuration", entry.entry_id, platform)
-        with open(os.path.dirname(os.path.realpath(__file__))+'/'+platform+'.yaml', 'r') as stream:
-            yaml_cfg=yaml.safe_load(stream)
+        async with aiofiles.open(os.path.dirname(os.path.realpath(__file__))+'/'+platform+'.yaml', 'r') as y: 
+            yaml_cfg=yaml.safe_load(await y.read())
     except Exception as e:
         _LOGGER.error("%s - async_setup_entry %s: Reading static yaml configuration failed: %s (%s.%s)", entry.entry_id, platform, str(e), e.__class__.__module__, type(e).__name__)
         return False