Ensure list_entities_services always fills missing object_ids (#1468)

Author: bdraco

aioesphomeapi/client.py

@@ -302,6 +302,9 @@ async def device_info(self) -> DeviceInfo:
     async def list_entities_services(
         self,
     ) -> tuple[list[EntityInfo], list[UserService]]:
+        # Ensure we have device_info for computing missing object_ids
+        if (device_info := self._cached_device_info) is None:
+            device_info = await self.device_info()
         msgs = await self._get_connection().send_messages_await_response_complex(
             (ListEntitiesRequest(),),
             lambda msg: type(msg) is not ListEntitiesDoneResponse,
@@ -319,9 +322,8 @@ async def list_entities_services(
                 continue
             if cls := response_types[msg_type]:
                 entities.append(cls.from_pb(msg))
-        # Fill in missing object_id values if we have cached device_info
-        if self._cached_device_info is not None:
-            entities = fill_missing_object_ids(entities, self._cached_device_info)
+        # Fill in missing object_id values using cached device_info
+        entities = fill_missing_object_ids(entities, device_info)
         return entities, services
 
     async def device_info_and_list_entities(

tests/test_client.py

@@ -355,7 +355,8 @@ async def test_connect_while_already_connected(auth_client: APIClient) -> None:
     [
         (
             [ListEntitiesBinarySensorResponse(), ListEntitiesDoneResponse()],
-            ([BinarySensorInfo()], []),
+            # Empty-name entity gets object_id from device name
+            ([BinarySensorInfo(object_id="test-device")], []),
         ),
         (
             [ListEntitiesServicesResponse(), ListEntitiesDoneResponse()],
@@ -366,13 +367,54 @@ async def test_connect_while_already_connected(auth_client: APIClient) -> None:
 async def test_list_entities(
     auth_client: APIClient, input: dict[str, Any], output: dict[str, Any]
 ) -> None:
+    # list_entities_services now automatically fetches device_info if not cached
+    patch_response_simple(
+        auth_client,
+        DeviceInfoResponse(name="test-device", mac_address="AA:BB:CC:DD:EE:FF"),
+    )
     patch_response_complex(auth_client, input)
     resp = await auth_client.list_entities_services()
     assert resp == output
 
 
+async def test_list_entities_auto_fetches_device_info(auth_client: APIClient) -> None:
+    """Test list_entities_services automatically fetches device_info when not cached."""
+    # Verify _cached_device_info is initially None
+    assert auth_client._cached_device_info is None
+
+    # Patch device_info response (will be called automatically)
+    patch_response_simple(
+        auth_client,
+        DeviceInfoResponse(name="auto-device", mac_address="AA:BB:CC:DD:EE:FF"),
+    )
+
+    # Patch list_entities response
+    patch_response_complex(
+        auth_client,
+        [
+            ListEntitiesBinarySensorResponse(name="My Sensor"),
+            ListEntitiesSensorResponse(name=""),  # Empty name, should use device name
+            ListEntitiesDoneResponse(),
+        ],
+    )
+
+    # Call list_entities_services WITHOUT calling device_info first
+    entities, _services = await auth_client.list_entities_services()
+
+    # Verify device_info was fetched and cached
+    assert auth_client._cached_device_info is not None
+    assert auth_client._cached_device_info.name == "auto-device"
+
+    # Verify object_id was filled in correctly
+    assert len(entities) == 2
+    # Named entity gets object_id from its name
+    assert entities[0].object_id == "my_sensor"
+    # Empty-name entity gets object_id from device name
+    assert entities[1].object_id == "auto-device"
+
+
 async def test_list_entities_with_cached_device_info(auth_client: APIClient) -> None:
-    """Test list_entities_services fills object_id when device_info was called first."""
+    """Test list_entities_services uses cached device_info without re-fetching."""
     # First call device_info() to populate the cache
     patch_response_simple(
         auth_client,
@@ -381,6 +423,9 @@ async def test_list_entities_with_cached_device_info(auth_client: APIClient) ->
     device_info = await auth_client.device_info()
     assert device_info.name == "my-device"
 
+    # Clear the simple response patch - list_entities_services should NOT call device_info again
+    auth_client._connection.send_message_await_response = None
+
     # Now call list_entities_services - it should use cached device_info
     # to fill in missing object_id values
     patch_response_complex(