pyvesync 3.0.0b3__tar.gz → 3.0.0b4__tar.gz

{pyvesync-3.0.0b3/src/pyvesync.egg-info → pyvesync-3.0.0b4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyvesync
-Version: 3.0.0b3
+Version: 3.0.0b4
 Summary: pyvesync is a library to manage Etekcity Devices, Cosori Air Fryers, and Levoit Air Purifiers run on the VeSync app.
 Author: Mark Perdue
 Author-email: Joe Trabulsy <webdjoe@gmail.com>
@@ -525,3 +525,20 @@ After:
 All [contributions](CONTRIBUTING.md) are welcome.
 
 This project is licensed under [MIT](LICENSE).
+
+## Contributors
+
+This is an open source project and cannot exist without the contributions of its community. Thank you to all the contributors who have helped make this project better!
+
+A special thanks for helping with V3 go live:
+
+| [<img src="https://github.com/cdninja.png" width="60px;"/><br /><sub><a href="https://github.com/cdninja">cdninja</a></sub>](https://github.com/cdninja) | [<img src="https://github.com/sapuseven.png" width="60px;"/><br /><sub><a href="https://github.com/sapuseven">sapuseven</a></sub>](https://github.com/sapuseven) | [<img src="https://github.com/sdrapha.png" width="60px;"/><br /><sub><a href="https://github.com/sdrapha">sdrapha</a></sub>](https://github.com/sdrapha) |
+| :------- | :------- | :------- |
+
+And to all of those that contributed to the project:
+
+<a href="https://github.com/webdjoe/pyvesync/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=webdjoe/pyvesync" />
+</a>
+
+Made with [contrib.rocks](https://contrib.rocks).

{pyvesync-3.0.0b3 → pyvesync-3.0.0b4}/README.md

@@ -494,3 +494,20 @@ After:
 All [contributions](CONTRIBUTING.md) are welcome.
 
 This project is licensed under [MIT](LICENSE).
+
+## Contributors
+
+This is an open source project and cannot exist without the contributions of its community. Thank you to all the contributors who have helped make this project better!
+
+A special thanks for helping with V3 go live:
+
+| [<img src="https://github.com/cdninja.png" width="60px;"/><br /><sub><a href="https://github.com/cdninja">cdninja</a></sub>](https://github.com/cdninja) | [<img src="https://github.com/sapuseven.png" width="60px;"/><br /><sub><a href="https://github.com/sapuseven">sapuseven</a></sub>](https://github.com/sapuseven) | [<img src="https://github.com/sdrapha.png" width="60px;"/><br /><sub><a href="https://github.com/sdrapha">sdrapha</a></sub>](https://github.com/sdrapha) |
+| :------- | :------- | :------- |
+
+And to all of those that contributed to the project:
+
+<a href="https://github.com/webdjoe/pyvesync/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=webdjoe/pyvesync" />
+</a>
+
+Made with [contrib.rocks](https://contrib.rocks).

{pyvesync-3.0.0b3 → pyvesync-3.0.0b4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyvesync"
-version = "3.0.0b3"
+version = "3.0.0b4"
 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"

{pyvesync-3.0.0b3 → pyvesync-3.0.0b4}/src/pyvesync/base_devices/purifier_base.py

@@ -125,7 +125,7 @@ class PurifierState(DeviceState):
     @air_quality_level.setter
     def air_quality_level(self, value: int | None) -> None:
         """Set air quality level."""
-        if isinstance(value, str):
+        if isinstance(value, int):
             self._air_quality_level = AirQualityLevel.from_int(value)
 
     def set_air_quality_level(self, value: int | str | None) -> None:

{pyvesync-3.0.0b3 → pyvesync-3.0.0b4}/src/pyvesync/base_devices/switch_base.py

@@ -102,7 +102,7 @@ class VeSyncSwitch(VeSyncBaseToggleDevice):
     """Etekcity Switch Base Class.
 
     Abstract Base Class for Etekcity Switch Devices, inheriting from
-    pyvesync.vesyncbasedevice.VeSyncBaseDevice. Should not be instantiated directly,
+    pyvesync.base_devices.vesyncbasedevice.VeSyncBaseDevice. Should not be instantiated directly,
     subclassed by VeSyncWallSwitch and VeSyncDimmerSwitch.
 
     Attributes:

{pyvesync-3.0.0b3 → pyvesync-3.0.0b4}/src/pyvesync/const.py

@@ -45,7 +45,7 @@ DEFAULT_TZ = "America/New_York"
 DEFAULT_REGION = "US"
 APP_VERSION = "5.6.60"
 APP_ID = ''.join(choices(string.ascii_lowercase + string.digits, k=8))  # noqa: S311
-PHONE_BRAND = "SM N9005"
+PHONE_BRAND = "pyvesync"
 PHONE_OS = "Android"
 # MOBILE_ID = "1234567890123456"
 MOBILE_ID = str(randint(1000000000000000, 9999999999999999))  # noqa: S311

{pyvesync-3.0.0b3 → pyvesync-3.0.0b4}/src/pyvesync/devices/vesyncbulb.py

@@ -15,7 +15,7 @@ from __future__ import annotations
 import logging
 from collections.abc import Mapping
 from typing import TYPE_CHECKING
-from deprecated import deprecated
+from typing_extensions import deprecated
 from pyvesync.base_devices import VeSyncBulb
 from pyvesync.const import DeviceStatus, ConnectionStatus
 from pyvesync.models.base_models import DefaultValues

{pyvesync-3.0.0b3 → pyvesync-3.0.0b4}/src/pyvesync/devices/vesyncfan.py

@@ -125,6 +125,20 @@ class VeSyncTowerFan(BypassV2Mixin, VeSyncFanBase):
         self.state.connection_status = ConnectionStatus.ONLINE
         return True
 
+    async def toggle_switch(self, toggle: bool | None = None) -> bool:
+        payload_data = {
+            'powerSwitch': int(toggle),
+            'switchIdx': 0,
+        }
+        r_dict = await self.call_bypassv2_api("setSwitch", payload_data)
+        r = Helpers.process_dev_response(logger, "toggle_switch", self, r_dict)
+        if r is None:
+            return False
+
+        self.state.device_status = DeviceStatus.from_bool(toggle)
+        self.state.connection_status = ConnectionStatus.ONLINE
+        return True
+
     async def toggle_oscillation(self, toggle: bool) -> bool:
         payload_data = {
             "oscillationSwitch": int(toggle)

{pyvesync-3.0.0b3 → pyvesync-3.0.0b4}/src/pyvesync/devices/vesynchumidifier.py

@@ -246,7 +246,7 @@ class VeSyncHumid200300S(BypassV2Mixin, VeSyncHumidifier):
                          self.device_name, self.device_type)
             return False
 
-        if Validators.validate_zero_to_hundred(brightness):
+        if not Validators.validate_zero_to_hundred(brightness):
             logger.debug("Brightness value must be set between 0 and 100")
             return False
 
@@ -666,7 +666,7 @@ class VeSyncHumid1000S(VeSyncHumid200300S):
 
         self._set_state(r_model)
 
-    @deprecated("Use toggle_switch() instead.")
+    @deprecated("Use toggle_display() instead.")
     async def set_display(self, toggle: bool) -> bool:
         """Toggle display on/off.
 

{pyvesync-3.0.0b3 → pyvesync-3.0.0b4}/src/pyvesync/devices/vesyncoutlet.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 import logging
 from typing import TYPE_CHECKING
-from deprecated import deprecated
+from typing_extensions import deprecated
 
 from pyvesync.utils.helpers import Helpers, Timer
 from pyvesync.utils.logs import LibraryLogger
@@ -620,7 +620,7 @@ class VeSyncOutdoorPlug(BypassV1Mixin, VeSyncOutlet):
             if int(self.sub_device_no) == int(outlet.subDeviceNo):
                 self.state.device_status = outlet.subDeviceStatus
 
-    @deprecated(reason="Use toggle_switch(toggle: bool | None) instead")
+    @deprecated("Use toggle_switch(toggle: bool | None) instead")
     async def toggle(self, status: str) -> bool:
         """Deprecated, use toggle_switch() instead."""
         toggle = status != DeviceStatus.ON

{pyvesync-3.0.0b3 → pyvesync-3.0.0b4}/src/pyvesync/devices/vesyncswitch.py

@@ -25,7 +25,7 @@ from dataclasses import asdict
 import logging
 # from abc import ABCMeta, abstractmethod
 from typing import TYPE_CHECKING
-from deprecated import deprecated
+from typing_extensions import deprecated
 
 from pyvesync.base_devices.switch_base import VeSyncSwitch
 from pyvesync.utils.colors import Color
@@ -265,9 +265,7 @@ class VeSyncDimmerSwitch(BypassV1Mixin, VeSyncSwitch):
         self.state.indicator_status = result.indicatorlightStatus
         self.state.device_status = result.deviceStatus
 
-    @deprecated(
-        reason="switch_toggle() deprecated, use toggle_switch(toggle: bool | None = None)"
-    )
+    @deprecated("switch_toggle() deprecated, use toggle_switch(toggle: bool | None = None)")
     async def switch_toggle(self, status: str) -> bool:
         """Toggle switch status."""
         return await self.toggle_switch(status == DeviceStatus.ON)

{pyvesync-3.0.0b3 → pyvesync-3.0.0b4}/src/pyvesync/models/vesync_models.py

@@ -206,7 +206,7 @@ def _flatten_device_prop(d: dict[str, Any]) -> dict[str, Any]:
             d['connectionStatus'] = device_prop['connectionStatus']
         if device_prop.get('wifiMac') is not None:
             d['macID'] = device_prop['wifiMac']
-    del d['deviceProp']
+    d.pop("deviceProp", None)
     return d
 
 
@@ -230,38 +230,25 @@ class ResponseDeviceDetailsModel(ResponseBaseModel):
     type: str
     uuid: str | None
     configModule: str
-    macID: str
-    mode: str
-    speed: str | None
-    currentFirmVersion: str
-    subDeviceType: str | None
-    subDeviceList: None | str
-    extension: None | InternalDeviceListExtension
+    macID: str = ""
+    mode: str = ""
+    speed: str | None = None
+    currentFirmVersion: str | None = None
+    subDeviceType: str | None = None
+    subDeviceList: str | None = None
+    extension: InternalDeviceListExtension | None = None
     subDeviceNo: int | None = None
     deviceStatus: str = "off"
     connectionStatus: str = "offline"
     productType: str | None = None
-    # deviceProp: InitVar[None | InternalDevicePropModel] = None
-
-    # def __post_init__(self, deviceProp: None | IntRespDevicePropModel) -> None:
-    #     """Set productType based on deviceType."""
-    #     if deviceProp is not None:
-    #         if deviceProp.powerSwitch == 1:
-    #             self.deviceStatus = "on"
-    #         elif deviceProp.powerSwitch == 0:
-    #             self.deviceStatus = "off"
-    #         if isinstance(deviceProp.connectionStatus, str) and \
-    #                 self.connectionStatus != deviceProp.connectionStatus:
-    #             self.connectionStatus = deviceProp.connectionStatus
 
     @classmethod
     def __pre_deserialize__(cls, d: dict[Any, Any]) -> dict[Any, Any]:
         """Perform device_list pre-deserialization processes.
 
         This performs the following:
-            - Flattens the deviceProp field into deviceStatus and connectionStatus fields
-            - Sets subDeviceNo to 0 if not present
-            - Sets cid to uuid or macID if null
+            - Flattens the `deviceProp` field into `deviceStatus`, `connectionStatus` and `macID`
+            - Sets `cid` to `uuid` or `macID` if null
         """
         super().__pre_deserialize__(d)
         d = _flatten_device_prop(d)

{pyvesync-3.0.0b3 → pyvesync-3.0.0b4}/src/pyvesync/vesync.py

@@ -79,7 +79,9 @@ class VeSync:  # pylint: disable=function-redefined
                  password: str,
                  country_code: str = DEFAULT_REGION,
                  session: ClientSession | None = None,
-                 time_zone: str = DEFAULT_TZ) -> None:
+                 time_zone: str = DEFAULT_TZ,
+                 debug: bool = False,
+                 redact: bool = True) -> None:
         """Initialize VeSync Manager.
 
         This class is used as the manager for all VeSync objects, all methods and
@@ -138,10 +140,8 @@ class VeSync:  # pylint: disable=function-redefined
         """
         self.session = session
         self._close_session = False
-        self._debug = False
-        self._redact = True
-        if self._redact:
-            self.redact = self.redact
+        self._debug = debug
+        self.redact = redact
         self.username: str = username
         self.password: str = password
         self._token: str | None = None

{pyvesync-3.0.0b3 → pyvesync-3.0.0b4/src/pyvesync.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyvesync
-Version: 3.0.0b3
+Version: 3.0.0b4
 Summary: pyvesync is a library to manage Etekcity Devices, Cosori Air Fryers, and Levoit Air Purifiers run on the VeSync app.
 Author: Mark Perdue
 Author-email: Joe Trabulsy <webdjoe@gmail.com>
@@ -525,3 +525,20 @@ After:
 All [contributions](CONTRIBUTING.md) are welcome.
 
 This project is licensed under [MIT](LICENSE).
+
+## Contributors
+
+This is an open source project and cannot exist without the contributions of its community. Thank you to all the contributors who have helped make this project better!
+
+A special thanks for helping with V3 go live:
+
+| [<img src="https://github.com/cdninja.png" width="60px;"/><br /><sub><a href="https://github.com/cdninja">cdninja</a></sub>](https://github.com/cdninja) | [<img src="https://github.com/sapuseven.png" width="60px;"/><br /><sub><a href="https://github.com/sapuseven">sapuseven</a></sub>](https://github.com/sapuseven) | [<img src="https://github.com/sdrapha.png" width="60px;"/><br /><sub><a href="https://github.com/sdrapha">sdrapha</a></sub>](https://github.com/sdrapha) |
+| :------- | :------- | :------- |
+
+And to all of those that contributed to the project:
+
+<a href="https://github.com/webdjoe/pyvesync/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=webdjoe/pyvesync" />
+</a>
+
+Made with [contrib.rocks](https://contrib.rocks).