Fixing tplink issues with offline devices during setup (#23668)
* Fixing tplink issues with offline devices during setup. * Fixing circleci errors. * Adding code to defer the creation of entities that are not online. * Addressing code review changes and cleaning up a little. * Fixing tests and static analysis. * Adding test to satisfy coverage requirements. * Resolving merge conflicts. * Fixing issue where lights don't appear in the integration page. * Using pyHS100 properties for most sysinfo. Addressing some PR feedback. * Addressing some PR feedback. * Better testing async_add_entities_retry Testing for static dimmers. Making greater use of conf constants. * Fixing all static analysis issues. * Adding non-blocking call for getting discovering devices. * Address PR feedback
This commit is contained in:
1 parent
6f299e7245
commit
bf91a8c1b3
7 files changed
+541
-139
No files matched your search
@@ -6,28 +6,43 @@ import voluptuous as vol
|
||||
from homeassistant.const import CONF_HOST
|
||||
from homeassistant import config_entries
|
||||
import homeassistant.helpers.config_validation as cv
|
||||
from .config_flow import async_get_devices
|
||||
from .const import DOMAIN
|
||||
from homeassistant.helpers.typing import ConfigType, HomeAssistantType
|
||||
|
||||
from .common import (
|
||||
async_discover_devices,
|
||||
get_static_devices,
|
||||
ATTR_CONFIG,
|
||||
CONF_DIMMER,
|
||||
CONF_DISCOVERY,
|
||||
CONF_LIGHT,
|
||||
CONF_SWITCH,
|
||||
SmartDevices
|
||||
)
|
||||
|
||||
_LOGGER = logging.getLogger(__name__)
|
||||
|
||||
DOMAIN = 'tplink'
|
||||
|
||||
TPLINK_HOST_SCHEMA = vol.Schema({
|
||||
vol.Required(CONF_HOST): cv.string
|
||||
})
|
||||
|
||||
CONF_LIGHT = 'light'
|
||||
CONF_SWITCH = 'switch'
|
||||
CONF_DISCOVERY = 'discovery'
|
||||
|
||||
ATTR_CONFIG = 'config'
|
||||
|
||||
CONFIG_SCHEMA = vol.Schema({
|
||||
DOMAIN: vol.Schema({
|
||||
vol.Optional('light', default=[]): vol.All(cv.ensure_list,
|
||||
[TPLINK_HOST_SCHEMA]),
|
||||
vol.Optional('switch', default=[]): vol.All(cv.ensure_list,
|
||||
[TPLINK_HOST_SCHEMA]),
|
||||
vol.Optional('discovery', default=True): cv.boolean,
|
||||
vol.Optional(CONF_LIGHT, default=[]): vol.All(
|
||||
cv.ensure_list,
|
||||
[TPLINK_HOST_SCHEMA]
|
||||
),
|
||||
vol.Optional(CONF_SWITCH, default=[]): vol.All(
|
||||
cv.ensure_list,
|
||||
[TPLINK_HOST_SCHEMA]
|
||||
),
|
||||
vol.Optional(CONF_DIMMER, default=[]): vol.All(
|
||||
cv.ensure_list,
|
||||
[TPLINK_HOST_SCHEMA]
|
||||
),
|
||||
vol.Optional(CONF_DISCOVERY, default=True): cv.boolean,
|
||||
}),
|
||||
}, extra=vol.ALLOW_EXTRA)
|
||||
|
||||
@@ -46,76 +61,45 @@ async def async_setup(hass, config):
|
||||
return True
|
||||
|
||||
|
||||
async def async_setup_entry(hass, config_entry):
|
||||
async def async_setup_entry(hass: HomeAssistantType, config_entry: ConfigType):
|
||||
"""Set up TPLink from a config entry."""
|
||||
from pyHS100 import SmartBulb, SmartPlug, SmartDeviceException
|
||||
|
||||
devices = {}
|
||||
|
||||
config_data = hass.data[DOMAIN].get(ATTR_CONFIG)
|
||||
|
||||
# These will contain the initialized devices
|
||||
lights = hass.data[DOMAIN][CONF_LIGHT] = []
|
||||
switches = hass.data[DOMAIN][CONF_SWITCH] = []
|
||||
|
||||
# If discovery is defined and not disabled, discover devices
|
||||
# If initialized from configure integrations, there's no config
|
||||
# so we default here to True
|
||||
if config_data is None or config_data[CONF_DISCOVERY]:
|
||||
devs = await async_get_devices(hass)
|
||||
_LOGGER.info("Discovered %s TP-Link smart home device(s)", len(devs))
|
||||
devices.update(devs)
|
||||
|
||||
def _device_for_type(host, type_):
|
||||
dev = None
|
||||
if type_ == CONF_LIGHT:
|
||||
dev = SmartBulb(host)
|
||||
elif type_ == CONF_SWITCH:
|
||||
dev = SmartPlug(host)
|
||||
|
||||
return dev
|
||||
|
||||
# When arriving from configure integrations, we have no config data.
|
||||
# Add static devices
|
||||
static_devices = SmartDevices()
|
||||
if config_data is not None:
|
||||
for type_ in [CONF_LIGHT, CONF_SWITCH]:
|
||||
for entry in config_data[type_]:
|
||||
try:
|
||||
host = entry['host']
|
||||
dev = _device_for_type(host, type_)
|
||||
devices[host] = dev
|
||||
_LOGGER.debug("Succesfully added %s %s: %s",
|
||||
type_, host, dev)
|
||||
except SmartDeviceException as ex:
|
||||
_LOGGER.error("Unable to initialize %s %s: %s",
|
||||
type_, host, ex)
|
||||
static_devices = get_static_devices(
|
||||
config_data,
|
||||
)
|
||||
|
||||
# This is necessary to avoid I/O blocking on is_dimmable
|
||||
def _fill_device_lists():
|
||||
for dev in devices.values():
|
||||
if isinstance(dev, SmartPlug):
|
||||
try:
|
||||
if dev.is_dimmable: # Dimmers act as lights
|
||||
lights.append(dev)
|
||||
else:
|
||||
switches.append(dev)
|
||||
except SmartDeviceException as ex:
|
||||
_LOGGER.error("Unable to connect to device %s: %s",
|
||||
dev.host, ex)
|
||||
lights.extend(static_devices.lights)
|
||||
switches.extend(static_devices.switches)
|
||||
|
||||
elif isinstance(dev, SmartBulb):
|
||||
lights.append(dev)
|
||||
else:
|
||||
_LOGGER.error("Unknown smart device type: %s", type(dev))
|
||||
# Add discovered devices
|
||||
if config_data is None or config_data[CONF_DISCOVERY]:
|
||||
discovered_devices = await async_discover_devices(hass, static_devices)
|
||||
|
||||
# Avoid blocking on is_dimmable
|
||||
await hass.async_add_executor_job(_fill_device_lists)
|
||||
lights.extend(discovered_devices.lights)
|
||||
switches.extend(discovered_devices.switches)
|
||||
|
||||
forward_setup = hass.config_entries.async_forward_entry_setup
|
||||
if lights:
|
||||
_LOGGER.debug("Got %s lights: %s", len(lights), lights)
|
||||
_LOGGER.debug(
|
||||
"Got %s lights: %s",
|
||||
len(lights),
|
||||
", ".join([d.host for d in lights])
|
||||
)
|
||||
hass.async_create_task(forward_setup(config_entry, 'light'))
|
||||
if switches:
|
||||
_LOGGER.debug("Got %s switches: %s", len(switches), switches)
|
||||
_LOGGER.debug(
|
||||
"Got %s switches: %s",
|
||||
len(switches),
|
||||
", ".join([d.host for d in switches])
|
||||
)
|
||||
hass.async_create_task(forward_setup(config_entry, 'switch'))
|
||||
|
||||
return True
|
||||
|
||||
Reference in new issue
Block a user