add #10137 changes to domain merging #10589
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
carlad
requested review from
wochinge,
alwx,
jupyterjazz and
ePreda
and removed request for
a team
ePreda
approved these changes
Dec 28, 2021
carlad
force-pushed
the
10570-10137-into-main
branch
from
4103ed4
to
1c15db6
Compare
carlad
force-pushed
the
10570-10137-into-main
branch
from
69cefca
to
7f030df
Compare
joejuzl
reviewed
Jan 3, 2022
| def merge_lists(list1: List[Any], list2: List[Any]) -> List[Any]: | ||
| return sorted(list(set(list1 + list2))) | ||
| This is used when multiple domain yml files are configured in a single | ||
| directory. Unlike the merge method above, which merges Domain objects by |
There was a problem hiding this comment.
Is there a reason we can't use this implementation for both?
There was a problem hiding this comment.
@joejuzl So this PR is to port the changes from 2.8.x into main, which we decided to implement in this way as we were planning to rethink how we handle the domain.
But as we wanted to ensure that main also handled multiple domain files, we thought it would be better in the short-term to implement this solution...
|
🚀 A preview of the docs have been deployed at the following URL: https://10589--rasahq-docs-rasa-v2.netlify.app/docs/rasa |
joejuzl
approved these changes
Jan 4, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Proposed changes:
closes #10570
2.8.xin use_entities is broken when domain is split #10137 intomain2.8.xPRStatus (please check what you already did):