fix timeout issue and typehints

Author: raman325

custom_components/pyscript/__init__.py

@@ -81,12 +81,15 @@ async def reload_scripts_handler(call):
             _LOGGER.error(err)
             return
 
-        # If data in config doesn't match config entry, trigger a config import
-        # so that the config entry can get updated
-        if DOMAIN in conf and conf[DOMAIN] != config_entry.data:
-            await hass.config_entries.flow.async_init(
-                DOMAIN, context={"source": SOURCE_IMPORT}, data=conf[DOMAIN]
-            )
+        if DOMAIN in conf:
+            config = PYSCRIPT_SCHEMA(conf[DOMAIN])
+
+            # If data in config doesn't match config entry, trigger a config import
+            # so that the config entry can get updated
+            if config != config_entry.data:
+                await hass.config_entries.flow.async_init(
+                    DOMAIN, context={"source": SOURCE_IMPORT}, data=config
+                )
 
         State.set_pyscript_config(config_entry.data)
 

custom_components/pyscript/config_flow.py

@@ -19,7 +19,7 @@ class PyscriptConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
     VERSION = 1
     CONNECTION_CLASS = config_entries.CONN_CLASS_LOCAL_PUSH
 
-    async def async_step_user(self, user_input: Dict[str, Any] = None) -> None:
+    async def async_step_user(self, user_input: Dict[str, Any] = None) -> Dict[str, Any]:
         """Handle a flow initialized by the user."""
         if user_input is not None:
             if len(self.hass.config_entries.async_entries(DOMAIN)) > 0:
@@ -30,7 +30,7 @@ async def async_step_user(self, user_input: Dict[str, Any] = None) -> None:
 
         return self.async_show_form(step_id="user", data_schema=PYSCRIPT_SCHEMA)
 
-    async def async_step_import(self, import_config: Dict[str, Any] = None) -> None:
+    async def async_step_import(self, import_config: Dict[str, Any] = None) -> Dict[str, Any]:
         """Import a config entry from configuration.yaml."""
         # Check if import config entry matches any existing config entries
         # so we can update it if necessary