Merge pull request #80 from devinmatte/cache_busters

Lowering cache now that we're more performant

Author: devinmatte

packet/packet.py

@@ -58,7 +58,7 @@ def set_essays(freshman_username, eboard=None, events=None, achieve=None):
     return True
 
 
-@lru_cache(maxsize=2048)
+@lru_cache(maxsize=512)
 def get_signatures(freshman_username):
     """
     Gets a list of all signatures for the given member
@@ -75,17 +75,17 @@ def get_signatures(freshman_username):
 
     upper_signatures = db.session.query(UpperSignature.member, UpperSignature.signed, Freshman.rit_username) \
         .select_from(UpperSignature).join(Packet).join(Freshman) \
-        .filter(UpperSignature.packet_id == packet.id, UpperSignature.eboard.is_(False))\
-        .order_by(UpperSignature.signed.desc())\
+        .filter(UpperSignature.packet_id == packet.id, UpperSignature.eboard.is_(False)) \
+        .order_by(UpperSignature.signed.desc()) \
         .distinct().all()
-    fresh_signatures = \
-    db.session.query(FreshSignature.freshman_username, FreshSignature.signed, Freshman.rit_username, Freshman.name) \
+    fresh_signatures = db.session.query(
+        FreshSignature.freshman_username, FreshSignature.signed, Freshman.rit_username, Freshman.name) \
         .select_from(Packet).join(FreshSignature).join(Freshman) \
         .filter(FreshSignature.packet_id == packet.id) \
         .order_by(FreshSignature.signed.desc()) \
         .distinct().all()
 
-    misc_signatures = db.session.query(MiscSignature.member, Freshman.rit_username)\
+    misc_signatures = db.session.query(MiscSignature.member, Freshman.rit_username) \
         .select_from(MiscSignature).join(Packet).join(Freshman) \
         .filter(MiscSignature.packet_id == packet.id) \
         .distinct().all()
@@ -96,6 +96,7 @@ def get_signatures(freshman_username):
             'misc': misc_signatures}
 
 
+@lru_cache(maxsize=512)
 def get_misc_signatures():
     packet_misc_sigs = {}
     try:
@@ -111,7 +112,7 @@ def get_misc_signatures():
     return packet_misc_sigs
 
 
-@lru_cache(maxsize=2048)
+@lru_cache(maxsize=512)
 def valid_signature(signer_username, freshman_username):
     if signer_username == freshman_username:
         return False
@@ -127,17 +128,15 @@ def valid_signature(signer_username, freshman_username):
     return True
 
 
-@lru_cache(maxsize=512)
 def get_freshman(freshman_username):
     return Freshman.query.filter_by(rit_username=freshman_username).first()
 
 
-@lru_cache(maxsize=512)
 def get_current_packet(freshman_username):
     return get_freshman(freshman_username).current_packet()
 
 
-@lru_cache(maxsize=2048)
+@lru_cache(maxsize=512)
 def get_number_signed(freshman_username, separated=False):
     """
     Gets the raw number of signatures for the user
@@ -151,7 +150,7 @@ def get_number_signed(freshman_username, separated=False):
         .first().signatures_received(not separated)
 
 
-@lru_cache(maxsize=2048)
+@lru_cache(maxsize=512)
 def get_number_required(separated=False):
     """
     Get the number of required signatures for Packet (not counting on/off-floor status)
@@ -162,7 +161,7 @@ def get_number_required(separated=False):
         .filter(Packet.start < datetime.now(), Packet.end > datetime.now()).first().signatures_required(not separated)
 
 
-@lru_cache(maxsize=2048)
+@lru_cache(maxsize=512)
 def get_upperclassmen_percent(username, onfloor=False):
     required = get_number_required(True)
     upperclassmen_required = required['upperclassmen'] + required['eboard'] + required['miscellaneous']
@@ -186,14 +185,29 @@ def signed_packets(member):
     return MiscSignature.query.filter_by(member=member).all()
 
 
+@lru_cache(maxsize=512)
+def signed_packet(signer, freshman):
+    packet = get_current_packet(freshman)
+    freshman_signature = FreshSignature.query.filter_by(packet=packet, freshman_username=signer, signed=True).first()
+    upper_signature = UpperSignature.query.filter_by(packet=packet, member=signer, signed=True).first()
+    misc_signature = MiscSignature.query.filter_by(packet=packet, member=signer).first()
+
+    if freshman_signature is not None:
+        return freshman_signature.signed
+    if upper_signature is not None:
+        return upper_signature.signed
+    if misc_signature is not None:
+        return misc_signature
+    return False
+
+
 def clear_cache():
     """
     Clear cache of all frequently changing data
     """
+    get_upperclassmen_percent.cache_clear()
     get_number_signed.cache_clear()
-    get_signatures.cache_clear()
     get_number_required.cache_clear()
-    get_upperclassmen_percent.cache_clear()
-    get_freshman.cache_clear()
-    get_current_packet.cache_clear()
     signed_packets.cache_clear()
+    get_signatures.cache_clear()
+    get_misc_signatures.cache_clear()

packet/routes/freshmen.py

@@ -1,9 +1,8 @@
 from flask import redirect, render_template, request
 
-from packet import auth, app, db
-from packet.models import Packet
-from packet.utils import before_request
+from packet import auth, app
 from packet.packet import set_essays, get_current_packet
+from packet.utils import before_request
 
 
 @app.route("/")

packet/routes/shared.py

@@ -3,9 +3,9 @@
 from packet import auth, app
 from packet.member import current_packets
 from packet.models import Freshman
-from packet.packet import get_number_required, get_number_signed
+from packet.packet import get_number_required, get_number_signed, signed_packet
 from packet.packet import get_signatures, get_upperclassmen_percent
-from packet.utils import before_request, signed_packet
+from packet.utils import before_request
 
 
 @app.route('/logout')
@@ -23,7 +23,7 @@ def freshman_packet(uid, info=None):
     signatures = get_signatures(uid)
     signed_dict = get_number_signed(uid, True)
     required = get_number_required()
-    signed = sum(signed_dict.values())
+    signed = get_number_signed(uid)
 
     packet_signed = signed_packet(info['uid'], uid)
     return render_template("packet.html", info=info, signatures=signatures, uid=uid, required=required, signed=signed,

packet/utils.py

@@ -11,8 +11,7 @@
                          ldap_is_onfloor,
                          ldap_get_roomnumber,
                          ldap_get_groups)
-from packet.models import FreshSignature, UpperSignature, MiscSignature
-from packet.packet import get_current_packet, get_freshman
+from packet.packet import get_freshman
 
 INTRO_REALM = "https://sso.csh.rit.edu/auth/realms/intro"
 
@@ -67,21 +66,6 @@ def is_on_floor(uid):
     return get_freshman(uid).onfloor
 
 
-@lru_cache(maxsize=2048)
-def signed_packet(signer, freshman):
-    packet = get_current_packet(freshman)
-    freshman_signature = FreshSignature.query.filter_by(packet=packet, freshman_username=signer, signed=True).first()
-    upper_signature = UpperSignature.query.filter_by(packet=packet, member=signer, signed=True).first()
-    misc_signature = MiscSignature.query.filter_by(packet=packet, member=signer).first()
-
-    if freshman_signature is not None:
-        return freshman_signature.signed
-    if upper_signature is not None:
-        return upper_signature.signed
-    if misc_signature is not None:
-        return misc_signature
-    return False
-
 
 @app.context_processor
 def utility_processor():