Merge branch 'master' into Restarting_Session_on_Every_Message

Author: degiz

.github/workflows/vulnerability-scan.yml

@@ -2,8 +2,8 @@ name: Vulnerability Scan
 
 on:
   schedule:
-    # Run once every day
-    - cron: '0 0 * * *'
+    # Run every third day
+    - cron: 0 0 * * */3
 
 jobs:
   scan:
@@ -35,10 +35,11 @@ jobs:
         echo "::set-env name=IMAGE_WITH_POETRY_LOCK::$IMAGE_NAME"
 
     - name: Scan image 🕵️‍♀️🕵️‍♂️
-      uses: homoluctus/gitrivy@v2.0.0
+      uses: wochinge/gitrivy@6bf026b
       with:
         # Needs the token so it can create an issue once a vulnerability was found
         token: ${{ secrets.GITHUB_TOKEN }}
         image: ${{ env.IMAGE_WITH_POETRY_LOCK }}
         ignore_unfixed: true
         issue_label: "tool:trivy,type:vulnerability"
+        fail_on_vulnerabilities: true

changelog/5637.enhancement.rst

@@ -0,0 +1,2 @@
+Added behavior to the ``rasa --version`` command. It will now also list information about the operating system,
+python version and rasa-sdk. This will make it easier for users to file bug reports.

changelog/5737.bugfix.rst

@@ -0,0 +1,3 @@
+Pinned the library version for the Azure :ref:`cloud-storage` to ``2.1.0`` since the
+persistor is currently not compatible with later versions of the ``azure-storage-blob``
+library.

changelog/5756.improvement.rst

@@ -0,0 +1,8 @@
+To avoid the problem of our entity extractors predicting entity labels for just a part of the words,
+we introduced a cleaning method after the prediction was done.
+We should avoid the incorrect prediction in the first place.
+To achieve this we will not tokenize words into sub-words anymore.
+We take the mean feature vectors of the sub-words as the feature vector of the word.
+
+.. warning::
+    This change is model breaking. Please, retrain your models.

poetry.lock

@@ -9,7 +9,7 @@ exclude = "((.eggs | .git | .pytype | .pytest_cache | build | dist))"
 
 [tool.poetry]
 name = "rasa"
-version = "1.10.0"
+version = "1.11.0a1"
 description = "Open source machine learning framework to automate text- and voice-based conversations: NLU, dialogue management, connect to Slack, Facebook, and more - Create chatbots and voice assistants"
 authors = [ "Rasa Technologies GmbH <[email protected]>",]
 maintainers = [ "Tom Bocklisch <[email protected]>",]
@@ -91,7 +91,7 @@ rocketchat_API = ">=0.6.31,<1.4.0"
 colorhash = "~1.0.2"
 pika = "~1.1.0"
 jsonschema = "~3.2"
-packaging = "~19.0"
+packaging = ">=19.0,<20.4"
 gevent = ">=1.4,<1.6"
 pytz = "^2019.1"
 rasa-sdk = "^1.10.0"
@@ -142,7 +142,7 @@ black = "^19.10b0"
 flake8 = "^3.7.9"
 pytype = "^2020.1.24"
 google-cloud-storage = "^1.25.0"
-azure-storage-blob = "^12.1.0"
+azure-storage-blob = "<=2.1.0"
 coveralls = "^2.0.0"
 towncrier = "^19.2.0"
 toml = "^0.10.0"

pyproject.toml

@@ -1,8 +1,9 @@
+import sys
 import argparse
 import logging
+import platform
 
 import rasa.utils.io
-
 from rasa import version
 from rasa.cli import (
     scaffold,
@@ -20,6 +21,7 @@
 from rasa.cli.utils import parse_last_positional_argument_as_model_path
 from rasa.utils.common import set_log_level
 import rasa.utils.tensorflow.environment as tf_env
+from rasa_sdk import __version__ as rasa_sdk_version
 
 logger = logging.getLogger(__name__)
 
@@ -64,7 +66,22 @@ def create_argument_parser() -> argparse.ArgumentParser:
 
 
 def print_version() -> None:
-    print("Rasa", version.__version__)
+    """Prints version information of rasa tooling and python."""
+
+    python_version, os_info = sys.version.split("\n")
+    try:
+        from rasax.community.version import __version__  # pytype: disable=import-error
+
+        rasa_x_info = __version__
+    except ModuleNotFoundError:
+        rasa_x_info = None
+
+    print(f"Rasa Version     : {version.__version__}")
+    print(f"Rasa SDK Version : {rasa_sdk_version}")
+    print(f"Rasa X Version   : {rasa_x_info}")
+    print(f"Python Version   : {python_version}")
+    print(f"Operating System : {platform.platform()}")
+    print(f"Python Path      : {sys.executable}")
 
 
 def main() -> None:

rasa/__main__.py

@@ -53,7 +53,7 @@
 CONFIG_MANDATORY_KEYS_NLU = ["language", "pipeline"]
 CONFIG_MANDATORY_KEYS = CONFIG_MANDATORY_KEYS_CORE + CONFIG_MANDATORY_KEYS_NLU
 
-MINIMUM_COMPATIBLE_VERSION = "1.10.0"
+MINIMUM_COMPATIBLE_VERSION = "1.11.0a1"
 
 GLOBAL_USER_CONFIG_PATH = os.path.expanduser("~/.config/rasa/global.yml")
 

rasa/constants.py

@@ -803,7 +803,6 @@ def _predict_entities(
         )
 
         entities = self.add_extractor_name(entities)
-        entities = self.clean_up_entities(message, entities)
         entities = message.get(ENTITIES, []) + entities
 
         return entities

rasa/nlu/classifiers/diet_classifier.py

@@ -37,6 +37,7 @@
 
 CLS_TOKEN = "__CLS__"
 POSITION_OF_CLS_TOKEN = -1
+NUMBER_OF_SUB_TOKENS = "number_of_sub_tokens"
 
 MESSAGE_ATTRIBUTES = [TEXT, INTENT, RESPONSE]