Clean up inits, don't double-init

Author: bouwew

plugwise/__init__.py

@@ -61,13 +61,12 @@ def __init__(
             timeout,
         )
 
-        self._smile_api: SmileAPI | SmileLegacyAPI
         self._host = host
         self._passwd = password
+        self._websession = websession
         self._user = username
         self._port = port
         self._timeout = timeout
-        self._websession = websession
 
         self._cooling_present = False
         self._elga = False
@@ -76,9 +75,9 @@ def __init__(
         self._on_off_device = False
         self._opentherm_device = False
         self._schedule_old_states: dict[str, dict[str, str]] = {}
+        self._smile_api: SmileAPI | SmileLegacyAPI
         self._stretch_v2 = False
-        self._stretch_v3 = False
-        self._target_smile: str
+        self._target_smile: str = NONE
         self.gateway_id: str = NONE
         self.loc_data: dict[str, ThermoLoc] = {}
         self.smile_fw_version: str | None
@@ -131,14 +130,14 @@ async def connect(self) -> bool:
         self._smile_api = SmileAPI(
             self._host,
             self._passwd,
+            self._websession,
             self._cooling_present,
             self._elga,
             self._is_thermostat,
             self._last_active,
             self._on_off_device,
             self._opentherm_device,
             self._schedule_old_states,
-            self._target_smile,
             self.gateway_id,
             self.loc_data,
             self.smile_fw_version,
@@ -150,7 +149,6 @@ async def connect(self) -> bool:
             self.smile_name,
             self.smile_type,
             self.smile_version,
-            self._websession,
             self._user,
             self._port,
             self._timeout,
@@ -159,12 +157,11 @@ async def connect(self) -> bool:
             self._smile_api = SmileLegacyAPI(
                 self._host,
                 self._passwd,
+                self._websession,
                 self._is_thermostat,
                 self._on_off_device,
                 self._opentherm_device,
-                self._schedule_old_states,
                 self._stretch_v2,
-                self._stretch_v3,
                 self._target_smile,
                 self.loc_data,
                 self.smile_fw_version,
@@ -176,7 +173,6 @@ async def connect(self) -> bool:
                 self.smile_type,
                 self.smile_version,
                 self.smile_zigbee_mac_address,
-                self._websession,
                 self._user,
                 self._port,
                 self._timeout,
@@ -236,7 +232,6 @@ async def _smile_detect(self, result: etree, dsmrmain: etree) -> None:
 
         if self.smile_type == "stretch":
             self._stretch_v2 = self.smile_version[1].major == 2
-            self._stretch_v3 = self.smile_version[1].major == 3
 
         if self.smile_type == "thermostat":
             self._is_thermostat = True

plugwise/helper.py

@@ -197,28 +197,27 @@ def __init__(self) -> None:
         """Set the constructor for this class."""
         self._cooling_activation_outdoor_temp: float
         self._cooling_deactivation_threshold: float
-        self._cooling_present = False
+        self._cooling_present: bool
         self._count: int
         self._dhw_allowed_modes: list[str] = []
         self._domain_objects: etree
         self._endpoint: str
-        self._elga = False
+        self._elga: bool
         self._gw_allowed_modes: list[str] = []
         self._heater_id: str
         self._home_location: str
-        self._is_thermostat = False
+        self._is_thermostat: bool
         self._last_active: dict[str, str | None]
         self._last_modified: dict[str, str] = {}
         self._notifications: dict[str, dict[str, str]] = {}
-        self._on_off_device = False
-        self._opentherm_device = False
+        self._on_off_device: bool
+        self._opentherm_device: bool
         self._outdoor_temp: float
         self._reg_allowed_modes: list[str] = []
         self._schedule_old_states: dict[str, dict[str, str]] = {}
         self._smile_legacy = False
         self._status: etree
-        self._stretch_v2 = False
-        self._stretch_v3 = False
+        self._stretch_v2: bool
         self._system: etree
         self._thermo_locs: dict[str, ThermoLoc] = {}
         ###################################################################

plugwise/legacy/data.py

@@ -60,7 +60,7 @@ def _all_device_data(self) -> None:
         )
         if self._is_thermostat:
             self.gw_data.update(
-                {"heater_id": self._heater_id, "cooling_present": self._cooling_present}
+                {"heater_id": self._heater_id, "cooling_present": False}
             )
 
     def _device_data_switching_group(

plugwise/legacy/helper.py

@@ -70,23 +70,19 @@ def __init__(self) -> None:
         """Set the constructor for this class."""
         self._appliances: etree
         self._count: int
-        self._cooling_present = False
         self._domain_objects: etree
         self._heater_id: str
         self._home_location: str
-        self._is_thermostat = False
-        self._last_active: dict[str, str | None] = {}
+        self._is_thermostat: bool
         self._last_modified: dict[str, str] = {}
         self._locations: etree
         self._modules: etree
         self._notifications: dict[str, dict[str, str]] = {}
-        self._on_off_device = False
-        self._opentherm_device = False
+        self._on_off_device: bool
+        self._opentherm_device: bool
         self._outdoor_temp: float
-        self._schedule_old_states: dict[str, dict[str, str]] = {}
         self._status: etree
-        self._stretch_v2 = False
-        self._stretch_v3 = False
+        self._stretch_v2: bool
         self._system: etree
 
         self.device_items: int = 0

plugwise/legacy/smile.py

@@ -41,12 +41,11 @@ def __init__(
         self,
         host: str,
         password: str,
+        websession: aiohttp.ClientSession,
         _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,
         loc_data: dict[str, ThermoLoc],
         smile_fw_version: str | None,
@@ -58,7 +57,6 @@ 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,
@@ -77,9 +75,7 @@ def __init__(
         self._is_thermostat = _is_thermostat
         self._on_off_device = _on_off_device
         self._opentherm_device = _opentherm_device
-        self._schedule_old_states = _schedule_old_states
         self._stretch_v2 = _stretch_v2
-        self._stretch_v3 = _stretch_v3
         self._target_smile = _target_smile
         self.loc_data = loc_data
         self.smile_fw_version = smile_fw_version

plugwise/smile.py

@@ -48,14 +48,14 @@ def __init__(
         self,
         host: str,
         password: str,
+        websession: aiohttp.ClientSession,
         _cooling_present: bool,
         _elga: bool,
         _is_thermostat: bool,
         _last_active: dict[str, str | None],
         _on_off_device: bool,
         _opentherm_device: bool,
         _schedule_old_states: dict[str, dict[str, str]],
-        _target_smile: str | None,
         gateway_id: str,
         loc_data: dict[str, ThermoLoc],
         smile_fw_version: str | None,
@@ -67,7 +67,6 @@ 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,
@@ -91,7 +90,6 @@ def __init__(
         self._on_off_device = _on_off_device
         self._opentherm_device = _opentherm_device
         self._schedule_old_states = _schedule_old_states
-        self._target_smile = _target_smile
         self.gateway_id = gateway_id
         self.loc_data = loc_data
         self.smile_fw_version = smile_fw_version