plugwise 1.7.1__py3-none-any.whl → 1.7.2__py3-none-any.whl

plugwise/__init__.py

@@ -296,7 +296,7 @@ class Smile(SmileComm):
         ):
             system = await self._request(SYSTEM)
             self.smile_version = parse(system.find("./gateway/firmware").text)
-            return_model = system.find("./gateway/product").text
+            return_model = str(system.find("./gateway/product").text)
             self.smile_hostname = system.find("./gateway/hostname").text
             # If wlan0 contains data it's active, so eth0 should be checked last
             for network in ("wlan0", "eth0"):
@@ -307,7 +307,7 @@ class Smile(SmileComm):
         elif dsmrmain is not None:
             status = await self._request(STATUS)
             self.smile_version = parse(status.find("./system/version").text)
-            return_model = status.find("./system/product").text
+            return_model = str(status.find("./system/product").text)
             self.smile_hostname = status.find("./network/hostname").text
             self.smile_mac_address = status.find("./network/mac_address").text
         else:  # pragma: no cover

plugwise/legacy/smile.py

@@ -231,21 +231,50 @@ class SmileLegacyAPI(SmileLegacyData):
     async def set_switch_state(
         self, appl_id: str, members: list[str] | None, model: str, state: str
     ) -> None:
-        """Set the given State of the relevant Switch."""
+        """Set the given state of the relevant switch.
+
+        For individual switches, sets the state directly.
+        For group switches, sets the state for each member in the group separately.
+        For switch-locks, sets the lock state using a different data format.
+        """
         switch = Munch()
         switch.actuator = "actuator_functionalities"
         switch.func_type = "relay_functionality"
         if self._stretch_v2:
             switch.actuator = "actuators"
             switch.func_type = "relay"
-        switch.func = "state"
 
+        # Handle switch-lock
+        if model == "lock":
+            state = "false" if state == "off" else "true"
+            appliance = self._appliances.find(f'appliance[@id="{appl_id}"]')
+            appl_name = appliance.find("name").text
+            appl_type = appliance.find("type").text
+            data = f'''
+                <appliances>
+                    <appliance id="{appl_id}">
+                        <name><![CDATA[{appl_name}]]></name>
+                        <description><![CDATA[]]></description>
+                        <type><![CDATA[{appl_type}]]></type>
+                        <{switch.actuator}>
+                            <{switch.func_type}>
+                                <lock>{state}</lock>
+                            </{switch.func_type}>
+                        </{switch.actuator}>
+                    </appliance>
+                </appliances>'''.strip()
+            await self.call_request(APPLIANCES, method="post", data=data)
+            return
+
+        # Handle group of switches
+        data = f"<{switch.func_type}><state>{state}</state></{switch.func_type}>"
         if members is not None:
-            return await self._set_groupswitch_member_state(members, state, switch)
-
-        data = f"<{switch.func_type}><{switch.func}>{state}</{switch.func}></{switch.func_type}>"
-        uri = f"{APPLIANCES};id={appl_id}/{switch.func_type}"
+            return await self._set_groupswitch_member_state(
+                data, members, state, switch
+            )
 
+        # Handle individual relay switches
+        uri = f"{APPLIANCES};id={appl_id}/relay"
         if model == "relay":
             locator = (
                 f'appliance[@id="{appl_id}"]/{switch.actuator}/{switch.func_type}/lock'
@@ -257,16 +286,14 @@ class SmileLegacyAPI(SmileLegacyData):
         await self.call_request(uri, method="put", data=data)
 
     async def _set_groupswitch_member_state(
-        self, members: list[str], state: str, switch: Munch
+        self, data: str, members: list[str], state: str, switch: Munch
     ) -> None:
         """Helper-function for set_switch_state().
 
-        Set the given State of the relevant Switch within a group of members.
+        Set the given State of the relevant Switch (relay) within a group of members.
         """
         for member in members:
-            uri = f"{APPLIANCES};id={member}/{switch.func_type}"
-            data = f"<{switch.func_type}><{switch.func}>{state}</{switch.func}></{switch.func_type}>"
-
+            uri = f"{APPLIANCES};id={member}/relay"
             await self.call_request(uri, method="put", data=data)
 
     async def set_temperature(self, _: str, items: dict[str, float]) -> None:

{plugwise-1.7.1.dist-info → plugwise-1.7.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: plugwise
-Version: 1.7.1
+Version: 1.7.2
 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.7.1.dist-info → plugwise-1.7.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-plugwise/__init__.py,sha256=hLwUqdGAo39LzTXYz6Lkua_9RelJx5k-uAeJSrZdfYk,17760
+plugwise/__init__.py,sha256=3ewWm0PtaLgYsD4oHJ8BQ3DJMV3c-Qx2mWbdcJQkdAk,17770
 plugwise/common.py,sha256=_41FLLjgccaHjaV0Ndn1YEkxjB_qKev1k3ZnhSUzXjc,9305
 plugwise/constants.py,sha256=Vd8tvOHsRtZxtUUFXBXolZj3QiKnxRt0bnwDT9DoEqE,17073
 plugwise/data.py,sha256=ITGnS5RiRbd3O2KbYLc9_5okw81zLl7azXNXtuTwaoY,13022
@@ -10,9 +10,9 @@ plugwise/smilecomm.py,sha256=aQ2KkebDTou18k-flrVmTnFkgls33Xu8D9ZZQQt2R5k,5178
 plugwise/util.py,sha256=d3nOS9fzZ1MwJX8_77KOgW3CtQnGYc0oGcnqHrlxlLo,11015
 plugwise/legacy/data.py,sha256=s2WYjgxwcuAGS8UOxJVf7xLSxS38Zgr8GsjxlxfD98w,3574
 plugwise/legacy/helper.py,sha256=CjLGUhWRgNCOyooVyylLABdv0H2zoiKzjhQ-g7E8x9M,17059
-plugwise/legacy/smile.py,sha256=aCG5uaOCS4GOGfIbxTp8U-CFE3Cib-UspB4qSamm_eY,11659
-plugwise-1.7.1.dist-info/LICENSE,sha256=mL22BjmXtg_wnoDnnaqps5_Bg_VGj_yHueX5lsKwbCc,1144
-plugwise-1.7.1.dist-info/METADATA,sha256=Dnc7KdcTcDjT33JYXSkkDkHXkxKHXEet2gXQcQpSuyo,9148
-plugwise-1.7.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-plugwise-1.7.1.dist-info/top_level.txt,sha256=MYOmktMFf8ZmX6_OE1y9MoCZFfY-L8DA0F2tA2IvE4s,9
-plugwise-1.7.1.dist-info/RECORD,,
+plugwise/legacy/smile.py,sha256=zPIuOBUfhjaOZqMR0T5lw3-qB_9KHhAaBMW06tR1NT8,12836
+plugwise-1.7.2.dist-info/LICENSE,sha256=mL22BjmXtg_wnoDnnaqps5_Bg_VGj_yHueX5lsKwbCc,1144
+plugwise-1.7.2.dist-info/METADATA,sha256=NBEB-iLRSihQX8UuHyVQmg2hIZCU1gf_8aximWzJ3K0,9148
+plugwise-1.7.2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+plugwise-1.7.2.dist-info/top_level.txt,sha256=MYOmktMFf8ZmX6_OE1y9MoCZFfY-L8DA0F2tA2IvE4s,9
+plugwise-1.7.2.dist-info/RECORD,,