googlesamples/grpc/device_helper: ignore noop execution

Bug: 66963608
Change-Id: Ia1b2074749266aa135a483ead3406c4fa6118947

Author: proppy

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

@@ -67,18 +67,24 @@ def decorator(fn):
         return decorator
 
     def submit_commands(self, devices, execution):
-        """Submit device command executions."""
+        """Submit device command executions.
+
+        Returns: a list of concurrent.futures for scheduled executions.
+        """
         fs = []
         for device in devices:
-            if device[key_id_] == self.device_id:
-                for command in execution:
-                    f = self.executor.submit(
-                        self.dispatch_command, **command
-                    )
-                    fs.append(f)
-            else:
+            if device[key_id_] != self.device_id:
                 logging.warning('Ignoring command for unknown device: %s'
                                 % device[key_id_])
+                continue
+            if not execution:
+                logging.warning('Ignoring noop execution')
+                continue
+            for command in execution:
+                f = self.executor.submit(
+                    self.dispatch_command, **command
+                )
+                fs.append(f)
         return fs
 
     def dispatch_command(self, command, params=None):

google-assistant-sdk/tests/test_device_helpers.py

@@ -39,6 +39,23 @@ def build_device_request(device_id, command, arg):
     }
 
 
+def build_noop_device_request(device_id):
+    return {
+        'inputs': [{
+            'intent': 'action.devices.EXECUTE',
+            'payload': {
+                'commands': [{
+                    'devices': [
+                        {'id': device_id}
+                    ],
+                    'execution': None,
+                }]
+            }
+        }],
+        'requestId': '42'
+    }
+
+
 class DeviceRequestHandlerTest(unittest.TestCase):
     def setUp(self):
         self.handler_called = False
@@ -83,6 +100,16 @@ def test_unknown_command(self):
         self.assertEqual(len(fs), 1)
         self.assertFalse(self.handler_called)
 
+    def test_noop_execution(self):
+        device_handler = device_helpers.DeviceRequestHandler(
+            'some-device',
+        )
+        device_handler.command('SOME_COMMAND')(self.handler)
+        device_request = build_noop_device_request('some-device')
+        fs = device_handler(device_request)
+        self.assertEqual(len(fs), 0)
+        self.assertFalse(self.handler_called)
+
     def test_exception(self):
         err = Exception('some error')