Merge "google-assistant-sdk/pushtotalk: fix device action handler init"

Author: proppy

google-assistant-sdk/googlesamples/assistant/grpc/pushtotalk.py

@@ -356,15 +356,6 @@ def main(api_endpoint, credentials, project_id,
         sample_width=audio_sample_width,
     )
 
-    device_handler = device_helpers.DeviceRequestHandler(device_id)
-
-    @device_handler.command('action.devices.commands.OnOff')
-    def onoff(on):
-        if on:
-            logging.info('Turning device on')
-        else:
-            logging.info('Turning device off')
-
     if not device_id or not device_model_id:
         try:
             with open(device_config) as f:
@@ -407,6 +398,15 @@ def onoff(on):
             with open(device_config, 'w') as f:
                 json.dump(payload, f)
 
+    device_handler = device_helpers.DeviceRequestHandler(device_id)
+
+    @device_handler.command('action.devices.commands.OnOff')
+    def onoff(on):
+        if on:
+            logging.info('Turning device on')
+        else:
+            logging.info('Turning device off')
+
     with SampleAssistant(lang, device_model_id, device_id,
                          conversation_stream,
                          grpc_channel, grpc_deadline,

google-assistant-sdk/tests/data/turnon.riff

@@ -34,6 +34,7 @@ def device_model():
                            '--project-id', PROJECT_ID,
                            'register-model', '--model', device_model_id,
                            '--type', 'LIGHT',
+                           '--trait', 'action.devices.traits.OnOff',
                            '--manufacturer', 'assistant-sdk-test',
                            '--product-name', 'assistant-sdk-test'])
     yield device_model_id
@@ -123,3 +124,22 @@ def test_endtoend_textinput(device_model, device_instance):
     assert err is None
     assert 'grapefruit' in out
     assert 'pamplemousse' in out
+
+
+def test_onoff_device_action(device_model):
+    temp_dir = tempfile.mkdtemp()
+    audio_out_file = os.path.join(temp_dir, 'out.raw')
+    # Use an non-existing device config file intentionally
+    # to force device registration.
+    device_config = os.path.join(temp_dir, 'device_config.json')
+    out = subprocess.check_output(['python', '-m',
+                                   'googlesamples.assistant.grpc.pushtotalk',
+                                   '--verbose',
+                                   '--project-id', PROJECT_ID,
+                                   '--device-model-id', device_model,
+                                   '--device-config', device_config,
+                                   '-i', 'tests/data/turnon.riff',
+                                   '-o', audio_out_file],
+                                  stderr=subprocess.STDOUT)
+    assert 'turning device on' in builtins.str(out).lower()
+    assert os.path.getsize(audio_out_file) > 0