Fix devices missing in logbook when all requested entities are filtered (#74073)

homeassistant/components/logbook/websocket_api.py

@@ -301,7 +301,7 @@ async def ws_event_stream(
     entity_ids = msg.get("entity_ids")
     if entity_ids:
         entity_ids = async_filter_entities(hass, entity_ids)
-        if not entity_ids:
+        if not entity_ids and not device_ids:
             _async_send_empty_response(connection, msg_id, start_time, end_time)
             return
 

tests/components/logbook/test_websocket_api.py

@@ -2564,3 +2564,96 @@ async def test_logbook_stream_ignores_forced_updates(
 
     # Check our listener got unsubscribed
     assert sum(hass.bus.async_listeners().values()) == init_count
+
+
+@patch("homeassistant.components.logbook.websocket_api.EVENT_COALESCE_TIME", 0)
+async def test_subscribe_all_entities_are_continuous_with_device(
+    hass, recorder_mock, hass_ws_client
+):
+    """Test subscribe/unsubscribe logbook stream with entities that are always filtered and a device."""
+    now = dt_util.utcnow()
+    await asyncio.gather(
+        *[
+            async_setup_component(hass, comp, {})
+            for comp in ("homeassistant", "logbook", "automation", "script")
+        ]
+    )
+    await async_wait_recording_done(hass)
+    devices = await _async_mock_devices_with_logbook_platform(hass)
+    device = devices[0]
+    device2 = devices[1]
+
+    entity_ids = ("sensor.uom", "sensor.uom_two")
+
+    def _create_events():
+        for entity_id in entity_ids:
+            for state in ("1", "2", "3"):
+                hass.states.async_set(
+                    entity_id, state, {ATTR_UNIT_OF_MEASUREMENT: "any"}
+                )
+                hass.states.async_set("counter.any", state)
+                hass.states.async_set("proximity.any", state)
+        hass.bus.async_fire("mock_event", {"device_id": device.id})
+        hass.bus.async_fire("mock_event", {"device_id": device2.id})
+
+    init_count = sum(hass.bus.async_listeners().values())
+    _create_events()
+
+    await async_wait_recording_done(hass)
+    websocket_client = await hass_ws_client()
+    await websocket_client.send_json(
+        {
+            "id": 7,
+            "type": "logbook/event_stream",
+            "start_time": now.isoformat(),
+            "entity_ids": ["sensor.uom", "counter.any", "proximity.any"],
+            "device_ids": [device.id, device2.id],
+        }
+    )
+
+    msg = await asyncio.wait_for(websocket_client.receive_json(), 2)
+    assert msg["id"] == 7
+    assert msg["type"] == TYPE_RESULT
+    assert msg["success"]
+
+    msg = await asyncio.wait_for(websocket_client.receive_json(), 2)
+    assert msg["id"] == 7
+    assert msg["type"] == "event"
+    assert msg["event"]["events"] == [
+        {"domain": "test", "message": "is on fire", "name": "device name", "when": ANY},
+        {"domain": "test", "message": "is on fire", "name": "device name", "when": ANY},
+    ]
+    assert msg["event"]["partial"] is True
+
+    msg = await asyncio.wait_for(websocket_client.receive_json(), 2)
+    assert msg["id"] == 7
+    assert msg["type"] == "event"
+    assert msg["event"]["events"] == []
+    assert "partial" not in msg["event"]
+
+    for _ in range(2):
+        _create_events()
+        msg = await asyncio.wait_for(websocket_client.receive_json(), 2)
+        assert msg["id"] == 7
+        assert msg["type"] == "event"
+        assert msg["event"]["events"] == [
+            {
+                "domain": "test",
+                "message": "is on fire",
+                "name": "device name",
+                "when": ANY,
+            },
+            {
+                "domain": "test",
+                "message": "is on fire",
+                "name": "device name",
+                "when": ANY,
+            },
+        ]
+        assert "partial" not in msg["event"]
+
+    await websocket_client.close()
+    await hass.async_block_till_done()
+
+    # Check our listener got unsubscribed
+    assert sum(hass.bus.async_listeners().values()) == init_count