Merge branch '1.4.x' into prepare-1.5.0

Author: federicotdn

CHANGELOG.rst

@@ -22,7 +22,7 @@ Added
   stored under the ``metadata`` key when reading the event from a JSON object or
   dictionary.
 - Add command line argument ``rasa x --config CONFIG``, to specify path to the policy
-  and NLU pipeline configuration of your bot (default: ``config.yml``)
+  and NLU pipeline configuration of your bot (default: ``config.yml``).
 - Added a new NLU featurizer - ``ConveRTFeaturizer`` based on `ConveRT
   <https://github.com/PolyAI-LDN/polyai-models>`_ model released by PolyAI.
 - Added a new preconfigured pipeline - ``pretrained_embeddings_convert``.
@@ -46,6 +46,14 @@ Fixed
 - Fixed bug where facebooks generic template was not rendered when buttons were ``None``
 - Fixed default intents unnecessarily raising undefined parsing error
 
+[1.4.6] - 2019-11-22
+^^^^^^^^^^^^^^^^^^^^
+
+Fixed
+-----
+- Fixed Rasa X not working when any tracker store was configured for Rasa.
+- Use the matplotlib backend ``agg`` in case the ``tkinter`` package is not installed.
+
 [1.4.5] - 2019-11-14
 ^^^^^^^^^^^^^^^^^^^^
 

docs/user-guide/installation.rst

@@ -13,7 +13,7 @@ Installation
 Quick Installation
 ~~~~~~~~~~~~~~~~~~
 
-You can install both Rasa and Rasa X using pip (requires Python 3.6.0 or higher).
+You can install both Rasa Open Source and Rasa X using pip (requires Python 3.6 or 3.7).
 
 .. code-block:: bash
 
@@ -141,17 +141,29 @@ Tools like `virtualenv <https://virtualenv.pypa.io/en/latest/>`_ and `virtualenv
 
 .. tabs::
 
-    .. tab:: Rasa and Rasa X
+    .. tab:: Rasa Open Source and Rasa X
 
-        To install both Rasa and Rasa X in one go:
+        First make sure your ``pip`` version is up to date:
+
+        .. code-block:: bash
+
+            $ pip install -U pip
+
+        To install both Rasa Open Source and Rasa X in one go:
 
         .. code-block:: bash
 
             $ pip install rasa-x --extra-index-url https://pypi.rasa.com/simple
 
-    .. tab:: Rasa only
+    .. tab:: Rasa Open Source only
+
+        First make sure your ``pip`` version is up to date:
+
+        .. code-block:: bash
+
+            $ pip install -U pip
 
-        If you just want to install Rasa without Rasa X:
+        To install Rasa Open Source without Rasa X:
 
         .. code-block:: bash
 
@@ -175,7 +187,7 @@ You can now head over to the tutorial.
 Building from Source
 ~~~~~~~~~~~~~~~~~~~~
 
-If you want to use the development version of Rasa, you can get it from GitHub:
+If you want to use the development version of Rasa Open Source, you can get it from GitHub:
 
 .. code-block:: bash
 
@@ -205,7 +217,7 @@ for your assistant.
 I have decided on a pipeline. How do I install the dependencies for it?
 -----------------------------------------------------------------------
 
-When you install Rasa, the dependencies for the ``supervised_embeddings`` - TensorFlow
+When you install Rasa Open Source, the dependencies for the ``supervised_embeddings`` - TensorFlow
 and sklearn_crfsuite get automatically installed. However, spaCy and MITIE need to be separately installed if you want to use pipelines containing components from those libraries.
 
 .. admonition:: Just give me everything!
@@ -235,9 +247,9 @@ You can install it with the following commands:
     $ python -m spacy download en_core_web_md
     $ python -m spacy link en_core_web_md en
 
-This will install Rasa NLU as well as spacy and its language model
+This will install Rasa Open Source as well as spaCy and its language model
 for the English language. We recommend using at least the
-"medium" sized models (``_md``) instead of the spacy's
+"medium" sized models (``_md``) instead of the spaCy's
 default small ``en_core_web_sm`` model. Small models require less
 memory to run, but will somewhat reduce intent classification performance.
 

rasa/cli/x.py

@@ -118,7 +118,6 @@ def _overwrite_endpoints_for_local_x(
         wait_time_between_pulls=2,
     )
 
-    overwrite_existing_event_broker = False
     if endpoints.event_broker and not _is_correct_event_broker(endpoints.event_broker):
         cli_utils.print_error(
             "Rasa X currently only supports a SQLite event broker with path '{}' "
@@ -133,8 +132,9 @@ def _overwrite_endpoints_for_local_x(
         if not overwrite_existing_event_broker:
             exit(0)
 
-    if not endpoints.tracker_store or overwrite_existing_event_broker:
-        endpoints.event_broker = EndpointConfig(type="sql", db=DEFAULT_EVENTS_DB)
+    endpoints.event_broker = EndpointConfig(
+        type="sql", db=DEFAULT_EVENTS_DB, dialect="sqlite"
+    )
 
 
 def _is_correct_event_broker(event_broker: EndpointConfig) -> bool:

rasa/core/test.py

@@ -12,13 +12,18 @@
 from rasa.nlu.training_data.formats.markdown import MarkdownWriter
 from rasa.core.trackers import DialogueStateTracker
 from rasa.utils.io import DEFAULT_ENCODING
+import matplotlib
 
 if typing.TYPE_CHECKING:
     from rasa.core.agent import Agent
 
-import matplotlib
+try:
+    # If the `tkinter` package is available, we can use the `TkAgg` backend
+    import tkinter
 
-matplotlib.use("TkAgg")
+    matplotlib.use("TkAgg")
+except ImportError:
+    matplotlib.use("agg")
 
 logger = logging.getLogger(__name__)
 

tests/cli/test_rasa_x.py

@@ -1,13 +1,17 @@
 from pathlib import Path
+from unittest.mock import Mock
 
+from typing import Callable, Dict, Text, Any
 import pytest
-from typing import Callable, Dict
 from _pytest.pytester import RunResult
+from _pytest.monkeypatch import MonkeyPatch
+import questionary
 
 from aioresponses import aioresponses
 
 import rasa.utils.io as io_utils
 from rasa.cli import x
+from rasa.core.utils import AvailableEndpoints
 from rasa.utils.endpoints import EndpointConfig
 
 
@@ -61,6 +65,33 @@ def test_prepare_credentials_if_already_valid(tmpdir: Path):
     assert actual == credentials
 
 
+@pytest.mark.parametrize(
+    "event_broker",
+    [
+        # Event broker was not configured.
+        {},
+        # Event broker was explicitly configured to work with Rasa X in local mode.
+        {"type": "sql", "dialect": "sqlite", "db": x.DEFAULT_EVENTS_DB},
+        # Event broker was configured but the values are not compatible for running Rasa
+        # X in local mode.
+        {"type": "sql", "dialect": "postgresql"},
+    ],
+)
+def test_overwrite_endpoints_for_local_x(
+    event_broker: Dict[Text, Any], monkeypatch: MonkeyPatch
+):
+    confirm = Mock()
+    confirm.return_value.ask.return_value = True
+    monkeypatch.setattr(questionary, "confirm", confirm)
+
+    event_broker_config = EndpointConfig.from_dict(event_broker)
+    endpoints = AvailableEndpoints(event_broker=event_broker_config)
+
+    x._overwrite_endpoints_for_local_x(endpoints, "test-token", "http://localhost:5002")
+
+    assert x._is_correct_event_broker(endpoints.event_broker)
+
+
 def test_if_endpoint_config_is_valid_in_local_mode():
     config = EndpointConfig(type="sql", dialect="sqlite", db=x.DEFAULT_EVENTS_DB)