separate admin and bot blueprints

app/__init__.py

@@ -1,9 +1,9 @@
 import os
-from flask import Flask,send_from_directory
+from flask import Flask, send_from_directory, Blueprint
 from flask_cors import CORS
 from flask_mongoengine import MongoEngine
 from config import config
-from app.dialogue_manager.dialogue_manager import DialogueManager
+from app.bot.dialogue_manager.dialogue_manager import DialogueManager
 
 admin_panel_dist = 'static/'
 
@@ -29,19 +29,24 @@ def create_app(env="Development"):
     dialogue_manager.update_model(app.config["MODELS_DIR"])
     app.dialogue_manager : DialogueManager = dialogue_manager
 
-    from app.bots.controllers import bots
-    from app.nlu.controllers import nlu
-    from app.intents.controllers import intents
-    from app.train.controllers import train
-    from app.chat.controllers import chat
-    from app.entities.controllers import entities_blueprint
+    from app.admin.bots.controllers import bots
+    from app.admin.intents.controllers import intents
+    from app.admin.train.controllers import train
+    from app.bot.chat.controllers import chat
+    from app.admin.entities.controllers import entities_blueprint
 
-    app.register_blueprint(nlu)
-    app.register_blueprint(intents)
-    app.register_blueprint(train)
+    # bot endpoints
+    # TODO: move to a isolated web server
     app.register_blueprint(chat)
-    app.register_blueprint(bots)
-    app.register_blueprint(entities_blueprint)
+
+    # admin endpoints
+    admin_routes = Blueprint('admin', __name__, url_prefix='/admin/')
+    admin_routes.register_blueprint(intents)
+    admin_routes.register_blueprint(train)
+    admin_routes.register_blueprint(bots)
+    admin_routes.register_blueprint(entities_blueprint)
+    app.register_blueprint(admin_routes)
+
 
     @app.route('/ready')
     def ready():
@@ -51,10 +56,6 @@ def ready():
     def static_proxy(path):
         return send_from_directory(admin_panel_dist, path)
 
-    @app.route('/')
-    def root():
-        return send_from_directory(admin_panel_dist, 'index.html')
-
     @app.errorhandler(404)
     def not_found(error):
         return "Not found", 404

app/bots/controllers.py → app/admin/bots/controllers.py

@@ -1,12 +1,12 @@
 from flask import Blueprint, request, jsonify, Response, abort
 from bson.json_util import dumps, loads
-from app.bots.models import Bot
-from app.intents.models import Intent
-from app.entities.models import Entity
-from app.commons.utils import update_document
+from app.repository.bot import Bot
+from app.repository.intents import Intent
+from app.repository.entities import Entity
+from app.repository.utils import update_document
 
 bots = Blueprint('bots_blueprint', __name__,
-                 url_prefix='/agents/<bot_name>')
+                 url_prefix='/bots/<bot_name>')
 
 
 @bots.route('/config', methods=['PUT'])

app/entities/controllers.py → app/admin/entities/controllers.py

@@ -1,8 +1,8 @@
 from bson.json_util import dumps, loads
 from bson.objectid import ObjectId
 from flask import Blueprint, request, Response, jsonify, abort
-from app.commons.utils import update_document
-from app.entities.models import Entity
+from app.repository.utils import update_document
+from app.repository.entities import Entity
 
 entities_blueprint = Blueprint('entities_blueprint', __name__,
                                url_prefix='/entities')

app/intents/controllers.py → app/admin/intents/controllers.py

@@ -1,20 +1,13 @@
-import os
 from bson.json_util import dumps
 from bson.json_util import loads
 from bson.objectid import ObjectId
 from flask import Blueprint, request, Response, jsonify
-from flask import abort
-from flask import current_app as app
-from app.commons.utils import update_document
-from app.intents.models import ApiDetails
-from app.intents.models import Intent
-from app.intents.models import Parameter
-from app.nlu.training import train_pipeline
+from app.repository.utils import update_document
+from app.repository.intents import ApiDetails, Intent, Parameter
 
 intents = Blueprint('intents_blueprint', __name__,
                     url_prefix='/intents')
 
-
 @intents.route('/', methods=['POST'])
 def create_intent():
     """
@@ -104,15 +97,4 @@ def delete_intent(id):
     :return:
     """
     Intent.objects.get(id=ObjectId(id)).delete()
-
-    try:
-        train_pipeline(app)
-    except BaseException:
-        pass
-
-    # remove NER model for the deleted story
-    try:
-        os.remove("{}/{}.model".format(app.config["MODELS_DIR"], id))
-    except OSError:
-        pass
-    return jsonify({"result": True})
+    return jsonify({"status": "success"})

app/train/controllers.py → app/admin/train/controllers.py

@@ -1,6 +1,8 @@
 from bson.objectid import ObjectId
-from flask import Blueprint, request, jsonify
-from app.intents.models import Intent
+from app.repository.intents import Intent
+from flask import Blueprint,request, current_app as app, jsonify
+from app.bot.nlu.training import train_pipeline
+
 
 train = Blueprint('train_blueprint', __name__,
                   url_prefix='/train')
@@ -28,3 +30,13 @@ def get_training_data(story_id):
     """
     story = Intent.objects.get(id=ObjectId(story_id))
     return jsonify(story.trainingData)
+
+
+@train.route('/build_models', methods=['POST'])
+def build_models():
+    """
+    Build Intent classification and NER Models
+    :return:
+    """
+    train_pipeline(app)
+    return jsonify({"result": True})

app/chat/controllers.py → app/bot/chat/controllers.py

@@ -1,10 +1,10 @@
 from flask import Blueprint, request, abort, current_app as app
-from app.dialogue_manager.models import ChatModel
+from app.bot.dialogue_manager.models import ChatModel
 from flask import jsonify
 
-chat = Blueprint('chat', __name__, url_prefix='/api')
+chat = Blueprint('bots', __name__, url_prefix='/bots/v1/')
 
-@chat.route('/v1', methods=['POST'])
+@chat.route('/chat', methods=['POST'])
 def api():
     """
     Endpoint to converse with the chatbot.

app/dialogue_manager/dialogue_manager.py → app/bot/dialogue_manager/dialogue_manager.py

@@ -2,11 +2,11 @@
 import logging
 from typing import Dict, List, Optional, Tuple
 from jinja2 import Template
-from app.bots.models import Bot
-from app.intents.models import Intent
-from app.nlu.pipeline import NLUPipeline, IntentClassifier, EntityExtractor, SpacyFeaturizer
-from app.dialogue_manager.utils import SilentUndefined, call_api, get_synonyms, split_sentence
-from app.dialogue_manager.models import ChatModel, IntentModel, ParameterModel
+from app.repository.bot import Bot
+from app.repository.intents import Intent
+from app.bot.nlu.pipeline import NLUPipeline, IntentClassifier, EntityExtractor, SpacyFeaturizer
+from app.bot.dialogue_manager.utils import SilentUndefined, call_api, get_synonyms, split_sentence
+from app.bot.dialogue_manager.models import ChatModel, IntentModel, ParameterModel
 
 logger = logging.getLogger('dialogue_manager')
 

app/dialogue_manager/utils.py → app/bot/dialogue_manager/utils.py

@@ -4,7 +4,7 @@
 from jinja2 import Undefined
 
 from flask import current_app as app
-from app.entities.models import Entity
+from app.repository.entities import Entity
 
 
 def split_sentence(sentence):

app/nlu/pipeline.py → app/bot/nlu/pipeline.py

@@ -87,7 +87,7 @@ class IntentClassifier(NLUComponent):
     """Intent classification wrapper component."""
 
     def __init__(self):
-        from app.nlu.classifiers.sklearn_intent_classifer import SklearnIntentClassifier
+        from app.bot.nlu.classifiers.sklearn_intent_classifer import SklearnIntentClassifier
         self.classifier = SklearnIntentClassifier()
 
     def train(self, training_data: List[Dict[str, Any]], model_path: str) -> None:
@@ -109,7 +109,7 @@ class EntityExtractor(NLUComponent):
     """Entity extraction wrapper component."""
 
     def __init__(self, synonyms: Optional[Dict[str, str]] = None):
-        from app.nlu.entity_extractors.crf_entity_extractor import CRFEntityExtractor
+        from app.bot.nlu.entity_extractors.crf_entity_extractor import CRFEntityExtractor
         self.extractor = CRFEntityExtractor(synonyms or {})
 
     def train(self, training_data: List[Dict[str, Any]], model_path: str) -> None:

app/nlu/training.py → app/bot/nlu/training.py

@@ -2,9 +2,9 @@
 import os
 
 from app import DialogueManager
-from app.intents.models import Intent
-from app.nlu.pipeline import NLUPipeline, IntentClassifier, EntityExtractor, SpacyFeaturizer
-from app.dialogue_manager.utils import get_synonyms
+from app.repository.intents import Intent
+from app.bot.nlu.pipeline import NLUPipeline, IntentClassifier, EntityExtractor, SpacyFeaturizer
+from app.bot.dialogue_manager.utils import get_synonyms
 
 def train_pipeline(app):
     """