Got args/kwargs working

Author: contagon

custom_components/pyscript/__init__.py

@@ -21,10 +21,9 @@
     EVENT_STATE_CHANGED,
     SERVICE_RELOAD,
 )
-from homeassistant.core import Config, HomeAssistant, ServiceCall
+from homeassistant.core import Config, Event as HAEvent, HomeAssistant, ServiceCall
 from homeassistant.exceptions import HomeAssistantError
 import homeassistant.helpers.config_validation as cv
-from homeassistant.core import Event as HAEvent
 from homeassistant.helpers.restore_state import DATA_RESTORE_STATE
 from homeassistant.loader import bind_hass
 

custom_components/pyscript/entity.py

@@ -1,19 +1,19 @@
-"""Entity Classes"""
+"""Entity Classes."""
+from homeassistant.const import STATE_UNKNOWN
 from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.helpers.typing import StateType
-from homeassistant.const import STATE_UNKNOWN
 
 
 class PyscriptEntity(RestoreEntity):
-    """Generic Pyscript Entity"""
+    """Generic Pyscript Entity."""
 
     _attr_extra_state_attributes: dict
     _attr_state: StateType = STATE_UNKNOWN
 
     def set_state(self, state):
-        """Set the state"""
+        """Set the state."""
         self._attr_state = state
 
     def set_attributes(self, attributes):
-        """Set Attributes"""
+        """Set Attributes."""
         self._attr_extra_state_attributes = attributes

custom_components/pyscript/eval.py

@@ -377,8 +377,7 @@ async def trigger_init(self, trig_ctx, func_name):
             "task_unique": {"arg_cnt": {1, 2}},
             "time_active": {"arg_cnt": {"*"}},
             "time_trigger": {"arg_cnt": {0, "*"}, "rep_ok": True},
-            # TODO: Add in functionality to webhook with arguments
-            "webhook_trigger": {"arg_cnt": {1, 2, 3}, "rep_ok": True},
+            "webhook_trigger": {"arg_cnt": {1, 2}, "rep_ok": True},
         }
         kwarg_check = {
             "event_trigger": {"kwargs": {dict}},
@@ -394,8 +393,11 @@ async def trigger_init(self, trig_ctx, func_name):
                 "state_hold_false": {int, float},
                 "watch": {set, list},
             },
-            # "webhook_trigger": {"call": {str, list}, "local": bool},
-            "webhook_trigger": {"kwargs": {dict}},
+            "webhook_trigger": {
+                "kwargs": {dict},
+                "local_only": {bool},
+                "methods": {list, set},
+            },
         }
 
         for dec in self.decorators:

custom_components/pyscript/trigger.py

@@ -230,7 +230,13 @@ async def wait_until(
         __test_handshake__=None,
     ):
         """Wait for zero or more triggers, until an optional timeout."""
-        if state_trigger is None and time_trigger is None and event_trigger is None and mqtt_trigger is None and webhook_trigger is None:
+        if (
+            state_trigger is None
+            and time_trigger is None
+            and event_trigger is None
+            and mqtt_trigger is None
+            and webhook_trigger is None
+        ):
             if timeout is not None:
                 await asyncio.sleep(timeout)
                 return {"trigger_type": "timeout"}
@@ -413,7 +419,12 @@ async def wait_until(
                     state_trig_timeout = True
                     time_next = now + dt.timedelta(seconds=this_timeout)
             if this_timeout is None:
-                if state_trigger is None and event_trigger is None and mqtt_trigger is None and webhook_trigger is None:
+                if (
+                    state_trigger is None
+                    and event_trigger is None
+                    and mqtt_trigger is None
+                    and webhook_trigger is None
+                ):
                     _LOGGER.debug(
                         "trigger %s wait_until no next time - returning with none",
                         ast_ctx.name,
@@ -860,6 +871,8 @@ def __init__(
         self.mqtt_trigger_kwargs = trig_cfg.get("mqtt_trigger", {}).get("kwargs", {})
         self.webhook_trigger = trig_cfg.get("webhook_trigger", {}).get("args", None)
         self.webhook_trigger_kwargs = trig_cfg.get("webhook_trigger", {}).get("kwargs", {})
+        self.webhook_local_only = self.webhook_trigger_kwargs.get("local_only", True)
+        self.webhook_methods = self.webhook_trigger_kwargs.get("methods", {"POST", "PUT"})
         self.state_active = trig_cfg.get("state_active", {}).get("args", None)
         self.time_active = trig_cfg.get("time_active", {}).get("args", None)
         self.time_active_hold_off = trig_cfg.get("time_active", {}).get("kwargs", {}).get("hold_off", None)
@@ -1049,7 +1062,9 @@ async def trigger_watch(self):
                 await Mqtt.notify_add(self.mqtt_trigger[0], self.notify_q)
             if self.webhook_trigger is not None:
                 _LOGGER.debug("trigger %s adding webhook_trigger %s", self.name, self.webhook_trigger[0])
-                Webhook.notify_add(self.webhook_trigger[0], self.notify_q)
+                Webhook.notify_add(
+                    self.webhook_trigger[0], self.webhook_local_only, self.webhook_methods, self.notify_q
+                )
 
             last_trig_time = None
             last_state_trig_time = None
@@ -1237,6 +1252,11 @@ async def trigger_watch(self):
                     user_kwargs = self.mqtt_trigger_kwargs.get("kwargs", {})
                     if self.mqtt_trig_expr:
                         trig_ok = await self.mqtt_trig_expr.eval(notify_info)
+                elif notify_type == "webhook":
+                    func_args = notify_info
+                    user_kwargs = self.webhook_trigger_kwargs.get("kwargs", {})
+                    if self.webhook_trig_expr:
+                        trig_ok = await self.webhook_trig_expr.eval(notify_info)
 
                 else:
                     user_kwargs = self.time_trigger_kwargs.get("kwargs", {})

custom_components/pyscript/webhook.py

@@ -2,12 +2,12 @@
 
 import logging
 
-from .const import LOGGER_PATH
-
 from aiohttp import hdrs
 
 from homeassistant.components import webhook
 
+from .const import LOGGER_PATH
+
 _LOGGER = logging.getLogger(LOGGER_PATH + ".webhook")
 
 
@@ -49,24 +49,24 @@ async def webhook_handler(cls, hass, webhook_id, request):
         else:
             func_args["webhook_data"] = await request.post()
 
-
         await cls.update(webhook_id, func_args)
 
     @classmethod
-    def notify_add(cls, webhook_id, queue):
+    def notify_add(cls, webhook_id, local_only, methods, queue):
         """Register to notify for webhooks of given type to be sent to queue."""
-
         if webhook_id not in cls.notify:
             cls.notify[webhook_id] = set()
             _LOGGER.debug("webhook.notify_add(%s) -> adding webhook listener", webhook_id)
             webhook.async_register(
                 cls.hass,
-                "webhook",
-                "my_name",
+                "webhook",  # DOMAIN - unclear what this is used for
+                "pyscript",  # NAME - unclear what this is used for
                 webhook_id,
                 cls.webhook_handler,
+                local_only=local_only,
+                allowed_methods=methods,
             )
-            cls.notify_remove[webhook_id] = lambda : webhook.async_unregister(cls.hass, webhook_id)
+            cls.notify_remove[webhook_id] = lambda: webhook.async_unregister(cls.hass, webhook_id)
 
         cls.notify[webhook_id].add(queue)