Merge branch '1.6.x'

Author: tmbo

CHANGELOG.rst

@@ -17,6 +17,23 @@ This project adheres to `Semantic Versioning`_ starting with version 1.0.
 
 .. towncrier release notes start
 
+[1.6.2] - 2020-01-28
+^^^^^^^^^^^^^^^^^^^^
+
+Improvements
+------------
+- `#4989 <https://github.com/rasahq/rasa/issues/4989>`_: Switching back to a TensorFlow release which only includes CPU support to reduce the
+  size of the dependencies. If you want to use the TensorFlow package with GPU support,
+  please run ``tensorflow-gpu==1.15.0``.
+
+Bugfixes
+--------
+- `#5111 <https://github.com/rasahq/rasa/issues/5111>`_: Fixes ``Exception 'Loop' object has no attribute '_ready'`` error when running 
+  ``rasa init``.
+- `#5126 <https://github.com/rasahq/rasa/issues/5126>`_: Updated the end-to-end ValueError you recieve when you have a invalid story format to point
+  to the updated doc link.
+
+
 [1.6.1] - 2020-01-07
 ^^^^^^^^^^^^^^^^^^^^
 

docs/core/interactive-learning.rst

@@ -22,7 +22,9 @@ Some people call this `Software 2.0 <https://medium.com/@karpathy/software-2-0-a
 .. note::
 
     Rasa X provides a UI for interactive learning, and you can use any user conversation
-    as a starting point. See `Annotate Conversations <https://rasa.com/docs/rasa-x/annotate-conversations/>`_ in the Rasa X docs.
+    as a starting point. See
+    `Talking to Your Assistant <https://rasa.com/docs/rasa-x/user-guide/enable-workflows#talking-to-your-assistant/>`_
+    in the Rasa X docs.
 
 .. contents::
    :local:

docs/user-guide/command-line-interface.rst

@@ -254,11 +254,11 @@ You can specify the input file, output file, and the output format with the foll
 
 
 Start Rasa X
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~
 
 .. raw:: html
 
-    Rasa X is a tool that helps you build, improve, and deploy AI Assistants that are powered by the Rasa framework.
+    Rasa X is a toolset that helps you leverage conversations to improve your assistant.
     You can find more information about it <a class="reference external" href="https://rasa.com/docs/rasa-x/" target="_blank">here</a>.
 
 You can start Rasa X locally by executing
@@ -269,8 +269,7 @@ You can start Rasa X locally by executing
 
 .. raw:: html
 
-    To be able to start Rasa X you need to have Rasa X installed (instruction can be found
-    <a class="reference external" href="https://rasa.com/docs/rasa-x/installation-and-setup/" target="_blank">here</a>)
+    To be able to start Rasa X you need to have Rasa X local mode installed
     and you need to be in a Rasa project.
 
 .. note::

docs/user-guide/connectors/your-own-website.rst

@@ -9,7 +9,7 @@ Your Own Website
 
 If you just want an easy way for users to test your bot, the best option
 is usually the chat interface that ships with Rasa X, where you can `invite users
-to test your bot <../../rasa-x/docs/get-feedback-from-test-users>`_.
+to test your bot <../../rasa-x/docs/user-guide/enable-workflows#conversations-with-test-users>`_.
 
 If you already have an existing website and want to add a Rasa assistant to it,
 you have a couple of options:

docs/user-guide/messaging-and-voice-channels.rst

@@ -8,12 +8,6 @@ Messaging and Voice Channels
 
 .. edit-link::
 
-If you're testing this on your local computer (i.e. not a server), you
-will need to use `ngrok <https://rasa.com/docs/rasa-x/get-feedback-from-test-users/#use-ngrok-for-local-testing>`_.
-This gives your machine a domain name so that Facebook, Slack, etc. know where to send messages to
-reach your local machine.
-
-
 To make your assistant available on a messaging platform you need to provide credentials
 in a ``credentials.yml`` file.
 An example file is created when you run ``rasa init``, so it's easiest to edit that file
@@ -44,3 +38,31 @@ Learn how to make your assistant available on:
    connectors/rocketchat
    connectors/mattermost
    connectors/custom-connectors
+
+
+.. _using-ngrok:
+
+Testing Channels on Your Local Machine with Ngrok
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+You can use `ngrok <https://ngrok.com/>`_ to create a connection to your local
+computer that is publicly available on the internet.
+You don't need this when running Rasa on a server because, you can set up a domain
+name to point to that server's IP address, or use the IP address itself.
+
+After installing ngrok, run:
+
+.. copyable::
+
+   ngrok http 5005; rasa run
+
+Your webhook address will look like the following:
+
+- ``https://yyyyyy.ngrok.io/webhooks/<CHANNEL>/webhook``, e.g.
+- ``https://yyyyyy.ngrok.io/webhooks/facebook/webhook``
+
+.. warning::
+
+  With the free-tier of ngrok, you can run into limits on how many connections you can make per minute.
+  As of writing this, it is set to 40 connections / minute.
+

rasa/cli/x.py

@@ -153,10 +153,10 @@ def _get_event_broker_endpoint(
         return default_event_broker_endpoint
     elif not _is_correct_event_broker(event_broker_endpoint):
         cli_utils.print_error(
-            "Rasa X currently only supports a SQLite event broker with path '{}' "
-            "when running locally. You can deploy Rasa X with Docker "
-            "(https://rasa.com/docs/rasa-x/deploy/) if you want to use "
-            "other event broker configurations.".format(DEFAULT_EVENTS_DB)
+            f"Rasa X currently only supports a SQLite event broker with path '{DEFAULT_EVENTS_DB}' "
+            f"when running locally. You can deploy Rasa X with Docker "
+            f"(https://rasa.com/docs/rasa-x/installation-and-setup/docker-compose-quick-install/) "
+            f"if you want to use other event broker configurations."
         )
         continue_with_default_event_broker = questionary.confirm(
             "Do you want to continue with the default SQLite event broker?"
@@ -270,7 +270,7 @@ def _validate_rasa_x_start(args: argparse.Namespace, project_path: Text):
             "Rasa X is not installed. The `rasa x` "
             "command requires an installation of Rasa X. "
             "Instructions on how to install Rasa X can be found here: "
-            "https://rasa.com/docs/rasa-x/installation-and-setup/."
+            "https://rasa.com/docs/rasa-x/."
         )
 
     if args.port == args.rasa_x_port:

rasa/core/training/dsl.py

@@ -58,7 +58,7 @@ def _parse_item(self, line: Text) -> Optional["Message"]:
                 "Encountered invalid end-to-end format for message "
                 "`{}`. Please visit the documentation page on "
                 "end-to-end evaluation at {}/user-guide/evaluating-models/"
-                "end-to-end-evaluation/".format(line, DOCS_BASE_URL)
+                "#end-to-end-evaluation/".format(line, DOCS_BASE_URL)
             )
 
         intent = match.group(2)

rasa/version.py

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

requirements.txt

@@ -8,7 +8,7 @@ redis==3.3.5
 pymongo[tls,srv]==3.8.0
 numpy==1.16.3
 scipy==1.2.1
-tensorflow==1.15.0
+tensorflow-cpu==1.15.0
 absl-py>=0.8.0
 # setuptools comes from tensorboard requirement:
 # https://github.com/tensorflow/tensorboard/blob/1.14/tensorboard/pip_package/setup.py#L33
@@ -47,6 +47,8 @@ sanic-plugins-framework==0.8.2
 multidict==4.6.1
 aiohttp==3.5.4
 questionary==1.1.1
+# needed because of https://github.com/prompt-toolkit/python-prompt-toolkit/issues/951
+prompt-toolkit==2.0.10
 python-socketio==4.3.1
 # the below can be unpinned when python-socketio pins >=3.9.3
 python-engineio==3.9.3

setup.py

@@ -37,7 +37,7 @@
     "pymongo[tls,srv]~=3.8",
     "numpy~=1.16",
     "scipy~=1.2",
-    "tensorflow~=1.15.0",
+    "tensorflow-cpu~=1.15.0",
     # absl is a tensorflow dependency, but produces double logging before 0.8
     # should be removed once tensorflow requires absl > 0.8 on its own
     "absl-py>=0.8.0",
@@ -78,6 +78,8 @@
     "multidict==4.6.1",
     "aiohttp~=3.5",
     "questionary>=1.1.0",
+    # needed because of https://github.com/prompt-toolkit/python-prompt-toolkit/issues/951
+    "prompt-toolkit<3.0",
     "python-socketio>=4.3.1",
     # the below can be unpinned when python-socketio pins >=3.9.3
     "python-engineio>=3.9.3",