test merge

app.py

@@ -17,6 +17,8 @@ import gspread
 import numpy as np
 import pandas as pd
 import requests
+
+from requests import HTTPError
 from apscheduler.executors.pool import ThreadPoolExecutor
 from apscheduler.schedulers.background import BackgroundScheduler
 from discord import Color, Embed
@@ -46,6 +48,7 @@ with open(file_path, 'w') as json_file:
 gspread_bot = gspread.service_account(filename='service_account.json')
 worksheet = gspread_bot.open("levelbot").sheet1
 worksheet2 = gspread_bot.open("hf_discord_verified_users_test").sheet1
+test_merge_worksheet = gspread_bot.open("levelbot").sheet1
 """"""
 bot_ids = [1136614989411655780, 1166392942387265536, 1158038249835610123, 1130774761031610388, 1155489509518098565, 1155169841276260546, 1152238037355474964, 1154395078735953930]
 """"""
@@ -57,6 +60,7 @@ worksheet2_df = pd.DataFrame()
 print(type(global_df))
 community_global_df = pd.DataFrame() 
 community_global_df_with_id = pd.DataFrame()
+test_merge = pd.read_csv("https://docs.google.com/spreadsheets/d/1C8aLqgCqLYcMiIFf-P_Aosaa03C_WLIB_UyqvjSdWg8/export?format=csv&gid=0")
 data = pd.read_csv("https://docs.google.com/spreadsheets/d/1hQSsIg1Y9WdBF_CdNM1L1rUUREoxKqRTe3_ILo-WK8w/export?format=csv&gid=0")
 data2 = pd.read_csv("https://docs.google.com/spreadsheets/d/1T_twNONDSZ8zw7aDcYhw92DlawqPktti1xFw9ssJ13Y/export?format=csv&gid=0")
 
@@ -71,12 +75,9 @@ async def on_ready():
         print(f"XP_PER_MESSAGE: {XP_PER_MESSAGE}")
     
         """import data from google sheets -> HF Space df (doesn't make API call this way, as it's read-only)""" 
-        data['discord_user_id'] = data['discord_user_id'].astype(str)
-        global_df = data
+        global_df = test_merge
         print(f"csv successfully retrieved: \n {global_df}")
 
-
-
         worksheet2_df = data2.copy()
         worksheet2_df['discord_user_id'] = worksheet2_df['discord_user_id'].astype(str)
         worksheet2_df['id_recover_test'] = worksheet2_df['id_recover_test'].astype(str)  
@@ -93,19 +94,15 @@ async def on_ready():
 
 
 def update_google_sheet():
-    """save data from HF Space -> google sheets (makes 2 API calls)"""
+    """save data from HF Space -> google sheets (makes 1 API call)"""
     try:
         print("Updating google sheets...")
         print(f"------------------------------------------------------------------------")
-        name = "levelbot"
-        #worksheet = gspread_bot.open(name).sheet1
-        global_df['discord_user_id'] = global_df['discord_user_id'].astype(str)
-        global_df['discord_exp'] = global_df['discord_exp'].astype(str)
-        # could just do this / format
-        set_with_dataframe(worksheet, global_df)
+        name = "test_merge_worksheet"
+        set_with_dataframe(test_merge_worksheet, global_df)
         timestamp = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
         print(f"------------------------------------------------------------------------")
-        print(f"Google sheet {name} successfully updated at {timestamp}! \n{global_df}")
+        print(f"Google sheet {name} {test_merge_worksheet} successfully updated at {timestamp}! \n{global_df}")
         print(f"------------------------------------------------------------------------")
     except Exception as e:
         print(f"update_google_sheet Error: {e}")
@@ -374,7 +371,7 @@ async def add_exp(member_id):
                                         embed.set_image(url='https://cdn.discordapp.com/attachments/1150399343912833024/1205537451242688573/download_1.png?ex=65d8bb3e&is=65c6463e&hm=042fe7dd3521887db0bd48eeb846de1cc7c75194f9e95215c23512ff61ea3475&')
                                         
                                         lunar = bot.get_user(811235357663297546)
-                                        await member.send(embed=embed)  
+                                        #await member.send(embed=embed)  
                                         await lunar.send(embed=embed)  
                                         print(f"Sent verification cap embed to {member}")
                                         print(f"------------------------------------------------------------------------")
@@ -424,14 +421,14 @@ async def add_exp(member_id):
                                     embed.add_field(name="Verify Here:", value=verification_link, inline=True)
         
                                     lunar = bot.get_user(811235357663297546)
-                                    await member.send(embed=embed)
+                                    #await member.send(embed=embed)
                                     await lunar.send(embed=embed)  
                                     print(f"Sent levelup embed to {member}")
                                     #You can verify your account to earn 100 points! To verify, do A.                            
 
                             
                     print(f"------------------------------------------------------------------------")
-        if not member_found:
+        if not member_found: # this only checks if discord_user_id (with L) is present in discord_user_id column, 
             # if not, create new record
             print(f"Creating new record for {member}")            
             
@@ -444,11 +441,14 @@ async def add_exp(member_id):
             if not member_id.startswith("L") and not member_id.endswith("L"): 
                 member_id = f"L" + str(member_id) + f"L"
             member_name = str(member.name)
-            hub_user_name = ""
+            hf_user_name = "n/a"
             hub_exp = "L0L"
             total_exp = xp
-            row_data = [member_id, member_name, xp, current_level, hub_user_name, hub_exp, total_exp]
-            global_df.loc[len(global_df.index)] = row_data      
+            verified_date = "n/a"
+
+            row_data = [member_id, member_name, xp, current_level, hf_user_name, hub_exp, total_exp, verified_date]
+            global_df.loc[len(global_df.index)] = row_data  
+
             print(f"------------------------------------------------------------------------")
     except Exception as e:
         print(f"add_exp Error: {e}")   
@@ -456,12 +456,101 @@ async def add_exp(member_id):
 
 @bot.event
 async def on_message(message):
+    global global_df
     try:
         if message.author.id not in bot_ids: # could change to if author does not have bot role (roleid)
-            if "!help_xp" not in message.content:
-                print(f"adding exp from message {message.author}")
-                await asyncio.sleep(0.1)
-                await add_exp(message.author.id)
+            print(f"adding exp from message {message.author}")
+            await asyncio.sleep(0.1)
+            await add_exp(message.author.id)
+            # add check for verification
+            # could add !help to bot description
+
+            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("Error occured when trying to authenticate. Likely invalid API Token.")
+                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") 
+                    # 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 [email protected]")         
+                        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 [email protected]")         
+                        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 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
+                            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']}] 🤗")    
+                            await lunar.send(f"Verification successful! [{member} <---> {user['name']}] 🤗")  
+                            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 [email protected]")         
+                            await lunar.send(f"The Discord account {member} is already verified! To change discord accounts or HF accounts, contact <@811235357663297546> or [email protected]")         
+                            print(f"The Discord account {member} is already verified! To change discord accounts or HF accounts, contact <@811235357663297546> or [email protected]")
+                            return                     
+
+                    # -----------------------------------------------------------------------------------------
+                    xp = 10
+                    current_level = calculate_level(xp)
+                    xp = str(xp)
+                    if not xp.startswith("L") and not xp.endswith("L"): 
+                        xp = f"L" + str(xp) + f"L"            
+                    hub_exp = "L0L"
+                    total_exp = xp
+                    
+                    row_data = [altered_member_id, 
+                                member.name, 
+                                xp, 
+                                current_level, 
+                                user['name'], 
+                                "L0L", 
+                                xp, 
+                                verified_date]
+                    
+                    global_df.loc[len(global_df.index)] = row_data 
+                    await member.add_roles(role)
+                    print(f"New record created for ")
+                  
         await bot.process_commands(message)
     except Exception as e:
         print(f"on_message Error: {e}")
@@ -507,6 +596,7 @@ async def remove_huggingfolks():
         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)
         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')