Mypy fixes, clean up

Author: bouwew

plugwise/__init__.py

@@ -58,29 +58,28 @@ def __init__(
             websession,
         )
 
-        self._smile_api = None
+        self._smile_api: SmileAPI | SmileLegacyAPI
         self._host = host
         self._passwd = password
         self._user = username
         self._port = port
         self._timeout = timeout
-        self._websession = websession
+        # self._websession = websession
 
         self._cooling_present = False
-        self._data: PlugwiseData = {}
         self._elga = False
         self._is_thermostat = False
         self._on_off_device = False
         self._opentherm_device = False
-        self._schedule_old_states = {}
+        self._schedule_old_states: dict[str, dict[str, str]] = {}
         self._stretch_v2 = False
         self._stretch_v3 = False
-        self._target_smile: str | None = None
-        self.smile_fw_version: str | None = None
-        self.smile_hostname: str | None = None
+        self._target_smile: str
+        self.smile_fw_version: str | None
+        self.smile_hostname: str
         self.smile_hw_version: str | None = None
         self.smile_legacy = False
-        self.smile_mac_address: str | None = None
+        self.smile_mac_address: str | None
         self.smile_model: str
         self.smile_name: str
         self.smile_type: str
@@ -145,7 +144,7 @@ async def connect(self) -> bool:
             self._user,
             self._port,
             self._timeout,
-            self._websession,
+            # self._websession,
          )
         if self.smile_legacy:
             self._smile_api = SmileLegacyAPI(
@@ -170,7 +169,7 @@ async def connect(self) -> bool:
                 self._user,
                 self._port,
                 self._timeout,
-                self._websession,
+                # self._websession,
             )
 
         # Update all endpoints on first connect
@@ -306,8 +305,7 @@ def get_all_devices(self) -> None:
 
     async def async_update(self) -> PlugwiseData:
         """Perform an incremental update for updating the various device states."""
-        self._data = await self._smile_api.async_update()
-        return self._data
+        return await self._smile_api.async_update()
 
 ########################################################################################################
 ###  API Set and HA Service-related Functions                                                        ###

plugwise/legacy/smile.py

@@ -8,8 +8,8 @@
 
 import aiohttp
 
-# Dict as class
 from munch import Munch
+import semver
 
 # Version detection
 from plugwise.constants import (
@@ -41,22 +41,22 @@ def __init__(
         self,
         host: str,
         password: str,
-        _is_thermostat,
-        _on_off_device,
-        _opentherm_device,
-        _schedule_old_states,
-        _stretch_v2,
-        _stretch_v3,
-        _target_smile,
-        smile_fw_version,
-        smile_hostname,
-        smile_hw_version,
-        smile_mac_address,
-        smile_model,
-        smile_name,
-        smile_type,
-        smile_version,
-        smile_zigbee_mac_address,
+        _is_thermostat: bool,
+        _on_off_device: bool,
+        _opentherm_device: bool,
+        _schedule_old_states: dict[str, dict[str, str]],
+        _stretch_v2: bool,
+        _stretch_v3: bool,
+        _target_smile: str,
+        smile_fw_version: str | None,
+        smile_hostname: str,
+        smile_hw_version: str | None,
+        smile_mac_address: str | None,
+        smile_model: str,
+        smile_name: str,
+        smile_type: str,
+        smile_version: tuple[str, semver.version.Version],
+        smile_zigbee_mac_address: str | None,
         username: str = DEFAULT_USERNAME,
         port: int = DEFAULT_PORT,
         timeout: float = DEFAULT_TIMEOUT,
@@ -255,3 +255,27 @@ async def _set_groupswitch_member_state(
             data = f"<{switch.func_type}><{switch.func}>{state}</{switch.func}></{switch.func_type}>"
 
             await self._request(uri, method="put", data=data)
+
+    async def set_number_setpoint(self, key: str, temperature: float) -> None:
+        """Set the max. Boiler or DHW setpoint on the Central Heating boiler."""
+        pass
+
+    async def set_temperature_offset(self, dev_id: str, offset: float) -> None:
+        """Set the Temperature offset for thermostats that support this feature."""
+        pass
+
+    async def set_gateway_mode(self, mode: str) -> None:
+        """Set the gateway mode."""
+        pass
+
+    async def set_regulation_mode(self, mode: str) -> None:
+        """Set the heating regulation mode."""
+        pass
+
+    async def set_dhw_mode(self, mode: str) -> None:
+        """Set the domestic hot water heating regulation mode."""
+        pass
+
+    async def delete_notification(self) -> None:
+        """Delete the active Plugwise Notification."""
+        pass