Merge branch 'master' into include-source-in-failed-stories

Author: degiz

.github/ISSUE_TEMPLATE/ask_question.md

@@ -2,7 +2,7 @@
 name: Bug report
 about: Create a report to help us improve
 title: ''
-labels: 'type:bug :bug:'
+labels: 'area:rasa-oss :ferris_wheel:,type:bug :bug:'
 assignees: ''
 
 ---

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Ask a question
+    url: https://forum.rasa.com/
+    about: If you have a "How do I?" question please ask in the forum https://forum.rasa.com

.github/ISSUE_TEMPLATE/config.yml

@@ -2,7 +2,7 @@
 name: Feature request
 about: Suggest an idea on how to improve Rasa
 title: ''
-labels: 'type:enhancement :sparkles:'
+labels: 'area:rasa-oss :ferris_wheel:,type:enhancement :sparkles:'
 assignees: ''
 
 ---

.github/ISSUE_TEMPLATE/feature_request.md

@@ -41,3 +41,4 @@ jobs:
         token: ${{ secrets.GITHUB_TOKEN }}
         image: ${{ env.IMAGE_WITH_POETRY_LOCK }}
         ignore_unfixed: true
+        issue_label: "tool:trivy,type:vulnerability"

.github/workflows/vulnerability-scan.yml

@@ -17,6 +17,26 @@ This project adheres to `Semantic Versioning`_ starting with version 1.0.
 
 .. towncrier release notes start
 
+[1.9.7] - 2020-04-23
+^^^^^^^^^^^^^^^^^^^^
+
+Improvements
+------------
+- `#4606 <https://github.com/rasahq/rasa/issues/4606>`_: The stream reading timeout for ``rasa shell` is now configurable by using the
+  environment variable ``RASA_SHELL_STREAM_READING_TIMEOUT_IN_SECONDS``.
+  This can help to fix problems when using ``rasa shell`` with custom actions which run
+  10 seconds or longer.
+
+Bugfixes
+--------
+- `#5709 <https://github.com/rasahq/rasa/issues/5709>`_: Reverted changes in 1.9.6 that led to model incompatibility. Upgrade to 1.9.7 to fix 
+  ``self.sequence_lengths_for(tf_batch_data[TEXT_SEQ_LENGTH][0]) IndexError: list index out of range`` 
+  error without needing to retrain earlier 1.9 models.
+
+  Therefore, all 1.9 models `except for 1.9.6` will be compatible; a model trained on 1.9.6 will need
+  to be retrained on 1.9.7.
+
+
 [1.9.6] - 2020-04-15
 ^^^^^^^^^^^^^^^^^^^^
 

CHANGELOG.rst

@@ -0,0 +1,18 @@
+Add support for entities with roles and grouping of entities in Rasa NLU.
+
+You can now define a role and/or group label in addition to the entity type for entities.
+Use the role label if an entity can play different roles in your assistant.
+For example, a city can be a destination or a departure city.
+The group label can be used to group multiple entities together.
+For example, you could group different pizza orders, so that you know what toppings goes with which pizza and
+what size which pizza has.
+For more details see :ref:`entities-roles-groups`.
+
+To fill slots from entities with a specific role/group, you need to either use forms or use a custom action.
+We updated the tracker method ``get_latest_entity_values`` to take an optional role/group label.
+If you want to use a form, you can add the specific role/group label of interest to the slot mapping function
+``from_entity`` (see :ref:`forms``).
+
+.. note::
+
+    Composite entities are currently just supported by the :ref:``diet-classifier`` and :ref:``CRFEntityExtractor``.

changelog/3765.feature.rst

@@ -1 +1 @@
-Fixed issue where posting to certain callback channel URLs would return a 500 error on successful posts due to invalid response format
+Fixed issue where posting to certain callback channel URLs would return a 500 error on successful posts due to invalid response format.

changelog/5230.bugfix.rst

@@ -0,0 +1,29 @@
+Update training data format for NLU to support entities with a role or group label.
+
+You can now specify synonyms, roles, and groups of entities using the following data format:
+Markdown:
+
+.. code-block:: none
+
+  [LA]{"entity": "location", "role": "city", "group": "CA", "value": "Los Angeles"}
+
+JSON:
+
+.. code-block:: none
+
+  "entities": [
+      {
+          "start": 10,
+          "end": 12,
+          "value": "Los Angeles",
+          "entity": "location",
+          "role": "city",
+          "group": "CA",
+      }
+  ]
+
+The markdown format ``[LA](location:Los Angeles)`` is deprecated. To update your training data file just
+execute the following command on the terminal of your choice:
+``sed -i .deprecated -E 's/\[(.*)\]\((.*):(.*)\)/\[\1\]\{"entity": "\2", "value": "\3"\}/g' nlu.md``
+
+For more information about the new data format see :ref:`training-data-format`.