plugwise 1.3.0__py3-none-any.whl → 1.4.0__py3-none-any.whl

plugwise/__init__.py

@@ -85,6 +85,7 @@ class Smile(SmileComm):
         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 @@ class Smile(SmileComm):
             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 @@ class Smile(SmileComm):
             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

@@ -252,6 +252,7 @@ ApplianceType = Literal[
     "mac_address",
     "members",
     "model",
+    "model_id",
     "name",
     "vendor",
     "zigbee_mac_address",
@@ -511,15 +512,16 @@ class DeviceData(TypedDict, total=False):
 
     # Appliance base data
     dev_class: str
-    firmware: str | None
+    firmware: str
     hardware: str
     location: str
-    mac_address: str | None
+    mac_address: str
     members: list[str]
     model: str
+    model_id: str | None
     name: str
     vendor: str
-    zigbee_mac_address: str | None
+    zigbee_mac_address: str
 
     # For temporary use
     cooling_enabled: bool

plugwise/helper.py

@@ -254,6 +254,7 @@ class SmileHelper(SmileCommon):
         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 @@ class SmileHelper(SmileCommon):
         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 @@ class SmileHelper(SmileCommon):
         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 @@ class SmileAPI(SmileComm, SmileData):
         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 @@ class SmileAPI(SmileComm, SmileData):
         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
 

{plugwise-1.3.0.dist-info → plugwise-1.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: plugwise
-Version: 1.3.0
+Version: 1.4.0
 Summary: Plugwise Smile (Adam/Anna/P1) and Stretch module for Python 3.
 Home-page: https://github.com/plugwise/python-plugwise
 Author: Plugwise device owners

{plugwise-1.3.0.dist-info → plugwise-1.4.0.dist-info}/RECORD

@@ -1,17 +1,17 @@
-plugwise/__init__.py,sha256=EXiTp-N8kQqOUAaczDbULS176NwA2C1FcfWiKkBzNdI,16887
+plugwise/__init__.py,sha256=wA-xl4Cd2mioaKhP31D6dHNu-CM2X-5n8TlQbSIra3k,17035
 plugwise/common.py,sha256=geZd-kVQ0F1OTJoUd2WMPxNBVpSLgZ2ID_47ainOMnk,12746
-plugwise/constants.py,sha256=O2sEAUjoOgvuM5dsS7jzZOMDcy6h8WI1p-od9WzJvQ4,16722
+plugwise/constants.py,sha256=kVNrr4zeKFMiGBogVLZ6B925FHAIgy1PY2BBxaT1vkk,16742
 plugwise/data.py,sha256=I4w3ABqmcj_uSnfxTWPYQH8WP6HaywVMx1aQ-feBdU0,10734
 plugwise/exceptions.py,sha256=Ce-tO9uNsMB-8FP6VAxBvsHNJ-NIM9F0onUZOdZI4Ys,1110
-plugwise/helper.py,sha256=2oSUV2Wj0LkfhAvfXwMvfDrJ9x5SWlen4IVCs4twYSU,44123
+plugwise/helper.py,sha256=05dG0FYCBNwO10P5l7LfeouO5Jrs8i-e0jzftZbgFIw,44074
 plugwise/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-plugwise/smile.py,sha256=TyDXl1NSMFxsZehtopawpYpL6vie3NM3gVcez_bfjvA,18681
+plugwise/smile.py,sha256=QEztzHr3dzwoZv6lgXKZqDwwCy4WD-2LlS5FhWBHk48,18762
 plugwise/util.py,sha256=lCasQDzYO3CNAIHbLKTK16YJxQKoBrTQkJ1nCMmF17g,8006
 plugwise/legacy/data.py,sha256=DsHR9xgiFDg_Vh_6ZpOskw8ZhNQ3CmwjstI3yiH6MEk,3048
 plugwise/legacy/helper.py,sha256=7QCJyaR9FaM4EEQxGt2oFJac6Pu5OKoi_LG_GQKzRs4,18012
 plugwise/legacy/smile.py,sha256=7oaPZuvxrYRvoA8qWFvtWSwQRFfQl1XXpPjWXn3_xFs,11314
-plugwise-1.3.0.dist-info/LICENSE,sha256=mL22BjmXtg_wnoDnnaqps5_Bg_VGj_yHueX5lsKwbCc,1144
-plugwise-1.3.0.dist-info/METADATA,sha256=7JzpaCXGkFUFcdvHvbCjsKLbKKackFQFjC9moyvg60o,9097
-plugwise-1.3.0.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-plugwise-1.3.0.dist-info/top_level.txt,sha256=MYOmktMFf8ZmX6_OE1y9MoCZFfY-L8DA0F2tA2IvE4s,9
-plugwise-1.3.0.dist-info/RECORD,,
+plugwise-1.4.0.dist-info/LICENSE,sha256=mL22BjmXtg_wnoDnnaqps5_Bg_VGj_yHueX5lsKwbCc,1144
+plugwise-1.4.0.dist-info/METADATA,sha256=EZRtW9L6vE2vrmMPW9FIDyX1jm4_R2oSjDx6gBAZP2w,9097
+plugwise-1.4.0.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+plugwise-1.4.0.dist-info/top_level.txt,sha256=MYOmktMFf8ZmX6_OE1y9MoCZFfY-L8DA0F2tA2IvE4s,9
+plugwise-1.4.0.dist-info/RECORD,,