From cd4db314cda6e72f48ee78a44b8ec0cc1d339113 Mon Sep 17 00:00:00 2001
From: Michael Hansen <mike@rhasspy.org>
Date: Tue, 3 Mar 2026 11:58:18 -0600
Subject: [PATCH] Implement suggestions

---
 homeassistant/components/intent/__init__.py | 8 ++++----
 tests/components/intent/test_init.py        | 9 +++++++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/homeassistant/components/intent/__init__.py b/homeassistant/components/intent/__init__.py
index 9e6d43e61b5..690fccbf29f 100644
--- a/homeassistant/components/intent/__init__.py
+++ b/homeassistant/components/intent/__init__.py
@@ -627,10 +627,10 @@ class IntentHandleView(http.HomeAssistantView):
             {
                 vol.Required("name"): cv.string,
                 vol.Optional("data"): vol.Schema({cv.string: object}),
-                vol.Optional("language"): str,
-                vol.Optional("assistant"): vol.Any(str, None),
-                vol.Optional("device_id"): vol.Any(str, None),
-                vol.Optional("satellite_id"): vol.Any(str, None),
+                vol.Optional("language"): cv.string,
+                vol.Optional("assistant"): vol.Any(cv.string, None),
+                vol.Optional("device_id"): vol.Any(cv.string, None),
+                vol.Optional("satellite_id"): vol.Any(cv.string, None),
             }
         )
     )
diff --git a/tests/components/intent/test_init.py b/tests/components/intent/test_init.py
index 025e8c74847..a76980efbd0 100644
--- a/tests/components/intent/test_init.py
+++ b/tests/components/intent/test_init.py
@@ -102,9 +102,13 @@ async def test_http_language_device_satellite_id(
 
         intent_type = "TestIntent"
 
-        async def async_handle(self, intent_obj):
+        async def async_handle(self, intent_obj: intent.Intent):
             """Handle the intent."""
             assert intent_obj.context.user_id == hass_admin_user.id
+            assert intent_obj.device_id == device_id
+            assert intent_obj.satellite_id == satellite_id
+            assert intent_obj.language == language
+
             response = intent_obj.create_response()
             response.async_set_speech("Test response")
             response.async_set_speech_slots({"slot1": "value 1", "slot2": 2})
@@ -196,7 +200,8 @@ async def test_http_assistant(
         "/api/intent/handle",
         json={
             "name": "HassTurnOn",
-            "data": {"name": "Garage Door 1", "assistant": conversation.DOMAIN},
+            "data": {"name": "Garage Door 1"},
+            "assistant": conversation.DOMAIN,
         },
     )
     assert resp.status == 200