oauth verification update (big)

app.py

@@ -1,41 +1,46 @@
-import asyncio
+import os
+import re
 import csv
-import datetime
 import json
+import time
+import random
+import asyncio
+import discord
 import logging
-import os
 import os.path
-import random
-import re
+import secrets
+import gspread
+import datetime
+import requests
 import threading
-import time
-
-import discord
-import gradio as gr
 import gradio_client
-import gspread
+
 import numpy as np
 import pandas as pd
-import requests
+import gradio as gr
 import plotly.graph_objects as go
 
+from tabulate import tabulate
 from requests import HTTPError
-from apscheduler.executors.pool import ThreadPoolExecutor
-from apscheduler.schedulers.background import BackgroundScheduler
+from gradio_client import Client
 from discord import Color, Embed
+from discord.ui import Button, View
 from discord.ext import commands, tasks
-from gradio_client import Client
-from gspread_dataframe import get_as_dataframe, set_with_dataframe
+from datetime import datetime, timedelta
+from apscheduler.executors.pool import ThreadPoolExecutor
 from gspread_formatting.dataframe import format_with_dataframe
+from apscheduler.schedulers.background import BackgroundScheduler
+from gspread_dataframe import get_as_dataframe, set_with_dataframe
 from huggingface_hub import HfApi, list_liked_repos, list_metrics, list_models
-from tabulate import tabulate
-from datetime import datetime, timedelta
-
 
 DISCORD_TOKEN = os.environ.get("DISCORD_TOKEN", None)
 intents = discord.Intents.all() 
 bot = commands.Bot(command_prefix='!', intents=intents)
 
+GRADIO_APP_URL = "https://huggingface.co/spaces/discord-community/LevelBot"
+# Dictionary to store user IDs and their corresponding unique strings
+user_tokens = {}
+
 
 """"""
 XP_PER_MESSAGE = 10 # 100k messages = 1M exp = lvl 100
@@ -60,6 +65,31 @@ community_global_df_gradio = pd.DataFrame()
 test_merge = pd.read_csv("https://docs.google.com/spreadsheets/d/1C8aLqgCqLYcMiIFf-P_Aosaa03C_WLIB_UyqvjSdWg8/export?format=csv&gid=0")
 
 
+class DMButton(Button):
+    def __init__(self, label, style):
+        super().__init__(label=label, style=style)
+
+    async def callback(self, interaction: discord.Interaction):
+        # await interaction.user.send(self.message) # this is for DMs, but users may have DMs disabled
+        user_id = interaction.user.id
+        if int(user_id) in user_tokens:
+            del user_tokens[int(user_id)] # always delete all past tokens for a given user when creating new link
+        unique_string = generate_unique_string()
+        user_tokens[user_id] = unique_string
+        unique_link = f"<{GRADIO_APP_URL}?user_id={user_id}&token={unique_string}>"
+        message = f"Login link generated! To complete the verification process:\n- 1 Visit this link,\n- 2 click the '🤗Sign in with Hugging Face' button\n\n{unique_link}"
+        await interaction.response.send_message(message, ephemeral=True)
+
+
+@bot.command(name='sendbutton')
+async def send_button(ctx):
+    if ctx.author.id == 811235357663297546:
+        button = DMButton(label="Verify Discord Account", style=discord.ButtonStyle.primary)
+        view = View(timeout=None)
+        view.add_item(button)
+        await ctx.send("Click the button below to generate your verification link:",view=view) #  
+
+
 @bot.event
 async def on_ready():
     try:
@@ -67,6 +97,22 @@ async def on_ready():
         await asyncio.sleep(1.1)
         print(f'Logged in as {bot.user.name}')
         print(f"XP_PER_MESSAGE: {XP_PER_MESSAGE}")
+
+        channel = bot.get_channel(932563860597121054)
+        if channel:
+            try:
+                message = await channel.fetch_message(1269917762327674974)
+                if message:
+                    button = DMButton(label="Verify Discord Account", style=discord.ButtonStyle.primary)
+                    view = View(timeout=None)
+                    view.add_item(button)
+                    await message.edit(view=view)
+                    print("message edited")
+            except discord.NotFound:
+                print(f"Message with ID {KNOWN_MESSAGE_ID} not found.")
+            except discord.HTTPException as e:
+                print(f"Failed to fetch message with ID {KNOWN_MESSAGE_ID}: {e}")
+                
     
         """import data from google sheets -> HF Space df (doesn't make API call this way, as it's read-only)""" 
         global_df = test_merge
@@ -466,7 +512,6 @@ async def add_exp(member_id):
 
 @bot.event
 async def on_message(message):
-    global global_df
     org_link = "https://huggingface.co/organizations/discord-community/share/wPKRAHYbAlaEaCxUxcqVyaaaeZcYagDvqc"
     invite_message = "Click to join our community org on the HF Hub!"
     try:
@@ -478,109 +523,8 @@ async def on_message(message):
             # add check for verification
             if message.content.find("!help") != -1:
                 await message.channel.send(
-                    "To verify your 🤗 account, message me '!auth <TOKEN>' using your API token found here: https://huggingface.co/settings/token"
-                )    
-            if message.content.startswith('!auth'):
-                await asyncio.sleep(3)
-                lunar = bot.get_user(811235357663297546)
-                token = message.content.split()[-1].strip()
-                try:
-                    user = HfApi().whoami(token)
-                except HTTPError as e:
-                    await message.channel.send(f"Error occured when trying to authenticate. Likely invalid API Token. {e}")
-                token = "abc" # reset right after we use to be safe
-                
-                if user['type'] == 'org':
-                    await message.channel.send(
-                        "Authentication failed because you tried to authenticate with an organization's API token. Please authenticate with your User API token instead."
-                    )
-                    return
-
-                try:
-                    server = bot.get_guild(879548962464493619)
-                    #role = discord.utils.get(server.roles, name="verified")
-                    role = server.get_role(900063512829755413)
-                    member = server.get_member(message.author.id)
-                    verified_date = datetime.now().strftime("%m/%d/%Y, %H:%M:%S") 
-                    likes = 0
-                    models = 0
-                    datasets = 0
-                    spaces = 0
-                    discussions = 0
-                    papers = 0
-                    upvotes = 0
-                    # important!-----------------------------------------------------------------------------
-                    # In order to add verification to a discord account, some important checks must ALL pass:
-                    # 1. Discord account should not already have verified role.
-                    # 2. hf_user_name should not already exist in the dataframe.
-                    # -----> If it does, it means we are trying to link 1 HF account to multiple discord accounts. 1->many is disallowed.
-                    
-                    # check if the member has the verified role (prevent duplicate entries in google sheet)
-                    # if users want to change discord / HF accounts, we can deal with that manually 
-                    if role in member.roles:
-                        await message.channel.send(f"{member} already has has the '{role}' role and is already verified! To change discord accounts or HF accounts, contact <@811235357663297546> or adam@huggingface.co")         
-                        return
-
-                    # check if hf_user_name in dataframe:
-                    if user['name'] in global_df['hf_user_name'].values:
-                        await message.channel.send(f"The HF account {user['name']} is already verified! To change discord accounts or HF accounts, contact <@811235357663297546> or adam@huggingface.co")         
-                        return
-
-                    # check if discord_user_id in dataframe:
-                    altered_member_id = "L" + str(member.id) + "L"
-                    if altered_member_id in global_df['discord_user_id'].values:
-
-                        hf_user_name = global_df.loc[global_df['discord_user_id'] == altered_member_id, 'hf_user_name'].iloc[0]
-
-                        if pd.isnull(hf_user_name) or hf_user_name == 'n/a':
-                            # empty (no link created yet between discord_user_id and hf_user_name) so we can update
-                            global_df.loc[global_df['discord_user_id'] == altered_member_id, 'hf_user_name'] = user['name']
-                            global_df.loc[global_df['discord_user_id'] == altered_member_id, 'verified_date'] = verified_date
-                            await member.add_roles(role)
-                            if role in member.roles:
-                                print(f"Updated hf_user_name for id {member.id} | discord_user_name {member} | hf_user_name {user['name']}")  
-                                await message.channel.send(f"Verification successful! [{member} <---> {user['name']}] 🤗 {org_link} {invite_message}")    
-                                await lunar.send(f"Verification successful! [{member} <---> {user['name']}] \n🤗 {org_link} {invite_message}")  
-                                print(f"Verification successful! [{member} <---> {user['name']}] 🤗")                                
-                            return                            
-                        else:
-                            await message.channel.send(f"The Discord account {member} is already verified! To change discord accounts or HF accounts, contact <@811235357663297546> or adam@huggingface.co")         
-                            await lunar.send(f"The Discord account {member} is already verified! To change discord accounts or HF accounts, contact <@811235357663297546> or adam@huggingface.co")         
-                            print(f"The Discord account {member} is already verified! To change discord accounts or HF accounts, contact <@811235357663297546> or adam@huggingface.co")
-                            return  
-                except Exception as e:
-                    print(f"verification Error: {e}")
-
-                    # -----------------------------------------------------------------------------------------
-                    # If creating new record (edge case)
-                    xp = 10
-                    discord_exp = "L10L"
-                    hub_exp = "L0L"
-                    total_exp = "L10L"
-                    current_level = calculate_level(xp)
-                    
-                    row_data = [altered_member_id, 
-                                member.name, 
-                                discord_exp, 
-                                current_level, 
-                                user['name'], 
-                                "L0L", 
-                                hub_exp, 
-                                total_exp,
-                                verified_date,
-                                likes,
-                                models,
-                                datasets,
-                                spaces,
-                                discussions,
-                                papers, 
-                                upvotes]
-                    
-                    global_df.loc[len(global_df.index)] = row_data 
-                    await member.add_roles(role)
-                    if role in member.roles: 
-                        print(f"New record created for {member}")
-                print("------------------------------------------------------------------------")                  
+                    "To verify your 🤗 account, generate a login link in the verification channel! "
+                )                    
         await bot.process_commands(message)
     except Exception as e:
         print(f"on_message Error: {e}")
@@ -860,6 +804,85 @@ def create_plot(username, year):
 
     return fig
 #-------------------------------------------------------------------------------------------------------------------------------
+async def add_verified_role_to_member(member, role):
+    await member.add_roles(role)
+
+
+def add_verified_role(member, role):
+    loop = asyncio.get_event_loop()
+    loop.run_until_complete(add_role_to_member(member, role))
+
+    
+async def send_lunar_verification_logs(lunar, member, username)
+    org_link = "https://huggingface.co/organizations/discord-community/share/wPKRAHYbAlaEaCxUxcqVyaaaeZcYagDvqc"
+    invite_message = "Click to join our community org on the HF Hub!"
+    await lunar.send(f"Verification successful! [{member} <---> {username}] \n🤗 {invite_message}\n{org_link} ")
+
+def send_lunar_verification_logs_def(lunar, member, username)
+    loop = asyncio.get_event_loop()
+    loop.run_until_complete(send_lunar_verification_logs(lunar, member, username))
+    
+def verify_button(profile: gr.OAuthProfile | None, request: gr.Request) -> str:
+    url_str = str(request.url)
+    query_params = parse_qs(urlparse(url_str).query)
+    user_id = query_params.get('user_id', [None])[0]
+    token = query_params.get('token', [None])[0]
+
+    print(f"||| token:{token}||| user_id:{user_id}||| profile:{profile}||| user_tokens:{user_tokens}")
+
+    if user_id is None or token is None:
+        return "# ❌ Invalid link. Generate a new link [here](https://discord.com/channels/879548962464493619/900125909984624713) !"
+        
+    if int(user_id) not in user_tokens or user_tokens[int(user_id)] != token:
+        return "# ❌ Invalid or expired link. Generate a new link [here](https://discord.com/channels/879548962464493619/900125909984624713) !"
+
+    if profile is None:
+        return f"# ❌ Not logged in with Hugging Face yet."
+
+    server = bot.get_guild(879548962464493619)
+    role = server.get_role(900063512829755413)
+    member = server.get_member(user_id)
+    verified_date = datetime.now().strftime("%m/%d/%Y, %H:%M:%S") 
+    likes = 0
+    models = 0
+    datasets = 0
+    spaces = 0
+    discussions = 0
+    papers = 0
+    upvotes = 0
+
+    # do they have the verified role already?
+    if role in member.roles:
+        return (f" ❌ {member} already has has the '{role}' role! To change discord accounts or HF accounts, contact @lunarflu on discord or adam@huggingface.co")         
+
+
+    # check if hf_user_name in dataframe:
+    if profile.username in global_df['hf_user_name'].values:
+        return (f"The HF account {profile.username} is already verified! To change discord accounts or HF accounts, contact @lunarflu or adam@huggingface.co")         
+
+    # check if discord_user_id in dataframe:
+    lunar = bot.get_user(811235357663297546)
+    altered_member_id = "L" + str(member.id) + "L"
+    if altered_member_id in global_df['discord_user_id'].values:
+
+        hf_user_name = global_df.loc[global_df['discord_user_id'] == altered_member_id, 'hf_user_name'].iloc[0]
+
+        if pd.isnull(hf_user_name) or hf_user_name == 'n/a':
+            # empty (no link created yet between discord_user_id and hf_user_name) so we can update
+            global_df.loc[global_df['discord_user_id'] == altered_member_id, 'hf_user_name'] = profile.username
+            global_df.loc[global_df['discord_user_id'] == altered_member_id, 'verified_date'] = verified_date
+            add_verified_role(member, role)
+            if role in member.roles:
+                print(f"Updated hf_user_name for id {member.id} | discord_user_name {member} | hf_user_name {user['name']}")  
+                return (f" ✅ Verification successful! [{member} <---> {profile.username}] 🤗\n{invite_message}\n{org_link} ")    
+                send_lunar_verification_logs_def(lunar, member, profile.username)  
+                print(f" ✅ Verification successful! [{member} <---> {profile.username}] 🤗")                                                          
+        else:
+            return (f" ❌ The Discord account {member} is already verified! To change discord accounts or HF accounts, contact @lunarflu or adam@huggingface.co")         
+            print(f"The Discord account {member} is already verified! To change discord accounts or HF accounts, contact @lunarflu or adam@huggingface.co")
+
+    # Remove the token after successful verification
+    del user_tokens[int(user_id)]
 
 
 demo = gr.Blocks()
@@ -898,6 +921,28 @@ with demo:
                     gr.Markdown("# 📈 How to earn Experience!")
                 with gr.Row():
                     gr.DataFrame(get_data2, every=5, interactive=False)
+            #------------------------------------------------------------------------------
+            with gr.TabItem(" Discord Verification", elem_id="verify-tab", id=2):
+                with gr.Row():
+                    login_button = gr.LoginButton()
+            m1 = gr.Markdown()
+            demo.load(verify_button, inputs=None, outputs=m1)
+
+            def check_login_status():
+                try:
+                    return login_button.get_session().get("oauth_info", None)
+                except AttributeError:
+                    return None
+        
+            def check_login_wrapper():
+                session = check_login_status()
+                if session is None:
+                    return "Not logged in."
+                else:
+                    return f"Logged in as {session.get('username', 'Unknown')}"
+        
+            login_button.click(check_login_wrapper, inputs=None, outputs=m1)            
+            #------------------------------------------------------------------------------                    
             with gr.TabItem("📈 Activity Heatmap", elem_id="activity-heatmap", id=1):
                 with gr.Row():
                     username_input = gr.Textbox(label="Enter Username")