Handle unavailable input_select in Google Assistant (#38611)

homeassistant/components/google_assistant/trait.py

@@ -1285,10 +1285,8 @@ class ModesTrait(_Trait):
 
         return features & media_player.SUPPORT_SELECT_SOUND_MODE
 
-    def sync_attributes(self):
+    def _generate(self, name, settings):
-        """Return mode attributes for a sync request."""
+        """Generate a list of modes."""
-
-        def _generate(name, settings):
         mode = {
             "name": name,
             "name_values": [
@@ -1303,9 +1301,7 @@ class ModesTrait(_Trait):
                     "setting_name": setting,
                     "setting_values": [
                         {
-                                "setting_synonym": self.SYNONYMS.get(
+                            "setting_synonym": self.SYNONYMS.get(setting, [setting]),
-                                    setting, [setting]
-                                ),
                             "lang": "en",
                         }
                     ],
@@ -1313,18 +1309,25 @@ class ModesTrait(_Trait):
             )
         return mode
 
-        attrs = self.state.attributes
+    def sync_attributes(self):
+        """Return mode attributes for a sync request."""
         modes = []
-        if self.state.domain == media_player.DOMAIN:
+
-            if media_player.ATTR_SOUND_MODE_LIST in attrs:
+        for domain, attr, name in (
-                modes.append(
+            (media_player.DOMAIN, media_player.ATTR_SOUND_MODE_LIST, "sound mode"),
-                    _generate("sound mode", attrs[media_player.ATTR_SOUND_MODE_LIST])
+            (input_select.DOMAIN, input_select.ATTR_OPTIONS, "option"),
-                )
+            (humidifier.DOMAIN, humidifier.ATTR_AVAILABLE_MODES, "mode"),
-        elif self.state.domain == input_select.DOMAIN:
+        ):
-            modes.append(_generate("option", attrs[input_select.ATTR_OPTIONS]))
+            if self.state.domain != domain:
-        elif self.state.domain == humidifier.DOMAIN:
+                continue
-            if humidifier.ATTR_AVAILABLE_MODES in attrs:
+
-                modes.append(_generate("mode", attrs[humidifier.ATTR_AVAILABLE_MODES]))
+            items = self.state.attributes.get(attr)
+
+            if items is not None:
+                modes.append(self._generate(name, items))
+
+            # Shortcut since all domains are currently unique
+            break
 
         payload = {"availableModes": modes}
 

tests/components/google_assistant/test_smart_home.py

@@ -337,8 +337,6 @@ async def test_execute(hass):
         const.SOURCE_CLOUD,
     )
 
-    print(result)
-
     assert result == {
         "requestId": REQ_ID,
         "payload": {

tests/components/google_assistant/test_trait.py

@@ -1515,6 +1515,11 @@ async def test_modes_input_select(hass):
     assert helpers.get_google_type(input_select.DOMAIN, None) is not None
     assert trait.ModesTrait.supported(input_select.DOMAIN, None, None)
 
+    trt = trait.ModesTrait(
+        hass, State("input_select.bla", "unavailable"), BASIC_CONFIG,
+    )
+    assert trt.sync_attributes() == {"availableModes": []}
+
     trt = trait.ModesTrait(
         hass,
         State(