Merge 29614ee into f406337

changelog/5230.bugfix.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/5465.feature.rst → changelog/5465.feature.rst

@@ -2,22 +2,25 @@ Update training data format for NLU to support composite entities.
 
 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"}
+  [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",
-        }
+  "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:

changelog/5475.bugfix.rst

@@ -2,4 +2,4 @@ One word can just have one entity label.
 
 If you are using, for example, ``ConveRTTokenizer`` words can be split into multiple tokens.
 Our entity extractors assign entity labels per token. So, it might happen, that a word, that was split into two tokens,
-got assigned two different entity labels. This is now fixed. One word can just have one entity label at a time.
+got assigned two different entity labels. This is now fixed. One word can just have one entity label at a time.

changelog/5509.bugfix.rst

@@ -2,4 +2,4 @@ An entity label should always cover a complete word.
 
 If you are using, for example, ``ConveRTTokenizer`` words can be split into multiple tokens.
 Our entity extractors assign entity labels per token. So, it might happen, that just a part of a word has
-an entity label. This is now fixed. An entity label always covers a complete word.
+an entity label. This is now fixed. An entity label always covers a complete word.

examples/moodbot/config.yml

@@ -4,11 +4,9 @@ pipeline:
   - name: "SpacyNLP"
   - name: "SpacyTokenizer"
   - name: "SpacyFeaturizer"
-  - name: "RegexFeaturizer"
-  - name: "LexicalSyntacticFeaturizer"
   - name: "DIETClassifier"
+    entity_recognition: False
     epochs: 100
-  - name: "EntitySynonymMapper"
 
 policies:
   - name: TEDPolicy

pyproject.toml

@@ -9,7 +9,7 @@ exclude = "((.eggs | .git | .pytype | .pytest_cache | build | dist))"
 
 [tool.poetry]
 name = "rasa"
-version = "1.9.5"
+version = "1.10.0-alpha1"
 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 <hi@rasa.com>",]
 maintainers = [ "Tom Bocklisch <tom@rasa.com>",]

rasa/constants.py

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

rasa/version.py

@@ -1,3 +1,3 @@
 # this file will automatically be changed,
 # do not add anything but the version number here!
-__version__ = "1.9.5"
+__version__ = "1.10.0-alpha1"

tests/conftest.py

@@ -88,13 +88,10 @@ async def default_agent(_trained_default_agent: Agent) -> Agent:
 @pytest.fixture(scope="session")
 async def trained_moodbot_path(tmpdir_factory: TempdirFactory) -> Text:
     output = tmpdir_factory.mktemp("moodbot").strpath
-    tmp_config_file = os.path.join(output, "config.yml")
-
-    update_number_of_epochs("examples/moodbot/config.yml", tmp_config_file)
 
     return await train_async(
         domain="examples/moodbot/domain.yml",
-        config=tmp_config_file,
+        config="examples/moodbot/config.yml",
         training_files="examples/moodbot/data/",
         output_path=MOODBOT_MODEL_PATH,
     )

tests/core/conftest.py

@@ -189,7 +189,7 @@ def tracker_with_six_scheduled_reminders(
 
 
 @pytest.fixture(scope="session")
-def moodbot_domain(trained_moodbot_path):
+def moodbot_domain():
     domain_path = os.path.join("examples", "moodbot", "domain.yml")
     return Domain.load(domain_path)
 

tests/core/test_agent.py

@@ -42,7 +42,7 @@ async def model(request):
 
 
 @pytest.fixture()
-def model_server(loop, sanic_client, trained_moodbot_path):
+def model_server(loop, sanic_client, trained_moodbot_path: Text):
     app = model_server_app(trained_moodbot_path, model_hash="somehash")
     return loop.run_until_complete(sanic_client(app))
 

tests/core/test_restore.py

@@ -1,14 +1,10 @@
-import asyncio
+from typing import Text
 
-import pytest
-
-import rasa.utils.io
 from rasa.core import restore
 from rasa.core.agent import Agent
-from rasa.model import get_model
 
 
-async def test_restoring_tracker(trained_moodbot_path, recwarn):
+async def test_restoring_tracker(trained_moodbot_path: Text, recwarn):
     tracker_dump = "data/test_trackers/tracker_moodbot.json"
 
     agent = Agent.load(trained_moodbot_path)