Fix get_all_bouquets to retrieve all bouquets

openwebif/api.py

@@ -41,6 +41,8 @@
 if TYPE_CHECKING:
     from collections.abc import Mapping
 
+    from openwebif.types import Bouquets
+
 _LOGGER = logging.getLogger(__name__)
 
 
@@ -508,15 +510,17 @@ async def get_all_services(self) -> dict[str, Any]:
         """Get list of all services."""
         return await self._call_api(PATH_GETALLSERVICES)
 
-    async def get_bouquets(self, stype: SType = SType.TV) -> dict[str, Any]:
+    async def get_bouquets(self, stype: SType = SType.TV) -> Bouquets:
         """Get list of bouquets."""
         return await self._call_api(PATH_BOUQUETS, {"stype": str(stype)})
 
-    async def get_all_bouquets(self) -> dict[str, Any]:
+    async def get_all_bouquets(self) -> Bouquets:
         """Get list of all tv and radio bouquets."""
         return {
-            **(await self.get_bouquets(SType.TV)),
-            **(await self.get_bouquets(SType.RADIO)),
+            "bouquets": [
+                *((await self.get_bouquets(SType.TV))["bouquets"]),
+                *((await self.get_bouquets(SType.RADIO))["bouquets"]),
+            ],
         }
 
     async def zap(self, source: str) -> bool:

openwebif/types.py

@@ -0,0 +1,9 @@
+"""Types for openwebif."""
+
+from typing import TypedDict
+
+
+class Bouquets(TypedDict):
+    """The bouquets type."""
+
+    bouquets: list[list[str]]

pyproject.toml

@@ -68,6 +68,8 @@ ignore = [
     # Ignored due to performance: https://github.com/charliermarsh/ruff/issues/2923
     "UP038", # Use `X | Y` in `isinstance` call instead of `(X, Y)`
 
+    "COM812",
+    "ISC001"
 ]
 
 [tool.ruff.lint.extend-per-file-ignores]