Mark scripts as response optional, make it always return a response i…

…f return_response is set
home-assistant · Jul 6, 2023 · 2ed3693 · 2ed3693
1 parent de24860
commit 2ed3693
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/homeassistant/components/script/__init__.py b/homeassistant/components/script/__init__.py
@@ -608,7 +608,7 @@ async def _service_handler(self, service: ServiceCall) -> ServiceResponse:
             variables=service.data, context=service.context, wait=True
         )
         if service.return_response:
-            return response
+            return response or {}
         return None
 
     async def async_added_to_hass(self) -> None:

diff --git a/homeassistant/helpers/service.py b/homeassistant/helpers/service.py
@@ -678,6 +678,13 @@ def async_set_service_schema(
     if "target" in schema:
         description["target"] = schema["target"]
 
+    if (
+        response := hass.services.supports_response(domain, service)
+    ) != SupportsResponse.NONE:
+        description["response"] = {
+            "optional": response == SupportsResponse.OPTIONAL,
+        }
+
     hass.data.pop(ALL_SERVICE_DESCRIPTIONS_CACHE, None)
     hass.data[SERVICE_DESCRIPTION_CACHE][(domain, service)] = description