Readd websession and fix typing

Author: bouwew

plugwise/__init__.py

@@ -43,19 +43,20 @@ def __init__(
         self,
         host: str,
         password: str,
+        websession: aiohttp.ClientSession,
         username: str = DEFAULT_USERNAME,
         port: int = DEFAULT_PORT,
         timeout: float = DEFAULT_TIMEOUT,
-        websession: aiohttp.ClientSession | None = None,
+
     ) -> None:
         """Set the constructor for this class."""
         super().__init__(
             host,
             password,
+            websession,
             username,
             port,
             timeout,
-            websession,
         )
 
         self._smile_api: SmileAPI | SmileLegacyAPI
@@ -64,7 +65,7 @@ def __init__(
         self._user = username
         self._port = port
         self._timeout = timeout
-        # self._websession = websession
+        self._websession = websession
 
         self._cooling_present = False
         self._elga = False
@@ -141,10 +142,10 @@ async def connect(self) -> bool:
             self.smile_name,
             self.smile_type,
             self.smile_version,
+            self._websession,
             self._user,
             self._port,
             self._timeout,
-            # self._websession,
          )
         if self.smile_legacy:
             self._smile_api = SmileLegacyAPI(
@@ -166,10 +167,10 @@ async def connect(self) -> bool:
                 self.smile_type,
                 self.smile_version,
                 self.smile_zigbee_mac_address,
+                self._websession,
                 self._user,
                 self._port,
                 self._timeout,
-                # self._websession,
             )
 
         # Update all endpoints on first connect

plugwise/helper.py

@@ -104,10 +104,10 @@ def __init__(
         self,
         host: str,
         password: str,
+        websession: ClientSession | None,
         username: str,
         port: int,
         timeout: float,
-        websession: ClientSession | None,
     ) -> None:
         """Set the constructor for this class."""
         if not websession:

plugwise/legacy/smile.py

@@ -57,19 +57,19 @@ def __init__(
         smile_type: str,
         smile_version: tuple[str, semver.version.Version],
         smile_zigbee_mac_address: str | None,
+        websession: aiohttp.ClientSession,
         username: str = DEFAULT_USERNAME,
         port: int = DEFAULT_PORT,
         timeout: float = DEFAULT_TIMEOUT,
-        websession: aiohttp.ClientSession | None = None,
     ) -> None:
         """Set the constructor for this class."""
         super().__init__(
             host,
             password,
+            websession,
             username,
             port,
             timeout,
-            websession,
         )
         SmileLegacyData.__init__(self)
 

plugwise/smile.py

@@ -63,20 +63,20 @@ def __init__(
         smile_name: str,
         smile_type: str,
         smile_version: tuple[str, semver.version.Version],
+        websession: aiohttp.ClientSession,
         username: str = DEFAULT_USERNAME,
         port: int = DEFAULT_PORT,
         timeout: float = DEFAULT_TIMEOUT,
-        websession: aiohttp.ClientSession | None = None,
 
     ) -> None:
         """Set the constructor for this class."""
         super().__init__(
             host,
             password,
+            websession,
             username,
             port,
             timeout,
-            websession,
         )
         SmileData.__init__(self)