enhancing tectics

app.py

@@ -84,6 +84,15 @@ class DMButton(Button):
         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) #  
+
+
 def generate_unique_string(length=6):
     return secrets.token_hex(length // 2)
 
@@ -122,7 +131,7 @@ async def on_ready():
 
         # updates both leaderboards
         remove_huggingfolks.start()
-
+        give_verified_roles.start()
         print("------------------------------------------------------------------------")
     except Exception as e:
         print(f"on_ready Error: {e}")
@@ -208,7 +217,26 @@ def update_hub_stats():
     print(f"Hub stats successfully updated at {timestamp}! \n{global_df}")
     print("------------------------------------------------------------------------")
 
-                 
+
+@tasks.loop(minutes=1)
+async def give_verified_roles():
+    global global_df
+    guild = bot.get_guild(879548962464493619)
+    role = guild.get_role(900063512829755413)
+    await guild.chunk()
+    for index, row in global_df.iterrows():
+        hf_user_name = row['hf_user_name']
+        if pd.notna(hf_user_name) and hf_user_name.lower() != 'n/a':
+            discord_id = row['discord_user_id'].strip('L')
+            member = guild.get_member(int(discord_id))
+            if not member:
+                continue
+            if role not in member.roles:
+                await member.add_roles(role)
+                lunar = bot.get_user(811235357663297546)
+                await lunar.send(f"Verified role given to {member}!") 
+                
+        
 thread_pool_executor = ThreadPoolExecutor(max_workers=2)
 asyncio_executor = AsyncIOExecutor()
 scheduler = BackgroundScheduler(executors={
@@ -216,6 +244,7 @@ scheduler = BackgroundScheduler(executors={
 })
 scheduler.add_job(update_google_sheet, trigger='interval', minutes=1, max_instances=2, executor='default')
 scheduler.add_job(update_hub_stats, trigger='interval', minutes=1.5, max_instances=2, executor='default')
+#scheduler.add_job(give_verified_roles, trigger='interval', minutes=1, max_instances=1, executor='asyncio')
 scheduler.start()
 #asyncio.get_event_loop().run_forever()
 
@@ -554,67 +583,65 @@ def format_hyperlink(username):
     return f'<a target="_blank" href="https://huggingface.co/{username}" style="color: var(--link-text-color);">{username}</a>'
 
 
-
-@tasks.loop(minutes=10)
+@tasks.loop(minutes=1)
 async def remove_huggingfolks():
     try:
+        # remove huggingfolks
+        global community_global_df
+        global community_global_df_with_id   
+        global community_global_df_gradio
+
+        community_global_df = global_df.copy()
+        
         guild = bot.get_guild(879548962464493619)
         role = discord.utils.get(guild.roles, id=897376942817419265)
-        await guild.chunk()
         members_with_role = [member.id for member in guild.members if role in member.roles]
 
-        top_num_rows = await asyncio.to_thread(_remove_huggingfolks_sync, members_with_role)
+        # remove L formatting (doesn't affect main global_df)
+        community_global_df['discord_user_id'] = community_global_df['discord_user_id'].str.strip('L').astype(str)
+        
+        for member_id in members_with_role:
+            community_global_df = community_global_df[community_global_df.iloc[:, 0] != str(member_id)]
+
+        # make a copy while discord id column still exists -> use for rank in discord embeds
+        community_global_df_with_id = community_global_df_with_id.copy()
+
+        # reorder (switching from discord_user_name to hf_user_name)
+        reorder = ['discord_user_id', 'hf_user_name', 'discord_exp','discord_level', 'discord_user_name', 'hub_exp', 'total_exp', 'verified_date']
+        community_global_df = community_global_df[reorder]
+
+        # drop first column (discord id -> this is so we can display the important stuff in the leaderboard)
+        community_global_df.drop(community_global_df.columns[0], axis=1, inplace=True)
+        community_global_df.drop(community_global_df.columns[1], axis=1, inplace=True)
+        community_global_df.drop(community_global_df.columns[2], axis=1, inplace=True)
+        community_global_df.drop(community_global_df.columns[2], axis=1, inplace=True)
+        community_global_df.drop(community_global_df.columns[3], axis=1, inplace=True)
+        # drop rows (records) where hf_user_name does not exist (we display only verified users)
+        community_global_df = community_global_df.dropna(subset=['hf_user_name'])
+        community_global_df['total_exp'] = community_global_df['total_exp'].str.strip('L').astype(int)
+        community_global_df['total_exp'] = pd.to_numeric(community_global_df['total_exp'], errors='coerce').fillna(0).astype(int)
+        community_global_df = community_global_df.nlargest(len(community_global_df), 'total_exp')  
+        # add profile hyperlinks to gradio demo
+        community_global_df_gradio = community_global_df.copy() # must be a COPY, otherwise it adds a new name for the same dataframe.
+        community_global_df_gradio['hf_user_name'] = community_global_df_gradio['hf_user_name'].apply(format_hyperlink)
+
+        top_num = 30
+        top_num_exp = community_global_df.nlargest(top_num, 'total_exp')
+        
+        top_num_exp['D'] = ['🥇','🥈','🥉'] + [''] * (top_num - 3)
+        top_num_rows = top_num_exp.values.tolist()
 
+        #print(top_30_rows)
         channel = bot.get_channel(1197143964994773023)
         message = await channel.fetch_message(1197148293164187678)
 
+        # put into message / leaderboard
         new_table = tabulate(top_num_rows, headers=["Name", "Level", "Experience", "Rank"], tablefmt="plain")
         await message.edit(content=f"Updated Leaderboard:\n```\n{new_table}\n```")
         print("Updated discord leaderboard!")
-        print("------------------------------------------------------------------------")
+        print("------------------------------------------------------------------------")        
     except Exception as e:
-        print(f"remove_huggingfolks Error: {e}")
-
-
-def _remove_huggingfolks_sync(members_with_role):
-    global community_global_df
-    global community_global_df_with_id
-    global community_global_df_gradio
-
-
-    community_global_df = global_df.copy()
-
-    community_global_df['discord_user_id'] = community_global_df['discord_user_id'].str.strip('L').astype(str)
-
-    for member_id in members_with_role:
-        community_global_df = community_global_df[community_global_df['discord_user_id'] != str(member_id)]
-
-    community_global_df_with_id = community_global_df.copy()
-
-    reorder = ['discord_user_id', 'hf_user_name', 'discord_exp', 'discord_level', 'discord_user_name', 'hub_exp', 'total_exp', 'verified_date']
-    community_global_df = community_global_df[reorder]
-
-    community_global_df.drop(community_global_df.columns[0], axis=1, inplace=True)
-    community_global_df.drop(community_global_df.columns[1], axis=1, inplace=True)
-    community_global_df.drop(community_global_df.columns[2], axis=1, inplace=True)
-    community_global_df.drop(community_global_df.columns[2], axis=1, inplace=True)
-    community_global_df.drop(community_global_df.columns[3], axis=1, inplace=True)
-    
-    # drop rows (records) where hf_user_name does not exist (we display only verified users)
-    community_global_df = community_global_df.dropna(subset=['hf_user_name'])
-    community_global_df['total_exp'] = community_global_df['total_exp'].str.strip('L').astype(int)
-    community_global_df['total_exp'] = pd.to_numeric(community_global_df['total_exp'], errors='coerce').fillna(0).astype(int)
-    community_global_df = community_global_df.nlargest(len(community_global_df), 'total_exp')  
-
-    community_global_df_gradio = community_global_df.copy()
-    community_global_df_gradio['hf_user_name'] = community_global_df_gradio['hf_user_name'].apply(format_hyperlink)
-
-    top_num = 30
-    top_num_exp = community_global_df.head(top_num).copy()
-    top_num_exp['Rank'] = ['🥇', '🥈', '🥉'] + [''] * (top_num - 3)
-    top_num_rows = top_num_exp.values.tolist()
-    return top_num_rows
-
+        print(f"remove_huggingfolks Error: {e}") 
 
 
 @bot.command(name='xp_help')
@@ -624,7 +651,34 @@ async def xp_help(ctx):
         await ctx.author.send(help_message)
     except Exception as e:
         print(f"xp_help Error: {e}")
-  
+        
+
+@bot.command()
+async def count_users_with_role(ctx, role_id):
+    role = discord.utils.get(ctx.guild.roles, id=int(role_id))
+    count = sum(1 for member in ctx.guild.members if role in member.roles)
+    await ctx.send(f"Number of users with the role '{role.name}': {count}")
+
+
+@bot.command()
+async def send_hub_org_dm_retroactive(ctx, role_id):
+    if ctx.author.id == 811235357663297546:
+        lunar = bot.get_user(811235357663297546)
+        role = discord.utils.get(ctx.guild.roles, id=int(role_id))
+        # for every person with this role
+        # dm them message with link
+        if role:
+            for member in role.members:
+                try:
+                    dm_message = f"Hey {member}! You've just been invited to join the Hugging Face Discord Community org! 🤗\n If you're interested in collaborating on open source projects, hanging out with the community or just enjoying your new badge, we're happy to have you! ❤️ https://huggingface.co/organizations/discord-community/share/wPKRAHYbAlaEaCxUxcqVyaaaeZcYagDvqc"
+                    await member.send(dm_message)
+                    await lunar.send(dm_message)
+                    await asyncio.sleep(5)
+                except discord.Forbidden:
+                    print(f"Could not DM {member.name}")
+                    await lunar.send(f"Could not DM {member.name} a Hugging Face Org invite link")
+
+    
 
 DISCORD_TOKEN = os.environ.get("DISCORD_TOKEN", None)
 def run_bot():
@@ -648,48 +702,7 @@ def get_data2():
         display_df = pd.DataFrame(display_data) 
         return display_df
     except Exception as e:
-        print(f"get_data2 Error: {e}")    
-
-
-@bot.event
-async def on_member_join(member):
-    try:
-        # Check if the member already has a record
-        global global_df
-        member_id = f"L{member.id}L"  # Ensure consistent formatting with the database
-        if member_id not in global_df['discord_user_id'].values:
-            # Create a new row for the user
-            print(f"Creating new record for {member}")
-            xp = 0  # Start with zero XP
-            current_level = calculate_level(xp)
-            xp = f"L{xp}L"
-            member_name = member.name
-            hf_user_name = "n/a"
-            hub_exp = "L0L"
-            total_exp = xp
-            verified_date = "n/a"
-
-            # Initialize additional columns for the new row
-            likes = 0
-            models = 0
-            datasets = 0
-            spaces = 0
-            discussions = 0
-            papers = 0
-            upvotes = 0
-
-            row_data = [
-                member_id, member_name, xp, current_level, hf_user_name, hub_exp,
-                total_exp, verified_date, likes, models, datasets, spaces, discussions,
-                papers, upvotes
-            ]
-            global_df.loc[len(global_df.index)] = row_data  # Add the new row
-
-            print(f"Added new user {member.name} with ID {member.id} to the database.")
-        else:
-            print(f"User {member.name} with ID {member.id} already exists in the database.")
-    except Exception as e:
-        print(f"Error adding new member {member}: {e}")
+        print(f"get_data2 Error: {e}")      
 
 
 #-------------------------------------------------------------------------------------------------------------------------------
@@ -889,27 +902,6 @@ with demo:
         TITLE = """<h1 align="center" id="space-title">🤗 Hugging Face Level Leaderboard</h1>"""
         gr.HTML(TITLE)
         with gr.Tabs(elem_classes="tab-buttons") as tabs:
-            #------------------------------------------------------------------------------
-            with gr.TabItem("✅ Discord Verification", elem_id="verify-tab", id=2):
-                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("🏅 Level leaderboard", elem_id="level-table", id=0):
                 #gr.Markdown("# 📈 Experience Leaderboard")
                 with gr.Row():
@@ -929,7 +921,27 @@ with demo:
                 with gr.Row():
                     gr.Markdown("# 📈 How to earn Experience!")
                 with gr.Row():
-                    gr.DataFrame(get_data2, every=5, interactive=False)            
+                    gr.DataFrame(get_data2, every=5, interactive=False)
+            #------------------------------------------------------------------------------
+            with gr.TabItem("✅ Discord Verification", elem_id="verify-tab", id=2):
+                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():