context provided to state, service and event trigger functions

service calls now provide optional context argument for outbound

Author: craigbarratt

custom_components/pyscript/__init__.py

@@ -187,6 +187,7 @@ async def state_changed(event):
             "var_name": var_name,
             "value": new_val,
             "old_value": old_val,
+            "context": event.context,
         }
         await State.update(new_vars, func_args)
 

custom_components/pyscript/event.py

@@ -35,10 +35,10 @@ def init(cls, hass):
     async def event_listener(cls, event):
         """Listen callback for given event which updates any notifications."""
 
-        _LOGGER.debug("event_listener(%s)", event)
         func_args = {
             "trigger_type": "event",
             "event_type": event.event_type,
+            "context": event.context,
         }
         func_args.update(event.data)
         await cls.update(event.event_type, func_args)

custom_components/pyscript/function.py

@@ -5,6 +5,8 @@
 import logging
 import traceback
 
+from homeassistant.core import Context
+
 from .const import LOGGER_PATH
 
 _LOGGER = logging.getLogger(LOGGER_PATH + ".function")
@@ -170,7 +172,12 @@ def service_has_service(cls, domain, name):
     @classmethod
     async def service_call(cls, domain, name, **kwargs):
         """Implement service.call()."""
-        await cls.hass.services.async_call(domain, name, kwargs)
+        if "context" in kwargs and isinstance(kwargs["context"], Context):
+            context = kwargs["context"]
+            del kwargs["context"]
+            await cls.hass.services.async_call(domain, name, kwargs, context=context)
+        else:
+            await cls.hass.services.async_call(domain, name, kwargs)
 
     @classmethod
     async def service_completions(cls, root):

tests/test_function.py

@@ -200,6 +200,7 @@ def func3(trigger_type=None, event_type=None, **kwargs):
     seq_num += 1
     log.info(f"func3 trigger_type = {trigger_type}, event_type = {event_type}, event_data = {kwargs}")
     exec_test = task.executor(sum, range(5))
+    kwargs["context"] = {"user_id": kwargs["context"].user_id, "parent_id": kwargs["context"].parent_id, "id": "1234"}
     pyscript.done = [seq_num, trigger_type, event_type, kwargs, exec_test]
 
 @event_trigger("test_event4", "arg1 == 20 and arg2 == 30")
@@ -209,6 +210,8 @@ def func4(trigger_type=None, event_type=None, **kwargs):
     seq_num += 1
     res = task.wait_until(event_trigger=["test_event4b", "arg1 == 25 and arg2 == 35"], timeout=10)
     log.info(f"func4 trigger_type = {res}, event_type = {event_type}, event_data = {kwargs}")
+    kwargs["context"] = {"user_id": kwargs["context"].user_id, "parent_id": kwargs["context"].parent_id, "id": "1234"}
+    res["context"] = kwargs["context"]
     pyscript.done = [seq_num, res, event_type, kwargs]
 
     seq_num += 1
@@ -224,6 +227,7 @@ def func4(trigger_type=None, event_type=None, **kwargs):
     seq_num += 1
     res = task.wait_until(state_trigger=["False", "pyscript.xyznotset", "pyscript.f4var2 == '10'"], timeout=10, state_hold=1e-6)
     log.info(f"func4 trigger_type = {res}")
+    res["context"] = {"user_id": res["context"].user_id, "parent_id": res["context"].parent_id, "id": "1234"}
     pyscript.done = [seq_num, res, pyscript.setVar1, pyscript.setVar1.attr1, state.get("pyscript.setVar1.attr2"),
     pyscript.setVar2, state.get("pyscript.setVar3")]
 
@@ -440,6 +444,8 @@ def func9(var_name=None, value=None, old_value=None):
     ]
     assert "func2 var = pyscript.f2var2, value = 2" in caplog.text
 
+    context = {"user_id": None, "parent_id": None, "id": "1234"}
+
     seq_num += 1
     hass.bus.async_fire("test_event3", {"arg1": 12, "arg2": 34})
     hass.bus.async_fire("test_event3", {"arg1": 20, "arg2": 29})
@@ -449,7 +455,7 @@ def func9(var_name=None, value=None, old_value=None):
         seq_num,
         "event",
         "test_event3",
-        {"arg1": 20, "arg2": 30},
+        {"arg1": 20, "arg2": 30, "context": context},
         10,
     ]
 
@@ -467,12 +473,15 @@ def func9(var_name=None, value=None, old_value=None):
         "event_type": "test_event4b",
         "arg1": 25,
         "arg2": 35,
+        "context": context,
     }
-    assert literal_eval(await wait_until_done(notify_q)) == [
+    ret = await wait_until_done(notify_q)
+    print(f"test_event4b ret = {ret}")
+    assert literal_eval(ret) == [
         seq_num,
         trig,
         "test_event4",
-        {"arg1": 20, "arg2": 30},
+        {"arg1": 20, "arg2": 30, "context": context},
     ]
 
     seq_num += 1
@@ -492,6 +501,7 @@ def func9(var_name=None, value=None, old_value=None):
         "var_name": "pyscript.f4var2",
         "value": "10",
         "old_value": "2",
+        "context": context,
     }
     result = literal_eval(await wait_until_done(notify_q))
     assert result[0] == seq_num

tests/test_unique.py

@@ -81,6 +81,7 @@ def func0(var_name=None, value=None):
     pyscript.done = [seq_num, var_name]
     result = task.wait_until(state_trigger=["pyscript.f0var2"])
     seq_num += 1
+    result["context"] = {"user_id": result["context"].user_id, "parent_id": result["context"].parent_id, "id": "1234"}
     pyscript.done = [seq_num, var_name, result]
 
 @state_trigger("pyscript.f1var1 == '1'")
@@ -258,8 +259,15 @@ def func6():
     #
     seq_num += 1
     hass.states.async_set("pyscript.f0var2", 1)
+    context = {"user_id": None, "parent_id": None, "id": "1234"}
     assert literal_eval(await wait_until_done(notify_q)) == [
         seq_num,
         "pyscript.f0var1",
-        {"old_value": None, "trigger_type": "state", "value": "1", "var_name": "pyscript.f0var2"},
+        {
+            "old_value": None,
+            "trigger_type": "state",
+            "value": "1",
+            "var_name": "pyscript.f0var2",
+            "context": context,
+        },
     ]