Merge pull request #515 from plugwise/improve-2

Code improvements

Author: bouwew

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## Ongoing
+
+- General improving of code
+
 ## v0.37.0
 
 - Refactor code into separate parts/paths for actual and legacy Plugwise devices.

plugwise/__init__.py

@@ -31,10 +31,6 @@
 import aiohttp
 from defusedxml import ElementTree as etree
 
-# Dict as class
-# Version detection
-import semver
-
 
 class Smile(SmileComm):
     """The Plugwise SmileConnect class."""
@@ -80,15 +76,15 @@ def __init__(
         self._target_smile: str = NONE
         self.gateway_id: str = NONE
         self.loc_data: dict[str, ThermoLoc] = {}
-        self.smile_fw_version: str | None
-        self.smile_hostname: str
+        self.smile_fw_version: str | None = None
+        self.smile_hostname: str = NONE
         self.smile_hw_version: str | None = None
         self.smile_legacy = False
-        self.smile_mac_address: str | None
-        self.smile_model: str
-        self.smile_name: str
-        self.smile_type: str
-        self.smile_version: tuple[str, semver.version.Version]
+        self.smile_mac_address: str | None = None
+        self.smile_model: str = NONE
+        self.smile_name: str = NONE
+        self.smile_type: str = NONE
+        self.smile_version: str = NONE
         self.smile_zigbee_mac_address: str | None = None
 
     async def connect(self) -> bool:
@@ -143,12 +139,10 @@ async def connect(self) -> bool:
             self.smile_fw_version,
             self.smile_hostname,
             self.smile_hw_version,
-            self.smile_legacy,
             self.smile_mac_address,
             self.smile_model,
             self.smile_name,
             self.smile_type,
-            self.smile_version,
             self._user,
             self._port,
             self._timeout,
@@ -171,7 +165,6 @@ async def connect(self) -> bool:
                 self.smile_model,
                 self.smile_name,
                 self.smile_type,
-                self.smile_version,
                 self.smile_zigbee_mac_address,
                 self._user,
                 self._port,
@@ -207,8 +200,8 @@ async def _smile_detect(self, result: etree, dsmrmain: etree) -> None:
             )
             raise UnsupportedDeviceError
 
-        ver = semver.version.Version.parse(self.smile_fw_version)
-        self._target_smile = f"{model}_v{ver.major}"
+        version_major: str = self.smile_fw_version.split(".", 1)[0]
+        self._target_smile = f"{model}_v{version_major}"
         LOGGER.debug("Plugwise identified as %s", self._target_smile)
         if self._target_smile not in SMILES:
             LOGGER.error(
@@ -228,10 +221,10 @@ async def _smile_detect(self, result: etree, dsmrmain: etree) -> None:
         self.smile_model = "Gateway"
         self.smile_name = SMILES[self._target_smile].smile_name
         self.smile_type = SMILES[self._target_smile].smile_type
-        self.smile_version = (self.smile_fw_version, ver)
+        self.smile_version = self.smile_fw_version
 
         if self.smile_type == "stretch":
-            self._stretch_v2 = self.smile_version[1].major == 2
+            self._stretch_v2 = int(version_major) == 2
 
         if self.smile_type == "thermostat":
             self._is_thermostat = True

plugwise/helper.py

@@ -214,8 +214,7 @@ def __init__(self) -> None:
         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._schedule_old_states: dict[str, dict[str, str]]
         self._status: etree
         self._stretch_v2: bool
         self._system: etree
@@ -240,13 +239,13 @@ def __init__(self) -> None:
         self.gw_data: GatewayData = {}
         self.gw_devices: dict[str, DeviceData] = {}
         self.loc_data: dict[str, ThermoLoc]
-        self.smile_fw_version: str | None = None
-        self.smile_hw_version: str | None = None
-        self.smile_mac_address: str | None = None
+        self.smile_fw_version: str | None
+        self.smile_hw_version: str | None
+        self.smile_mac_address: str | None
         self.smile_model: str
         self.smile_name: str
         self.smile_type: str
-        self.smile_zigbee_mac_address: str | None = None
+        self.smile_zigbee_mac_address: str | None
         self.therms_with_offset_func: list[str] = []
 
     def smile(self, name: str) -> bool:
@@ -305,13 +304,12 @@ def _get_module_data(
     def _energy_device_info_finder(self, appliance: etree, appl: Munch) -> Munch:
         """Helper-function for _appliance_info_finder().
 
-        Collect energy device info (Circle, Plug, Stealth): firmware, model and vendor name.
+        Collect energy device info (Smartmeter, Plug): firmware, model and vendor name.
         """
         if self.smile_type == "power":
             locator = "./logs/point_log/electricity_point_meter"
             mod_type = "electricity_point_meter"
             module_data = self._get_module_data(appliance, locator, mod_type)
-            appl.zigbee_mac = module_data["zigbee_mac_address"]
             appl.hardware = module_data["hardware_version"]
             appl.model = module_data["vendor_model"]
             appl.vendor_name = module_data["vendor_name"]

plugwise/legacy/helper.py

@@ -51,7 +51,6 @@
 # This way of importing aiohttp is because of patch/mocking in testing (aiohttp timeouts)
 from defusedxml import ElementTree as etree
 from munch import Munch
-import semver
 
 
 def etree_to_dict(element: etree) -> dict[str, str]:
@@ -90,15 +89,13 @@ def __init__(self) -> None:
         self.gw_data: GatewayData = {}
         self.gw_devices: dict[str, DeviceData] = {}
         self.loc_data: dict[str, ThermoLoc]
-        self.smile_fw_version: str | None = None
-        self.smile_hw_version: str | None = None
-        self.smile_legacy = False
-        self.smile_mac_address: str | None = None
+        self.smile_fw_version: str | None
+        self.smile_hw_version: str | None
+        self.smile_mac_address: str | None
         self.smile_model: str
         self.smile_name: str
         self.smile_type: str
-        self.smile_version: tuple[str, semver.version.Version]
-        self.smile_zigbee_mac_address: str | None = None
+        self.smile_zigbee_mac_address: str | None
 
     def smile(self, name: str) -> bool:
         """Helper-function checking the smile-name."""
@@ -176,15 +173,15 @@ def _get_module_data(
     def _energy_device_info_finder(self, appliance: etree, appl: Munch) -> Munch:
         """Helper-function for _appliance_info_finder().
 
-        Collect energy device info (Circle, Plug, Stealth): firmware, model and vendor name.
+        Collect energy device info (Smartmeter, Circle, Stealth, etc.): firmware, model and vendor name.
         """
         if self.smile_type in ("power", "stretch"):
             locator = "./services/electricity_point_meter"
             mod_type = "electricity_point_meter"
 
             module_data = self._get_module_data(appliance, locator, mod_type)
-            # Filter appliance without zigbee_mac, it's an orphaned device
             appl.zigbee_mac = module_data["zigbee_mac_address"]
+            # Filter appliance without zigbee_mac, it's an orphaned device
             if appl.zigbee_mac is None and self.smile_type != "power":
                 return None
 

plugwise/legacy/smile.py

@@ -6,7 +6,6 @@
 
 import datetime as dt
 
-# Version detection
 from plugwise.constants import (
     APPLIANCES,
     DEFAULT_PORT,
@@ -29,7 +28,6 @@
 
 import aiohttp
 from munch import Munch
-import semver
 
 
 class SmileLegacyAPI(SmileComm, SmileLegacyData):
@@ -55,7 +53,6 @@ def __init__(
         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,
@@ -85,7 +82,6 @@ def __init__(
         self.smile_model = smile_model
         self.smile_name = smile_name
         self.smile_type = smile_type
-        self.smile_version = smile_version
         self.smile_zigbee_mac_address = smile_zigbee_mac_address
 
         self._previous_day_number: str = "0"

plugwise/smile.py

@@ -35,9 +35,6 @@
 # Dict as class
 from munch import Munch
 
-# Version detection
-import semver
-
 
 class SmileAPI(SmileComm, SmileData):
     """The Plugwise SmileAPI helper class for actual Plugwise devices."""
@@ -61,12 +58,10 @@ def __init__(
         smile_fw_version: str | None,
         smile_hostname: str | None,
         smile_hw_version: str | None,
-        smile_legacy: bool,
         smile_mac_address: str | None,
         smile_model: str,
         smile_name: str,
         smile_type: str,
-        smile_version: tuple[str, semver.version.Version],
         username: str = DEFAULT_USERNAME,
         port: int = DEFAULT_PORT,
         timeout: float = DEFAULT_TIMEOUT,
@@ -95,12 +90,10 @@ def __init__(
         self.smile_fw_version = smile_fw_version
         self.smile_hostname = smile_hostname
         self.smile_hw_version = smile_hw_version
-        self.smile_legacy = smile_legacy
         self.smile_mac_address = smile_mac_address
         self.smile_model = smile_model
         self.smile_name = smile_name
         self.smile_type = smile_type
-        self.smile_version = smile_version
 
         self._heater_id: str
         self._cooling_enabled = False

pyproject.toml

@@ -34,7 +34,6 @@ dependencies    = [
         "munch",
         "pyserial",
         "python-dateutil",
-        "semver>=3.0.0",
 ]
 
 [project.urls]