Allow extra values in the slot schema of intent handlers #15246
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ghost
added
the
|
Cool, thanks! CC @tschmidty69 |
balloob
reviewed
Jul 1, 2018
| @@ -137,7 +137,8 @@ def async_validate_slots(self, slots): | |||
| if self._slot_schema is None: | |||
| self._slot_schema = vol.Schema({ | |||
| key: SLOT_SCHEMA.extend({'value': validator}) | |||
| for key, validator in self.slot_schema.items()}) | |||
| for key, validator in self.slot_schema.items()}, | |||
| extra=vol.ALLOW_EXTRA) | |||
There was a problem hiding this comment.
I am a bit surprised this was the fix, as SLOT_SCHEMA already had vol.ALLOW_EXTRAS set.
There was a problem hiding this comment.
SLOT_SCHEMA is the schema for one specific slot (e.g. name). This sets vol.ALLOW_EXTRAS to the schema of the parent object containing all slots.
awarecan
pushed a commit
to awarecan/home-assistant
that referenced
this pull request
Jul 16, 2018
Merged
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description:
PR #14315 introduced additional slot values for the siteId and probability in the snips component. Unfortunately this caused the schema validation in the IntentHandler to fail for ServiceIntentHandlers used for example by HassTurnOn.
The problem was also reported in issue #14918
As a solution I propose to allow arbitrary extra keys when validating the schema.
Related issue (if applicable): fixes #14918
Pull request in home-assistant.github.io with documentation (if applicable): home-assistant/home-assistant.github.io#<home-assistant.github.io PR number goes here>
Example entry for
configuration.yaml(if applicable):Checklist:
tox. Your PR cannot be merged unless tests passIf user exposed functionality or configuration variables are added/changed:
If the code communicates with devices, web services, or third-party tools:
REQUIREMENTSvariable (example).requirements_all.txtby runningscript/gen_requirements_all.py..coveragerc.If the code does not interact with devices: