瀏覽代碼

implement api in the main controller

nico 8 年之前
父節點
當前提交
60247058de
共有 2 個文件被更改,包括 11 次插入3 次删除
  1. 9 1
      core/MainController.py
  2. 2 2
      test.py

+ 9 - 1
core/MainController.py

@@ -8,7 +8,8 @@ from core.ConfigurationManager import SettingLoader
 from core.OrderAnalyser import OrderAnalyser
 from core.OrderAnalyser import OrderAnalyser
 from core.OrderListener import OrderListener
 from core.OrderListener import OrderListener
 from core.TriggerLauncher import TriggerLauncher
 from core.TriggerLauncher import TriggerLauncher
-
+from flask import Flask
+from core.RestAPI.FlaskAPI import FlaskAPI
 from neurons import Say
 from neurons import Say
 
 
 logging.basicConfig()
 logging.basicConfig()
@@ -21,6 +22,13 @@ class MainController:
         # get global configuration
         # get global configuration
         self.settings = SettingLoader.get_settings()
         self.settings = SettingLoader.get_settings()
 
 
+        # run the api if the user want it
+        if self.settings.rest_api.active:
+            Utils.print_info("Starting REST API Listening port: %s" % self.settings.rest_api.port)
+            app = Flask(__name__)
+            flask_api = FlaskAPI(app, port=self.settings.rest_api.port, brain_file=brain_file)
+            flask_api.start()
+
         # create an order listener object. This last will the trigger callback before starting
         # create an order listener object. This last will the trigger callback before starting
         self.order_listener = OrderListener(self.analyse_order)
         self.order_listener = OrderListener(self.analyse_order)
         # Wait that the kalliope trigger is pronounced by the user
         # Wait that the kalliope trigger is pronounced by the user

+ 2 - 2
test.py

@@ -4,12 +4,12 @@ import re
 from collections import Counter
 from collections import Counter
 
 
 from flask import Flask
 from flask import Flask
-
+from core.RestAPI.FlaskAPI import FlaskAPI
 from core import OrderAnalyser
 from core import OrderAnalyser
 from core.ConfigurationManager import SettingLoader
 from core.ConfigurationManager import SettingLoader
 from core.ConfigurationManager import YAMLLoader
 from core.ConfigurationManager import YAMLLoader
 from core.ConfigurationManager.BrainLoader import BrainLoader
 from core.ConfigurationManager.BrainLoader import BrainLoader
-from core.RestAPI.FlaskAPI import FlaskAPI
+
 from neurons import Systemdate
 from neurons import Systemdate
 from neurons.tasker_autoremote.tasker_autoremote import Tasker_autoremote
 from neurons.tasker_autoremote.tasker_autoremote import Tasker_autoremote