pyvesync 3.1.0__tar.gz → 3.1.2__tar.gz

{pyvesync-3.1.0/src/pyvesync.egg-info → pyvesync-3.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyvesync
-Version: 3.1.0
+Version: 3.1.2
 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.1.0 → pyvesync-3.1.2}/pyproject.toml

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

{pyvesync-3.1.0 → pyvesync-3.1.2}/src/pyvesync/auth.py

@@ -145,6 +145,15 @@ class VeSyncAuth:
         self._country_code = country_code.upper()
         self._current_region = region
 
+    async def reauthenticate(self) -> bool:
+        """Re-authenticate using stored username and password.
+
+        Returns:
+            True if re-authentication successful, False otherwise
+        """
+        self.clear_credentials()
+        return await self.login()
+
     async def load_credentials_from_file(
         self, file_path: str | Path | None = None
     ) -> bool:

{pyvesync-3.1.0 → pyvesync-3.1.2}/src/pyvesync/const.py

@@ -34,6 +34,7 @@ from uuid import uuid4
 
 from pyvesync.utils.enum_utils import IntEnumMixin
 
+MAX_API_REAUTH_RETRIES = 3
 DEFAULT_LANGUAGE = 'en'
 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,

{pyvesync-3.1.0 → pyvesync-3.1.2}/src/pyvesync/device_map.py

@@ -750,7 +750,7 @@ purifier_modules: list[PurifierMap] = [
             PurifierAutoPreference.QUIET,
         ],
         features=[PurifierFeatures.AIR_QUALITY],
-        fan_levels=list(range(1, 5)),
+        fan_levels=list(range(1, 4)),
         device_alias='Core 300S',
         model_display='Core 300S',
         model_name='Core 300S',
@@ -790,7 +790,7 @@ purifier_modules: list[PurifierMap] = [
     ),
     PurifierMap(
         class_name='VeSyncAir131',
-        dev_types=['LV-PUR131S', 'LV-RH131S'],
+        dev_types=['LV-PUR131S', 'LV-RH131S', 'LV-RH131S-WM'],
         modes=[PurifierModes.SLEEP, PurifierModes.MANUAL, PurifierModes.AUTO],
         features=[PurifierFeatures.AIR_QUALITY],
         fan_levels=list(range(1, 4)),
@@ -888,7 +888,7 @@ purifier_modules: list[PurifierMap] = [
         setup_entry='EL551S',
     ),
     PurifierMap(
-        class_name='VeSyncAirBaseV2',
+        class_name='VeSyncAirSprout',
         dev_types=[
             'LAP-B851S-WEU',
             'LAP-B851S-WNA',
@@ -925,7 +925,7 @@ objects for purifier devices."""
 fan_modules: list[FanMap] = [
     FanMap(
         class_name='VeSyncTowerFan',
-        dev_types=['LTF-F422S-KEU', 'LTF-F422S-WUSR', 'LTF-F422_WJP', 'LTF-F422S-WUS'],
+        dev_types=['LTF-F422S-KEU', 'LTF-F422S-WUSR', 'LTF-F422S-WJP', 'LTF-F422S-WUS'],
         modes=[
             FanModes.NORMAL,
             FanModes.TURBO,

{pyvesync-3.1.0 → pyvesync-3.1.2}/src/pyvesync/devices/vesynchumidifier.py

@@ -665,6 +665,7 @@ class VeSyncHumid1000S(VeSyncHumid200300S):
         self.state.device_status = DeviceStatus.from_int(resp_model.powerSwitch)
         self.state.connection_status = ConnectionStatus.ONLINE
         self.state.mode = resp_model.workMode
+        self.state.humidity = resp_model.humidity
         self.state.auto_target_humidity = resp_model.targetHumidity
         self.state.mist_level = resp_model.mistLevel
         self.state.mist_virtual_level = resp_model.virtualLevel

{pyvesync-3.1.0 → pyvesync-3.1.2}/src/pyvesync/devices/vesyncpurifier.py

@@ -123,6 +123,7 @@ class VeSyncAirBypass(BypassV2Mixin, VeSyncPurifier):
             result (InnerPurifierResult): Data model for inner result in purifier
                 details response.
         """
+        self.state.connection_status = ConnectionStatus.ONLINE
         self.state.device_status = DeviceStatus.ON if result.enabled else DeviceStatus.OFF
         self.state.filter_life = result.filter_life or 0
         self.state.mode = result.mode

{pyvesync-3.1.0 → pyvesync-3.1.2}/src/pyvesync/utils/errors.py

@@ -799,9 +799,11 @@ class VeSyncLoginError(VeSyncError):
 class VeSyncTokenError(VeSyncError):
     """Exception raised for VeSync API authentication errors."""
 
-    def __init__(self) -> None:
+    def __init__(self, msg: str | None = None) -> None:
         """Initialize the exception with a message."""
-        super().__init__('Token expired or invalid - please re-authenticate with login()')
+        super().__init__(
+            f'Token expired or invalid - {msg if msg else "Re-authentication required"}'
+        )
 
 
 class VeSyncServerError(VeSyncError):
@@ -857,8 +859,6 @@ def raise_api_errors(error_info: ResponseInfo) -> None:
             raise VeSyncRateLimitError
         case ErrorTypes.AUTHENTICATION:
             raise VeSyncLoginError(error_info.message)
-        case ErrorTypes.TOKEN_ERROR:
-            raise VeSyncTokenError
         case ErrorTypes.SERVER_ERROR:
             msg = (
                 f'{error_info.message} - '

{pyvesync-3.1.0 → pyvesync-3.1.2}/src/pyvesync/vesync.py

@@ -16,6 +16,7 @@ from pyvesync.auth import VeSyncAuth
 from pyvesync.const import (
     DEFAULT_REGION,
     DEFAULT_TZ,
+    MAX_API_REAUTH_RETRIES,
     REGION_API_MAP,
     STATUS_OK,
 )
@@ -34,6 +35,7 @@ from pyvesync.utils.errors import (
     VeSyncAPIStatusCodeError,
     VeSyncError,
     VeSyncServerError,
+    VeSyncTokenError,
     raise_api_errors,
 )
 from pyvesync.utils.helpers import Helpers
@@ -47,6 +49,7 @@ class VeSync:  # pylint: disable=function-redefined
 
     __slots__ = (
         '__weakref__',
+        '_api_attempts',
         '_auth',
         '_close_session',
         '_debug',
@@ -130,6 +133,7 @@ class VeSync:  # pylint: disable=function-redefined
                 Object to store device state information
         """
         self.session = session
+        self._api_attempts = 0
         self._close_session = False
         self._debug = debug
         self.redact = redact
@@ -381,6 +385,7 @@ class VeSync:  # pylint: disable=function-redefined
             VeSyncAPIResponseError: If API response is invalid.
             VeSyncServerError: If server returns an error.
         """
+        self.enabled = False
         success = await self._auth.login()
         if success:
             self.enabled = True
@@ -403,6 +408,9 @@ class VeSync:  # pylint: disable=function-redefined
     async def update_all_devices(self) -> None:
         """Run `get_details()` for each device and update state."""
         logger.debug('Start updating the device details one by one')
+        if len(self._device_container) == 0:
+            logger.error('No devices to update')
+            return
         update_tasks: list[asyncio.Task] = [
             asyncio.create_task(device.update()) for device in self._device_container
         ]
@@ -410,7 +418,7 @@ class VeSync:  # pylint: disable=function-redefined
         for task in done:
             exc = task.exception()
             if exc is not None and isinstance(exc, VeSyncError):
-                logger.debug('Error updating device: %s', exc)
+                logger.error('Error updating device: %s', exc)
 
     async def __aenter__(self) -> Self:
         """Asynchronous context manager enter."""
@@ -424,6 +432,24 @@ class VeSync:  # pylint: disable=function-redefined
             return
         logger.debug('Session not closed, exiting context manager')
 
+    async def _reauthenticate(self) -> bool:
+        """Re-authenticate using stored username and password.
+
+        Returns:
+            True if re-authentication successful, False otherwise
+        """
+        self.enabled = False
+        self._api_attempts += 1
+        if self._api_attempts >= MAX_API_REAUTH_RETRIES:
+            logger.error('Max API re-authentication attempts reached')
+            raise VeSyncTokenError
+        success = await self.auth.reauthenticate()
+        if success:
+            self.enabled = True
+            self._api_attempts = 0
+            return True
+        return await self.auth.reauthenticate()
+
     async def async_call_api(
         self,
         api: str,
@@ -460,6 +486,7 @@ class VeSync:  # pylint: disable=function-redefined
         if self.session is None:
             self.session = ClientSession()
             self._close_session = True
+        self._api_attempts += 1
         response = None
         status_code = None
         if isinstance(json_object, DataClassORJSONMixin):
@@ -491,6 +518,13 @@ class VeSync:  # pylint: disable=function-redefined
                 resp_dict = Helpers.try_json_loads(resp_bytes)
                 if isinstance(resp_dict, dict):
                     error_info = ErrorCodes.get_error_info(resp_dict.get('code'))
+                    if error_info.error_type == ErrorTypes.TOKEN_ERROR:
+                        if await self._reauthenticate():
+                            self.enabled = True
+                            return await self.async_call_api(
+                                api, method, json_object, headers
+                            )
+                        raise VeSyncTokenError
                     if resp_dict.get('msg') is not None:
                         error_info.message = f'{error_info.message} ({resp_dict["msg"]})'
                         raise_api_errors(error_info)

{pyvesync-3.1.0 → pyvesync-3.1.2/src/pyvesync.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyvesync
-Version: 3.1.0
+Version: 3.1.2
 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>