From 9a9607d5c52e6aa4337d574c02bd3943f2712a29 Mon Sep 17 00:00:00 2001
From: Tanja Bergmann <tabergma@gmail.com>
Date: Tue, 11 Jun 2019 13:59:41 +0200
Subject: [PATCH] Update reqs and Makefile.

---
 Makefile         | 28 +++++++---------------------
 demo/actions.py  | 14 ++++----------
 requirements.txt |  3 +--
 setup.py         |  3 +--
 4 files changed, 13 insertions(+), 35 deletions(-)

diff --git a/Makefile b/Makefile
index d9f3e1ec1..c0ab49476 100644
--- a/Makefile
+++ b/Makefile
@@ -3,36 +3,22 @@
 TEST_PATH=./
 
 help:
-	@echo "    train-nlu"
-	@echo "        Train the natural language understanding using Rasa NLU."
-	@echo "    train-core"
-	@echo "        Train a dialogue model using Rasa core."
+	@echo "    train"
+	@echo "        Train a Rasa model."
 	@echo "    run-cmdline"
 	@echo "        Starts the bot on the command line"
 	@echo "    visualize"
 	@echo "        Saves the story graphs into a file"
 
 run-actions:
-	python3 -m rasa_core_sdk.endpoint --actions demo.actions
+	rasa run actions --actions demo.actions
 
-train-nlu:
-	python3 -m rasa_nlu.train -c nlu_tensorflow.yml --fixed_model_name current --data data/nlu/ -o models --project nlu --verbose
-
-train-core:
-	python3 -m rasa_core.train -d domain.yml -s data/core -c policy.yml --debug -o models/dialogue
-
-train-memo:
-	python -m rasa_core.train -d domain.yml -s data/core -c augmentedmemo-only.yml -o models/dialogue --augmentation 0
+train:
+	rasa train
 
 run-cmdline:
 	make run-actions&
-	python3 -m rasa_core.run -d models/dialogue -u models/nlu/current --debug --endpoints endpoints.yml
+	rasa shell --debug --endpoints endpoints.yml
 
 visualize:
-	python3 -m rasa_core.visualize -s data/core/ -d domain.yml -o story_graph.png
-
-train-online:
-	python -m rasa_core.train -u models/nlu/current/ --online --core models/dialogue/
-
-evaluate-core:
-	python -m rasa_core.test --core models/dialogue -s data/core/ --fail_on_prediction_errors
+	rasa visualize --stories data/core/ --domain domain.yml --out story_graph.png
diff --git a/demo/actions.py b/demo/actions.py
index ae5fae2df..3b1ef5425 100644
--- a/demo/actions.py
+++ b/demo/actions.py
@@ -4,16 +4,10 @@
 from typing import Text, Dict, Any, List
 import json
 
-from rasa_core_sdk import Action, Tracker, ActionExecutionRejection
-from rasa_core_sdk.executor import CollectingDispatcher
-from rasa_core_sdk.forms import FormAction, REQUESTED_SLOT
-from rasa_core_sdk.events import (
-    SlotSet,
-    UserUtteranceReverted,
-    ConversationPaused,
-    FollowupAction,
-    Form,
-)
+from rasa_sdk import Action, Tracker
+from rasa_sdk.executor import CollectingDispatcher
+from rasa_sdk.forms import FormAction
+from rasa_sdk.events import SlotSet, UserUtteranceReverted, ConversationPaused
 
 from demo.api import MailChimpAPI
 from demo import config
diff --git a/requirements.txt b/requirements.txt
index 3135de1f2..ecc7b2eda 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,4 @@
-rasa_nlu[tensorflow]==0.15.0
-rasa_core==0.14.4
+rasa==1.0.9
 mailchimp3==3.0.2
 oauth2client==4.1.2
 gspread==3.0.0
diff --git a/setup.py b/setup.py
index 825314ebb..c9117157e 100644
--- a/setup.py
+++ b/setup.py
@@ -3,8 +3,7 @@
 import os
 
 install_requires = [
-    "rasa_nlu[tensorflow]==0.15.0",
-    "rasa_core==0.14.4",
+    "rasa==1.0.9",
     "mailchimp3~=3.0.2",
     "oauth2client~=4.1.2",
     "gspread~=3.0.0",