moved db initialization (#2049)

mslib/mscolab/app/__init__.py

@@ -25,10 +25,14 @@
 """
 
 import os
+
+from flask_migrate import Migrate
+
 import mslib
 
 from flask import Flask
 from mslib.mscolab.conf import mscolab_settings
+from flask_sqlalchemy import SQLAlchemy
 from mslib.mswms.gallery_builder import STATIC_LOCATION
 from mslib.utils import prefix_route
 
@@ -58,3 +62,6 @@
 APP.config['MAIL_PASSWORD'] = getattr(mscolab_settings, "MAIL_PASSWORD", None)
 APP.config['MAIL_USE_TLS'] = getattr(mscolab_settings, "MAIL_USE_TLS", None)
 APP.config['MAIL_USE_SSL'] = getattr(mscolab_settings, "MAIL_USE_SSL", None)
+
+db = SQLAlchemy(APP)
+migrate = Migrate(APP, db, render_as_batch=True)

mslib/mscolab/models.py

@@ -28,14 +28,10 @@
 import datetime
 import logging
 import jwt
-
 from passlib.apps import custom_app_context as pwd_context
-from flask_sqlalchemy import SQLAlchemy
-from mslib.mscolab.app import APP
+from mslib.mscolab.app import db
 from mslib.mscolab.message_type import MessageType
 
-db = SQLAlchemy(APP)
-
 
 class User(db.Model):
 

mslib/mscolab/server.py

@@ -39,13 +39,12 @@
 from flask import send_from_directory, abort, url_for
 from flask_mail import Mail, Message
 from flask_cors import CORS
-from flask_migrate import Migrate
 from flask_httpauth import HTTPBasicAuth
 from validate_email import validate_email
 from werkzeug.utils import secure_filename
 
 from mslib.mscolab.conf import mscolab_settings
-from mslib.mscolab.models import Change, MessageType, User, db
+from mslib.mscolab.models import Change, MessageType, User
 from mslib.mscolab.sockets_manager import setup_managers
 from mslib.mscolab.utils import create_files, get_message_dict
 from mslib.utils import conditional_decorator
@@ -56,7 +55,6 @@
 APP = create_app(__name__)
 mail = Mail(APP)
 CORS(APP, origins=mscolab_settings.CORS_ORIGINS if hasattr(mscolab_settings, "CORS_ORIGINS") else ["*"])
-migrate = Migrate(APP, db, render_as_batch=True)
 auth = HTTPBasicAuth()