reload via Configuration -> Integrations UI menu now starts triggers, reported by Fabio C.

Author: craigbarratt

custom_components/pyscript/__init__.py

@@ -226,10 +226,12 @@ def check_event(event, do_reload: bool) -> bool:
 async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
     """Initialize the pyscript config entry."""
     global_ctx_only = None
+    doing_reload = False
     if Function.hass:
         #
         # reload yaml if this isn't the first time (ie, on reload)
         #
+        doing_reload = True
         if await update_yaml_config(hass, config_entry):
             global_ctx_only = "*"
 
@@ -355,6 +357,9 @@ async def hass_stop(event: HAEvent) -> None:
 
     await watchdog_start(hass, pyscript_folder, reload_scripts_handler)
 
+    if doing_reload:
+        start_global_contexts(global_ctx_only="*")
+
     return True
 
 

docs/new_features.rst

@@ -62,7 +62,7 @@ Breaking changes since 1.2.1 include:
 Bug fixes since 1.2.1 include:
 
 - Fixed ``@state_trigger`` with only a ``.old`` variable, which previously never triggered; reported by stigvi.
-- Reload with global_ctx="*" now starts triggers, reported by Fabio C.
+- Reload with global_ctx="*" and reload via Configuration -> Integrations UI menu now start triggers, reported by Fabio C.
 - Fixed subscripts when running python 3.9.x.
 - Timeouts that implement time triggers might infrequenctly occur a tiny time before the target time. A fix was added
   to do an additional short timeout when there is an early timeout, to make sure any time trigger occurs at or shortly

tests/test_decorator_errors.py

@@ -4,6 +4,7 @@
 from datetime import datetime as dt
 
 from custom_components.pyscript.const import DOMAIN
+from custom_components.pyscript.function import Function
 import custom_components.pyscript.trigger as trigger
 from pytest_homeassistant_custom_component.async_mock import mock_open, patch
 
@@ -17,6 +18,8 @@ async def setup_script(hass, notify_q, now, source):
         "/hello.py",
     ]
 
+    Function.hass = None
+
     with patch("custom_components.pyscript.os.path.isdir", return_value=True), patch(
         "custom_components.pyscript.glob.iglob", return_value=scripts
     ), patch("custom_components.pyscript.global_ctx.open", mock_open(read_data=source)), patch(

tests/test_decorators.py

@@ -4,6 +4,7 @@
 from datetime import datetime as dt
 
 from custom_components.pyscript.const import DOMAIN
+from custom_components.pyscript.function import Function
 import custom_components.pyscript.trigger as trigger
 from pytest_homeassistant_custom_component.async_mock import mock_open, patch
 
@@ -17,6 +18,8 @@ async def setup_script(hass, notify_q, now, source):
         "/hello.py",
     ]
 
+    Function.hass = None
+
     with patch("custom_components.pyscript.os.path.isdir", return_value=True), patch(
         "custom_components.pyscript.glob.iglob", return_value=scripts
     ), patch("custom_components.pyscript.global_ctx.open", mock_open(read_data=source)), patch(

tests/test_function.py

@@ -107,6 +107,8 @@ async def setup_script(hass, notify_q, notify_q2, now, source, config=None):
 
     file_contents = {f"{conf_dir}/hello.py": source}
 
+    Function.hass = None
+
     mock_open = MockOpen()
     for key, value in file_contents.items():
         mock_open[key].read_data = value

tests/test_init.py

@@ -24,6 +24,8 @@ async def setup_script(hass, notify_q, now, source, script_name="/hello.py"):
 
     scripts = [script_name]
 
+    Function.hass = None
+
     with patch("custom_components.pyscript.os.path.isdir", return_value=True), patch(
         "custom_components.pyscript.glob.iglob", return_value=scripts
     ), patch("custom_components.pyscript.global_ctx.open", mock_open(read_data=source)), patch(

tests/test_unique.py

@@ -4,6 +4,7 @@
 from datetime import datetime as dt
 
 from custom_components.pyscript.const import DOMAIN
+from custom_components.pyscript.function import Function
 import custom_components.pyscript.trigger as trigger
 from pytest_homeassistant_custom_component.async_mock import mock_open, patch
 
@@ -17,6 +18,8 @@ async def setup_script(hass, notify_q, now, source):
         "/some/config/dir/pyscripts/hello.py",
     ]
 
+    Function.hass = None
+
     with patch("custom_components.pyscript.os.path.isdir", return_value=True), patch(
         "custom_components.pyscript.glob.iglob", return_value=scripts
     ), patch("custom_components.pyscript.global_ctx.open", mock_open(read_data=source)), patch(