Fixing structure and performance improvements

Author: devinmatte

app.py

@@ -1,6 +1,6 @@
 from conditional import app
 
 if __name__ == "__main__":
-    app.run(host=app.config['IP'], port=app.config['PORT'])
+    app.run(host=app.config['IP'], port=app.config['PORT'], threaded=False)
 
 application = app

conditional/__init__.py

@@ -1,28 +1,26 @@
-# pylint: disable=wrong-import-order
-from ._version import __version__
-
 import os
 from datetime import datetime
 
+import structlog
 from csh_ldap import CSHLDAP
 from flask import Flask, redirect, render_template, g
 from flask_migrate import Migrate
+from flask_gzip import Gzip
 from flask_pyoidc.flask_pyoidc import OIDCAuthentication
 from flask_sqlalchemy import SQLAlchemy
 from raven.contrib.flask import Sentry
-import structlog
-
-from conditional import config
 
 app = Flask(__name__)
+gzip = Gzip(app)
 
-app.config.from_object(config)
-if os.path.exists(os.path.join(os.getcwd(), "config.py")):
-    app.config.from_pyfile(os.path.join(os.getcwd(), "config.py"))
-
-app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False
+# Load default configuration and any environment variable overrides
+_root_dir = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
+app.config.from_pyfile(os.path.join(_root_dir, "config.env.py"))
 
-app.config["VERSION"] = __version__
+# Load file based configuration overrides if present
+_pyfile_config = os.path.join(_root_dir, "config.py")
+if os.path.exists(_pyfile_config):
+    app.config.from_pyfile(_pyfile_config)
 
 db = SQLAlchemy(app)
 migrate = Migrate(app, db)

conditional/_version.py

@@ -1,7 +1,11 @@
+import json
 import secrets
+import os
 from os import environ as env
 
-from conditional import __version__
+# Fetch the version number from the npm package file
+with open(os.path.join(os.getcwd(), "package.json")) as package_file:
+    VERSION = json.load(package_file)["version"]
 
 # Flask config
 DEBUG = env.get("CONDITIONAL_DEBUG", "false").lower() == "true"
@@ -13,6 +17,7 @@
 
 # DB Info
 SQLALCHEMY_DATABASE_URI = env.get("SQLALCHEMY_DATABASE_URI", "")
+SQLALCHEMY_TRACK_MODIFICATIONS = False
 
 # LDAP config
 LDAP_RO = env.get("CONDITIONAL_LDAP_RO", "true").lower() == "true"
@@ -23,7 +28,7 @@
 # Do not set the DSN for local development
 SENTRY_CONFIG = {
     'dsn': env.get("CONDITIONAL_SENTRY_DSN", ""),
-    'release': __version__,
+    'release': VERSION,
 }
 
 # OIDC Config

conditional/config.py renamed to config.env.py

@@ -5,6 +5,7 @@ click~=6.7
 csh-ldap~=2.0.2
 Flask~=1.1.0
 Flask-Migrate~=2.1.1
+Flask-Gzip~=0.2
 Flask-pyoidc~=1.3.0
 Flask-SQLAlchemy~=2.3.2
 gunicorn~=19.7.1