Db connection issue

.gitignore

@@ -100,3 +100,6 @@ webapp/static/output.js
 
 # Users info
 users.json
+
+# Flask Session
+flask_session/

requirements.txt

@@ -8,5 +8,6 @@ numpy
 scipy
 scikit-learn
 flask_sqlalchemy
+flask-session
 flask-login
 gunicorn

tests/test_db_select.py

@@ -1,14 +1,18 @@
+from tests.utils import rig_test_client
 from webapp import app
 import json
+import flask
 
 def test_db_list():
     response = app.test_client().get("/db_list")
     assert response.status_code == 200
 
 
 def test_db_choose():
-    response = app.test_client().get("/db_choose/cmpd")
-    assert response.status_code == 200
-    response_data = json.loads(response.get_data().decode('utf-8'))
-    assert response_data['result'] == app.config['DB_NAME']
-
+    with rig_test_client({}) as test_app:
+        with test_app.session_transaction() as session:
+            session['engine'] = 'cmpd'
+            response = test_app.get("/db_choose/cmpd")
+            assert response.status_code == 200
+        response_data = json.loads(response.get_data().decode('utf-8'))
+        assert response_data['result'] == session['engine']

tests/test_evaluations_feature_distribution.py

@@ -66,19 +66,23 @@
 
 def test_get_feature_dist_test():
     with rig_test_client(data) as test_app:
+        with test_app.session_transaction() as session:
+            session['engine'] = 'cmpd'
         url = '/evaluations/1/feature_dist_test/arrests_id_p1d_arrestscrimetype_assault_avg/2014-04-24'
         response = test_app.get(url)
+        assert response.status_code == 200
         response_data = json.loads(response.get_data().decode('utf-8'))
         expected = load_json_example('/evaluations/1/feature_dist_test')
-        assert response.status_code == 200
         assert expected == response_data
 
 def test_get_feature_dist_train():
     with rig_test_client(data) as test_app:
+        with test_app.session_transaction() as session:
+            session['engine'] = 'cmpd'
         url = '/evaluations/1/feature_dist_train/arrests_id_p1d_arrestscrimetype_assault_avg'
         response = test_app.get(url)
+        assert response.status_code == 200
         response_data = json.loads(response.get_data().decode('utf-8'))
         expected = load_json_example('/evaluations/1/feature_dist_train')
-        assert response.status_code == 200
         assert expected == response_data
 

tests/test_evaluations_feature_importance.py

@@ -21,6 +21,8 @@
 
 def test_feature_importance():
     with rig_test_client(data) as test_app:
+        with test_app.session_transaction() as session:
+            session['engine'] = 'cmpd'
         url = '/evaluations/1/feature_importance/10'
         response = test_app.get(url)
         assert response.status_code == 200

tests/test_evaluations_individual_importance.py

@@ -21,6 +21,8 @@
 
 def test_individual_importances():
     with rig_test_client(data) as test_app:
+        with test_app.session_transaction() as session:
+            session['engine'] = 'cmpd'
         url = '/evaluations/1/individual_feature_importance/1234/2014-12-01'
         response = test_app.get(url)
         assert response.status_code == 200

tests/test_evaluations_metricsovertime.py

@@ -45,6 +45,8 @@
 
 def test_metric_overtime():
     with rig_test_client(data) as test_app:
+        with test_app.session_transaction() as session:
+            session['engine'] = 'cmpd'
         route = '/evaluations/1/metric_overtime'
         response = test_app.post(
             route,

tests/test_evaluations_model_comments.py

@@ -24,6 +24,8 @@
 
 def test_model_comments():
     with rig_test_client(data) as test_app:
+        with test_app.session_transaction() as session:
+            session['engine'] = 'cmpd'
         route = '/evaluations/model_comments'
         response = test_app.post(
             route,

tests/test_evaluations_model_groups.py

@@ -68,6 +68,8 @@ def test_model_groups_1():
         'evaluations': evaluations_data
     }
     with rig_test_client(data) as test_app:
+        with test_app.session_transaction() as session:
+            session['engine'] = 'cmpd'
         route = '/evaluations/search_model_groups/all'
         response = test_app.post(
             route,
@@ -104,6 +106,8 @@ def test_model_groups_2():
         'evaluations': evaluations_data
     }
     with rig_test_client(data) as test_app:
+        with test_app.session_transaction() as session:
+            session['engine'] = 'cmpd'
         route = '/evaluations/search_model_groups/all'
         response = test_app.post(
             route,

tests/test_evaluations_modelprediction.py

@@ -18,6 +18,8 @@
 
 def test_model_prediction():
     with rig_test_client(data) as test_app:
+        with test_app.session_transaction() as session:
+            session['engine'] = 'cmpd'
         url = '/evaluations/1/model_result/{}'.format(EVALUATION_START_TIME)
         response = test_app.get(url)
         assert response.status_code == 200

tests/test_evaluations_precisionrecallthreshold.py

@@ -22,6 +22,8 @@
 
 def test_precision_recall_threshold():
     with rig_test_client(data) as test_app:
+        with test_app.session_transaction() as session:
+            session['engine'] = 'cmpd'
         url = '/evaluations/1/threshold_precision_recall/2015-01-01'
         response = test_app.get(url)
         assert response.status_code == 200

tests/test_evaluations_response_dist.py

@@ -23,6 +23,8 @@
 
 def test_response_dist():
     with rig_test_client(data) as test_app:
+        with test_app.session_transaction() as session:
+            session['engine'] = 'cmpd'
         url = '/evaluations/1/response_dist/{}'.format(EVALUATION_START_TIME)
         response = test_app.get(url)
         assert response.status_code == 200

tests/test_evaluations_roc.py

@@ -23,6 +23,8 @@
 
 def test_roc():
     with rig_test_client(data) as test_app:
+        with test_app.session_transaction() as session:
+            session['engine'] = 'cmpd'
         url = '/evaluations/1/roc/{}'.format(EVALUATION_START_TIME)
         response = test_app.get(url)
         assert response.status_code == 200

tests/test_evaluations_searchmodels.py

@@ -78,6 +78,8 @@
 @pytest.mark.skip(reason="no way of currently testing this")
 def test_search_models():
     with rig_test_client(data) as test_app:
+        with test_app.session_transaction() as session:
+            session['engine'] = 'cmpd'
         route = '/evaluations/search_models'
         response = test_app.post(
             route,

tests/test_evaluations_searchmodels_overtime.py

@@ -80,6 +80,8 @@ def test_convert():
 @pytest.mark.skip(reason="no way of currently testing this")
 def test_search_models_over_time():
     with rig_test_client(data) as test_app:
+        with test_app.session_transaction() as session:
+            session['engine'] = 'cmpd'
         route = '/evaluations/search_models_over_time'
         response = test_app.post(
             route,

tests/test_evaluations_simpleprecisionrecall.py

@@ -22,6 +22,8 @@
 
 def test_simple_precision_recall():
     with rig_test_client(data) as test_app:
+        with test_app.session_transaction() as session:
+            session['engine'] = 'cmpd'
         url = '/evaluations/1/simple_precision_recall/{}'.format(EVALUATION_START_TIME)
         response = test_app.get(url)
         assert response.status_code == 200

tests/utils.py

@@ -3,7 +3,7 @@
 import testing.postgresql
 from sqlalchemy import create_engine
 import json
-
+from flask import session
 
 def load_json_example(route):
     filepath = 'sample_json' + route + '.json'
@@ -139,4 +139,8 @@ def rig_test_client(data):
         engine = create_engine(dburl)
         setup_data(engine, data)
         app.config['SQLALCHEMY_DATABASE_URI'] = dburl
+        app.config['SECRET_KEY'] = 'testit!'
+        app.config['SQLALCHEMY_BINDS'] = {
+            'cmpd': dburl,
+        }
         yield app.test_client()

webapp/__init__.py

@@ -1,12 +1,24 @@
 from flask import Flask
+from flask_session import Session
 from webapp.flask_util_js import FlaskUtilJs
 from flask_sqlalchemy import SQLAlchemy
 import flask_login
 import json
+from config import db_dict
 
-app = Flask(__name__,instance_relative_config=True)
+app = Flask(__name__, instance_relative_config=True)
 app.secret_key = "tyra american top models"
+app.config['SQLALCHEMY_DATABASE_URI'] = db_dict['cmpd']['url']
+
+app.config['SQLALCHEMY_BINDS'] = {key: db_dict[key]['url'] for key in db_dict.keys()}
+
+
 db = SQLAlchemy(app)
+
+app.config['SESSION_TYPE'] = 'filesystem'
+sess = Session(app)
+sess.init_app(app)
+
 fujs = FlaskUtilJs(app)
 login_manager = flask_login.LoginManager()
 login_manager.init_app(app)