fix: device fixes (#451)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: webdjoe

.pre-commit-config.yaml

@@ -15,7 +15,7 @@ repos:
   hooks:
   - id: mypy
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.14.3
+  rev: v0.14.4
   hooks:
     - id: ruff-check
       args: [ --fix, --config=ruff.toml ]

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyvesync"
-version = "3.2.1"
+version = "3.2.2"
 description = "pyvesync is a library to manage Etekcity Devices, Cosori Air Fryers, and Levoit Air Purifiers run on the VeSync app."
 readme = "README.md"
 requires-python = ">=3.11"

src/pyvesync/base_devices/purifier_base.py

@@ -109,7 +109,7 @@ def __init__(
         self.auto_preference_type: str | None = None
         self.auto_room_size: int | None = None
         self._air_quality_level: AirQualityLevel | None = None
-        self.child_lock: bool = False
+        self.child_lock: bool | None = None
         self.filter_open_state: bool = False
         self.display_status: str | None = None
         self.display_set_status: str | None = None
@@ -502,11 +502,11 @@ async def child_lock_off(self) -> bool:
 
     @property
     @deprecated('Use self.state.child_lock instead.')
-    def child_lock(self) -> bool:
+    def child_lock(self) -> bool | None:
         """Get child lock state.
 
         Returns:
-            bool : True if child lock is enabled, False if not.
+            bool | None : True if child lock is enabled, False if not, None if unknown.
         """
         return self.state.child_lock
 

src/pyvesync/device_map.py

@@ -697,7 +697,7 @@ class ThermostatMap(DeviceMapTemplate):
     ),
     HumidifierMap(
         class_name='VeSyncHumid1000S',
-        dev_types=['LUH-M101S-WUS', 'LUH-M101S-WEUR', 'LUH-M101S-WUSR'],
+        dev_types=['LUH-M101S-WUS', 'LUH-M101S-WUSR'],
         features=[],
         mist_modes={
             HumidifierModes.AUTO: 'auto',

src/pyvesync/devices/vesyncoutlet.py

@@ -803,7 +803,7 @@ async def get_details(self) -> None:
     async def toggle_switch(self, toggle: bool | None = None) -> bool:
         if toggle is None:
             toggle = self.state.device_status != DeviceStatus.ON
-        toggle_int = bool(toggle)
+        toggle_int = int(toggle)
         r_dict = await self.call_bypassv2_api(
             'setProperty',
             data={'powerSwitch_1': toggle_int},

src/tests/api/vesyncoutlet/BSDOG01.yaml

@@ -14,7 +14,7 @@ turn_off:
     method: bypassV2
     payload:
       data:
-        powerSwitch_1: false
+        powerSwitch_1: 0
       method: setProperty
       subDeviceNo: 0
       source: APP
@@ -42,7 +42,7 @@ turn_on:
     method: bypassV2
     payload:
       data:
-        powerSwitch_1: true
+        powerSwitch_1: 1
       method: setProperty
       subDeviceNo: 0
       source: APP

src/tests/base_test_cases.py

@@ -3,7 +3,6 @@
 from __future__ import annotations
 from typing import TYPE_CHECKING
 import asyncio
-import logging
 import pytest
 from unittest.mock import MagicMock, patch
 
@@ -31,7 +30,6 @@ def setup(self, caplog):
         """
         self.mock_api_call = patch("pyvesync.vesync.ClientSession")
         self.caplog = caplog
-        self.caplog.set_level(logging.DEBUG)
         self.mock_api = self.mock_api_call.start()
         self.loop = asyncio.new_event_loop()
         self.mock = MagicMock()
@@ -40,7 +38,6 @@ def setup(self, caplog):
         self.manager.redact = False
         self.manager.auth._token = TestDefaults.token
         self.manager.auth._account_id = TestDefaults.account_id
-        caplog.set_level(logging.DEBUG)
         yield
         self.mock.stop()
         self.loop.stop()
@@ -84,7 +81,6 @@ def setup(self, caplog):
         self.loop = asyncio.new_event_loop()
         self.mock_api_call = patch('pyvesync.vesync.VeSync.async_call_api')
         self.caplog = caplog
-        self.caplog.set_level(logging.DEBUG)
         self.mock_api = self.mock_api_call.start()
         self.mock_api.return_value.ok = True
         self.manager = VeSync(TestDefaults.email, TestDefaults.password)
@@ -93,7 +89,6 @@ def setup(self, caplog):
         self.manager.enabled = True
         self.manager.auth._token = TestDefaults.token
         self.manager.auth._account_id = TestDefaults.account_id
-        caplog.set_level(logging.DEBUG)
         yield
         self.mock_api_call.stop()
 

src/tests/call_json_humidifiers.py

@@ -211,7 +211,7 @@ class HumidifierDefaults:
         "screenSwitch": int(HumidifierDefaults.display_config),
         "screenState": int(HumidifierDefaults.display),
         "nightLight": {
-            "nightLightSwitch": 0,
+            "nightLightSwitch": int(HumidifierDefaults.nightlight_status),
             "brightness": HumidifierDefaults.nightlight_brightness,
         },
         "scheduleCount": 0,

src/tests/test_x_vesync_api_responses.py

@@ -1,6 +1,5 @@
 """General VeSync tests."""
 
-import logging
 import asyncio
 import orjson
 import pytest
@@ -69,14 +68,12 @@ def setup(self, caplog):
         Class instance with mocked call_api() function and VeSync object
         """
         self.caplog = caplog
-        self.caplog.set_level(logging.DEBUG)
         self.loop = asyncio.new_event_loop()
         self.mock = MagicMock()
         self.manager = VeSync('EMAIL', 'PASSWORD')
         self.manager.enabled = True
         self.manager.auth._token = TestDefaults.token
         self.manager.auth._account_id = TestDefaults.account_id
-        caplog.set_level(logging.DEBUG)
         yield
         self.mock.stop()
         self.loop.stop()