Limit parallel requests to Philips Hue

homeassistant/components/hue/bridge.py

@@ -32,6 +32,7 @@ def __init__(self, hass, config_entry, allow_unreachable, allow_groups):
         self.available = True
         self.authorized = False
         self.api = None
+        self.parallel_updates_semaphore = None
 
     @property
     def host(self):
@@ -77,9 +78,19 @@ async def async_setup(self, tries=0):
             DOMAIN, SERVICE_HUE_SCENE, self.hue_activate_scene, schema=SCENE_SCHEMA
         )
 
+        self.parallel_updates_semaphore = asyncio.Semaphore(
+            3 if self.api.config.modelid == "BSB001" else 10
+        )
+
         self.authorized = True
         return True
 
+    async def async_request_call(self, coro):
+        """Process request batched."""
+
+        async with self.parallel_updates_semaphore:
+            return await coro
+
     async def async_reset(self):
         """Reset this bridge to default state.
 

homeassistant/components/hue/light.py

@@ -202,7 +202,7 @@ async def async_update_items(
     try:
         start = monotonic()
         with async_timeout.timeout(4):
-            await api.update()
+            await bridge.async_request_call(api.update())
     except aiohue.Unauthorized:
         await bridge.handle_unauthorized_error()
         return
@@ -434,9 +434,9 @@ async def async_turn_on(self, **kwargs):
                 command["effect"] = "none"
 
         if self.is_group:
-            await self.light.set_action(**command)
+            await self.bridge.async_request_call(self.light.set_action(**command))
         else:
-            await self.light.set_state(**command)
+            await self.bridge.async_request_call(self.light.set_state(**command))
 
     async def async_turn_off(self, **kwargs):
         """Turn the specified or all lights off."""
@@ -457,9 +457,9 @@ async def async_turn_off(self, **kwargs):
             command["alert"] = "none"
 
         if self.is_group:
-            await self.light.set_action(**command)
+            await self.bridge.async_request_call(self.light.set_action(**command))
         else:
-            await self.light.set_state(**command)
+            await self.bridge.async_request_call(self.light.set_state(**command))
 
     async def async_update(self):
         """Synchronize state with bridge."""

homeassistant/components/hue/sensor_base.py

@@ -101,7 +101,7 @@ async def async_update_items(self):
         try:
             start = monotonic()
             with async_timeout.timeout(4):
-                await api.update()
+                await self.bridge.async_request_call(api.update())
         except Unauthorized:
             await self.bridge.handle_unauthorized_error()
             return

tests/components/hue/test_light.py

@@ -204,6 +204,10 @@ async def mock_request(method, path, **kwargs):
             return bridge.mock_group_responses.popleft()
         return None
 
+    async def async_request_call(coro):
+        await coro
+
+    bridge.async_request_call = async_request_call
     bridge.api.config.apiversion = "9.9.9"
     bridge.api.lights = Lights({}, mock_request)
     bridge.api.groups = Groups({}, mock_request)

tests/components/hue/test_sensor_base.py

@@ -277,6 +277,10 @@ async def mock_request(method, path, **kwargs):
             return bridge.mock_sensor_responses.popleft()
         return None
 
+    async def async_request_call(coro):
+        await coro
+
+    bridge.async_request_call = async_request_call
     bridge.api.config.apiversion = "9.9.9"
     bridge.api.sensors = Sensors({}, mock_request)
     return bridge