Update user auth for HF spaces

app.py

@@ -1,28 +1,15 @@
 import streamlit as st
-from streamlit_gsheets import GSheetsConnection
+# Do not load st-gsheets-connection
+# from streamlit_gsheets import GSheetsConnection
+import gspread
+from oauth2client.service_account import ServiceAccountCredentials
 import hmac
 
 # Standard imports
-import numpy as np
 import pandas as pd
-from datetime import datetime
-import os
-import random
-
-# Import torch
-import torch
-
-# Data visualization
-import matplotlib.pyplot as plt
-import seaborn as sns
-
-# Path manipulation
-from pathlib import Path
-import sys
 
 # Custom and other imports
-import project_config
-from utils import add_logo
+# from utils import add_logo
 from menu import menu
 
 # Insert logo
@@ -39,6 +26,27 @@ if "role" not in st.session_state:
 #     # Callback function to save the role selection to Session State
 #     st.session_state.role = st.session_state._role
 
+
+# From https://stackoverflow.com/questions/55961295/serviceaccountcredentials-from-json-keyfile-name-equivalent-for-remote-json
+# See also https://www.slingacademy.com/article/pandas-how-to-read-and-update-google-sheet-files/
+def create_keyfile_dict():
+    variables_keys = {
+        # "spreadsheet": st.secrets['spreadsheet'], # spreadsheet
+        "type": st.secrets['type'], # type
+        "project_id": st.secrets['project_id'], # project_id
+        "private_key_id": st.secrets['private_key_id'], # private_key_id
+        "private_key": st.secrets['private_key'], # private_key
+        "client_email": st.secrets['client_email'], # client_email
+        "client_id": st.secrets['client_id'], # client_id
+        "auth_uri": st.secrets['auth_uri'], # auth_uri
+        "token_uri": st.secrets['token_uri'], # token_uri
+        "auth_provider_x509_cert_url": st.secrets['auth_provider_x509_cert_url'], # auth_provider_x509_cert_url
+        "client_x509_cert_url": st.secrets['client_x509_cert_url'], # client_x509_cert_url
+        "universe_domain": st.secrets['universe_domain'] # universe_domain
+    }
+    return variables_keys
+
+
 def check_password():
     """Returns `True` if the user had a correct password."""
 
@@ -51,14 +59,31 @@ def check_password():
 
     def password_entered():
         """Checks whether a password entered by the user is correct."""
+
+        # Define the scope
+        scope = [
+            'https://spreadsheets.google.com/feeds',
+            'https://www.googleapis.com/auth/drive'
+        ]
+
+        # Add credentials to the account
+        creds = ServiceAccountCredentials.from_json_keyfile_dict(create_keyfile_dict(), scope)
+
+        # Authenticate and create the client
+        client = gspread.authorize(creds)
+
+        # Open the spreadsheet
+        sheet = client.open_by_url(st.secrets['spreadsheet']).worksheet("user_db")
+        data = sheet.get_all_records()
+        user_db = pd.DataFrame(data)
         
-        # Create a connection object to Google Sheets
-        conn = st.connection("gsheets", type=GSheetsConnection)
+        # # Create a connection object to Google Sheets
+        # conn = st.connection("gsheets", type=GSheetsConnection)
 
-        # Read the user database
-        user_db = conn.read()
-        user_db.dropna(axis=0, how="all", inplace=True)
-        user_db.dropna(axis=1, how="all", inplace=True)
+        # # Read the user database
+        # user_db = conn.read()
+        # user_db.dropna(axis=0, how="all", inplace=True)
+        # user_db.dropna(axis=1, how="all", inplace=True)
 
         # Check if the username is in the database
         if st.session_state["username"] in user_db.username.values:

requirements.txt

@@ -6,4 +6,5 @@ seaborn
 pathlib
 torch
 altair<5
-st-gsheets-connection
+gspread
+oauth2client