Skip to content

Commit 53b0242

Browse files
TyDunnTyDunn
authored
Merge branch 'master' into update_docs_action_command
2 parents a7cf095 + 8f15261 commit 53b0242

File tree

104 files changed

+1932
-1408
lines changed

Some content is hidden

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

104 files changed

+1932
-1408
lines changed

‎.github/ISSUE_TEMPLATE.md‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,33 @@
1-
<!-- THIS INFORMATION IS MANDATORY - YOUR ISSUE WILL BE CLOSED IF IT IS MISSING. If you don't know your Rasa Core version, use `pip list | grep rasa`. Removing the below information is allowed for FEATURE REQUESTS. -->
1+
<!-- THIS INFORMATION IS MANDATORY - YOUR ISSUE WILL BE CLOSED IF IT IS MISSING. If you don't know your Rasa version, use `pip list | grep rasa`. Removing the below information is allowed for FEATURE REQUESTS. Please format any code or console output with the three ticks ``` above and below. -->
22

33
**Rasa version**:
44

5-
**Python version**:
5+
**Rasa X version** (if used & relevant):
6+
7+
**Python version**:
68

79
**Operating system** (windows, osx, ...):
810

911
**Issue**:
1012

1113

1214

13-
**Content of configuration file (config.yml)**:
15+
**Error (including full traceback)**:
16+
```
17+
18+
```
19+
20+
**Command or request that led to error**:
21+
```
22+
23+
```
24+
25+
**Content of configuration file (config.yml)** (if relevant):
1426
```yml
1527

1628
```
1729

18-
**Content of domain file (domain.yml)** (if used & relevant):
19-
```yaml
30+
**Content of domain file (domain.yml)** (if relevant):
31+
```yml
2032

2133
```

‎.travis.yml‎

Lines changed: 12 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ env:
1111
# https://github.com/travis-ci/travis-ci/issues/7940
1212
global:
1313
- BOTO_CONFIG=/dev/null
14-
- COVERALLS_PARALLEL=true
1514
- PIP_USE_PEP517=false
1615

1716
install:
@@ -20,7 +19,7 @@ install:
2019
- pip install git+https://github.com/tmbo/MITIE.git
2120
- pip install -r requirements-dev.txt
2221
- pip install -e .
23-
- pip install coveralls==1.3.0
22+
- pip install coveralls==1.7.0
2423
- pip install https://github.com/explosion/spacy-models/releases/download/en_core_web_md-2.1.0/en_core_web_md-2.1.0.tar.gz#egg=en_core_web_md==2.1.0 --no-cache-dir > jnk
2524
- python -m spacy link en_core_web_md en
2625
- pip install https://github.com/explosion/spacy-models/releases/download/de_core_news_sm-2.1.0/de_core_news_sm-2.1.0.tar.gz#egg=de_core_news_sm==2.1.0 --no-cache-dir > jnk
@@ -33,50 +32,26 @@ install:
3332
before_script:
3433
- mkdir $HOME/tmp
3534
- export TMPDIR=$HOME/tmp
36-
after_success:
37-
- coveralls
3835
jobs:
3936
include:
4037
- stage: test
4138
name: "Black Formatting"
4239
python: 3.6
4340
script: pip install black; black --check .
44-
- &test-core
41+
- &run-tests
4542
stage: test
46-
name: "Test Core 3.6"
47-
python: "3.6"
43+
name: "Test 3.5"
44+
python: "3.5"
4845
script:
49-
- py.test tests/core --cov rasa -v --cov-append
50-
- <<: *test-core
51-
name: "Test Core 3.5"
52-
python: '3.5'
53-
- <<: *test-core
54-
name: "Test Core 3.7"
55-
python: '3.7'
56-
- &test-nlu-base
57-
stage: test
58-
name: "Test NLU 3.6"
59-
python: "3.6"
60-
script:
61-
- py.test tests/nlu/base --cov rasa -v --cov-append
62-
- <<: *test-nlu-base
63-
name: "Test NLU 3.5"
64-
python: '3.5'
65-
- <<: *test-nlu-base
66-
name: "Test NLU 3.7"
67-
python: '3.7'
68-
- &test-nlu-training
69-
stage: test
70-
name: "Test NLU training 3.6"
71-
python: "3.6"
72-
script:
73-
- py.test tests/nlu/training --cov rasa -v --cov-append
74-
- <<: *test-nlu-training
75-
name: "Test NLU training 3.5"
76-
python: '3.5'
77-
- <<: *test-nlu-training
78-
name: "Test NLU training 3.7"
46+
- py.test tests --cov rasa -v
47+
- <<: *run-tests
48+
name: "Test 3.6"
49+
python: '3.6'
50+
- <<: *run-tests
51+
name: "Test 3.7"
7952
python: '3.7'
53+
after_success:
54+
- coveralls # only this version will submit results to coveralls
8055
- stage: integration
8156
name: "Test API specification"
8257
language: python
@@ -85,8 +60,6 @@ jobs:
8560
script:
8661
- swagger-cli validate docs/_static/spec/action-server.yml
8762
- swagger-cli validate docs/_static/spec/rasa.yml
88-
after_success:
89-
- coveralls
9063
- stage: test
9164
if: branch =~ /(\d+\.\d+\.x)/ or branch = "master" # only new version PRs & PRs to master will test starter packs
9265
name: "NLU starter pack (NLU only)"

‎CHANGELOG.rst‎

Lines changed: 55 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Rasa Change Log
66
All notable changes to this project will be documented in this file.
77
This project adheres to `Semantic Versioning`_ starting with version 1.0.
88

9-
[Unreleased 1.0.2.aX] - `master`_
9+
[Unreleased 1.0.6.aX] - `master`_
1010
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1111

1212
Added
@@ -20,6 +20,60 @@ Removed
2020

2121
Fixed
2222
-----
23+
- slack notifications from bots correctly render text
24+
- fixed usage of ``--log-file`` argument for ``rasa run`` and ``rasa shell``
25+
- check if correct tracker store is configured in local mode
26+
27+
[1.0.6] - 2019-06-03
28+
^^^^^^^^^^^^^^^^^^^^
29+
30+
Fixed
31+
-----
32+
- fixed backwards incompatible utils changes
33+
34+
[1.0.5] - 2019-06-03
35+
^^^^^^^^^^^^^^^^^^^^
36+
37+
Fixed
38+
-----
39+
- fixed spacy being a required dependency (regression)
40+
41+
[1.0.4] - 2019-06-03
42+
^^^^^^^^^^^^^^^^^^^^
43+
44+
Added
45+
-----
46+
- automatic creation of index on the ``sender_id`` column when using an SQL
47+
tracker store. If you have an existing data and you are running into performance
48+
issues, please make sure to add an index manually using
49+
``CREATE INDEX event_idx_sender_id ON events (sender_id);``.
50+
51+
Changed
52+
-------
53+
- NLU evaluation in cross-validation mode now also provides intent/entity reports,
54+
confusion matrix, etc.
55+
56+
[1.0.3] - 2019-05-30
57+
^^^^^^^^^^^^^^^^^^^^
58+
59+
Fixed
60+
-----
61+
- non-ascii characters render correctly in stories generated from interactive learning
62+
- validate domain file before usage, e.g. print proper error messages if domain file
63+
is invalid instead of raising errors
64+
65+
[1.0.2] - 2019-05-29
66+
^^^^^^^^^^^^^^^^^^^^
67+
68+
Added
69+
-----
70+
- added ``domain_warnings()`` method to ``Domain`` which returns a dict containing the
71+
diff between supplied {actions, intents, entities, slots} and what's contained in the
72+
domain
73+
74+
Fixed
75+
-----
76+
- fix lookup table files failed to load issues/3622
2377
- buttons can now be properly selected during cmdline chat or when in interactive learning
2478
- set slots correctly when events are added through the API
2579
- mapping policy no longer ignores NLU threshold

‎data/test/json_with_special_chars_convered_to_md.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
## intent:affirm
2+
- yes\n
3+
4+
## intent:restaurant_search
5+
- i'm looking for a place in the [n\north\n](location) of town
6+
7+
## synonym:chinese
8+
- C\thi\rne\bs
9+
- chines
10+
- Chinese

‎data/test/training_data_containing_special_chars.json‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
{
2+
"rasa_nlu_data": {
3+
"common_examples": [
4+
{
5+
"text": "yes\n",
6+
"intent": "affirm"
7+
},
8+
{
9+
"entities": [
10+
{
11+
"start": 31,
12+
"end": 38,
13+
"value": "n\north\n",
14+
"entity": "location"
15+
}
16+
],
17+
"intent": "restaurant_search\t",
18+
"text": "i'm looking for a place in the n\north\n of town"
19+
}
20+
],
21+
"entity_synonyms": [
22+
{
23+
"synonyms": [
24+
"C\thi\rne\bs",
25+
"chines",
26+
"Chinese"
27+
],
28+
"value": "chinese"
29+
}
30+
],
31+
"regex_features": []
32+
}
33+
}

‎data/test_domains/default.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ entities:
1414

1515
templates:
1616
utter_greet:
17-
- hey there!
17+
- text: hey there!
1818
utter_goodbye:
19-
- goodbye :(
19+
- text: goodbye :(
2020
utter_default:
21-
- default message
21+
- text: default message
2222

2323
actions:
2424
- utter_default

‎data/test_domains/duplicate_actions.yml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
intents:
2+
- greet
3+
- default
4+
- goodbye
5+
6+
slots:
7+
cuisine:
8+
type: text
9+
location:
10+
type: text
11+
12+
entities:
13+
- name
14+
15+
templates:
16+
utter_greet:
17+
- text: hey there!
18+
utter_goodbye:
19+
- text: goodbye :(
20+
utter_default:
21+
- text: default message
22+
23+
actions:
24+
- utter_default
25+
- utter_greet
26+
- utter_goodbye
27+
- utter_default

‎data/test_domains/duplicate_entities.yml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
intents:
2+
- greet
3+
- default
4+
- goodbye
5+
- default
6+
- goodbye
7+
8+
slots:
9+
cuisine:
10+
type: text
11+
location:
12+
type: text
13+
14+
entities:
15+
- name
16+
- name
17+
18+
templates:
19+
utter_greet:
20+
- text: hey there!
21+
utter_goodbye:
22+
- text: goodbye :(
23+
utter_default:
24+
- text: default message
25+
26+
actions:
27+
- utter_default
28+
- utter_greet
29+
- utter_goodbye

‎data/test_domains/duplicate_intents.yml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
intents:
2+
- greet
3+
- default
4+
- goodbye
5+
- default
6+
- goodbye
7+
8+
slots:
9+
cuisine:
10+
type: text
11+
location:
12+
type: text
13+
14+
entities:
15+
- name
16+
17+
templates:
18+
utter_greet:
19+
- text: hey there!
20+
utter_goodbye:
21+
- text: goodbye :(
22+
utter_default:
23+
- text: default message
24+
25+
actions:
26+
- utter_default
27+
- utter_greet
28+
- utter_goodbye

‎data/test_domains/duplicate_templates.yml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
intents:
2+
- greet
3+
- default
4+
- goodbye
5+
6+
slots:
7+
cuisine:
8+
type: text
9+
location:
10+
type: text
11+
12+
entities:
13+
- name
14+
15+
templates:
16+
utter_greet:
17+
- text: hey there!
18+
utter_goodbye:
19+
- text: goodbye :(
20+
utter_default:
21+
- text: default message
22+
utter_greet:
23+
- text: hey there!
24+
25+
actions:
26+
- utter_default
27+
- utter_greet
28+
- utter_goodbye

0 commit comments

Comments
 (0)