Aggressive Caching

Author: devinmatte

packet/ldap.py

@@ -1,14 +1,14 @@
 from functools import lru_cache
 
-import ldap
-
 from packet import _ldap
 
 
+@lru_cache(maxsize=4096)
 def _ldap_get_group_members(group):
     return _ldap.get_group(group).get_members()
 
 
+@lru_cache(maxsize=4096)
 def _ldap_is_member_of_group(member, group):
     group_list = member.get("memberOf")
     for group_dn in group_list:
@@ -17,7 +17,7 @@ def _ldap_is_member_of_group(member, group):
     return False
 
 
-@lru_cache(maxsize=1024)
+@lru_cache(maxsize=2048)
 def _ldap_is_member_of_directorship(account, directorship):
     directors = _ldap.get_directorship_heads(directorship)
     for director in directors:
@@ -48,16 +48,6 @@ def ldap_get_onfloor_members():
     return _ldap_get_group_members("onfloor")
 
 
-@lru_cache(maxsize=1024)
-def ldap_get_current_students():
-    return _ldap_get_group_members("current_student")
-
-
-@lru_cache(maxsize=1024)
-def ldap_get_all_members():
-    return _ldap_get_group_members("member")
-
-
 @lru_cache(maxsize=1024)
 def ldap_get_groups(account):
     group_list = account.get("memberOf")
@@ -68,17 +58,6 @@ def ldap_get_groups(account):
     return groups
 
 
-@lru_cache(maxsize=1024)
-def ldap_get_group_desc(group):
-    con = _ldap.get_con()
-    results = con.search_s(
-        "cn=groups,cn=accounts,dc=csh,dc=rit,dc=edu",
-        ldap.SCOPE_SUBTREE,
-        "(cn=%s)" % group,
-        ['description'])
-    return results[0][1]['description'][0].decode('utf-8')
-
-
 @lru_cache(maxsize=1024)
 def ldap_get_eboard():
     members = _ldap_get_group_members("eboard-chairman") + _ldap_get_group_members("eboard-evaluations"
@@ -90,6 +69,7 @@ def ldap_get_eboard():
     return members
 
 
+@lru_cache(maxsize=2048)
 def ldap_get_live_onfloor():
     """
     :return: All upperclassmen who live on floor and are not eboard
@@ -101,67 +81,46 @@ def ldap_get_live_onfloor():
             members.append(member)
     return members
 
+
 # Status checkers
 
+@lru_cache(maxsize=1024)
 def ldap_is_active(account):
     return _ldap_is_member_of_group(account, 'active')
 
 
+@lru_cache(maxsize=1024)
 def ldap_is_alumni(account):
     # If the user is not active, they are an alumni.
     return not _ldap_is_member_of_group(account, 'active')
 
 
+@lru_cache(maxsize=1024)
 def ldap_is_eboard(account):
     return _ldap_is_member_of_group(account, 'eboard')
 
 
+@lru_cache(maxsize=1024)
 def ldap_is_rtp(account):
     return _ldap_is_member_of_group(account, 'rtp')
 
 
+@lru_cache(maxsize=1024)
 def ldap_is_intromember(account):
     return _ldap_is_member_of_group(account, 'intromembers')
 
 
+@lru_cache(maxsize=1024)
 def ldap_is_onfloor(account):
     return _ldap_is_member_of_group(account, 'onfloor')
 
 
+@lru_cache(maxsize=1024)
 def ldap_is_current_student(account):
     return _ldap_is_member_of_group(account, 'current_student')
 
 
-# Directorships
-
-def ldap_is_financial_director(account):
-    return _ldap_is_member_of_directorship(account, 'financial')
-
-
-def ldap_is_eval_director(account):
-    return _ldap_is_member_of_directorship(account, 'evaluations')
-
-
-def ldap_is_chairman(account):
-    return _ldap_is_member_of_directorship(account, 'chairman')
-
-
-def ldap_is_history(account):
-    return _ldap_is_member_of_directorship(account, 'history')
-
-
-def ldap_is_imps(account):
-    return _ldap_is_member_of_directorship(account, 'imps')
-
-
-def ldap_is_social(account):
-    return _ldap_is_member_of_directorship(account, 'Social')
-
-
-def ldap_is_rd(account):
-    return _ldap_is_member_of_directorship(account, 'research')
-
-
+@lru_cache(maxsize=1024)
 def ldap_get_roomnumber(account):
     try:
         return account.roomNumber

packet/packet.py

@@ -1,3 +1,5 @@
+from functools import lru_cache
+
 from packet.ldap import ldap_get_member, ldap_is_intromember
 from .models import Freshman, UpperSignature, FreshSignature, MiscSignature, db
 
@@ -48,9 +50,11 @@ def get_signatures(freshman_username):
             'misc': misc_signatures}
 
 
+@lru_cache(maxsize=512)
 def get_number_signed(freshman_username):
     return Freshman.query.filter_by(rit_username=freshman_username).first().current_packet().signatures_received()
 
 
+@lru_cache(maxsize=4096)
 def get_number_required(freshman_username):
     return Freshman.query.filter_by(rit_username=freshman_username).first().current_packet().signatures_required()

packet/utils.py

@@ -45,55 +45,22 @@ def wrapped_function(*args, **kwargs):
     return wrapped_function
 
 
+@lru_cache(maxsize=2048)
 def get_member_info(uid):
     account = ldap_get_member(uid)
 
     member_info = {
         "user_obj": account,
         "group_list": ldap_get_groups(account),
         "uid": account.uid,
-        "ritUid": parse_rit_uid(account.ritDn),
         "name": account.cn,
         "active": ldap_is_active(account),
         "onfloor": ldap_is_onfloor(account),
         "room": ldap_get_roomnumber(account),
-        "hp": account.housingPoints,
-        "plex": account.plex,
-        "rn": ldap_get_roomnumber(account),
-        "birthday": parse_date(account.birthday),
-        "memberSince": parse_date(account.memberSince),
-        "lastlogin": parse_date(account.krblastsuccessfulauth),
-        "year": parse_account_year(account.memberSince)
     }
     return member_info
 
 
-def parse_date(date):
-    if date:
-        year = date[0:4]
-        month = date[4:6]
-        day = date[6:8]
-        return month + "-" + day + "-" + year
-    return False
-
-
-def parse_rit_uid(dn):
-    if dn:
-        return dn.split(",")[0][4:]
-
-    return None
-
-
-def parse_account_year(date):
-    if date:
-        year = int(date[0:4])
-        month = int(date[4:6])
-        if month <= 8:
-            year = year - 1
-        return year
-    return None
-
-
 @lru_cache(maxsize=2048)
 def is_on_floor(uid):
     return (Freshman.query.filter_by(rit_username=uid)).first().onfloor
@@ -118,13 +85,15 @@ def signed_packet(signer, freshman):
 @app.context_processor
 def utility_processor():
     # pylint: disable=bare-except
+    @lru_cache(maxsize=4096)
     def get_display_name(username):
         try:
             member = ldap_get_member(username)
             return member.cn + " (" + member.uid + ")"
         except:
             return username
 
+    @lru_cache(maxsize=4096)
     def get_freshman_name(username):
         try:
             freshman = Freshman.query.filter_by(rit_username=username).first()