Skip to content

Commit 5524c15

Browse files
authored
Merge branch 'master' into issue4896
2 parents c7c8fce + 4bbf78b commit 5524c15

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+934
-282
lines changed

.travis.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@ install:
1717
# The instructions listed here should be equivalent to the ones
1818
# listed in README.md!
1919
- sudo apt-get update -qq
20-
- python -m pip install -U pip
20+
# Pip 20.0.1 breaks our build script when installing one of the
21+
# dependencies in requirements-dev.txt (ninja 1.9.0.post1). For the
22+
# moment, use pip 19 to install them.
23+
- python -m pip install -U 'pip<20'
2124
- pip install -r requirements-dev.txt
2225
- pip install -e .
2326
- make prepare-tests-ubuntu

LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
same "printed page" as the copyright notice for easier
187187
identification within third-party archives.
188188

189-
Copyright 2019 Rasa Technologies GmbH
189+
Copyright 2020 Rasa Technologies GmbH
190190

191191
Licensed under the Apache License, Version 2.0 (the "License");
192192
you may not use this file except in compliance with the License.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ tagged a new version) we trigger a webhook on netlify (see `.travis.yml`).
192192

193193
## License
194194
Licensed under the Apache License, Version 2.0.
195-
Copyright 2019 Rasa Technologies GmbH. [Copy of the license](LICENSE.txt).
195+
Copyright 2020 Rasa Technologies GmbH. [Copy of the license](LICENSE.txt).
196196

197197
A list of the Licenses of the dependencies of the project can be found at
198198
the bottom of the

changelog/400.feature.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Rename ``templates`` key in domain to ``responses``.
2+
3+
``templates`` key will still work for backwards compatibility but will raise a future warning.

changelog/4964.feature.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
External events and reminders now trigger intents (and entities) instead of actions.
2+
3+
Add new endpoint ``/conversations/<conversation_id>/trigger_intent``, which lets the user specify an intent and a
4+
list of entities that is injected into the conversation in place of a user message. The bot then predicts and
5+
executes a response action.

changelog/4964.improvement.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
``ReminderCancelled`` can now cancel multiple reminders if no name is given. It still cancels a single
2+
reminder if the reminder's name is specified.

changelog/4964.removal.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
The endpoint ``/conversations/<conversation_id>/execute`` is now deprecated. Instead, users should use
2+
the ``/conversations/<conversation_id>/trigger_intent`` endpoint and thus trigger intents instead of actions.

changelog/5092.bugfix.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
DynamoDB tracker store decimal values will now be rounded on save. Previously values exceeding 38 digits caused an unhandled error.

data/test_domains/default.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ slots:
1212
entities:
1313
- name
1414

15-
templates:
15+
responses:
1616
utter_greet:
1717
- text: hey there!
1818
utter_goodbye:
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
intents:
2+
- greet: {use_entities: [name]}
3+
- default: {ignore_entities : [unrelated_recognized_entity]}
4+
- goodbye: {use_entities: null}
5+
- thank: {use_entities: False}
6+
- ask: {use_entities: True}
7+
- why: {use_entities: []}
8+
- pure_intent
9+
10+
entities:
11+
- name
12+
- unrelated_recognized_entity
13+
- other
14+
15+
templates:
16+
utter_greet:
17+
- hey there!
18+
utter_goodbye:
19+
- goodbye :(
20+
utter_default:
21+
- default message
22+
23+
actions:
24+
- utter_default
25+
- utter_greet
26+
- utter_goodbye

0 commit comments

Comments
 (0)