Merge branch 'master' into patch-1

erohmensing · web-flow · commit ca4e6d2f5f99 · 2020-03-03T14:25:06.000+01:00
diff --git a/.github/workflows/continous-integration.yml b/.github/workflows/continous-integration.yml
@@ -14,6 +14,8 @@ on:
 # - SLACK_WEBHOOK_TOKEN: token to post to RasaHQ slack account (in 1password)
 # - PYPI_TOKEN: publishing token for amn41 account, needs to be maintainer of
 #               RasaHQ/rasa on pypi (account credentials in 1password)
+# - DOCKERHUB_PASSWORD: password for an account with write access to the rasa
+#                       repo on hub.docker.com. used to pull and upload containers
 
 env:
   # needed to fix issues with boto during testing:
@@ -155,13 +157,52 @@ jobs:
         COVERALLS_SERVICE_NAME: github
       run: poetry run coveralls
 
+  docker:
+    name: Build Docker
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        image:
+          - {"file": "Dockerfile", "tag_ext": ""}
+          - {"file": "docker/Dockerfile_full", "tag_ext": "-full"}
+          - {"file": "docker/Dockerfile_pretrained_embeddings_mitie_en", "tag_ext": "-mitie-en"}
+          - {"file": "docker/Dockerfile_pretrained_embeddings_spacy_de", "tag_ext": "-spacy-de"}
+          - {"file": "docker/Dockerfile_pretrained_embeddings_spacy_en", "tag_ext": "-spacy-en"}
+
+    env:
+      DOCKERHUB_USERNAME: tmbo
+
+    steps:
+    - name: Checkout git repository 🕝
+      uses: actions/checkout@v2
+
+    - name: Login to DockerHub Registry 🔢
+      run: echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u ${{ env.DOCKERHUB_USERNAME }} --password-stdin
+
+    - name: Pull latest${{ matrix.image.tag_ext }} Docker image for caching
+      run: docker pull rasa/rasa:latest${{ matrix.image.tag_ext }} || true
+
+    - name: Build latest${{ matrix.image.tag_ext }} Docker image
+      run: docker build . --file ${{ matrix.image.file }} --tag rasa/rasa:latest${{ matrix.image.tag_ext }} --cache-from rasa/rasa:latest${{ matrix.image.tag_ext }}
+
+    - name: Push image with latest tag 📦
+      if: github.event_name == 'push' && github.ref == 'refs/heads/master'
+      run: docker push rasa/rasa:latest${{ matrix.image.tag_ext }}
+
+    - name: Push image with ${{github.event.ref}} tag 📦
+      if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')
+      run: |
+        docker tag rasa/rasa:latest${{ matrix.image.tag_ext }} rasa/rasa:${{github.event.ref}}${{ matrix.image.tag_ext }}
+        docker push rasa/rasa:${{github.event.ref}}${{ matrix.image.tag_ext }}
+
   deploy:
     name: Deploy to PyPI
     runs-on: ubuntu-latest
 
     # deploy will only be run when there is a tag available
     if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')
-    needs: [quality, test, api]     # only run after all other stages succeeded
+    needs: [quality, test, api, docker]  # only run after all other stages succeeded
 
     steps:
     - name: Checkout git repository 🕝
@@ -195,7 +236,7 @@ jobs:
       env:
         GH_RELEASE_NOTES_TOKEN: ${{ secrets.GH_RELEASE_NOTES_TOKEN }}
         SLACK_WEBHOOK_TOKEN: ${{ secrets.SLACK_WEBHOOK_TOKEN }}
-        GITHUB_TAG: ${{ github.ref }}
+        GITHUB_TAG: ${{ github.event.ref }}
         GITHUB_REPO_SLUG: ${{ github.repository }}
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -104,27 +104,6 @@ Improvements
   does not help for the case where messages are sent to an unavailable RabbitMQ instance.
 - `#5250 <https://github.com/rasahq/rasa/issues/5250>`_: Added support for mattermost connector to use bot accounts.
 - `#5266 <https://github.com/rasahq/rasa/issues/5266>`_: We updated our code to TensorFlow 2.
-
-  We added a new docker image for ConveRT.
-  The new images uses the following configuration
-
-  .. code-block:: yaml
-  
-      language: "en"
-
-      pipeline:
-      - name: ConveRTTokenizer
-      - name: ConveRTFeaturizer
-      - name: RegexFeaturizer
-      - name: LexicalSyntacticFeaturizer
-      - name: CountVectorsFeaturizer
-      - name: CountVectorsFeaturizer
-         analyzer: "char_wb"
-         min_ngram: 1
-         max_ngram: 4
-      - name: DIETClassifier
-      - name: EntitySynonymMapper
-      - name: ResponseSelector
 - `#5317 <https://github.com/rasahq/rasa/issues/5317>`_: Events exported using ``rasa export`` receive a message header if published through a
   ``PikaEventBroker``. The header is added to the message's ``BasicProperties.headers``
   under the ``rasa-export-process-id`` key
diff --git a/changelog/5330.misc.rst b/changelog/5330.misc.rst
@@ -0,0 +1 @@
+Build our docker containers as part of our continuous integration workflow.
diff --git a/changelog/5340.misc.rst b/changelog/5340.misc.rst
@@ -0,0 +1,2 @@
+Expand the allowed range of ``tensorflow-addons`` versions to ``>=0.7.1`` to make it possible
+to install Rasa Open Source on MacOS Mojave.
diff --git a/changelog/5348.misc.rst b/changelog/5348.misc.rst
@@ -0,0 +1 @@
+Remove deprecation warnings for ``CRFEntityExtractor`` and ``SklearnIntentClassifier``.
diff --git a/data/test_evaluations/end_to_end_story.md b/data/test_evaluations/end_to_end_story.md
@@ -1,29 +1,17 @@
 ## simple_story_with_only_start
-* greet: Hello
-    - utter_ask_howcanhelp
+* greet: /greet
+    - utter_greet
 
 ## simple_story_with_multiple_turns
-* greet: good morning
- - utter_ask_howcanhelp
-* inform: im looking for a [moderately](price:moderate) priced restaurant in the [east](location) part of town
- - utter_on_it
- - utter_ask_cuisine
+* greet: /greet
+ - utter_greet
+* default: /default
+ - utter_default
+ * goodbye: /goodbye
+ - utter_goodbye
  
  ## story_with_multiple_entities_correction_and_search
-* greet: hello
- - utter_ask_howcanhelp
-* inform: im looking for a [cheap](price:lo) restaurant which has [french](cuisine) food and is located in [bombay](location)
- - utter_on_it
- - utter_ask_numpeople
-* inform: for [six](people:6) please
- - utter_ask_moreupdates
-* inform: actually i need a [moderately](price:moderate) priced restaurant
- - utter_ask_moreupdates
-* deny: no
- - utter_ack_dosearch
- - action_search_restaurants
- - action_suggest
-
-## story_with_intent_restated
-* greet: /greet
- - utter_ask_howcanhelp
+* greet: /greet{"name": "Max"}
+ - utter_greet
+* default: /default
+ - utter_default
diff --git a/data/test_evaluations/form-end-to-end-stories.md b/data/test_evaluations/form-end-to-end-stories.md
@@ -0,0 +1,37 @@
+## Happy path
+* greet: /greet
+    - utter_greet
+* request_restaurant: /request_restaurant
+    - restaurant_form
+    - form{"name": "restaurant_form"}
+    - form{"name": null}
+    - utter_slots_values
+* thankyou: /thankyou
+    - utter_noworries
+
+## Happy path with form prefix
+* greet: /greet
+    - utter_greet
+* request_restaurant: /request_restaurant
+    - restaurant_form
+    - form{"name": "restaurant_form"}
+* form: /inform{"cuisine": "afghan"} <!-- intent "inform" is ignored inside the form -->
+    - form: restaurant_form
+    - form{"name": null}
+    - utter_slots_values
+* thankyou: /thankyou
+    - utter_noworries
+ 
+## unhappy path
+* greet: /greet
+    - utter_greet
+* request_restaurant: /request_restaurant
+    - restaurant_form
+    - form{"name": "restaurant_form"}
+* chitchat: /chitchat
+    - utter_chitchat
+    - restaurant_form
+    - form{"name": null}
+    - utter_slots_values
+* thankyou: /thankyou
+    - utter_noworries
diff --git a/docs/nlu/components.rst b/docs/nlu/components.rst
@@ -676,10 +676,6 @@ MitieIntentClassifier
 SklearnIntentClassifier
 ~~~~~~~~~~~~~~~~~~~~~~~
 
-.. warning::
-    ``SklearnIntentClassifier`` is deprecated and should be replaced by ``DIETClassifier``. See
-    :ref:`migration guide <migration-to-rasa-1.8>` for more details.
-
 :Short: Sklearn intent classifier
 :Outputs: ``intent`` and ``intent_ranking``
 :Requires: ``dense_features`` for user messages
@@ -1267,10 +1263,6 @@ CRFEntityExtractor
     .. note::
         If "pattern" features are used, you need to have ``RegexFeaturizer`` in your pipeline.
 
-    .. warning::
-        ``CRFEntityExtractor`` is deprecated and should be replaced by ``DIETClassifier``. See
-        :ref:`migration guide <migration-to-rasa-1.8>` for more details.
-
 :Configuration:
     ``CRFEntityExtractor`` has a list of default features to use.
     However, you can overwrite the default configuration.
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -117,7 +117,7 @@ PyJWT = "~1.7"
 python-dateutil = "~2.8"
 tensorflow = "~2.1"
 tensorflow_hub = "~0.7"
-tensorflow-addons = "~0.8"
+tensorflow-addons = ">=0.7.1"
 tensorflow-probability = "~0.7"
 setuptools = ">=41.0.0"
 kafka-python = "^1.4"
diff --git a/rasa/nlu/classifiers/sklearn_intent_classifier.py b/rasa/nlu/classifiers/sklearn_intent_classifier.py
@@ -65,13 +65,6 @@ def __init__(
             self.le = LabelEncoder()
         self.clf = clf
 
-        common_utils.raise_warning(
-            "'SklearnIntentClassifier' is deprecated and will be removed in version "
-            "2.0. Use 'DIETClassifier' instead.",
-            category=FutureWarning,
-            docs=DOCS_URL_MIGRATION_GUIDE,
-        )
-
     @classmethod
     def required_packages(cls) -> List[Text]:
         return ["sklearn"]
diff --git a/rasa/nlu/extractors/crf_entity_extractor.py b/rasa/nlu/extractors/crf_entity_extractor.py
@@ -114,12 +114,6 @@ def __init__(
 
         self._validate_configuration()
 
-        common_utils.raise_warning(
-            "'CRFEntityExtractor' is deprecated and will be removed in version "
-            "2.0. Use 'DIETClassifier' instead.",
-            docs=DOCS_URL_MIGRATION_GUIDE,
-        )
-
     def _validate_configuration(self) -> None:
         if len(self.component_config.get("features", [])) % 2 != 1:
             raise ValueError(
diff --git a/tests/core/conftest.py b/tests/core/conftest.py
@@ -8,21 +8,15 @@
 from typing import Text, Iterator
 
 import pytest
-from _pytest.tmpdir import TempdirFactory
 
 import rasa.utils.io
 from rasa.core.agent import Agent
 from rasa.core.channels.channel import CollectingOutputChannel, OutputChannel
-from rasa.core.domain import Domain, SessionConfig
+from rasa.core.domain import Domain
 from rasa.core.events import ReminderScheduled, UserUttered, ActionExecuted
-from rasa.core.interpreter import RegexInterpreter
 from rasa.core.nlg import TemplatedNaturalLanguageGenerator
-from rasa.core.policies.ensemble import PolicyEnsemble, SimplePolicyEnsemble
-from rasa.core.policies.memoization import (
-    AugmentedMemoizationPolicy,
-    MemoizationPolicy,
-    Policy,
-)
+from rasa.core.policies.ensemble import PolicyEnsemble
+from rasa.core.policies.memoization import Policy
 from rasa.core.processor import MessageProcessor
 from rasa.core.slots import Slot
 from rasa.core.tracker_store import InMemoryTrackerStore, MongoTrackerStore
@@ -229,23 +223,11 @@ def project() -> Text:
 
 
 @pytest.fixture
-async def restaurantbot(trained_async) -> Text:
-    restaurant_domain = os.path.join(RESTAURANTBOT_PATH, "domain.yml")
-    restaurant_config = os.path.join(RESTAURANTBOT_PATH, "config.yml")
-    restaurant_data = os.path.join(RESTAURANTBOT_PATH, "data/")
-
-    return await trained_async(restaurant_domain, restaurant_config, restaurant_data)
-
-
-@pytest.fixture
-async def form_bot(trained_async) -> Agent:
+async def form_bot_agent(trained_async, tmpdir_factory) -> Agent:
     zipped_model = await trained_async(
         domain="examples/formbot/domain.yml",
         config="examples/formbot/config.yml",
-        training_files=[
-            "examples/formbot/data/stories.md",
-            "examples/formbot/data/nlu.md",
-        ],
+        training_files=["examples/formbot/data/stories.md"],
     )
 
     return Agent.load_local_model(zipped_model)
diff --git a/tests/core/test_evaluation.py b/tests/core/test_evaluation.py

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Build our docker containers as part of our continuous integration workflow.`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Expand the allowed range of ``tensorflow-addons`` versions to ``>=0.7.1`` to make it possible
	`2`	`+to install Rasa Open Source on MacOS Mojave.`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Remove deprecation warnings for ``CRFEntityExtractor`` and ``SklearnIntentClassifier``.