Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge 1.9.x into master and reapply reverted 1.9.x changes #5712

Merged
merged 24 commits into from
Apr 24, 2020
Merged
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
38c4afe
make timeout for rasa shell configurable
wochinge Apr 21, 2020
5fde6ed
add whatsapp+ prefix to twilio creds
erohmensing Apr 21, 2020
333f69f
Merge pull request #5686 from RasaHQ/fix-timeout-error
wochinge Apr 22, 2020
d2a6a1c
Apply suggestions from code review
erohmensing Apr 23, 2020
50536ac
Revert "Mask vs sequence"
erohmensing Apr 23, 2020
a1a6887
Revert "Move activation to transformer block"
erohmensing Apr 23, 2020
92125c0
Merge pull request #5710 from RasaHQ/revert-5626-bug-activation
erohmensing Apr 23, 2020
5915f5e
changelog entry
erohmensing Apr 23, 2020
c0b3065
Update 5709.bugfix.rst
erohmensing Apr 23, 2020
23a5137
Merge pull request #5688 from RasaHQ/erohmensing-patch-2
erohmensing Apr 23, 2020
984a07f
Merge pull request #5709 from RasaHQ/revert-5565-mask-vs-sequence
erohmensing Apr 23, 2020
976aa76
prepared release of version 1.9.7
erohmensing Apr 23, 2020
46c6cec
Merge pull request #5711 from RasaHQ/prepare-release-1.9.7
erohmensing Apr 23, 2020
ecb7973
merge conflict
evgeniiaraz Apr 2, 2020
036567a
small changes
evgeniiaraz Apr 2, 2020
1cea69a
small changed by comments
evgeniiaraz Apr 2, 2020
65d4cfd
None return type
evgeniiaraz Apr 2, 2020
d6cdc79
Update docstring
evgeniiaraz Apr 3, 2020
f25a6ca
sequence length as a separate method
evgeniiaraz Apr 3, 2020
3d7cc8c
black
evgeniiaraz Apr 3, 2020
629ddce
move activation to transformer block
tabergma Apr 14, 2020
28c37f7
add changelog
tabergma Apr 14, 2020
eda7535
Merge branch 'master' into 1.9.x-merge
erohmensing Apr 23, 2020
7fffa52
reapplying changes
tabergma Apr 24, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
small changes
  • Loading branch information
evgeniiaraz authored and erohmensing committed Apr 23, 2020
commit 036567a28cb1e7d8fcc13582a31e2d1c0ff36994
10 changes: 5 additions & 5 deletions rasa/nlu/classifiers/diet_classifier.py
Original file line number Diff line number Diff line change
@@ -87,10 +87,10 @@

TEXT_FEATURES = f"{TEXT}_features"
LABEL_FEATURES = f"{LABEL}_features"
TEXT_MASK = f"{TEXT}_mask"
LABEL_MASK = f"{LABEL}_mask"
LABEL_IDS = f"{LABEL}_ids"
TAG_IDS = "tag_ids"
TEXT_SEQ_LENGTH = f"{TEXT}_lengths"
LABEL_SEQ_LENGTH = f"{LABEL}_lengths"


class DIETClassifier(IntentClassifier, EntityExtractor):
@@ -484,7 +484,7 @@ def _create_label_data(
# to track correctly dynamic sequences
label_data.add_features(LABEL_IDS, [np.expand_dims(label_ids, -1)])

label_data.add_mask(LABEL_MASK, LABEL_FEATURES)
label_data.add_lengths(LABEL_SEQ_LENGTH, LABEL_FEATURES)

return label_data

@@ -558,8 +558,8 @@ def _create_model_data(
model_data.add_features(LABEL_IDS, [np.expand_dims(label_ids, -1)])
model_data.add_features(TAG_IDS, [tag_ids])

model_data.add_mask(TEXT_MASK, TEXT_FEATURES)
model_data.add_mask(LABEL_MASK, LABEL_FEATURES)
model_data.add_lengths(TEXT_SEQ_LENGTH, TEXT_FEATURES)
model_data.add_lengths(LABEL_SEQ_LENGTH, LABEL_FEATURES)

return model_data

4 changes: 2 additions & 2 deletions rasa/nlu/selectors/response_selector.py
Original file line number Diff line number Diff line change
@@ -17,9 +17,9 @@
DIET,
TEXT_FEATURES,
LABEL_FEATURES,
TEXT_MASK,
LABEL_MASK,
LABEL_IDS,
TEXT_SEQ_LENGTH,
LABEL_SEQ_LENGTH,
)
from rasa.utils.tensorflow.constants import (
LABEL,