Version 4.2.1

- fix self.base not set when a ClientSession is given as a parameter
- fix format

openwebif/__init__.py

@@ -1,3 +1,3 @@
 """Top-level package for openwebif."""
 
-__version__ = "4.2.0"
+__version__ = "4.2.1"

openwebif/api.py

@@ -5,7 +5,7 @@
 from dataclasses import dataclass
 from re import sub
 from time import time
-from typing import Any, Mapping
+from typing import Any, Mapping, cast
 
 import aiohttp
 from yarl import URL
@@ -42,6 +42,7 @@ def enable_logging() -> None:
     logging.basicConfig(level=logging.INFO)
 
 
+# pylint: disable=too-many-instance-attributes
 @dataclass
 class OpenWebIfServiceEvent:
     """Represent a OpenWebIf service event."""
@@ -59,6 +60,7 @@ class OpenWebIfServiceEvent:
     station: str | None = None
 
 
+# pylint: disable=too-many-instance-attributes
 @dataclass
 class OpenWebIfStatus:
     """Repesent a OpenWebIf status."""
@@ -74,6 +76,7 @@ class OpenWebIfStatus:
     is_recording_playback: bool | None = False
 
 
+# pylint: disable=too-many-instance-attributes, disable=too-many-public-methods
 class OpenWebIfDevice:
     """Represent a OpenWebIf client device."""
 
@@ -122,6 +125,7 @@ def __init__(
             )
             self._session = aiohttp.ClientSession(self.base)
         elif isinstance(host, aiohttp.ClientSession):
+            self.base = cast(URL, host._base_url)
             self._session = host
         self.turn_off_to_deep = turn_off_to_deep
         self.source_bouquet = source_bouquet
@@ -273,7 +277,12 @@ def get_screen_grab_url(
         :return: The URL for the screen grab
         """
         return self.base.with_path(PATH_GRAB).with_query(
-            {"mode": mode.value, "format": file_format.value, "t": int(time()), "r": resolution}
+            {
+                "mode": mode.value,
+                "format": file_format.value,
+                "t": int(time()),
+                "r": resolution,
+            }
         )
 
     async def turn_off(self) -> bool:
@@ -446,9 +455,7 @@ async def get_bouquet_sources(self, bouquet: str | None = None) -> dict[str, Any
             # load first bouquet
             all_bouquets = await self.get_all_bouquets()
             if not all_bouquets:
-                _LOGGER.debug(
-                    "%s get_all_bouquets: No bouquets were found.", self.base
-                )
+                _LOGGER.debug("%s get_all_bouquets: No bouquets were found.", self.base)
                 return sources
 
             if "bouquets" in all_bouquets:

tests/test_openwebifpy.py

@@ -1,5 +1,4 @@
 """Tests the api."""
-# pylint: disable=protected-access
 import pytest
 
 import openwebif.api
@@ -9,7 +8,7 @@ def test_create() -> None:
     """Test creating a new device."""
     # Bogus config
     with pytest.raises(TypeError):
-        openwebif.api.OpenWebIfDevice()
+        openwebif.api.OpenWebIfDevice()  # type: ignore[call-arg]
 
 
 def test_get_picon_name() -> None: