Remove local pyvesync lib and migrate to public one. (#25)

* move to pip pyvesync library

* remove pyvesync

* improve extra attributes

* fix style

custom_components/vesync/__init__.py

@@ -6,6 +6,7 @@
 from homeassistant.core import HomeAssistant, ServiceCall
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.dispatcher import async_dispatcher_send
+from pyvesync.vesync import VeSync
 
 from .common import async_process_devices
 from .const import (
@@ -21,7 +22,6 @@
     VS_SENSORS,
     VS_SWITCHES,
 )
-from .pyvesync.vesync import VeSync
 
 PLATFORMS = {
     Platform.SWITCH: VS_SWITCHES,

custom_components/vesync/common.py

@@ -2,6 +2,7 @@
 import logging
 
 from homeassistant.helpers.entity import Entity, ToggleEntity
+from pyvesync.vesyncfan import model_features
 
 from .const import (
     DOMAIN,
@@ -13,7 +14,6 @@
     VS_SENSORS,
     VS_SWITCHES,
 )
-from .pyvesync.vesyncfan import model_features
 
 _LOGGER = logging.getLogger(__name__)
 

custom_components/vesync/config_flow.py

@@ -8,9 +8,9 @@
 from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import callback
 from homeassistant.data_entry_flow import FlowResult
+from pyvesync.vesync import VeSync
 
 from .const import DOMAIN
-from .pyvesync.vesync import VeSync
 
 _LOGGER = logging.getLogger(__name__)
 

custom_components/vesync/const.py

@@ -16,6 +16,8 @@
 VS_MODE_AUTO = "auto"
 VS_MODE_MANUAL = "manual"
 
+VS_TO_HA_ATTRIBUTES = {"humidity": "current_humidity"}
+
 DEV_TYPE_TO_HA = {
     "Core200S": "fan",
     "Core300S": "fan",

custom_components/vesync/fan.py

@@ -14,7 +14,7 @@
 )
 
 from .common import VeSyncDevice
-from .const import DEV_TYPE_TO_HA, DOMAIN, VS_DISCOVERY, VS_FANS
+from .const import DEV_TYPE_TO_HA, DOMAIN, VS_DISCOVERY, VS_FANS, VS_TO_HA_ATTRIBUTES
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -114,28 +114,13 @@ def unique_info(self):
     def extra_state_attributes(self):
         """Return the state attributes of the fan."""
         attr = {}
-
-        if hasattr(self.smartfan, "active_time"):
-            attr["active_time"] = self.smartfan.active_time
-
-        if hasattr(self.smartfan, "screen_status"):
-            attr["screen_status"] = self.smartfan.screen_status
-
-        if hasattr(self.smartfan, "child_lock"):
-            attr["child_lock"] = self.smartfan.child_lock
-
-        if hasattr(self.smartfan, "night_light"):
-            attr["night_light"] = self.smartfan.night_light
-
-        if hasattr(self.smartfan, "air_quality"):
-            attr["air_quality"] = self.smartfan.air_quality
-
-        if hasattr(self.smartfan, "mode"):
-            attr["mode"] = self.smartfan.mode
-
-        if hasattr(self.smartfan, "filter_life"):
-            attr["filter_life"] = self.smartfan.filter_life
-
+        for k, v in self.smarthumidifier.details.items():
+            if k in VS_TO_HA_ATTRIBUTES:
+                attr[VS_TO_HA_ATTRIBUTES[k]] = v
+            elif k in self.state_attributes:
+                attr[f"vs_{k}"] = v
+            else:
+                attr[k] = v
         return attr
 
     def set_percentage(self, percentage):

custom_components/vesync/humidifier.py

@@ -14,15 +14,21 @@
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from .common import VeSyncDevice, is_humidifier
-from .const import DOMAIN, VS_DISCOVERY, VS_HUMIDIFIERS, VS_MODE_AUTO, VS_MODE_MANUAL
+from .const import (
+    DOMAIN,
+    VS_DISCOVERY,
+    VS_HUMIDIFIERS,
+    VS_MODE_AUTO,
+    VS_MODE_MANUAL,
+    VS_TO_HA_ATTRIBUTES,
+)
 
 _LOGGER = logging.getLogger(__name__)
 
 MAX_HUMIDITY = 80
 MIN_HUMIDITY = 30
 
 MODES = [MODE_AUTO, MODE_NORMAL, MODE_SLEEP]
-VESYNC_TO_HA_ATTRIBUTES = {"humidity": "current_humidity"}
 
 
 async def async_setup_entry(
@@ -117,9 +123,11 @@ def extra_state_attributes(self):
 
         attr = {}
         for k, v in self.smarthumidifier.details.items():
-            if k in VESYNC_TO_HA_ATTRIBUTES:
-                attr[VESYNC_TO_HA_ATTRIBUTES[k]] = v
-            elif k not in self.state_attributes:
+            if k in VS_TO_HA_ATTRIBUTES:
+                attr[VS_TO_HA_ATTRIBUTES[k]] = v
+            elif k in self.state_attributes:
+                attr[f"vs_{k}"] = v
+            else:
                 attr[k] = v
         return attr