pyvesync 2.1.9__tar.gz → 2.1.11__tar.gz

{pyvesync-2.1.9 → pyvesync-2.1.11}/MANIFEST.in

@@ -1 +1,3 @@
 include README.md LICENSE requirements.txt
+exclude test
+prune test

{pyvesync-2.1.9 → pyvesync-2.1.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyvesync
-Version: 2.1.9
+Version: 2.1.11
 Summary: pyvesync is a library to manage Etekcity                 Devices, Cosori Air Fryers and Levoit Air                      Purifiers run on the VeSync app.
 Home-page: https://github.com/webdjoe/pyvesync
 Author: Mark Perdue, Joe Trabulsy
@@ -14,8 +14,13 @@ Classifier: Natural Language :: English
 Classifier: Programming Language :: Python :: 3.8
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
-Provides-Extra: dev
 License-File: LICENSE
+Requires-Dist: requests>=2.20.0
+Provides-Extra: dev
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: pytest-cov; extra == "dev"
+Requires-Dist: yaml; extra == "dev"
+Requires-Dist: tox; extra == "dev"
 
 # pyvesync [![build status](https://img.shields.io/pypi/v/pyvesync.svg)](https://pypi.python.org/pypi/pyvesync) [![Build Status](https://dev.azure.com/webdjoe/pyvesync/_apis/build/status/webdjoe.pyvesync?branchName=master)](https://dev.azure.com/webdjoe/pyvesync/_build/latest?definitionId=4&branchName=master) [![Open Source? Yes!](https://badgen.net/badge/Open%20Source%20%3F/Yes%21/blue?icon=github)](https://github.com/Naereen/badges/) [![PyPI license](https://img.shields.io/pypi/l/ansicolortags.svg)](https://pypi.python.org/pypi/ansicolortags/) <!-- omit in toc -->
 
@@ -48,9 +53,9 @@ pyvesync is a library to manage VeSync compatible [smart home devices](#supporte
   - [Standard Air Purifier Properties \& Methods](#standard-air-purifier-properties--methods)
     - [Air Purifier Properties](#air-purifier-properties)
     - [Air Purifier Methods](#air-purifier-methods)
-    - [Levoit Purifier Core200S/300S/400S and Vital 100S/200S Properties](#levoit-purifier-core200s300s400s-and-vital-100s200s-properties)
-    - [Levoit Purifier Core200S/300S/400S and Vital 100S/200S Methods](#levoit-purifier-core200s300s400s-and-vital-100s200s-methods)
-    - [Levoit Vital 100S/200S Properties and Methods](#levoit-vital-100s200s-properties-and-methods)
+    - [Levoit Purifier Core200S/300S/400S and Vital 100S/200S Properties](#levoit-purifier-core200s300s400s-vital-100s200s--everest-air-properties)
+    - [Levoit Purifier Core200S/300S/400S, Vital 100S/200S & Everest Air Methods](#levoit-purifier-core200s300s400s-vital-100s200s--everest-air-methods)
+    - [Levoit Vital 100S/200S Properties and Methods](#levoit-vital-100s200s--everest-air-properties-and-methods)
   - [Lights API Methods \& Properties](#lights-api-methods--properties)
     - [Brightness Light Bulb Method and Properties](#brightness-light-bulb-method-and-properties)
     - [Light Bulb Color Temperature Methods and Properties](#light-bulb-color-temperature-methods-and-properties)
@@ -113,6 +118,7 @@ pip install pyvesync
 5. Core 600S
 6. Vital 100S
 7. Vital 200S
+8. Everest Air
 
 ### Etekcity Bulbs
 
@@ -130,6 +136,7 @@ pip install pyvesync
 3. LUH-D301S-WEU Dual (200S)
 4. LV600S
 5. OasisMist LUS-O415S-WUS
+6. OasisMist LUH-M101S-WUS
 
 Cosori Air Fryer
 
@@ -348,13 +355,13 @@ Compatible levels for each model:
 - PUR131S [1, 2, 3]
 - Vital 100S/200S [1, 2, 3, 4]
 
-#### Levoit Purifier Core200S/300S/400S and Vital 100S/200S Properties
+#### Levoit Purifier Core200S/300S/400S, Vital 100S/200S & Everest Air Properties
 
 `VeSyncFan.child_lock` - Return the state of the child lock (True=On/False=off)
 
 `VeSyncAir.night_light` - Return the state of the night light (on/dim/off) **Not available on Vital 100S/200S**
 
-#### Levoit Purifier Core200S/300S/400S and Vital 100S/200S Methods
+#### Levoit Purifier Core200S/300S/400S, Vital 100S/200S & Everest Air Methods
 
 `VeSyncFan.child_lock_on()` Enable child lock
 
@@ -366,13 +373,15 @@ Compatible levels for each model:
 
 `VeSyncFan.set_night_light('on'|'dim'|'off')` - Set night light brightness
 
-`VeSyncFan.get_timer()` - Get any running timers, stores Timer DataClass in `VeSyncFan.timer`
+`VeSyncFan.get_timer()` - Get any running timers, stores Timer DataClass in `VeSyncFan.timer`. See [Timer Dataclass](#timer-dataclass)
 
 `VeSyncFan.set_timer(timer_duration=3000)` - Set a timer for the device, only turns device off. Timer DataClass stored in `VeSyncFan.timer`
 
 `VeSyncFan.clear_timer()` - Cancel any running timer
 
-#### Levoit Vital 100S/200S Properties and Methods
+`VeSyncFan.reset_filter()` - Reset filter to 100% **NOTE: Only available on Core200S**
+
+#### Levoit Vital 100S/200S & Everest Air Properties and Methods
 
 The Levoit Vital 100S/200S has additional features not available on other models.
 
@@ -392,6 +401,23 @@ The Levoit Vital 100S/200S has additional features not available on other models
 
 `VeSyncFan.set_light_detection_off()` - Turn off light detection mode
 
+#### Levoit Everest Air Properties & Methods
+
+`VeSyncFan.turbo_mode()` - Set turbo mode
+
+Additional properties in the `VeSyncFan['details']` dictionary:
+
+```python
+VeSyncFan['Details'] = {
+  'pm1': 0,  # air quality reading of particulates 1.0 microns
+  'pm10': 10,  # air quality reading of particulates 10 microns
+  'fan_rotate_angle': 45,  # angle of fan vents
+  'aq_percent': 45, # Air Quality percentage reading
+  'filter_open_state': False  # returns bool of filter open
+}
+
+```
+
 ### Lights API Methods & Properties
 
 #### Brightness Light Bulb Method and Properties
@@ -1045,7 +1071,7 @@ After:
 }
 ```
 
-# Contributing
+## Contributing
 
 All [contributions](CONTRIBUTING.md) are welcome.
 

pyvesync-2.1.9/src/pyvesync.egg-info/PKG-INFO → pyvesync-2.1.11/README.md

@@ -1,22 +1,3 @@
-Metadata-Version: 2.1
-Name: pyvesync
-Version: 2.1.9
-Summary: pyvesync is a library to manage Etekcity                 Devices, Cosori Air Fryers and Levoit Air                      Purifiers run on the VeSync app.
-Home-page: https://github.com/webdjoe/pyvesync
-Author: Mark Perdue, Joe Trabulsy
-Author-email: webdjoe@gmail.com
-License: MIT
-Keywords: iot,vesync,levoit,etekcity,cosori,valceno
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Intended Audience :: Developers
-Classifier: Intended Audience :: End Users/Desktop
-Classifier: Natural Language :: English
-Classifier: Programming Language :: Python :: 3.8
-Requires-Python: >=3.8
-Description-Content-Type: text/markdown
-Provides-Extra: dev
-License-File: LICENSE
-
 # pyvesync [![build status](https://img.shields.io/pypi/v/pyvesync.svg)](https://pypi.python.org/pypi/pyvesync) [![Build Status](https://dev.azure.com/webdjoe/pyvesync/_apis/build/status/webdjoe.pyvesync?branchName=master)](https://dev.azure.com/webdjoe/pyvesync/_build/latest?definitionId=4&branchName=master) [![Open Source? Yes!](https://badgen.net/badge/Open%20Source%20%3F/Yes%21/blue?icon=github)](https://github.com/Naereen/badges/) [![PyPI license](https://img.shields.io/pypi/l/ansicolortags.svg)](https://pypi.python.org/pypi/ansicolortags/) <!-- omit in toc -->
 
 pyvesync is a library to manage VeSync compatible [smart home devices](#supported-devices)
@@ -48,9 +29,9 @@ pyvesync is a library to manage VeSync compatible [smart home devices](#supporte
   - [Standard Air Purifier Properties \& Methods](#standard-air-purifier-properties--methods)
     - [Air Purifier Properties](#air-purifier-properties)
     - [Air Purifier Methods](#air-purifier-methods)
-    - [Levoit Purifier Core200S/300S/400S and Vital 100S/200S Properties](#levoit-purifier-core200s300s400s-and-vital-100s200s-properties)
-    - [Levoit Purifier Core200S/300S/400S and Vital 100S/200S Methods](#levoit-purifier-core200s300s400s-and-vital-100s200s-methods)
-    - [Levoit Vital 100S/200S Properties and Methods](#levoit-vital-100s200s-properties-and-methods)
+    - [Levoit Purifier Core200S/300S/400S and Vital 100S/200S Properties](#levoit-purifier-core200s300s400s-vital-100s200s--everest-air-properties)
+    - [Levoit Purifier Core200S/300S/400S, Vital 100S/200S & Everest Air Methods](#levoit-purifier-core200s300s400s-vital-100s200s--everest-air-methods)
+    - [Levoit Vital 100S/200S Properties and Methods](#levoit-vital-100s200s--everest-air-properties-and-methods)
   - [Lights API Methods \& Properties](#lights-api-methods--properties)
     - [Brightness Light Bulb Method and Properties](#brightness-light-bulb-method-and-properties)
     - [Light Bulb Color Temperature Methods and Properties](#light-bulb-color-temperature-methods-and-properties)
@@ -113,6 +94,7 @@ pip install pyvesync
 5. Core 600S
 6. Vital 100S
 7. Vital 200S
+8. Everest Air
 
 ### Etekcity Bulbs
 
@@ -130,6 +112,7 @@ pip install pyvesync
 3. LUH-D301S-WEU Dual (200S)
 4. LV600S
 5. OasisMist LUS-O415S-WUS
+6. OasisMist LUH-M101S-WUS
 
 Cosori Air Fryer
 
@@ -348,13 +331,13 @@ Compatible levels for each model:
 - PUR131S [1, 2, 3]
 - Vital 100S/200S [1, 2, 3, 4]
 
-#### Levoit Purifier Core200S/300S/400S and Vital 100S/200S Properties
+#### Levoit Purifier Core200S/300S/400S, Vital 100S/200S & Everest Air Properties
 
 `VeSyncFan.child_lock` - Return the state of the child lock (True=On/False=off)
 
 `VeSyncAir.night_light` - Return the state of the night light (on/dim/off) **Not available on Vital 100S/200S**
 
-#### Levoit Purifier Core200S/300S/400S and Vital 100S/200S Methods
+#### Levoit Purifier Core200S/300S/400S, Vital 100S/200S & Everest Air Methods
 
 `VeSyncFan.child_lock_on()` Enable child lock
 
@@ -366,13 +349,15 @@ Compatible levels for each model:
 
 `VeSyncFan.set_night_light('on'|'dim'|'off')` - Set night light brightness
 
-`VeSyncFan.get_timer()` - Get any running timers, stores Timer DataClass in `VeSyncFan.timer`
+`VeSyncFan.get_timer()` - Get any running timers, stores Timer DataClass in `VeSyncFan.timer`. See [Timer Dataclass](#timer-dataclass)
 
 `VeSyncFan.set_timer(timer_duration=3000)` - Set a timer for the device, only turns device off. Timer DataClass stored in `VeSyncFan.timer`
 
 `VeSyncFan.clear_timer()` - Cancel any running timer
 
-#### Levoit Vital 100S/200S Properties and Methods
+`VeSyncFan.reset_filter()` - Reset filter to 100% **NOTE: Only available on Core200S**
+
+#### Levoit Vital 100S/200S & Everest Air Properties and Methods
 
 The Levoit Vital 100S/200S has additional features not available on other models.
 
@@ -392,6 +377,23 @@ The Levoit Vital 100S/200S has additional features not available on other models
 
 `VeSyncFan.set_light_detection_off()` - Turn off light detection mode
 
+#### Levoit Everest Air Properties & Methods
+
+`VeSyncFan.turbo_mode()` - Set turbo mode
+
+Additional properties in the `VeSyncFan['details']` dictionary:
+
+```python
+VeSyncFan['Details'] = {
+  'pm1': 0,  # air quality reading of particulates 1.0 microns
+  'pm10': 10,  # air quality reading of particulates 10 microns
+  'fan_rotate_angle': 45,  # angle of fan vents
+  'aq_percent': 45, # Air Quality percentage reading
+  'filter_open_state': False  # returns bool of filter open
+}
+
+```
+
 ### Lights API Methods & Properties
 
 #### Brightness Light Bulb Method and Properties
@@ -1045,7 +1047,7 @@ After:
 }
 ```
 
-# Contributing
+## Contributing
 
 All [contributions](CONTRIBUTING.md) are welcome.
 

{pyvesync-2.1.9 → pyvesync-2.1.11}/setup.py

@@ -1,39 +1,38 @@
-"""pyvesync setup script."""
-
-from os import path
-from setuptools import setup, find_packages
-
-
-this_directory = path.abspath(path.dirname(__file__))
-with open(path.join(this_directory, 'README.md'), encoding='utf-8') as f:
-    long_description = f.read()
-
-setup(
-    name='pyvesync',
-    version='2.1.9',
-    description='pyvesync is a library to manage Etekcity\
-                 Devices, Cosori Air Fryers and Levoit Air \
-                     Purifiers run on the VeSync app.',
-    long_description=long_description,
-    long_description_content_type='text/markdown',
-    url='https://github.com/webdjoe/pyvesync',
-    author='Mark Perdue, Joe Trabulsy',
-    author_email='webdjoe@gmail.com',
-    license='MIT',
-    classifiers=[
-        'License :: OSI Approved :: MIT License',
-        'Intended Audience :: Developers',
-        'Intended Audience :: End Users/Desktop',
-        'Natural Language :: English',
-        'Programming Language :: Python :: 3.8',
-    ],
-    keywords=['iot', 'vesync', 'levoit', 'etekcity', 'cosori', 'valceno'],
-    packages=find_packages('src', exclude=['tests', 'tests.*']),
-    package_dir={'': 'src'},
-    zip_safe=False,
-    install_requires=['requests>=2.20.0'],
-    extras_require={
-        'dev': ['pytest', 'pytest-cov', 'yaml', 'tox']
-    },
-    python_requires='>=3.8',
-)
+"""pyvesync setup script."""
+
+from os import path
+from setuptools import setup, find_packages
+
+
+this_directory = path.abspath(path.dirname(__file__))
+with open(path.join(this_directory, 'README.md'), encoding='utf-8') as f:
+    long_description = f.read()
+
+setup(
+    name='pyvesync',
+    version='2.1.11',
+    description='pyvesync is a library to manage Etekcity\
+                 Devices, Cosori Air Fryers and Levoit Air \
+                     Purifiers run on the VeSync app.',
+    long_description=long_description,
+    long_description_content_type='text/markdown',
+    url='https://github.com/webdjoe/pyvesync',
+    author='Mark Perdue, Joe Trabulsy',
+    author_email='webdjoe@gmail.com',
+    license='MIT',
+    classifiers=[
+        'License :: OSI Approved :: MIT License',
+        'Intended Audience :: Developers',
+        'Intended Audience :: End Users/Desktop',
+        'Natural Language :: English',
+        'Programming Language :: Python :: 3.8',
+    ],
+    keywords=['iot', 'vesync', 'levoit', 'etekcity', 'cosori', 'valceno'],
+    packages=find_packages('src', exclude=['tests', 'test*']),
+    package_dir={'': 'src'},
+    install_requires=['requests>=2.20.0'],
+    extras_require={
+        'dev': ['pytest', 'pytest-cov', 'yaml', 'tox']
+    },
+    python_requires='>=3.8',
+)

{pyvesync-2.1.9 → pyvesync-2.1.11}/src/pyvesync/helpers.py

@@ -6,7 +6,7 @@ import time
 import json
 import colorsys
 from dataclasses import dataclass, field, InitVar
-from typing import NamedTuple, Optional, Union
+from typing import Any, Dict, NamedTuple, Optional, Union
 import re
 import requests
 
@@ -38,7 +38,7 @@ class Helpers:
     """VeSync Helper Functions."""
 
     @staticmethod
-    def req_headers(manager) -> dict:
+    def req_headers(manager) -> Dict[str, str]:
         """Build header for api requests."""
         headers = {
             'accept-language': 'en',
@@ -51,7 +51,7 @@ class Helpers:
         return headers
 
     @staticmethod
-    def req_header_bypass() -> dict:
+    def req_header_bypass() -> Dict[str, str]:
         """Build header for api requests on 'bypass' endpoint."""
         return {
             'Content-Type': 'application/json; charset=UTF-8',
@@ -59,17 +59,17 @@ class Helpers:
             }
 
     @staticmethod
-    def req_body_base(manager) -> dict:
+    def req_body_base(manager) -> Dict[str, str]:
         """Return universal keys for body of api requests."""
         return {'timeZone': manager.time_zone, 'acceptLanguage': 'en'}
 
     @staticmethod
-    def req_body_auth(manager) -> dict:
+    def req_body_auth(manager) -> Dict[str, str]:
         """Keys for authenticating api requests."""
         return {'accountID': manager.account_id, 'token': manager.token}
 
     @staticmethod
-    def req_body_details() -> dict:
+    def req_body_details() -> Dict[str, str]:
         """Detail keys for api requests."""
         return {
             'appVersion': APP_VERSION,
@@ -79,83 +79,57 @@ class Helpers:
         }
 
     @classmethod
-    def req_body(cls, manager, type_) -> dict:
+    def req_body(cls, manager, type_) -> Dict[str, Any]:
         """Builder for body of api requests."""
-        body = {}
+        body = cls.req_body_base(manager)
 
         if type_ == 'login':
-            body = {**cls.req_body_base(manager),
-                    **cls.req_body_details()}
-            body['email'] = manager.username
-            body['password'] = cls.hash_password(manager.password)
-            body['devToken'] = ''
-            body['userType'] = USER_TYPE
-            body['method'] = 'login'
-        elif type_ == 'devicedetail':
-            body = {
-                **cls.req_body_base(manager),
-                **cls.req_body_auth(manager),
-                **cls.req_body_details(),
-            }
-            body['method'] = 'devicedetail'
-            body['mobileId'] = MOBILE_ID
-        elif type_ == 'devicelist':
-            body = {
-                **cls.req_body_base(manager),
-                **cls.req_body_auth(manager),
-                **cls.req_body_details(),
-            }
+            body |= cls.req_body_details()  # type: ignore
+            body |= {
+                'email': manager.username,
+                'password': cls.hash_password(manager.password),
+                'devToken': '',
+                'userType': USER_TYPE,
+                'method': 'login'
+            }  # type: ignore
+            return body
+
+        body |= cls.req_body_auth(manager)  # type: ignore
+
+        if type_ == 'devicestatus':
+            return body
+
+        body |= cls.req_body_details()  # type: ignore
+
+        if type_ == 'devicelist':
             body['method'] = 'devices'
             body['pageNo'] = '1'
             body['pageSize'] = '100'
-        elif type_ == 'devicestatus':
-            body = {**cls.req_body_base(manager),
-                    **cls.req_body_auth(manager)}
+
+        elif type_ == 'devicedetail':
+            body['method'] = 'devicedetail'
+            body['mobileId'] = MOBILE_ID
+
         elif type_ == 'energy_week':
-            body = {
-                **cls.req_body_base(manager),
-                **cls.req_body_auth(manager),
-                **cls.req_body_details(),
-            }
             body['method'] = 'energyweek'
             body['mobileId'] = MOBILE_ID
+
         elif type_ == 'energy_month':
-            body = {
-                **cls.req_body_base(manager),
-                **cls.req_body_auth(manager),
-                **cls.req_body_details(),
-            }
             body['method'] = 'energymonth'
             body['mobileId'] = MOBILE_ID
+
         elif type_ == 'energy_year':
-            body = {
-                **cls.req_body_base(manager),
-                **cls.req_body_auth(manager),
-                **cls.req_body_details(),
-            }
             body['method'] = 'energyyear'
             body['mobileId'] = MOBILE_ID
+
         elif type_ == 'bypass':
-            body = {
-                **cls.req_body_base(manager),
-                **cls.req_body_auth(manager),
-                **cls.req_body_details(),
-            }
             body['method'] = 'bypass'
+
         elif type_ == 'bypassV2':
-            body = {
-                **cls.req_body_base(manager),
-                **cls.req_body_auth(manager),
-                **cls.req_body_details(),
-            }
             body['deviceRegion'] = DEFAULT_REGION
             body['method'] = 'bypassV2'
+
         elif type_ == 'bypass_config':
-            body = {
-                **cls.req_body_base(manager),
-                **cls.req_body_auth(manager),
-                **cls.req_body_details(),
-            }
             body['method'] = 'firmwareUpdateInfo'
 
         return body
@@ -237,6 +211,8 @@ class Helpers:
                     API_BASE_URL + api, json=json_object, headers=headers,
                     timeout=API_TIMEOUT
                 )
+            else:
+                raise NameError(f'Invalid method {method}')
         except requests.exceptions.RequestException as e:
             logger.debug(e)
         except Exception as e:  # pylint: disable=broad-except

{pyvesync-2.1.9 → pyvesync-2.1.11}/src/pyvesync/vesync.py

@@ -74,11 +74,45 @@ def object_factory(dev_type, config, manager) -> Tuple[str, VeSyncBaseDevice]:
 
 
 class VeSync:  # pylint: disable=function-redefined
-    """VeSync API functions."""
+    """VeSync Manager Class."""
 
     def __init__(self, username, password, time_zone=DEFAULT_TZ,
                  debug=False, redact=True):
-        """Initialize VeSync class with username, password and time zone."""
+        """Initialize VeSync Manager.
+
+        This class is used as the manager for all VeSync objects, all methods and
+        API calls are performed from this class. Time zone, debug and redact are
+        optional. Time zone must be a string of an IANA time zone format. Once
+        class is instantiated, call `manager.login()` to log in to VeSync servers,
+        which returns `True` if successful. Once logged in, call `manager.update()`
+        to retrieve devices and update device details.
+
+        Parameters:
+        -----------
+            username : str
+                VeSync account username (usually email address)
+            password : str
+                VeSync account password
+            time_zone : str, optional
+                Time zone for device from IANA database, by default DEFAULT_TZ
+            debug : bool, optional
+                Enable debug logging, by default False
+            redact : bool, optional
+                Redact sensitive information in logs, by default True
+
+        Attributes
+        ----------
+            fans : list
+                List of VeSyncFan objects for humidifiers and air purifiers
+            outlets : list
+                List of VeSyncOutlet objects for smart plugs
+            switches : list
+                List of VeSyncSwitch objects for wall switches
+            bulbs : list
+                List of VeSyncBulb objects for smart bulbs
+            kitchen : list
+                List of VeSyncKitchen objects for smart kitchen appliances
+        """
         self.debug = debug
         if debug:  # pragma: no cover
             logger.setLevel(logging.DEBUG)
@@ -308,7 +342,15 @@ class VeSync:  # pylint: disable=function-redefined
         return proc_return
 
     def login(self) -> bool:
-        """Return True if log in request succeeds."""
+        """Log into VeSync server.
+
+        Username and password are provided when class is instantiated.
+
+        Returns
+        -------
+        bool
+            True if login successful, False if not
+        """
         user_check = isinstance(self.username, str) and len(self.username) > 0
         pass_check = isinstance(self.password, str) and len(self.password) > 0
         if user_check is False:
@@ -346,7 +388,16 @@ class VeSync:  # pylint: disable=function-redefined
         return False
 
     def update(self) -> None:
-        """Fetch updated information about devices."""
+        """Fetch updated information about devices.
+
+        Pulls devices list from VeSync and instantiates any new devices. Devices
+        are stored in the instance attributes `outlets`, `switches`, `fans`, and
+        `bulbs`. The `_device_list` attribute is a dictionary of these attributes.
+
+        Returns
+        -------
+        None
+        """
         if self.device_time_check():
 
             if not self.enabled: