New Session fixing attempt

battlebots/database/__init__.py

@@ -11,20 +11,21 @@
 engine.dispose()
 session_factory = sessionmaker(bind=engine)
 Session = _scoped_session(session_factory)
-
-session = Session()
+session = None
 
 
 @contextmanager
 def scoped_session():
     """Provide a transactional scope around a series of operations."""
     try:
-        yield session
-        session.commit()
+        yield Session()
+        Session.commit()
     except:
         logging.exception("Database had to do a rollback.")
-        session.rollback()
+        Session.rollback()
         raise
+    finally:
+        Session.remove()
 
 
 # Registers listeners (Don't remove this import!)

battlebots/database/access.py

@@ -3,7 +3,7 @@
 import logging
 
 from battlebots import config
-from battlebots.database import session, scoped_session
+from battlebots.database import Session, scoped_session
 from battlebots.database.models import Bot
 
 
@@ -37,7 +37,8 @@ def remove_bot(user, botname):
                         % (user.nickname, botname, code_dir))
         pass
 
-    bot = session.query(Bot).filter_by(user=user, name=botname).one_or_none()
+    bot = Session.query(Bot).filter_by(user=user, name=botname).one_or_none()
+
     if bot is None:
         logging.warning(
             'Trying to remove a bot that does not exist. User:{}, Bot:{}'

battlebots/database/listeners.py

@@ -1,11 +1,11 @@
 from sqlalchemy import event
 
-from battlebots.database import session
+from battlebots.database import Session
 from battlebots.database.models import MatchParticipation
 from battlebots.ranker.elo import elo_diff
 
 
-@event.listens_for(session, 'before_commit')
+@event.listens_for(Session, 'before_commit')
 def update_bot_ratings(session):
     # If anyone finds a better way to update the ratings, please do
 

battlebots/database/models.py

@@ -14,7 +14,7 @@
 from sqlalchemy.ext.associationproxy import association_proxy
 
 from battlebots import backports, config, sandbox
-from battlebots.database import session
+from battlebots.database import Session
 from battlebots.ranker.elo import DEFAULT_SCORE
 
 Base = declarative_base()
@@ -152,7 +152,7 @@ def loss_percentage(self):
 
     @property
     def rank(self):
-        bots = enumerate(session.query(Bot).order_by(desc(Bot.score)).all())
+        bots = enumerate(Session.query(Bot).order_by(desc(Bot.score)).all())
         return next(dropwhile(lambda bot: bot[1] != self, bots))[0]
 
 

battlebots/database/test_populate.py

@@ -1,6 +1,6 @@
 import datetime as d
 
-from battlebots.database import session
+from battlebots.database import scoped_session
 from battlebots.database.models import User, Bot, Match, MatchParticipation
 
 user1 = User('tester1', 'test1@mail.com', 'test_pw_1')
@@ -17,7 +17,6 @@
 
 l = [user1, user2, bot1, bot1, match1]
 
-for x in l:
-    session.add(x)
-
-session.commit()
+with scoped_session() as db:
+    for x in l:
+        db.add(x)

battlebots/ranker/ranker.py

@@ -17,7 +17,8 @@
 
 from battlebots import backports, config
 from battlebots.arbiter import arbiter
-from battlebots.database import access, session as db, scoped_session
+from battlebots.database import access as db
+from battlebots.database import scoped_session
 from battlebots.database.models import Bot, Match, MatchParticipation
 
 GRAPH_WANDERLUST = 0

battlebots/web/__init__.py

@@ -46,7 +46,15 @@
     )
 
 
-app.before_request(lambda: Session.remove())
+@app.before_request
+def before_request():
+    Session()
+
+
+@app.teardown_request
+def teardown_request(exception):
+    Session.commit()
+    Session.remove()
 
 from battlebots.web import views  # NOQA
 from battlebots.web.views import bots  # NOQA

battlebots/web/forms/users.py

@@ -5,7 +5,7 @@
 from battlebots.arbiter import arbiter
 from battlebots.database.models import User, PASSWORD_LENGTH, NICKNAME_LENGTH
 from battlebots.web.validators import NonDuplicate
-from battlebots.database import session
+from battlebots.database import Session
 
 
 class LoginForm(Form):
@@ -19,7 +19,7 @@ def validate(self):
         if not rv:
             return rv
 
-        user = session.query(User).filter_by(nickname=self.nickname.data).one_or_none()
+        user = Session.query(User).filter_by(nickname=self.nickname.data).one_or_none()
         if user is None:
             self.nickname.errors.append('User unknown.')
             return False

battlebots/web/validators.py

@@ -1,6 +1,6 @@
 from wtforms.validators import ValidationError
 
-from battlebots.database import session
+from battlebots.database import Session
 from battlebots.database.models import User
 
 MAX_FILE_AMOUNT = 50
@@ -13,7 +13,7 @@ def __init__(self, class_, attribute):
 
     def __call__(self, _, field):
 
-        user = session.query(self.class_).filter(
+        user = Session.query(self.class_).filter(
             getattr(self.class_, self.attribute) == field.data
         ).first()
 

battlebots/web/views/bots.py

@@ -7,7 +7,7 @@
 from werkzeug import secure_filename
 
 from battlebots import config
-from battlebots.database import session
+from battlebots.database import Session
 from battlebots.database import access as db
 from battlebots.database.models import Bot, Match, User
 from battlebots.web import app
@@ -35,8 +35,8 @@ def update_bot(username, botname):
         abort(400)  # Should not happen
 
     form = UpdateBotForm()
-    user = session.query(User).filter_by(nickname=username).one_or_none()
-    bot = session.query(Bot).filter_by(user=user, name=botname).one_or_none()
+    user = Session.query(User).filter_by(nickname=username).one_or_none()
+    bot = Session.query(Bot).filter_by(user=user, name=botname).one_or_none()
 
     if user is None:
         flash('User {} does not exist.')
@@ -80,12 +80,12 @@ def remove_bot(username, botname):
 @app.route('/bots/<username>/<botname>', methods=('GET',))
 def bot_page(username, botname):
 
-    user = session.query(User).filter_by(nickname=username).one_or_none()
+    user = Session.query(User).filter_by(nickname=username).one_or_none()
     if user is None:
         flash('User {} does not exist.')
         return redirect(url_for('users'))
 
-    bot = session.query(Bot).filter_by(user=user, name=botname).one_or_none()
+    bot = Session.query(Bot).filter_by(user=user, name=botname).one_or_none()
     if bot is None:
         flash('{} does not exist or does not belong to {}'
               .format(botname, username))
@@ -97,7 +97,7 @@ def bot_page(username, botname):
 
 @app.route('/matches/<matchid>')
 def match_page(matchid):
-    match = session.query(Match).filter_by(id=matchid).one_or_none()
+    match = Session.query(Match).filter_by(id=matchid).one_or_none()
 
     if match is None:
         flash('Match with id {} does not exist.'.format(matchid))

battlebots/web/views/users.py

@@ -1,7 +1,7 @@
 from flask import render_template, request, redirect, url_for, flash, abort
 from flask.ext.login import login_required, login_user, logout_user, current_user
 
-from battlebots.database import session
+from battlebots.database import Session
 from battlebots.database import access as db
 from battlebots.database.models import User
 from battlebots.web import app, lm
@@ -10,13 +10,13 @@
 
 @app.route('/users/')
 def users():
-    users_ = session.query(User).order_by(User.nickname).all()
+    users_ = Session.query(User).order_by(User.nickname).all()
     return render_template('users/users.html', users=users_)
 
 
 @app.route('/users/<username>')
 def user_page(username):
-    user = session.query(User).filter_by(nickname=username).one_or_none()
+    user = Session.query(User).filter_by(nickname=username).one_or_none()
 
     if user is None:
         flash('User with name {} does not exist.'.format(username))
@@ -35,7 +35,7 @@ def profile():
 def login():
     form = LoginForm()
     if form.validate_on_submit():
-        user = session.query(User).filter_by(nickname=form.nickname.data).first()
+        user = Session.query(User).filter_by(nickname=form.nickname.data).first()
         if user is None:
             abort(513)  # shouldn't happen
 
@@ -83,4 +83,4 @@ def unauthorized_handler():
 
 @lm.user_loader
 def load_user(id):
-    return session.query(User).filter(User.id == id).one_or_none()
+    return Session.query(User).filter(User.id == id).one_or_none()

battlebots/web/views/views.py

@@ -3,7 +3,7 @@
 
 from battlebots.web import app
 from battlebots.web.pagination_utils import paginate
-from battlebots.database import session
+from battlebots.database import Session
 from battlebots.database.models import Bot, Match
 
 
@@ -15,14 +15,14 @@ def home():
 
 @app.route('/ranking')
 def ranking():
-    bots = session.query(Bot).order_by(desc(Bot.score))
+    bots = Session.query(Bot).order_by(desc(Bot.score))
     ranked_bots = enumerate(bots)
     return render_template('ranking.html', bots=ranked_bots)
 
 
 @app.route('/matches/')
 def matches():
-    matches_ = session.query(Match).order_by(desc(Match.id))
+    matches_ = Session.query(Match).order_by(desc(Match.id))
     paginated_matches_ = paginate(matches_)
 
     return render_template('matches.html', paginated_matches=paginated_matches_)