Merge pull request RasaHQ#4738 from RasaHQ/1.4.x-merge

merge 1.4.x into master

Author: erohmensing

CHANGELOG.rst

@@ -34,6 +34,14 @@ Fixed
 - Fixed rasa init showing traceback error when user does Keyboard Interrupt before choosing a project path
 - ``CountVectorsFeaturizer`` featurizes intents only if its analyzer is set to ``word``
 
+[1.4.3] - 2019-10-29
+^^^^^^^^^^^^^^^^^^^^
+
+Fixed
+-----
+- Fixed ``Connection reset by peer`` errors and bot response delays when using the
+  RabbitMQ event broker.
+
 [1.4.2] - 2019-10-28
 ^^^^^^^^^^^^^^^^^^^^
 
@@ -46,6 +54,8 @@ Fixed
 - Fixed ``'Namespace' object has no attribute 'persist_nlu_data'`` error during
   interactive learning
 - Pinned `networkx~=2.3.0` to fix visualization in `rasa interactive` and Rasa X
+- Fixed ``No model found`` error when using ``rasa run actions`` with "actions"
+  as a directory.
 
 [1.4.1] - 2019-10-22
 ^^^^^^^^^^^^^^^^^^^^

data/test/markdown_single_sections/section_with_delimiter.md

@@ -0,0 +1,2 @@
+## synonym:10:00
+- 10:00 am

docs/conf.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # -- General configuration ------------------------------------------------
 import re
@@ -324,9 +323,7 @@
 
 # extlinks configuration
 
-extlinks = {
-    "gh-code": ("https://github.com/RasaHQ/rasa/tree/{}/%s".format(release), "github ")
-}
+extlinks = {"gh-code": (f"https://github.com/RasaHQ/rasa/tree/{release}/%s", "github ")}
 
 # Sphinxcontrib configuration
 scv_priority = "tags"
@@ -340,9 +337,9 @@
     re.compile(r"^[2-9]+\.\d+\.\d+$"),
     re.compile(r"^1\.[456789]+\.\d+$"),
     re.compile(r"^1\.3\.\d+$"),
-    re.compile("^1\.2\.9$"),
-    re.compile("^1\.1\.8$"),
-    re.compile("^1\.0\.9$"),
+    re.compile(r"^1\.2\.9$"),
+    re.compile(r"^1\.1\.8$"),
+    re.compile(r"^1\.0\.9$"),
 )
 scv_greatest_tag = True
 

docs/core/actions.rst

@@ -104,6 +104,8 @@ The only thing your action server needs to install is ``rasa-sdk``:
     separate container, you only need to install ``rasa-sdk``.
 
 The file that contains your custom actions should be called ``actions.py``.
+Alternatively, you can use a package directory called ``actions`` or else
+manually specify an actions module or package with the ``--actions`` flag.
 
 If you have ``rasa`` installed, run this command to start your action server:
 

docs/user-guide/connectors/mattermost.rst

@@ -24,9 +24,9 @@ Getting Credentials
       that is said.
    4. Make sure **trigger when** is set to value
       **first word matches a trigger word exactly**.
-   5. The callback url needs to be your ngrok url where you
+   5. The callback url needs to be either your localhost address for Rasa, or your ngrok url where you
       have your webhook running in Core or your public address, e.g.
-      ``http://test.example.com/webhooks/mattermost/webhook``.
+      ``http://test.example.com/webhooks/mattermost/webhook`` or ``http://localhost:5005/webhooks/mattermost/webhook``.
 
 
 For more detailed steps, visit the
@@ -49,7 +49,7 @@ you need to supply a ``credentials.yml`` with the following content:
    mattermost:
      url: "https://chat.example.com/api/v4"
      team: "community"
-     user: "[email protected]"
+     user: "[email protected]" #  actual username of your bot user, not displayname
      pw: "password"
      webhook_url: "https://server.example.com/webhooks/mattermost/webhook"
 

examples/concertbot/actions.py

@@ -12,7 +12,7 @@ def run(self, dispatcher, tracker, domain):
             {"artist": "Katy Perry", "reviews": 5.0},
         ]
         description = ", ".join([c["artist"] for c in concerts])
-        dispatcher.utter_message("{}".format(description))
+        dispatcher.utter_message(f"{description}")
         return [SlotSet("concerts", concerts)]
 
 
@@ -27,7 +27,7 @@ def run(self, dispatcher, tracker, domain):
         ]
         dispatcher.utter_message("here are some venues I found")
         description = ", ".join([c["name"] for c in venues])
-        dispatcher.utter_message("{}".format(description))
+        dispatcher.utter_message(f"{description}")
         return [SlotSet("venues", venues)]
 
 
@@ -37,7 +37,7 @@ def name(self):
 
     def run(self, dispatcher, tracker, domain):
         concerts = tracker.get_slot("concerts")
-        dispatcher.utter_message("concerts from slots: {}".format(concerts))
+        dispatcher.utter_message(f"concerts from slots: {concerts}")
         return []
 
 
@@ -47,5 +47,5 @@ def name(self):
 
     def run(self, dispatcher, tracker, domain):
         venues = tracker.get_slot("venues")
-        dispatcher.utter_message("venues from slots: {}".format(venues))
+        dispatcher.utter_message(f"venues from slots: {venues}")
         return []

examples/formbot/actions.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from typing import Dict, Text, Any, List, Union, Optional
 
 from rasa_sdk import Tracker

examples/restaurantbot/actions.py

@@ -2,7 +2,7 @@
 from rasa_sdk.events import SlotSet
 
 
-class RestaurantAPI(object):
+class RestaurantAPI:
     def search(self, info):
         return "papi's pizza place"
 

examples/restaurantbot/run.py

@@ -19,7 +19,7 @@ async def parse(text: Text, model_path: Text):
 
     response = await agent.handle_text(text)
 
-    logger.info("Text: '{}'".format(text))
+    logger.info(f"Text: '{text}'")
     logger.info("Response:")
     logger.info(response)
 
@@ -49,7 +49,7 @@ async def train_core(
     model_path = os.path.join(model_directory, model_name, "core")
     agent.persist(model_path)
 
-    logger.info("Model trained. Stored in '{}'.".format(model_path))
+    logger.info(f"Model trained. Stored in '{model_path}'.")
 
     return model_path
 
@@ -73,7 +73,7 @@ def train_nlu(
     model_path = os.path.join(model_directory, model_name)
     model_directory = trainer.persist(model_path, fixed_model_name="nlu")
 
-    logger.info("Model trained. Stored in '{}'.".format(model_directory))
+    logger.info(f"Model trained. Stored in '{model_directory}'.")
 
     return model_directory
 

rasa/cli/arguments/default_arguments.py

@@ -36,7 +36,7 @@ def add_stories_param(
         "--stories",
         type=str,
         default=DEFAULT_DATA_PATH,
-        help="File or folder containing your {} stories.".format(stories_name),
+        help=f"File or folder containing your {stories_name} stories.",
     )
 
 
@@ -100,7 +100,7 @@ def add_data_param(
         "--data",
         type=str,
         default=default,
-        help="Path to the file or directory containing {} data.".format(data_type),
+        help=f"Path to the file or directory containing {data_type} data.",
         required=required,
     )