Remove services and simply list discovery

Author: mdegat01

aiohasupervisor/discovery.py

@@ -10,10 +10,10 @@
 class DiscoveryClient(_SupervisorComponentClient):
     """Handles discovery access in supervisor."""
 
-    async def list(self) -> DiscoveryList:
-        """List discovered and available services."""
+    async def list(self) -> list[Discovery]:
+        """List discovered active services."""
         result = await self._client.get("discovery")
-        return DiscoveryList.from_dict(result.data)
+        return DiscoveryList.from_dict(result.data).discovery
 
     async def get(self, uuid: UUID) -> Discovery:
         """Get discovery details for a service."""

aiohasupervisor/models/__init__.py

@@ -43,7 +43,6 @@
 from aiohasupervisor.models.discovery import (
     Discovery,
     DiscoveryConfig,
-    DiscoveryList,
 )
 from aiohasupervisor.models.homeassistant import (
     HomeAssistantInfo,

aiohasupervisor/models/discovery.py

@@ -30,7 +30,6 @@ class DiscoveryList(ResponseData):
     """DiscoveryList model."""
 
     discovery: list[Discovery]
-    services: dict[str, list[str]]
 
 
 @dataclass(frozen=True, slots=True)

tests/test_discovery.py

@@ -22,16 +22,10 @@ async def test_discovery_list(
         body=load_fixture("discovery_list.json"),
     )
     disc_list = await supervisor_client.discovery.list()
-    assert disc_list.discovery[0].addon == "core_mosquitto"
-    assert disc_list.discovery[0].service == "mqtt"
-    assert disc_list.discovery[0].uuid.hex == "889ca604cff84004894e53d181655b3a"
-    assert disc_list.discovery[0].config["host"] == "core-mosquitto"
-    assert disc_list.services["vlc_telnet"] == ["core_vlc"]
-    assert disc_list.services["zwave_js"] == [
-        "core_zwave_js",
-        "a0d7b954_zwavejs2mqtt",
-        "77f1785d_zwave_mock_server",
-    ]
+    assert disc_list[0].addon == "core_mosquitto"
+    assert disc_list[0].service == "mqtt"
+    assert disc_list[0].uuid.hex == "889ca604cff84004894e53d181655b3a"
+    assert disc_list[0].config["host"] == "core-mosquitto"
 
 
 async def test_get_discovery(