Change wake word id to string

esphome · Sep 16, 2024 · 775ecdc · 775ecdc
1 parent 709cb3f
commit 775ecdc
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/aioesphomeapi/api.proto b/aioesphomeapi/api.proto
@@ -1590,7 +1590,7 @@ message VoiceAssistantAnnounceFinished {
 }
 
 message VoiceAssistantWakeWord {
-  uint32 id = 1;
+  string id = 1;
   string wake_word = 2;
   repeated string trained_languages = 3;
 }
@@ -1607,7 +1607,7 @@ message VoiceAssistantConfigurationResponse {
   option (ifdef) = "USE_VOICE_ASSISTANT";
 
   repeated VoiceAssistantWakeWord available_wake_words = 1;
-  repeated uint32 active_wake_words = 2;
+  repeated string active_wake_words = 2;
   uint32 max_active_wake_words = 3;
 }
 
@@ -1616,7 +1616,7 @@ message VoiceAssistantSetConfiguration {
   option (source) = SOURCE_CLIENT;
   option (ifdef) = "USE_VOICE_ASSISTANT";
 
-  repeated uint32 active_wake_words = 1;
+  repeated string active_wake_words = 1;
 }
 
 // ==================== ALARM CONTROL PANEL ====================

diff --git a/aioesphomeapi/api_pb2.py b/aioesphomeapi/api_pb2.py
diff --git a/aioesphomeapi/client.py b/aioesphomeapi/client.py
@@ -1474,7 +1474,7 @@ async def get_voice_assistant_configuration(
         return VoiceAssistantConfigurationResponseModel.from_pb(resp)
 
     async def set_voice_assistant_configuration(
-        self, active_wake_words: list[int]
+        self, active_wake_words: list[str]
     ) -> None:
         req = VoiceAssistantSetConfiguration(active_wake_words=active_wake_words)
         self._get_connection().send_message(req)

diff --git a/aioesphomeapi/model.py b/aioesphomeapi/model.py
@@ -1300,7 +1300,7 @@ class VoiceAssistantAnnounceFinished(APIModelBase):
 
 @_frozen_dataclass_decorator
 class VoiceAssistantWakeWord(APIModelBase):
-    id: int
+    id: str
     wake_word: str
     trained_languages: list[str]
 
@@ -1320,7 +1320,7 @@ class VoiceAssistantConfigurationResponse(APIModelBase):
     available_wake_words: list[VoiceAssistantWakeWord] = converter_field(
         default_factory=list, converter=VoiceAssistantWakeWord.convert_list
     )
-    active_wake_words: list[int] = converter_field(default_factory=list, converter=list)
+    active_wake_words: list[str] = converter_field(default_factory=list, converter=list)
     max_active_wake_words: int = 0
 
 

diff --git a/tests/test_client.py b/tests/test_client.py
@@ -2686,12 +2686,12 @@ def send_message(msg):
         response: message.Message = VoiceAssistantConfigurationResponse(
             available_wake_words=[
                 VoiceAssistantWakeWord(
-                    id=1,
+                    id="1234",
                     wake_word="okay nabu",
                     trained_languages=["en"],
                 )
             ],
-            active_wake_words=[1],
+            active_wake_words=["1234"],
             max_active_wake_words=1,
         )
         mock_data_received(protocol, generate_plaintext_packet(response))
@@ -2709,11 +2709,11 @@ async def test_set_voice_assistant_configuration(
     original_send_message = connection.send_message
 
     def send_message(msg):
-        assert msg == VoiceAssistantSetConfiguration(active_wake_words=[1])
+        assert msg == VoiceAssistantSetConfiguration(active_wake_words=["1234"])
         original_send_message(msg)
 
     with patch.object(connection, "send_message", new=send_message):
-        await client.set_voice_assistant_configuration([1])
+        await client.set_voice_assistant_configuration(["1234"])
 
 
 @pytest.mark.asyncio

diff --git a/tests/test_model.py b/tests/test_model.py
@@ -696,7 +696,7 @@ def test_voice_assistant_wake_word_convert_list() -> None:
                     "trained_languages": ["en"],
                 }
             ],
-            "active_wake_words": [1],
+            "active_wake_words": ["1234"],
             "max_active_wake_words": 1,
         }
     ) == VoiceAssistantConfigurationResponse(
@@ -707,6 +707,6 @@ def test_voice_assistant_wake_word_convert_list() -> None:
                 trained_languages=["en"],
             )
         ],
-        active_wake_words=[1],
+        active_wake_words=["1234"],
         max_active_wake_words=1,
     )