Merge pull request #619 from plugwise/impr_model_id

Improve model_id implementation

Author: bouwew

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v1.4.0
+
+- Improve model_id implementation, allow direct access to the gateway `smile_model_id`.
+
 ## v1.3.1
 
 - Add missing typing for model_id.

plugwise/__init__.py

@@ -85,6 +85,7 @@ def __init__(
         self.smile_legacy = False
         self.smile_mac_address: str | None = None
         self.smile_model: str = NONE
+        self.smile_model_id: str | None = None
         self.smile_name: str = NONE
         self.smile_type: str = NONE
         self.smile_version: str = NONE
@@ -145,6 +146,7 @@ async def connect(self) -> bool:
             self.smile_hw_version,
             self.smile_mac_address,
             self.smile_model,
+            self.smile_model_id,
             self.smile_name,
             self.smile_type,
             self._user,
@@ -190,6 +192,7 @@ async def _smile_detect(self, result: etree, dsmrmain: etree) -> None:
             self.smile_hw_version = gateway.find("hardware_version").text
             self.smile_hostname = gateway.find("hostname").text
             self.smile_mac_address = gateway.find("mac_address").text
+            self.smile_model_id = gateway.find("vendor_model").text
         else:
             model = await self._smile_detect_legacy(result, dsmrmain, model)
 

plugwise/constants.py

@@ -518,7 +518,7 @@ class DeviceData(TypedDict, total=False):
     mac_address: str
     members: list[str]
     model: str
-    model_id: str
+    model_id: str | None
     name: str
     vendor: str
     zigbee_mac_address: str

plugwise/helper.py

@@ -254,6 +254,7 @@ def __init__(self) -> None:
         self.smile_hw_version: str | None
         self.smile_mac_address: str | None
         self.smile_model: str
+        self.smile_model_id: str | None
         self.smile_name: str
         self.smile_type: str
         self.smile_zigbee_mac_address: str | None
@@ -351,7 +352,7 @@ def _p1_smartmeter_info_finder(self, appl: Munch) -> None:
         appl.dev_id = self.gateway_id
         appl.location = loc_id
         appl.mac = None
-        appl.model = self._domain_objects.find("./gateway/vendor_model").text
+        appl.model = None
         appl.model_id = None
         appl.name = "P1"
         appl.pwclass = "smartmeter"
@@ -421,7 +422,7 @@ def _appl_gateway_info(self, appl: Munch, appliance: etree) -> Munch:
         appl.hardware = self.smile_hw_version
         appl.mac = self.smile_mac_address
         appl.model = self.smile_model
-        appl.model_id = self._domain_objects.find("./gateway/vendor_model").text
+        appl.model_id = self.smile_model_id
         appl.name = self.smile_name
         appl.vendor_name = "Plugwise"
 

plugwise/smile.py

@@ -62,6 +62,7 @@ def __init__(
         smile_hw_version: str | None,
         smile_mac_address: str | None,
         smile_model: str,
+        smile_model_id: str | None,
         smile_name: str,
         smile_type: str,
         username: str = DEFAULT_USERNAME,
@@ -93,6 +94,7 @@ def __init__(
         self.smile_hw_version = smile_hw_version
         self.smile_mac_address = smile_mac_address
         self.smile_model = smile_model
+        self.smile_model_id = smile_model_id
         self.smile_name = smile_name
         self.smile_type = smile_type
 

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name            = "plugwise"
-version         = "1.3.1"
+version         = "1.4.0"
 license         = {file = "LICENSE"}
 description     = "Plugwise Smile (Adam/Anna/P1) and Stretch module for Python 3."
 readme          = "README.md"