Доавил заполнение бд триггерами и экшенами. Предварительно написан менеджер сценариев

__init__.py

@@ -6,7 +6,9 @@ from flask import render_template, request, redirect, url_for
 from flask_login import LoginManager, login_user, login_required, logout_user, current_user
 
 import db_routing
+from db_init import db_fill
 from db_routing import app, db
+from scenarioManger import Executor
 
 login_manager = LoginManager(app)
 
@@ -63,12 +65,14 @@ def workshop():
     if request.method == 'POST':
         if 'NewScenarioName' in request.form:
             newScenarioName = request.form['NewScenarioName']
-            triggerName = request.form['TriggerID']
+            triggerID = request.form['TriggerID']
             triggerArgs = request.form['TriggerArgs']
-            actionName = request.form['ActionID']
+            actionID = request.form['ActionID']
             actionArgs = request.form['ActionArgs']
-            db_routing.add_scenario(current_user.get_id(), newScenarioName, triggerName, triggerArgs, actionName,
-                                    actionArgs)
+            new_scenario = db_routing.add_scenario(current_user.get_id(), newScenarioName, triggerID, triggerArgs,
+                                                   actionID,
+                                                   actionArgs)
+            Executor(new_scenario)
             return redirect(url_for('workshop'))
 
         if 'TGUsername' in request.form:
@@ -131,4 +135,5 @@ def verify_password(username, password):
 if __name__ == '__main__':
     if not os.path.exists('./data.db'):
         db.create_all()
+        db_fill()
     app.run()

db_init.py

@@ -0,0 +1,7 @@
+from db_routing import add_trigger, add_action
+
+
+def db_fill():
+    add_trigger('Будильник', 'alarm_clock')
+    add_trigger('Проверить почту', 'check_email')
+

db_routing.py

@@ -66,6 +66,20 @@ def add_user(user_name, passw_hash):
         return False
 
 
+def add_trigger(name, def_name):
+    new_trigger = Trigger(name=name, def_name=def_name)
+    db.session.add(new_trigger)
+    db.session.commit()
+    return new_trigger
+
+
+def add_action(name, def_name):
+    new_action = Action(name=name, def_name=def_name)
+    db.session.add(new_action)
+    db.session.commit()
+    return new_action
+
+
 def add_scenario(owner_id, scenario_name, trigger_id, trigger_args, action_id, action_args):
     new_scenario = Scenario(owner_id=owner_id, scenario_name=scenario_name, trigger_id=trigger_id,
                             trigger_args=trigger_args, action_id=action_id, action_args=action_args)
@@ -81,14 +95,22 @@ def get_user(id=None, username=None):
         return User.query.filter_by(username=username).first()
 
 
-def get_trigers():
-    triggers_list = Trigger.query.all()
-    return triggers_list
+def get_trigers(id=None):
+    if id is None:
+        triggers_list = Trigger.query.all()
+        return triggers_list
+    else:
+        trigger = Trigger.query.filter_by(id=id).first()
+        return trigger
 
 
-def get_actions():
-    actions_list = Action.query.all()
-    return actions_list
+def get_actions(id=None):
+    if id is None:
+        actions_list = Action.query.all()
+        return actions_list
+    else:
+        action = Action.query.filter_by(id=id).first()
+        return action
 
 
 def get_user_scripts(current_user_id):

scenarioManger.py

@@ -0,0 +1,23 @@
+from threading import Thread
+from triggers import *
+import db_routing
+
+
+class Executor(Thread):
+    def __init__(self, scenario):
+        threading.Thread.__init__(self)
+        self.sceanrio_id = scenario.id
+        self.trigger_def = db_routing.get_trigers(scenario.id).def_name
+        self.trigger_args = scenario.trigger_args
+        self.action_def = db_routing.get_actions(scenario.id).def_name
+        self.action_args = scenario.action_args
+
+    def execute(self):
+        self.trigger_def(self.trigger_args)
+        self.action_def.def_name(self.action_args)
+
+    def run(self):
+        thread = Thread(target=self.execute)
+        thread.start()
+        thread.join()
+        db_routing.delete_scenario(self.sceanrio_id)