Add service to reload scenes from configuration.yaml (#25680)
* Allow reloading scenes * Update requirements * address comments * fix typing * fix tests * Update homeassistant/components/homeassistant/scene.py Co-Authored-By: Martin Hjelmare <marhje52@kth.se> * Address comments
This commit is contained in:
1 parent
b011dd0b02
commit
eceef82ffa
9 files changed
+153
-57
No files matched your search
@@ -1,5 +1,6 @@
|
||||
"""Allow users to set and activate scenes."""
|
||||
from collections import namedtuple
|
||||
import logging
|
||||
|
||||
import voluptuous as vol
|
||||
|
||||
@@ -11,12 +12,19 @@ from homeassistant.const import (
|
||||
CONF_PLATFORM,
|
||||
STATE_OFF,
|
||||
STATE_ON,
|
||||
SERVICE_RELOAD,
|
||||
)
|
||||
from homeassistant.core import State, DOMAIN
|
||||
from homeassistant import config as conf_util
|
||||
from homeassistant.exceptions import HomeAssistantError
|
||||
from homeassistant.loader import async_get_integration
|
||||
from homeassistant.helpers import (
|
||||
config_per_platform,
|
||||
config_validation as cv,
|
||||
entity_platform,
|
||||
)
|
||||
from homeassistant.core import State
|
||||
import homeassistant.helpers.config_validation as cv
|
||||
from homeassistant.helpers.state import HASS_DOMAIN, async_reproduce_state
|
||||
from homeassistant.components.scene import STATES, Scene
|
||||
|
||||
from homeassistant.components.scene import DOMAIN as SCENE_DOMAIN, STATES, Scene
|
||||
|
||||
PLATFORM_SCHEMA = vol.Schema(
|
||||
{
|
||||
@@ -37,19 +45,63 @@ PLATFORM_SCHEMA = vol.Schema(
|
||||
)
|
||||
|
||||
SCENECONFIG = namedtuple("SceneConfig", [CONF_NAME, STATES])
|
||||
_LOGGER = logging.getLogger(__name__)
|
||||
|
||||
|
||||
async def async_setup_platform(hass, config, async_add_entities, discovery_info=None):
|
||||
"""Set up home assistant scene entries."""
|
||||
scene_config = config.get(STATES)
|
||||
_process_scenes_config(hass, async_add_entities, config)
|
||||
|
||||
# This platform can be loaded multiple times. Only first time register the service.
|
||||
if hass.services.has_service(SCENE_DOMAIN, SERVICE_RELOAD):
|
||||
return
|
||||
|
||||
# Store platform for later.
|
||||
platform = entity_platform.current_platform.get()
|
||||
|
||||
async def reload_config(call):
|
||||
"""Reload the scene config."""
|
||||
try:
|
||||
conf = await conf_util.async_hass_config_yaml(hass)
|
||||
except HomeAssistantError as err:
|
||||
_LOGGER.error(err)
|
||||
return
|
||||
|
||||
integration = await async_get_integration(hass, SCENE_DOMAIN)
|
||||
|
||||
conf = await conf_util.async_process_component_config(hass, conf, integration)
|
||||
|
||||
if not conf or not platform:
|
||||
return
|
||||
|
||||
await platform.async_reset()
|
||||
|
||||
# Extract only the config for the Home Assistant platform, ignore the rest.
|
||||
for p_type, p_config in config_per_platform(conf, SCENE_DOMAIN):
|
||||
if p_type != DOMAIN:
|
||||
continue
|
||||
|
||||
_process_scenes_config(hass, async_add_entities, p_config)
|
||||
|
||||
hass.helpers.service.async_register_admin_service(
|
||||
SCENE_DOMAIN, SERVICE_RELOAD, reload_config
|
||||
)
|
||||
|
||||
|
||||
def _process_scenes_config(hass, async_add_entities, config):
|
||||
"""Process multiple scenes and add them."""
|
||||
scene_config = config[STATES]
|
||||
|
||||
# Check empty list
|
||||
if not scene_config:
|
||||
return
|
||||
|
||||
async_add_entities(
|
||||
HomeAssistantScene(hass, _process_config(scene)) for scene in scene_config
|
||||
HomeAssistantScene(hass, _process_scene_config(scene)) for scene in scene_config
|
||||
)
|
||||
return True
|
||||
|
||||
|
||||
def _process_config(scene_config):
|
||||
def _process_scene_config(scene_config):
|
||||
"""Process passed in config into a format to work with.
|
||||
|
||||
Async friendly.
|
||||
|
||||
@@ -5,6 +5,7 @@ import logging
|
||||
|
||||
import voluptuous as vol
|
||||
|
||||
from homeassistant.core import DOMAIN as HA_DOMAIN
|
||||
from homeassistant.const import CONF_PLATFORM, SERVICE_TURN_ON
|
||||
from homeassistant.helpers.config_validation import ENTITY_SERVICE_SCHEMA
|
||||
from homeassistant.helpers.entity import Entity
|
||||
@@ -60,6 +61,10 @@ async def async_setup(hass, config):
|
||||
component = hass.data[DOMAIN] = EntityComponent(logger, DOMAIN, hass)
|
||||
|
||||
await component.async_setup(config)
|
||||
# Ensure Home Assistant platform always loaded.
|
||||
await component.async_setup_platform(
|
||||
HA_DOMAIN, {"platform": "homeasistant", STATES: []}
|
||||
)
|
||||
|
||||
async def async_handle_scene_service(service):
|
||||
"""Handle calls to the switch services."""
|
||||
|
||||
Reference in new issue
Block a user