Get a client per session to help with expiry

src/data_storage.py

@@ -1,9 +1,7 @@
-from postgrest.exceptions import APIError
 from secrets import token_urlsafe
 import streamlit as st
-import time
 
-from queries.supabase_db.client import supabase_client
+from supabase import Client
 
 
 USERS_TABLE = "npcs_users"
@@ -11,15 +9,7 @@ USER_ROSTERS_TABLE = "npcs_user_rosters"
 TOKENS_TABLE = "npcs_tokens"
 
 
-try:
-    user_count = supabase_client.table(USERS_TABLE).select("*", count="exact").execute().count
-except APIError:
-    # automatic retry
-    time.sleep(0.5)
-    user_count = supabase_client.table(USERS_TABLE).select("*", count="exact").execute().count
-
-
-def update_selection(user_id: str | int, position_id: str, player_id: str):
+def update_selection(user_id: str | int, position_id: str, player_id: str, supabase_client: Client):
     existing_record = (
         supabase_client.table(USER_ROSTERS_TABLE)
         .select("*")
@@ -42,7 +32,7 @@ def update_selection(user_id: str | int, position_id: str, player_id: str):
         )
 
 
-def get_user_team(user_id):
+def get_user_team(user_id, supabase_client: Client):
     team = (
         supabase_client.table(USER_ROSTERS_TABLE)
         .select("position_id", "player_id")
@@ -56,11 +46,11 @@ def get_user_team(user_id):
         return {}
 
 
-def add_new_user(email: str, name: str):
+def add_new_user(email: str, name: str, supabase_client: Client):
     (supabase_client.table(USERS_TABLE).insert({"email": email.lower(), "name": name}).execute())
 
 
-def get_user(user_id: int):
+def get_user(user_id: int, supabase_client: Client):
     user_data = (
         supabase_client.table("npcs_users").select("user_id", "email", "name").eq("user_id", user_id).execute().data
     )
@@ -69,7 +59,7 @@ def get_user(user_id: int):
     return user_data[0]
 
 
-def get_user_id_if_email_exists(email: str) -> int | None:
+def get_user_id_if_email_exists(email: str, supabase_client: Client) -> int | None:
     query_result = supabase_client.table(USERS_TABLE).select("user_id").eq("email", email.lower()).execute().data
     if query_result:
         user_id = query_result[0]["user_id"]
@@ -78,7 +68,7 @@ def get_user_id_if_email_exists(email: str) -> int | None:
     return user_id
 
 
-def is_admin(user_id: int | None):
+def is_admin(user_id: int | None, supabase_client: Client):
     if user_id is None:
         return False
     query_result = supabase_client.table(USERS_TABLE).select("admin").eq("user_id", user_id).execute().data
@@ -87,7 +77,7 @@ def is_admin(user_id: int | None):
     return False
 
 
-def login_by_token(token: str):
+def login_by_token(token: str, supabase_client: Client):
     # returns true if logged in successfully
     query_result = supabase_client.table(TOKENS_TABLE).select("user_id").eq("token", token).execute().data
     if query_result:
@@ -98,24 +88,24 @@ def login_by_token(token: str):
     return user_id
 
 
-def create_new_token_for_user(user_id: int, existing_user: bool = False):
+def create_new_token_for_user(user_id: int, supabase_client: Client, existing_user: bool = False):
     # returns true if logged in successfully
     token = token_urlsafe(32)
     supabase_client.table(TOKENS_TABLE).upsert({"user_id": user_id, "token": token}).execute()
     return token
 
 
-def get_all_users(columns_included: list[str] = ["user_id", "name", "email"]):
+def get_all_users(supabase_client: Client, columns_included: list[str] = ["user_id", "name", "email"]):
     all_users = supabase_client.table(USERS_TABLE).select(*columns_included).execute().data
     return all_users
 
 
-def get_all_rosters() -> list[dict[str, int | str]]:
+def get_all_rosters(supabase_client: Client) -> list[dict[str, int | str]]:
     all_rosters = supabase_client.table(USER_ROSTERS_TABLE).select("user_id", "position_id", "player_id").execute().data
     return all_rosters
 
 
-def get_all_rosters_week(week: int) -> list[dict[str, int | str]]:
+def get_all_rosters_week(week: int, supabase_client: Client) -> list[dict[str, int | str]]:
     week_rosters = (
         supabase_client.table(USER_ROSTERS_TABLE)
         .select("user_id", "position_id", "player_id")
@@ -126,14 +116,14 @@ def get_all_rosters_week(week: int) -> list[dict[str, int | str]]:
     return week_rosters
 
 
-def migrate_players_from_week(migrate_from_week: int):
+def migrate_players_from_week(migrate_from_week: int, supabase_client: Client):
     """
     Migrate players from the week = migrate_from_week to the week = migrate_from_week + 1
     """
-    rosters = get_all_rosters_week(migrate_from_week)
+    rosters = get_all_rosters_week(migrate_from_week, supabase_client)
     for roster_slot_map in rosters:
         position_id = str(roster_slot_map["position_id"])
         player_id = str(roster_slot_map["player_id"])
         user_id = int(roster_slot_map["user_id"])
         new_position_id = f"""{migrate_from_week + 1}-{position_id.split("-", 1)[1]}"""
-        update_selection(user_id, new_position_id, player_id)
+        update_selection(user_id, new_position_id, player_id, supabase_client)

src/login.py

@@ -82,10 +82,10 @@ def generate_new_token_request():
     if not check_email(email := st.session_state["reset_token_user_email"]):
         st.warning("Sorry email is invalid.  Please try a valid email address.")
         return
-    user_id = get_user_id_if_email_exists(email)
+    user_id = get_user_id_if_email_exists(email, st.session_state["db_client"])
     if not user_id:
         return
-    token = create_new_token_for_user(user_id, existing_user=True)
+    token = create_new_token_for_user(user_id, st.session_state["db_client"], existing_user=True)
     insert_new_token_to_sheet(email, token)
 
     st.info("Request submitted.  Please check your email for a login url with a few minutes.")
@@ -106,10 +106,10 @@ def insert_new_token_to_sheet(email: str, token: str):
 
 
 def create_new_user_request(email: str, name: str):
-    add_new_user(email, name)
-    user_id = get_user_id_if_email_exists(email)
+    add_new_user(email, name, st.session_state["db_client"])
+    user_id = get_user_id_if_email_exists(email, st.session_state["db_client"])
     assert user_id
-    token = create_new_token_for_user(user_id)
+    token = create_new_token_for_user(user_id, st.session_state["db_client"])
     insert_new_token_to_sheet(email, token)
     st.info("New user request submitted.  Please check your email for a login url with a few minutes.")
 
@@ -123,7 +123,7 @@ def new_user_submitted():
         st.warning("No name entered.  Please enter your name for display.")
         return
 
-    if get_user_id_if_email_exists(email):
+    if get_user_id_if_email_exists(email, st.session_state["db_client"]):
         st.warning(
             "User with that email already exists.  If you would like a new login url, please click the New Login URL button."
         )
@@ -149,7 +149,7 @@ def get_logged_in_user_name_email() -> tuple[str | None, str | None]:
         # if not logged
         return (None, None)
 
-    user_info_map = get_user(user_id)
+    user_info_map = get_user(user_id, st.session_state["db_client"])
     email = user_info_map.get("email")
     name = user_info_map.get("name")
     return email, name

src/pages/10_Set_Your_Lineup.py

@@ -96,7 +96,7 @@ def position_cell(
 
 
 def update_and_save_selection(pos_label: str, selection_id: str):
-    update_selection(st.session_state["logged_in_user"], pos_label, selection_id)
+    update_selection(st.session_state["logged_in_user"], pos_label, selection_id, st.session_state["db_client"])
     st.rerun()
 
 
@@ -140,7 +140,7 @@ def get_page():
     if st.button("Refresh Data"):
         st.rerun()
     try:
-        existing_selections = get_user_team(st.session_state["logged_in_user"])
+        existing_selections = get_user_team(st.session_state["logged_in_user"], st.session_state["db_client"])
     except Exception:
         st.write("Sorry error occurred loading team. Please try refreshing page.")
         st.stop()

src/pages/11_Scoreboard.py

@@ -16,7 +16,7 @@ from stats import get_scores_map
 
 def get_users_df():
     columns = ["user_id", "name"]
-    all_users = pd.DataFrame(get_all_users(columns_included=columns), columns=columns)
+    all_users = pd.DataFrame(get_all_users(st.session_state["db_client"], columns_included=columns), columns=columns)
     return all_users
 
 
@@ -24,7 +24,7 @@ def get_users_df():
 def load_masked_rosters() -> dict[int, dict[str, PlayerOption]]:
     options_map = get_map_week_player_id_option()
     roster_user_position_map: dict[int, dict[str, PlayerOption]] = {}
-    for roster_slot_map in get_all_rosters():
+    for roster_slot_map in get_all_rosters(st.session_state["db_client"]):
         position_id = str(roster_slot_map["position_id"])
         player_id = str(roster_slot_map["player_id"])
         user_id = int(roster_slot_map["user_id"])

src/pages/99_Admin.py

@@ -7,7 +7,9 @@ from data_storage import add_new_user, is_admin, migrate_players_from_week
 
 
 def admin_add_new_user():
-    add_new_user(st.session_state["admin_new_user_email"], st.session_state["admin_new_user_name"])
+    add_new_user(
+        st.session_state["admin_new_user_email"], st.session_state["admin_new_user_name"], st.session_state["db_client"]
+    )
 
 
 def admin_add_new_user_form():
@@ -27,7 +29,7 @@ def migrate_players_week():
         st.text_input("Enter week to confirm", key="week_migrate_from")
         if st.button("Migrate Week"):
             if st.session_state.get("week_migrate_from") == str(week_migrate_from):
-                migrate_players_from_week(week_migrate_from)
+                migrate_players_from_week(week_migrate_from, st.session_state["db_client"])
                 st.warning("Week migrated")
             else:
                 st.warning("Must confirm migration by entering matching week")
@@ -37,7 +39,7 @@ def get_page():
     page_title = "Admin"
     st.set_page_config(page_title=page_title, page_icon=DEFAULT_ICON, layout="wide")
     common_page_config()
-    if not is_admin(st.session_state.get("logged_in_user")):
+    if not is_admin(st.session_state.get("logged_in_user"), st.session_state["db_client"]):
         st.write("Not authorized")
         st.stop()
 

src/queries/supabase_db/client.py

@@ -5,4 +5,6 @@ from supabase import create_client, Client
 url: str = str(os.environ.get("SUPABASE_URL"))
 key: str = str(os.environ.get("SUPABASE_KEY"))
 
-supabase_client: Client = create_client(url, key)
+
+def get_new_supabase_client() -> Client:
+    return create_client(url, key)

src/shared_page.py

@@ -2,6 +2,7 @@ import os
 import streamlit as st
 
 from queries.nflverse.github_data import load_assets
+from queries.supabase_db.client import get_new_supabase_client
 from data_storage import login_by_token
 
 
@@ -24,13 +25,20 @@ def login_token_arg_if_exists():
     url_params = st.query_params
     if arg_token := url_params.get("token"):
         try:
-            login_by_token(arg_token)
+            login_by_token(arg_token, st.session_state["db_client"])
         except Exception:
             st.write("Sorry, error logging in.  Please refresh to try again.")
             st.stop()
 
 
+def set_session_db_client():
+    session_db_key = "db_client"
+    if not st.session_state.get(session_db_key):
+        st.session_state[session_db_key] = get_new_supabase_client()
+
+
 def common_page_config():
     local_css()
     load_assets()
+    set_session_db_client()
     login_token_arg_if_exists()