Update async_execute_commands to work like async_execute_command

Implement cancel for multiple commands

homeassistant/components/overkiz/coordinator.py

@@ -61,7 +61,7 @@ def __init__(
         self.is_stateless = all(
             device.protocol in (Protocol.RTS, Protocol.INTERNAL) for device in devices
         )
-        self.executions: dict[str, dict[str, str]] = {}
+        self.executions: dict[str, Any] = {}
         self.areas = self._places_to_area(places) if places else None
         self.config_entry_id = config_entry_id
 

homeassistant/components/overkiz/executor.py

@@ -73,44 +73,66 @@ def select_attribute(self, *attributes: str) -> OverkizStateType:
     async def async_execute_command(self, command_name: str, *args: Any) -> None:
         """Execute device command in async context."""
         parameters = [arg for arg in args if arg is not None]
-        # Set the execution duration to 0 seconds for RTS devices on supported commands
-        # Default execution duration is 30 seconds and will block consecutive commands
-        if (
-            self.device.protocol == Protocol.RTS
-            and command_name not in COMMANDS_WITHOUT_DELAY
-        ):
-            parameters.append(0)
-
-        exec_id = await self.coordinator.client.execute_command(
-            self.device.device_url,
-            Command(command_name, parameters),
-            "Home Assistant",
-        )
-
-        # ExecutionRegisteredEvent doesn't contain the device_url, thus we need to register it here
-        self.coordinator.executions[exec_id] = {
-            "device_url": self.device.device_url,
-            "command_name": command_name,
-        }
-
-        await self.coordinator.async_refresh()
 
+        commands: list[list | str] = [[command_name, parameters]]
+        await self.async_execute_commands(commands)
+
+    # commands except an array of commands
+    # each command could be :
+    # - a simple string to execute a command without parameter
+    # - a list with command name as first index and parameters list  as second index
+    # Example of usage:
+    # commands: list[list | str] = [
+    #     [
+    #         OverkizCommand.SET_MODE_TEMPERATURE,
+    #         [OverkizCommandParam.MANUAL_MODE, temperature],
+    #     ],
+    #     [
+    #         OverkizCommand.SET_DEROGATION_ON_OFF_STATE,
+    #         [OverkizCommandParam.OFF],
+    #     ],
+    #     OverkizCommand.REFRESH_PASS_APC_HEATING_MODE,
+    #     OverkizCommand.REFRESH_PASS_APC_HEATING_PROFILE,
+    # ]
+    # await self.executor.async_execute_commands(commands)
     async def async_execute_commands(self, commands: list[list | str]) -> None:
         """Execute device commands in async context."""
-
+        command_names = []
         commands_objects = []
         for cmd in commands:
+            parameters = []
             if isinstance(cmd, list):
-                commands_objects.append(Command(cmd[0], cmd[1]))
+                command_name = cmd[0]
+                parameters = cmd[1]
             else:
-                commands_objects.append(Command(cmd))
+                command_name = cmd
+
+            # Set the execution duration to 0 seconds for RTS devices on supported commands
+            # Default execution duration is 30 seconds and will block consecutive commands
+            if (
+                self.device.protocol == Protocol.RTS
+                and command_name not in COMMANDS_WITHOUT_DELAY
+            ):
+                parameters.append(0)
+
+            command_names.append(command_name)
+            if len(parameters) > 0:
+                commands_objects.append(Command(command_name, parameters))
+            else:
+                commands_objects.append(Command(command_name))
 
-        await self.coordinator.client.execute_commands(
+        exec_id = await self.coordinator.client.execute_commands(
             self.device.device_url,
             commands_objects,
             "Home Assistant",
         )
 
+        # ExecutionRegisteredEvent doesn't contain the device_url, thus we need to register it here
+        self.coordinator.executions[exec_id] = {
+            "device_url": self.device.device_url,
+            "commands": command_names,
+        }
+
         await self.coordinator.async_refresh()
 
     async def async_cancel_command(
@@ -125,8 +147,9 @@ async def async_cancel_command(
                 exec_id
                 # Reverse dictionary to cancel the last added execution
                 for exec_id, execution in reversed(self.coordinator.executions.items())
+                for command in execution.get("commands")
                 if execution.get("device_url") == self.device.device_url
-                and execution.get("command_name") in commands_to_cancel
+                and command in commands_to_cancel
             ),
             None,
         )