modified imports

Dazu-io · Mar 20, 2019 · e602efe · e602efe
1 parent f078462
commit e602efe
Show file tree

Hide file tree

Showing 128 changed files with 585 additions and 603 deletions.
diff --git a/.codeclimate.yml b/.codeclimate.yml
@@ -1,3 +1,3 @@
 version: "2"
 exclude_patterns:
-- rasa_core/utils.py   # codeclimate has some encoding issues with this files because of emojis
+- rasa/core/utils.py   # codeclimate has some encoding issues with this files because of emojis
diff --git a/.coveragerc b/.coveragerc
@@ -7,4 +7,4 @@ exclude_lines =
     def create_argument_parser
     if typing.TYPE_CHECKING
 [run]
-source = rasa_core
+source = rasa
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -1,4 +1,4 @@
-<!-- THIS INFORMATION IS MANDATORY - YOUR ISSUE WILL BE CLOSED IF IT IS MISSING. If you don't know your Rasa Core version, use `pip list | grep rasa_core`. Removing the below information is allowed for FEATURE REQUESTS. --> 
+<!-- THIS INFORMATION IS MANDATORY - YOUR ISSUE WILL BE CLOSED IF IT IS MISSING. If you don't know your Rasa Core version, use `pip list | grep rasa`. Removing the below information is allowed for FEATURE REQUESTS. --> 
 
 **Rasa Core version**:
 

diff --git a/.gitignore b/.gitignore
@@ -28,6 +28,7 @@ bower_components/
 build/
 build/lib/
 dist/
+docs/core/_build
 docs/_build
 jnk/
 logs/
@@ -55,8 +56,8 @@ examples/concertbot/data*
 examples/concertbot/models*
 examples/moodbot/models*
 examples/restaurantbot/models*
-docs/key 
-docs/key.pub
+docs/core/key 
+docs/core/key.pub
 secrets.tar
 failed_stories.md
 .python-version
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,6 @@ sudo: required
 cache:
   directories:
   - "$HOME/.cache/pip"
-  - "$HOME/build/amn41/rasa_core/data"
 python:
 - '3.5'
 - '3.6'
@@ -16,7 +15,7 @@ install:
 - pip list
 script:
 - py.test --codestyle -m codestyle
-- travis_wait py.test tests --cov rasa_core -v
+- travis_wait py.test tests --cov rasa -v
  #- cd docs && make doctest   # can't do yet - doctests need to be cleaned up first
 after_success:
 - coveralls
@@ -28,8 +27,8 @@ jobs:
     install:
     - npm install -g swagger-cli
     script:
-    - swagger-cli validate docs/_static/spec/server.yml
-    - swagger-cli validate docs/_static/spec/action_server.yml
+    - swagger-cli validate docs/core/_static/spec/server.yml
+    - swagger-cli validate docs/core/_static/spec/action_server.yml
     after_success:
     - coveralls
   - stage: test
@@ -75,7 +74,7 @@ jobs:
     - git config --global user.name "Travis CI"
     - git remote set-url --push origin "[email protected]:$TRAVIS_REPO_SLUG"
     - export ${!TRAVIS*}
-    - sphinx-versioning push docs newdocs . -- -b dirhtml -A html_theme=rasabaster
+    - sphinx-versioning push docs/core newdocs . -- -b dirhtml -A html_theme=rasabaster
   - stage: trigger website rebuild
     if: fork = false AND branch = "master" AND type != "pull_request"
     script:

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,4 +1,4 @@
 include LICENSE.txt README.md requirements.txt dev-requirements.txt
-include rasa_core/schemas/* rasa_core/training/visualization.html
-include rasa_core/default_config.yml
+include rasa/core/schemas/* rasa/core/training/visualization.html
+include rasa/core/default_config.yml
 recursive-include rasa/cli/initial_project *
diff --git a/Makefile b/Makefile
@@ -22,7 +22,7 @@ clean:
 	rm -rf build/
 	rm -rf dist/
 	rm -rf *.egg-info
-	rm -rf docs/_build
+	rm -rf docs/core/_build
 
 lint:
 	py.test --pep8 -m pep8
@@ -34,7 +34,7 @@ doctest: clean
 	cd docs && make doctest
 
 livedocs:
-	cd docs && make livehtml
+	cd docs/core && make livehtml
 
 check-readme:
 	# if this runs through we can be sure the readme is properly shown on pypi

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Rasa Core 
+# Rasa Stack 
 
 [![Join the chat on Rasa Community Forum](https://img.shields.io/badge/forum-join%20discussions-brightgreen.svg)](https://forum.rasa.com/?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![PyPI version](https://img.shields.io/pypi/v/rasa_core.svg)](https://pypi.python.org/pypi/rasa-core)

diff --git a/data/test_config/example_config.yaml b/data/test_config/example_config.yaml
@@ -1,5 +1,5 @@
 policies:
   - name: MemoizationPolicy
     max_history: 5
-  - name: tests.conftest.ExamplePolicy
+  - name: tests.core.conftest.ExamplePolicy
     example_arg: 10
diff --git a/data/test_dialogues/default.json b/data/test_dialogues/default.json
@@ -1,17 +1,17 @@
 {
-  "py/object": "rasa_core.conversation.Dialogue",
+  "py/object": "rasa.core.conversation.Dialogue",
   "name": "default",
   "events": [
     {
-      "py/object": "rasa_core.events.ActionExecuted",
+      "py/object": "rasa.core.events.ActionExecuted",
       "action_name": "action_listen",
       "confidence": null,
       "policy": null,
       "timestamp": 1551952977.4850519,
       "unpredictable": false
     },
     {
-      "py/object": "rasa_core.events.UserUttered",
+      "py/object": "rasa.core.events.UserUttered",
       "entities": [
         {
           "end": 19,
@@ -45,21 +45,21 @@
       "timestamp": 1551953035.076376
     },
     {
-      "py/object": "rasa_core.events.SlotSet",
+      "py/object": "rasa.core.events.SlotSet",
       "key": "name",
       "timestamp": 1551953035.076385,
       "value": "Peter"
     },
     {
-      "py/object": "rasa_core.events.ActionExecuted",
+      "py/object": "rasa.core.events.ActionExecuted",
       "action_name": "utter_greet",
       "confidence": null,
       "policy": null,
       "timestamp": 1551953040.607782,
       "unpredictable": false
     },
     {
-      "py/object": "rasa_core.events.BotUttered",
+      "py/object": "rasa.core.events.BotUttered",
       "data": {
         "attachment": null,
         "buttons": null,

diff --git a/data/test_dialogues/formbot.json b/data/test_dialogues/formbot.json
@@ -1,17 +1,17 @@
 {
-  "py/object":"rasa_core.conversation.Dialogue",
+  "py/object":"rasa.core.conversation.Dialogue",
   "name":"formbot",
   "events":[
     {
-      "py/object":"rasa_core.events.ActionExecuted",
+      "py/object":"rasa.core.events.ActionExecuted",
       "action_name":"action_listen",
       "confidence":null,
       "policy":null,
       "timestamp":1551884035.892855,
       "unpredictable":false
     },
     {
-      "py/object":"rasa_core.events.UserUttered",
+      "py/object":"rasa.core.events.UserUttered",
       "entities":[
 
       ],
@@ -35,15 +35,15 @@
       "timestamp":1551884050.259948
     },
     {
-      "py/object":"rasa_core.events.ActionExecuted",
+      "py/object":"rasa.core.events.ActionExecuted",
       "action_name":"utter_greet",
       "confidence":1.0,
       "policy":"policy_2_MemoizationPolicy",
       "timestamp":1551884060.466681,
       "unpredictable":false
     },
     {
-      "py/object":"rasa_core.events.BotUttered",
+      "py/object":"rasa.core.events.BotUttered",
       "data":{
         "attachment":null,
         "buttons":null,
@@ -53,15 +53,15 @@
       "timestamp":1551884060.46669
     },
     {
-      "py/object":"rasa_core.events.ActionExecuted",
+      "py/object":"rasa.core.events.ActionExecuted",
       "action_name":"action_listen",
       "confidence":1.0,
       "policy":"policy_2_MemoizationPolicy",
       "timestamp":1551884061.9350882,
       "unpredictable":false
     },
     {
-      "py/object":"rasa_core.events.UserUttered",
+      "py/object":"rasa.core.events.UserUttered",
       "entities":[
         {
           "end":18,
@@ -107,23 +107,23 @@
       "timestamp":1551884090.9653602
     },
     {
-      "py/object":"rasa_core.events.ActionExecuted",
+      "py/object":"rasa.core.events.ActionExecuted",
       "action_name":"restaurant_form",
       "confidence":1.0,
       "policy":"policy_2_MemoizationPolicy",
       "timestamp":1551884095.542748,
       "unpredictable":false
     },
     {
-      "py/object":"rasa_core.events.ActionExecuted",
+      "py/object":"rasa.core.events.ActionExecuted",
       "action_name":"utter_slots_values",
       "confidence":1.0,
       "policy":"policy_2_MemoizationPolicy",
       "timestamp":1551884097.570883,
       "unpredictable":false
     },
     {
-      "py/object":"rasa_core.events.BotUttered",
+      "py/object":"rasa.core.events.BotUttered",
       "data":{
         "attachment":null,
         "buttons":null,
@@ -133,15 +133,15 @@
       "timestamp":1551884097.57089
     },
     {
-      "py/object":"rasa_core.events.ActionExecuted",
+      "py/object":"rasa.core.events.ActionExecuted",
       "action_name":"action_listen",
       "confidence":1.0,
       "policy":"policy_2_MemoizationPolicy",
       "timestamp":1551884098.8006358,
       "unpredictable":false
     },
     {
-      "py/object":"rasa_core.events.UserUttered",
+      "py/object":"rasa.core.events.UserUttered",
       "entities":[
 
       ],
@@ -165,26 +165,26 @@
       "timestamp":1551884208.092693
     },
     {
-      "py/object":"rasa_core.events.ActionExecuted",
+      "py/object":"rasa.core.events.ActionExecuted",
       "action_name":"action_deactivate_form",
       "confidence":null,
       "policy":null,
       "timestamp":1551884214.951055,
       "unpredictable":false
     },
     {
-      "py/object":"rasa_core.events.Form",
+      "py/object":"rasa.core.events.Form",
       "name":null,
       "timestamp":1551884214.9510589
     },
     {
-      "py/object":"rasa_core.events.SlotSet",
+      "py/object":"rasa.core.events.SlotSet",
       "key":"requested_slot",
       "timestamp":1551884214.951062,
       "value":null
     },
     {
-      "py/object":"rasa_core.events.ActionExecuted",
+      "py/object":"rasa.core.events.ActionExecuted",
       "action_name":"action_listen",
       "confidence":0.7680902069097734,
       "policy":"policy_0_KerasPolicy",