pyvesync 3.0.0b1__tar.gz → 3.0.0b3__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyvesync
-Version: 3.0.0b1
+Version: 3.0.0b3
 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>

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyvesync"
-version = "3.0.0b1"
+version = "3.0.0b3"
 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.0b1 → pyvesync-3.0.0b3}/src/pyvesync/base_devices/fan_base.py

@@ -6,13 +6,7 @@ from abc import abstractmethod
 from typing_extensions import deprecated
 
 from pyvesync.base_devices.vesyncbasedevice import VeSyncBaseToggleDevice, DeviceState
-from pyvesync.const import (
-    FanModes,
-    FanFeatures,
-    DeviceStatus,
-    FanSleepPreference,
-    StrFlag,
-    )
+from pyvesync.const import FanModes, FanFeatures
 
 if TYPE_CHECKING:
     from pyvesync import VeSync
@@ -26,10 +20,7 @@ logger = logging.getLogger(__name__)
 class FanState(DeviceState):
     """Base state class for Purifiers.
 
-    Not all attributes are supported by all devices. Attributes are set to
-    UNKNOWN by default and attributes that are not supported by all devices are
-    set to [StrFlag.NOT_SUPPORTED][pyvesync.const.StrFlag] or
-    [IntFlag.NOT_SUPPORTED][pyvesync.const.IntFlag].
+    Not all attributes are supported by all devices.
 
 
     Attributes:
@@ -93,17 +84,17 @@ class FanState(DeviceState):
         self.humidity: int | None = None
         self.temperature: int | None = None
         self.thermal_comfort: int | None = None
-        self.sleep_preference_type: str | None = FanSleepPreference.UNKNOWN
-        self.sleep_fallasleep_remain: str | None = DeviceStatus.UNKNOWN
-        self.sleep_oscillation_switch: str | None = DeviceStatus.UNKNOWN
-        self.sleep_change_fan_level: str | None = DeviceStatus.UNKNOWN
-        self.mute_status: str = DeviceStatus.UNKNOWN
-        self.mute_set_state: str = DeviceStatus.UNKNOWN
-        self.oscillation_status: str = DeviceStatus.UNKNOWN
-        self.oscillation_set_state: str = DeviceStatus.UNKNOWN
-        self.display_status: str = DeviceStatus.UNKNOWN
-        self.display_set_state: str = DeviceStatus.UNKNOWN
-        self.displaying_type: str = StrFlag.NOT_SUPPORTED
+        self.sleep_preference_type: str | None = None
+        self.sleep_fallasleep_remain: str | None = None
+        self.sleep_oscillation_switch: str | None = None
+        self.sleep_change_fan_level: str | None = None
+        self.mute_status: str | None = None
+        self.mute_set_state: str | None = None
+        self.oscillation_status: str | None = None
+        self.oscillation_set_state: str | None = None
+        self.display_status: str | None = None
+        self.display_set_state: str | None = None
+        self.displaying_type: str | None = None
 
 
 class VeSyncFanBase(VeSyncBaseToggleDevice):

{pyvesync-3.0.0b1 → pyvesync-3.0.0b3}/src/pyvesync/base_devices/humidifier_base.py

@@ -9,9 +9,7 @@ from pyvesync.base_devices.vesyncbasedevice import VeSyncBaseToggleDevice, Devic
 from pyvesync.const import (
     HumidifierFeatures,
     HumidifierModes,
-    DeviceStatus,
-    IntFlag,
-    StrFlag
+    DeviceStatus
     )
 
 if TYPE_CHECKING:
@@ -27,8 +25,7 @@ class HumidifierState(DeviceState):
     """State Class for VeSync Humidifiers.
 
     This is the state class for all vesync humidifiers. If there are
-    new features or state attributes, they should be added directly to
-    this class and be set to the default `NOT_SUPPORTED` flag.
+    new features or state attributes.
 
     Attributes:
         auto_preference (int): Auto preference level.
@@ -97,29 +94,29 @@ class HumidifierState(DeviceState):
         """
         super().__init__(device, details, feature_map)
         self.auto_stop_target_reached: bool = False
-        self.auto_target_humidity: int = IntFlag.NOT_SUPPORTED
+        self.auto_target_humidity: int | None = None
         self.automatic_stop_config: bool = False
         self.display_set_status: str = DeviceStatus.UNKNOWN
         self.display_status: str = DeviceStatus.UNKNOWN
-        self.humidity: int = IntFlag.NOT_SUPPORTED
+        self.humidity: int | None = None
         self.humidity_high: bool = False
         self.mist_level: int | None = None
         self.mist_virtual_level: int | None = None
-        self.mode: str = HumidifierModes.UNKNOWN
-        self.nightlight_brightness: int = IntFlag.NOT_SUPPORTED
-        self.nightlight_status: str = StrFlag.NOT_SUPPORTED
+        self.mode: str | None = None
+        self.nightlight_brightness: int | None = None
+        self.nightlight_status: str | None = None
         self.warm_mist_enabled: bool | None = None
-        self.warm_mist_level: int = IntFlag.NOT_SUPPORTED
+        self.warm_mist_level: int | None = None
         self.water_lacks: bool = False
         self.water_tank_lifted: bool = False
-        self.temperature: int = IntFlag.NOT_SUPPORTED
+        self.temperature: int | None = None
         # Superior 6000S States
-        self.auto_preference: int = IntFlag.NOT_SUPPORTED
-        self.filter_life_percent: int = IntFlag.NOT_SUPPORTED
-        self.drying_mode_level: int = IntFlag.NOT_SUPPORTED
-        self.drying_mode_auto_switch: str = StrFlag.NOT_SUPPORTED
-        self.drying_mode_status: str = StrFlag.NOT_SUPPORTED
-        self.drying_mode_time_remain: int = IntFlag.NOT_SUPPORTED
+        self.auto_preference: int | None = None
+        self.filter_life_percent: int | None = None
+        self.drying_mode_level: int | None = None
+        self.drying_mode_auto_switch: str | None = None
+        self.drying_mode_status: str | None = None
+        self.drying_mode_time_remain: int | None = None
 
     @property
     def automatic_stop(self) -> bool:
@@ -141,7 +138,7 @@ class HumidifierState(DeviceState):
         return self.auto_stop_target_reached
 
     @property
-    def target_humidity(self) -> int:
+    def target_humidity(self) -> int | None:
         """Return the target humidity level.
 
         Returns:
@@ -150,7 +147,7 @@ class HumidifierState(DeviceState):
         return self.auto_target_humidity
 
     @property
-    def auto_humidity(self) -> int:
+    def auto_humidity(self) -> int | None:
         """Return the auto humidity level.
 
         Returns:
@@ -174,7 +171,7 @@ class HumidifierState(DeviceState):
         return self.humidity
 
     @property
-    def drying_mode_state(self) -> str:
+    def drying_mode_state(self) -> str | None:
         """Return the drying mode state.
 
         Returns:
@@ -183,7 +180,7 @@ class HumidifierState(DeviceState):
         return self.drying_mode_status
 
     @property
-    def drying_mode_seconds_remaining(self) -> int:
+    def drying_mode_seconds_remaining(self) -> int | None:
         """Return the drying mode seconds remaining.
 
         Return:

{pyvesync-3.0.0b1 → pyvesync-3.0.0b3}/src/pyvesync/base_devices/outlet_base.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import logging
 from typing import TYPE_CHECKING
 
-from pyvesync.const import OutletFeatures, IntFlag, StrFlag, NightlightModes
+from pyvesync.const import OutletFeatures, NightlightModes
 from pyvesync.utils.helpers import Helpers
 from pyvesync.base_devices.vesyncbasedevice import VeSyncBaseToggleDevice, DeviceState
 from pyvesync.models.outlet_models import RequestEnergyHistory, ResponseEnergyHistory
@@ -89,12 +89,12 @@ class OutletState(DeviceState):
         self.device: VeSyncOutlet = device
         self.features: list[str] = feature_map.features
         self.active_time: int | None = 0
-        self.power: float = IntFlag.NOT_SUPPORTED
-        self.energy: float = IntFlag.NOT_SUPPORTED
-        self.voltage: float = IntFlag.NOT_SUPPORTED
-        self.nightlight_status: str | None = StrFlag.NOT_SUPPORTED
-        self.nightlight_brightness: int | None = IntFlag.NOT_SUPPORTED
-        self.nightlight_automode: str | None = StrFlag.NOT_SUPPORTED
+        self.power: float | None = None
+        self.energy: float | None = None
+        self.voltage: float | None = None
+        self.nightlight_status: str | None = None
+        self.nightlight_brightness: int | None = None
+        self.nightlight_automode: str | None = None
         self.weekly_history: ResponseEnergyResult | None = None
         self.monthly_history: ResponseEnergyResult | None = None
         self.yearly_history: ResponseEnergyResult | None = None

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

@@ -12,10 +12,7 @@ from pyvesync.const import (
     PurifierFeatures,
     PurifierModes,
     DeviceStatus,
-    NightlightModes,
-    PurifierAutoPreference,
-    IntFlag,
-    StrFlag,
+    NightlightModes
     )
 
 if TYPE_CHECKING:
@@ -97,25 +94,23 @@ class PurifierState(DeviceState):
         self.fan_level: int | None = None
         self.fan_set_level: int | None = None
         self.filter_life: int | None = None
-        self.auto_preference_type: str | None = PurifierAutoPreference.UNKNOWN
+        self.auto_preference_type: str | None = None
         self.auto_room_size: int | None = None
-        self._air_quality_level: AirQualityLevel = AirQualityLevel.UNKNOWN
+        self._air_quality_level: AirQualityLevel | None = None
         self.child_lock: bool = False
         self.filter_open_state: bool = False
-        self.display_status: str = DeviceStatus.UNKNOWN
-        self.display_set_state: str = DeviceStatus.UNKNOWN
+        self.display_status: str | None = None
+        self.display_set_state: str | None = None
         self.display_forever: bool = False
         # Attributes not supported by all purifiers
-        # When update is first called, devices that support these attributes will
-        # update them from NOT_SUPPORTED, whether to None or another value.
-        self.pm25: int | None = IntFlag.NOT_SUPPORTED
-        self.pm1: int | None = IntFlag.NOT_SUPPORTED
-        self.pm10: int | None = IntFlag.NOT_SUPPORTED
-        self.aq_percent: int | None = IntFlag.NOT_SUPPORTED
-        self.light_detection_switch: str = StrFlag.NOT_SUPPORTED
-        self.light_detection_status: str = StrFlag.NOT_SUPPORTED
-        self.nightlight_status: str = StrFlag.NOT_SUPPORTED
-        self.fan_rotate_angle: int | None = IntFlag.NOT_SUPPORTED
+        self.pm25: int | None = None
+        self.pm1: int | None = None
+        self.pm10: int | None = None
+        self.aq_percent: int | None = None
+        self.light_detection_switch: str | None = None
+        self.light_detection_status: str | None = None
+        self.nightlight_status: str | None = None
+        self.fan_rotate_angle: int | None = None
 
     @property
     def air_quality_level(self) -> int:
@@ -171,19 +166,19 @@ class PurifierState(DeviceState):
 
     @property
     @deprecated("Use PurifierState.nightlight_status instead.")
-    def night_light(self) -> str:
+    def night_light(self) -> str | None:
         """Return night light status."""
         return self.nightlight_status
 
     @property
     @deprecated("Use display_status instead.")
-    def display_state(self) -> str:
+    def display_state(self) -> str | None:
         """Return display status."""
         return self.display_status
 
     @property
     @deprecated("Use display_set_state instead.")
-    def display_switch(self) -> str:
+    def display_switch(self) -> str | None:
         """Return display switch status."""
         return self.display_set_state
 
@@ -499,7 +494,7 @@ class VeSyncPurifier(VeSyncBaseToggleDevice):
 
     @property
     @deprecated("Use self.state.nightlight_status instead.")
-    def night_light(self) -> str:
+    def night_light(self) -> str | None:
         """Get night light state.
 
         Returns:

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

@@ -7,7 +7,7 @@ from typing_extensions import deprecated
 from pyvesync.base_devices.vesyncbasedevice import VeSyncBaseToggleDevice, DeviceState
 
 from pyvesync.utils.colors import Color
-from pyvesync.const import SwitchFeatures, StrFlag, IntFlag
+from pyvesync.const import SwitchFeatures
 
 if TYPE_CHECKING:
     from pyvesync import VeSync
@@ -57,11 +57,11 @@ class SwitchState(DeviceState):
         """Initialize VeSync Switch State."""
         super().__init__(device, details, feature_map)
         self.device: VeSyncSwitch = device
-        self._backlight_color: Color | str | None = StrFlag.NOT_SUPPORTED
-        self.brightness: int = IntFlag.NOT_SUPPORTED
+        self._backlight_color: Color | None = None
+        self.brightness: int | None = None
         self.active_time: int | None = 0
-        self.backlight_status: str = StrFlag.NOT_SUPPORTED
-        self.indicator_status: str = StrFlag.NOT_SUPPORTED
+        self.backlight_status: str | None = None
+        self.indicator_status: str | None = None
 
     @property
     def backlight_rgb(self) -> RGB | None:

{pyvesync-3.0.0b1 → pyvesync-3.0.0b3}/src/pyvesync/base_devices/vesyncbasedevice.py

@@ -10,7 +10,7 @@ from typing_extensions import deprecated
 # import warnings
 import orjson
 
-from pyvesync.const import DeviceStatus, ConnectionStatus, IntFlag, StrFlag
+from pyvesync.const import DeviceStatus, ConnectionStatus
 
 logger = logging.getLogger(__name__)
 
@@ -53,6 +53,7 @@ class VeSyncBaseDevice(ABC, Generic[VS_STATE_T]):
         config_module (str): Configuration module of device.
         mac_id (str): MAC ID of device.
         current_firm_version (str): Current firmware version of device.
+        latest_firm_version (str | None): Latest firmware version of device.
         device_region (str): Region of device. (US, EU, etc.)
         pid (str): Product ID of device, pulled by some devices on update.
         sub_device_no (int): Sub-device number of device.
@@ -96,6 +97,7 @@ class VeSyncBaseDevice(ABC, Generic[VS_STATE_T]):
         "enabled",
         "features",
         "last_response",
+        "latest_firm_version",
         "mac_id",
         "manager",
         "pid",
@@ -129,6 +131,7 @@ class VeSyncBaseDevice(ABC, Generic[VS_STATE_T]):
         self.config_module: str = details.configModule
         self.mac_id: str | None = details.macID
         self.current_firm_version = details.currentFirmVersion
+        self.latest_firm_version: str | None = None
         self.device_region: str | None = details.deviceRegion
         self.pid: str | None = None
         self.sub_device_no: int | None = details.subDeviceNo
@@ -192,7 +195,7 @@ class VeSyncBaseDevice(ABC, Generic[VS_STATE_T]):
 
         This is going to be updated.
         """
-        return False
+        return self.latest_firm_version != self.current_firm_version
 
     async def set_timer(self, duration: int, action: str | None = None) -> bool:
         """Set timer for device.
@@ -542,8 +545,6 @@ class DeviceState:
                 or attr_name in [*self.__base_exclusions, *self._exclude_serialization]
             ):
                 continue
-            if attr_value in [IntFlag.NOT_SUPPORTED, StrFlag.NOT_SUPPORTED]:
-                continue
             state_dict[attr_name] = attr_value
         return state_dict
 

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

@@ -4,7 +4,8 @@ All device states and information are defined by Enums in this module.
 
 Attributes:
     DEFAULT_LANGUAGE (str): Default language for the VeSync app.
-    API_BASE_URL (str): Base URL for the VeSync API.
+    API_BASE_URL (str): Base URL for the VeSync API. If not specified,
+        a region-specific API URL is automatically selected.
     API_TIMEOUT (int): Timeout for API requests.
     USER_AGENT (str): User agent for API requests.
     DEFAULT_TZ (str): Default timezone for VeSync devices, updated by API after
@@ -12,6 +13,8 @@ Attributes:
     DEFAULT_REGION (str): Default region for VeSync devices,
         updated by API when retrieving devices.
     APP_VERSION (str): Version of the VeSync app.
+    APP_ID (str): ID of the app. VeSync uses a random 8-letter string, but any non-empty
+        string works.
     PHONE_BRAND (str): Brand of the phone used to login to the VeSync app.
     PHONE_OS (str): Operating system of the phone used to login to the VeSync app.
     MOBILE_ID (str): Unique identifier for the phone used to login to the VeSync app.
@@ -20,31 +23,37 @@ Attributes:
     BYPASS_HEADER_UA (str): Bypass header user agent
     TERMINAL_ID (str): Unique identifier for new API calls
 """
-from random import randint
-from uuid import uuid1
+from random import randint, choices
+from uuid import uuid4
+import string
 from enum import StrEnum, IntEnum, Enum
 from types import MappingProxyType
 from pyvesync.utils.enum_utils import IntEnumMixin
 
 DEFAULT_LANGUAGE = "en"
-API_BASE_URL = "https://smartapi.vesync.com"
+API_BASE_URL = None  # Global URL (non-EU regions): "https://smartapi.vesync.com"
 # If device is out of reach, the cloud api sends a timeout response after 7 seconds,
 # using 8 here so there is time enough to catch that message
+API_BASE_URL_US = "https://smartapi.vesync.com"
+API_BASE_URL_EU = "https://smartapi.vesync.eu"
+NON_EU_REGIONS = ['US', 'CA', 'MX', 'JP']
 API_TIMEOUT = 8
 USER_AGENT = (
     "VeSync/3.2.39 (com.etekcity.vesyncPlatform; build:5; iOS 15.5.0) Alamofire/5.2.1"
 )
 DEFAULT_TZ = "America/New_York"
 DEFAULT_REGION = "US"
-APP_VERSION = "2.8.6"
+APP_VERSION = "5.6.60"
+APP_ID = ''.join(choices(string.ascii_lowercase + string.digits, k=8))  # noqa: S311
 PHONE_BRAND = "SM N9005"
 PHONE_OS = "Android"
 # MOBILE_ID = "1234567890123456"
 MOBILE_ID = str(randint(1000000000000000, 9999999999999999))  # noqa: S311
 USER_TYPE = "1"
-BYPASS_APP_V = "VeSync 3.0.51"
+BYPASS_APP_V = f"VeSync {APP_VERSION}"
 BYPASS_HEADER_UA = "okhttp/3.12.1"
-TERMINAL_ID = '2' + uuid1().hex
+TERMINAL_ID = '2' + str(uuid4()).replace('-', '')
+CLIENT_TYPE = "vesyncApp"
 
 
 # Generic Constants
@@ -64,7 +73,7 @@ class ProductTypes(StrEnum):
 
 
 class IntFlag(IntEnum):
-    """Integer flag to indicate if a device is not supported.
+    """DEPRECATED. Integer flag to indicate if a device is not supported.
 
     This is used by data models as a default value for feature attributes
     that are not supported by all devices.
@@ -82,7 +91,7 @@ class IntFlag(IntEnum):
 
 
 class StrFlag(StrEnum):
-    """String flag to indicate if a device is not supported.
+    """DEPRECATED. String flag to indicate if a device is not supported.
 
     This is used by data models as a default value for feature attributes
     that are not supported by all devices.

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

@@ -8,7 +8,7 @@ import orjson
 from pyvesync.base_devices import VeSyncHumidifier
 from pyvesync.utils.helpers import Helpers, Validators, Timer
 from pyvesync.utils.device_mixins import BypassV2Mixin, process_bypassv2_result
-from pyvesync.const import DeviceStatus, IntFlag, ConnectionStatus
+from pyvesync.const import DeviceStatus, ConnectionStatus
 from pyvesync.models.bypass_models import ResultV2GetTimer, ResultV2SetTimer
 from pyvesync.models.humidifier_models import (
     ClassicLVHumidResult,
@@ -75,7 +75,7 @@ class VeSyncHumid200300S(BypassV2Mixin, VeSyncHumidifier):
         self.state.connection_status = ConnectionStatus.ONLINE
         self.state.device_status = DeviceStatus.from_bool(resp_model.enabled)
         self.state.mode = resp_model.mode
-        self.state.humidity = resp_model.humidity or IntFlag.NOT_SUPPORTED
+        self.state.humidity = resp_model.humidity
         self.state.mist_virtual_level = resp_model.mist_virtual_level or 0
         self.state.mist_level = resp_model.mist_level or 0
         self.state.water_lacks = resp_model.water_lacks
@@ -84,7 +84,7 @@ class VeSyncHumid200300S(BypassV2Mixin, VeSyncHumidifier):
         self.state.auto_stop_target_reached = resp_model.automatic_stop_reach_target
         if (
             self.supports_nightlight
-            and resp_model.night_light_brightness != IntFlag.NOT_SUPPORTED
+            and resp_model.night_light_brightness is not None
         ):
             self.state.nightlight_brightness = resp_model.night_light_brightness
             self.state.nightlight_status = (
@@ -93,7 +93,7 @@ class VeSyncHumid200300S(BypassV2Mixin, VeSyncHumidifier):
                 else DeviceStatus.OFF
             )
         self.state.display_status = DeviceStatus.from_bool(resp_model.display)
-        if self.supports_warm_mist and resp_model.warm_level != IntFlag.NOT_SUPPORTED:
+        if self.supports_warm_mist and resp_model.warm_level is not None:
             self.state.warm_mist_level = resp_model.warm_level
             self.state.warm_mist_enabled = resp_model.warm_enabled
         config = resp_model.configuration

{pyvesync-3.0.0b1 → pyvesync-3.0.0b3}/src/pyvesync/devices/vesyncpurifier.py

@@ -14,8 +14,6 @@ from pyvesync.utils.device_mixins import (
 from pyvesync.utils.helpers import Helpers, Timer
 # from pyvesync.models.base_models import DefaultValues
 from pyvesync.const import (
-    IntFlag,
-    StrFlag,
     PurifierAutoPreference,
     DeviceStatus,
     ConnectionStatus,
@@ -135,7 +133,7 @@ class VeSyncAirBypass(BypassV2Mixin, VeSyncPurifier):
         if self.supports_air_quality is True:
             self.state.pm25 = result.air_quality_value
             self.state.set_air_quality_level(result.air_quality)
-        if result.night_light != StrFlag.NOT_SUPPORTED:
+        if result.night_light is not None:
             self.state.nightlight_status = DeviceStatus.ON if result.night_light \
                 else DeviceStatus.OFF
 
@@ -490,7 +488,7 @@ class VeSyncAirBaseV2(VeSyncAirBypass):
         self.state.pm10 = details.PM10
         self.state.aq_percent = details.AQPercent
         self.state.fan_rotate_angle = details.fanRotateAngle
-        if details.filterOpenState != IntFlag.NOT_SUPPORTED:
+        if details.filterOpenState is not None:
             self.state.filter_open_state = bool(details.filterOpenState)
         if details.timerRemain > 0:
             self.state.timer = Timer(details.timerRemain, 'off')

{pyvesync-3.0.0b1 → pyvesync-3.0.0b3}/src/pyvesync/models/base_models.py

@@ -27,6 +27,7 @@ from mashumaro.config import BaseConfig
 from pyvesync.const import (
     USER_TYPE,
     APP_VERSION,
+    APP_ID,
     PHONE_BRAND,
     PHONE_OS,
     MOBILE_ID,
@@ -35,6 +36,7 @@ from pyvesync.const import (
     DEFAULT_TZ,
     BYPASS_HEADER_UA,
     TERMINAL_ID,
+    CLIENT_TYPE
     )
 
 
@@ -86,6 +88,8 @@ class DefaultValues:
     _call_number: ClassVar[int] = 0
     userType: str = USER_TYPE
     appVersion: str = APP_VERSION
+    clientType: str = CLIENT_TYPE
+    appId: str = APP_ID
     phoneBrand: str = PHONE_BRAND
     phoneOS: str = PHONE_OS
     mobileId: str = MOBILE_ID

{pyvesync-3.0.0b1 → pyvesync-3.0.0b3}/src/pyvesync/models/fan_models.py

@@ -33,7 +33,7 @@ class TowerFanResult(BypassV2InnerResult):
     thermalComfort: int
     errorCode: int
     scheduleCount: int
-    displayingType: int = IntFlag.NOT_SUPPORTED
+    displayingType: int | None = None
     sleepPreference: FanSleepPreferences | None = None
 
 

{pyvesync-3.0.0b1 → pyvesync-3.0.0b3}/src/pyvesync/models/home_models.py

@@ -20,7 +20,6 @@ from dataclasses import dataclass, field
 
 from pyvesync.models.base_models import (
     ResponseCodeModel,
-    ResponseBaseModel,
     RequestBaseModel,
     DefaultValues,
     )
@@ -36,9 +35,9 @@ class RequestHomeModel(RequestBaseModel):
     """
     # Arguments set by Manager Instance by passing kw_argument manager
     # these fields should be set to init=False
-    accountID: str = field(init=False)
-    token: str = field(init=False)
-    userCountryCode: str = field(init=False)
+    accountID: str
+    token: str
+    userCountryCode: str
     # Non-default constants
     method: str = 'getHomeList'
     # default values
@@ -52,17 +51,17 @@ class RequestHomeModel(RequestBaseModel):
 
 
 @dataclass
-class ResponseHomeModel(ResponseBaseModel):
+class ResponseHomeModel(ResponseCodeModel):
     """Model for the home data response.
 
-    Inherits from `ResponseBaseModel`. The `ResponseBaseModel` class provides the
+    Inherits from `ResponseCodeModel`. The `ResponseCodeModel` class provides the
     `code` and `msg` fields. The `ResponseHomeModel` class provides the `result`
     field containing the home data.
 
     Attributes:
         result: dict: The home data.
     """
-    result: IntResponseHomeResultModel
+    result: IntResponseHomeResultModel | IntResponseHomeInfoResultModel | None
 
 
 @dataclass
@@ -154,5 +153,6 @@ class IntResponseHomeResultModel:
 @dataclass
 class IntResponseHomeListModel:
     """Internal model for the 'homeList' field in home response result."""
-    homeID: str
+    homeId: int
     homeName: str
+    nickname: str | None = None

{pyvesync-3.0.0b1 → pyvesync-3.0.0b3}/src/pyvesync/models/humidifier_models.py

@@ -73,8 +73,8 @@ class ClassicLVHumidResult(InnerHumidifierBaseResult):
     automatic_stop_reach_target: bool = False
     water_tank_lifted: bool = False
     warm_enabled: bool = False
-    warm_level: int = IntFlag.NOT_SUPPORTED
-    night_light_brightness: int = IntFlag.NOT_SUPPORTED
+    warm_level: int | None = None
+    night_light_brightness: int | None = None
     configuration: ClassicConfig | None = None
 
 

{pyvesync-3.0.0b1 → pyvesync-3.0.0b3}/src/pyvesync/models/purifier_models.py

@@ -12,7 +12,6 @@ from dataclasses import dataclass
 # import orjson
 from mashumaro.config import BaseConfig
 from mashumaro.types import Discriminator
-from pyvesync.const import IntFlag, StrFlag
 from pyvesync.models.bypass_models import (
     RequestBypassV1,
     BypassV2InnerResult,
@@ -53,11 +52,11 @@ class PurifierV2DetailsResult(InnerPurifierBaseResult):
     efficientModeTimeRemain: int
     errorCode: int
     autoPreference: VitalAutoPreferences | None = None
-    fanRotateAngle: int | None = IntFlag.NOT_SUPPORTED
-    filterOpenState: int | None = IntFlag.NOT_SUPPORTED
-    PM1: int | None = IntFlag.NOT_SUPPORTED
-    PM10: int | None = IntFlag.NOT_SUPPORTED
-    AQPercent: int | None = IntFlag.NOT_SUPPORTED
+    fanRotateAngle: int | None = None
+    filterOpenState: int | None = None
+    PM1: int | None = None
+    PM10: int | None = None
+    AQPercent: int | None = None
 
 
 @dataclass
@@ -81,8 +80,8 @@ class PurifierCoreDetailsResult(InnerPurifierBaseResult):
     configuration: PurifierCoreDetailsConfig | None = None
     extension: dict | None = None
     air_quality_value: int | None = None
-    night_light: str | None = StrFlag.NOT_SUPPORTED
-    fan_rotate: str | None = StrFlag.NOT_SUPPORTED
+    night_light: str | None = None
+    fan_rotate: str | None = None
 
 
 # Purifier Timer Models