Cloud conf (#18216)

* Add original config to entityfilter

* Add alexa/google config to cloud status call

* Lint
This commit is contained in:
Paulus Schoutsen authored and Pascal Vizeli committed 2018-11-05 13:21:03 +01:00
1 parent 8de79ed57c
commit bf54582d76
5 files changed
+74 -20

No files matched your search

+2 -2
View File
@@ -122,7 +122,7 @@ class Cloud:
self.hass = hass
self.mode = mode
self.alexa_config = alexa
self._google_actions = google_actions
self.google_actions_user_conf = google_actions
self._gactions_config = None
self._prefs = None
self.id_token = None
@@ -180,7 +180,7 @@ class Cloud:
def gactions_config(self):
"""Return the Google Assistant config."""
if self._gactions_config is None:
conf = self._google_actions
conf = self.google_actions_user_conf
def should_expose(entity):
"""If an entity should be exposed."""
@@ -11,6 +11,8 @@ from homeassistant.components.http import HomeAssistantView
from homeassistant.components.http.data_validator import (
RequestDataValidator)
from homeassistant.components import websocket_api
from homeassistant.components.alexa import smart_home as alexa_sh
from homeassistant.components.google_assistant import smart_home as google_sh
from . import auth_api
from .const import DOMAIN, REQUEST_TIMEOUT
@@ -307,5 +309,9 @@ def _account_data(cloud):
'email': claims['email'],
'cloud': cloud.iot.state,
'google_enabled': cloud.google_enabled,
'google_entities': cloud.google_actions_user_conf['filter'].config,
'google_domains': list(google_sh.DOMAIN_TO_GOOGLE_TYPES),
'alexa_enabled': cloud.alexa_enabled,
'alexa_entities': cloud.alexa_config.should_expose.config,
'alexa_domains': list(alexa_sh.ENTITY_ADAPTERS),
}
+17 -11
View File
@@ -10,6 +10,18 @@ CONF_INCLUDE_ENTITIES = 'include_entities'
CONF_EXCLUDE_DOMAINS = 'exclude_domains'
CONF_EXCLUDE_ENTITIES = 'exclude_entities'
def _convert_filter(config):
filt = generate_filter(
config[CONF_INCLUDE_DOMAINS],
config[CONF_INCLUDE_ENTITIES],
config[CONF_EXCLUDE_DOMAINS],
config[CONF_EXCLUDE_ENTITIES],
)
filt.config = config
return filt
FILTER_SCHEMA = vol.All(
vol.Schema({
vol.Optional(CONF_EXCLUDE_DOMAINS, default=[]):
@@ -18,13 +30,7 @@ FILTER_SCHEMA = vol.All(
vol.Optional(CONF_INCLUDE_DOMAINS, default=[]):
vol.All(cv.ensure_list, [cv.string]),
vol.Optional(CONF_INCLUDE_ENTITIES, default=[]): cv.entity_ids,
}),
lambda config: generate_filter(
config[CONF_INCLUDE_DOMAINS],
config[CONF_INCLUDE_ENTITIES],
config[CONF_EXCLUDE_DOMAINS],
config[CONF_EXCLUDE_ENTITIES],
))
}), _convert_filter)
def generate_filter(include_domains, include_entities,
@@ -64,8 +70,8 @@ def generate_filter(include_domains, include_entities,
# Case 4 - both includes and excludes specified
# Case 4a - include domain specified
# - if domain is included, and entity not excluded, pass
# - if domain is not included, and entity not included, fail
# - if domain is included, pass if entity not excluded
# - if domain is not included, pass if entity is included
# note: if both include and exclude domains specified,
# the exclude domains are ignored
if include_d:
@@ -79,8 +85,8 @@ def generate_filter(include_domains, include_entities,
return entity_filter_4a
# Case 4b - exclude domain specified
# - if domain is excluded, and entity not included, fail
# - if domain is not excluded, and entity not excluded, pass
# - if domain is excluded, pass if entity is included
# - if domain is not excluded, pass if entity not excluded
if exclude_d:
def entity_filter_4b(entity_id):
"""Return filter function for case 4b."""