fix type check for kwargs and add function tests

Author: raman325

custom_components/pyscript/function.py

@@ -192,11 +192,11 @@ async def service_call(cls, domain, name, **kwargs):
         curr_task = asyncio.current_task()
         hass_args = {}
         for keyword, typ, default in [
-            ("context", Context, cls.task2context.get(curr_task, None)),
-            ("blocking", bool, None),
-            ("limit", float, None),
+            ("context", [Context], cls.task2context.get(curr_task, None)),
+            ("blocking", [bool], None),
+            ("limit", [float, int], None),
         ]:
-            if keyword in kwargs and isinstance(kwargs[keyword], typ):
+            if keyword in kwargs and type(kwargs[keyword]) in typ:
                 hass_args[keyword] = kwargs.pop(keyword)
             elif default:
                 hass_args[keyword] = default
@@ -262,17 +262,18 @@ async def service_call(*args, **kwargs):
                 curr_task = asyncio.current_task()
                 hass_args = {}
                 for keyword, typ, default in [
-                    ("context", Context, cls.task2context.get(curr_task, None)),
-                    ("blocking", bool, None),
-                    ("limit", float, None),
+                    ("context", [Context], cls.task2context.get(curr_task, None)),
+                    ("blocking", [bool], None),
+                    ("limit", [float, int], None),
                 ]:
-                    if keyword in kwargs and isinstance(kwargs[keyword], typ):
+                    if keyword in kwargs and type(kwargs[keyword]) in typ:
                         hass_args[keyword] = kwargs.pop(keyword)
                     elif default:
                         hass_args[keyword] = default
 
                 if len(args) != 0:
                     raise (TypeError, f"service {domain}.{service} takes no positional arguments")
+
                 await cls.hass.services.async_call(domain, service, kwargs, **hass_args)
 
             return service_call

custom_components/pyscript/state.py

@@ -260,11 +260,11 @@ async def service_call(*args, **kwargs):
                     curr_task = asyncio.current_task()
                     hass_args = {}
                     for keyword, typ, default in [
-                        ("context", Context, Function.task2context.get(curr_task, None)),
-                        ("blocking", bool, None),
-                        ("limit", float, None),
+                        ("context", [Context], Function.task2context.get(curr_task, None)),
+                        ("blocking", [bool], None),
+                        ("limit", [float, int], None),
                     ]:
-                        if keyword in kwargs and isinstance(kwargs[keyword], typ):
+                        if keyword in kwargs and type(kwargs[keyword]) in typ:
                             hass_args[keyword] = kwargs.pop(keyword)
                         elif default:
                             hass_args[keyword] = default

tests/test_function.py

@@ -12,6 +12,7 @@
 from pytest_homeassistant_custom_component.async_mock import MagicMock, Mock, mock_open, patch
 
 from homeassistant.const import EVENT_HOMEASSISTANT_STARTED, EVENT_STATE_CHANGED
+from homeassistant.core import Context
 from homeassistant.setup import async_setup_component
 
 
@@ -804,3 +805,41 @@ def set_add(entity_id=None, val1=None, val2=None):
     assert literal_eval(await wait_until_done(notify_q)) == [4, "pyscript.var1", "32"]
     assert literal_eval(await wait_until_done(notify_q)) == [5, "pyscript.var1", "50", "HomeAssistant"]
     assert "TypeError: service pyscript.set_add takes no positional arguments" in caplog.text
+
+
+async def test_service_call_params(hass):
+    """Test that hass params get set properly on service calls."""
+    Function.init(hass)
+    with patch.object(Function.hass.services, "async_call") as call, patch.object(
+        Function, "service_has_service", return_value=True
+    ):
+        await Function.service_call(
+            "test", "test", context=Context(id="test"), blocking=True, limit=1, other_service_data="test"
+        )
+        assert call.called
+        assert call.call_args[0] == ("test", "test", {"other_service_data": "test"})
+        assert call.call_args[1] == {"context": Context(id="test"), "blocking": True, "limit": 1}
+        call.reset_mock()
+
+        await Function.service_call(
+            "test", "test", context=Context(id="test"), blocking=False, other_service_data="test"
+        )
+        assert call.called
+        assert call.call_args[0] == ("test", "test", {"other_service_data": "test"})
+        assert call.call_args[1] == {"context": Context(id="test"), "blocking": False}
+        call.reset_mock()
+
+        await Function.get("test.test")(
+            context=Context(id="test"), blocking=True, limit=1, other_service_data="test"
+        )
+        assert call.called
+        assert call.call_args[0] == ("test", "test", {"other_service_data": "test"})
+        assert call.call_args[1] == {"context": Context(id="test"), "blocking": True, "limit": 1}
+        call.reset_mock()
+
+        await Function.get("test.test")(
+            context=Context(id="test"), blocking=False, other_service_data="test"
+        )
+        assert call.called
+        assert call.call_args[0] == ("test", "test", {"other_service_data": "test"})
+        assert call.call_args[1] == {"context": Context(id="test"), "blocking": False}