Merge test start

app.py

@@ -83,8 +83,8 @@ async def on_ready():
         print(worksheet2_df.dtypes)
 
         # updates both leaderboards
-        await remove_huggingfolks() # to initialize
-        print(community_global_df_with_id)
+        #await remove_huggingfolks() # to initialize
+        #print(community_global_df_with_id)
         remove_huggingfolks.start()
         #await periodic_api_test()
         print(f"------------------------------------------------------------------------")
@@ -218,126 +218,151 @@ async def add_exp(member_id):
         # discord_user_id = string
 
         member_found = False
+
+        # discord_user_id column
         for index, cell_value in global_df.iloc[:, 0].items():
-            if cell_value == str(member_id):
-                # if found, update that row...
-                member_found = True
-                print(f"Record for {member} found at row {index + 1}, column 1")
+            
+            # remove L (read, so no need to replace)
+            # tldr; set_as_dataframe forces scientific notation which corrupts discord_user_id data.
+            # set_as_dataframe is still highly efficient (1 API call), so we format numerical data as strings,
+            # which results in efficient google sheet updating + data integrity
+            if cell_value.startswith("L") and cell_value.endswith("L"):
+                cell_value_clipped = cell_value[1:-1]
+                # cell_value_clipped = 1234567890
+                if cell_value_clipped == str(member_id): # is this needed?
+                    # if found, update that row...
+                    member_found = True
+                    print(f"Record for {member} found at row {index + 1}, column 1")
+            
+                    # increment the old experience value (better not to replace outright)
+                    old_xp = global_df.loc[index, 'discord_exp']
+                    # remove L (write, so we replace)
+                    if old_xp.startswith("L") and old_xp.endswith("L"):  
+                        old_xp = old_xp[1:-1]
+                    # str -> int temporarily
+                    new_xp = int(old_xp) + XP_PER_MESSAGE
+                    # check + convert back to string + google sheet proofing
+                    if not new_xp.startswith("L") and not new_xp.endswith("L"): 
+                        new_xp = f"L" + str(new_xp) + f"L"
+
+                    # add back to dataframe in memory after checking redundantly; 
+                    if new_xp.startswith("L") and new_xp.endswith("L"): 
+                        global_df.loc[index, 'discord_exp'] = new_xp # do not change column name
+                        print(f"Record for {member} updated from {old_xp} to {global_df.loc[index, 'discord_exp']} (+{XP_PER_MESSAGE}) ")
         
-                # increment the old experience value (better not to replace outright)
-                old_xp = global_df.loc[index, 'discord_exp']
-                new_xp = old_xp + XP_PER_MESSAGE
-                global_df.loc[index, 'discord_exp'] = new_xp # do not change column name
-                print(f"Record for {member} updated from {old_xp} to {global_df.loc[index, 'discord_exp']} (+{XP_PER_MESSAGE}) ")
-
-          
-                # level up
-                current_level = calculate_level(new_xp) 
-                verified_role = guild.get_role(900063512829755413)
-                
-                print(f"Current_level for {member}: {current_level}")
-                if current_level >= 2 and current_level <=30:
-                    current_role = lvls[current_level]
-                    if current_role not in member.roles: # if we leveled up
-
-                        # finding leaderboard rank + excluding huggingfolks 
-                        try:
-                            row = global_df[global_df['discord_user_id'] == str(member_id)]
-                            print(f"member id found")# does this need to be string?
-                            target_exp = row['discord_exp'].values[0]
-                            rank = (global_df['discord_exp'] > target_exp).sum() + 1
-                            print(f"The rank for discord_id {member_id} based on discord_exp is: {rank}")
-                        except Exception as e:
-                            print(f"Discord ID {member_id} not found in the DataFrame.") 
-                            rank = "🤗"
-
-                        # temporary fix: remove ~100 exp when not verified, send embed on "levelup" prompting to verify
-                        # if level 3 -> then send embed, remove some exp
-                        if current_level >= 3: # could change to 4 maybe
-                            if verified_role not in member.roles:       
-                                if new_xp % 50 == 0: # staggers messages so we don't send one every time exp is earned
-                                    # claim exp (-30 for level 3, but +100 as bonus exp. This scales infinitely until the member verifies,
-                                    # so they can continue earning exp, it just won't translate to levels and the leaderboard.
-                                    # This way they can claim at any time and get a big boost in levels!
-                                    claim_exp = new_xp + 70
-                                                         
-                                    # send embed 
-                                    embed = Embed(color=Color.red())
+                  
+                        # level up
+                        current_level = calculate_level(new_xp) 
+                        verified_role = guild.get_role(900063512829755413)
+                        
+                        print(f"Current_level for {member}: {current_level}")
+                        if current_level >= 2 and current_level <=30:
+                            current_role = lvls[current_level]
+                            if current_role not in member.roles: # if we leveled up
+        
+                                # finding leaderboard rank + excluding huggingfolks 
+                                try:
+                                    # cell_value = L1234567890L
+                                    # make copy
+                                    # remove L
+                                    # do calculations
+                                    copy_df = global_df.copy()
+                                    copy_df['discord_user_id'] = copy_df['discord_user_id'].str.strip('L').astype(str)
+                                    copy_df['discord_exp'] = copy_df['discord_exp'].str.strip('L').astype(int)
+                                    row = copy_df[copy_df['discord_user_id'] == str(member_id)]
+                                    print(f"Row found for {member_id}!")
+                                    target_exp = row['discord_exp'].values[0]
+                                    rank = (copy_df['discord_exp'] > target_exp).sum() + 1
+                                    print(f"The rank for discord_id {member_id} based on discord_exp is: {rank}")
+                                except Exception as e:
+                                    print(f"Discord ID {member_id} not found in the DataFrame.") 
+                                    rank = "🤗"
+        
+                                # temporary fix: remove ~100 exp when not verified, send embed on "levelup" prompting to verify
+                                # if level 3 -> then send embed, remove some exp
+                                if current_level >= 3: # could change to 4 maybe
+                                    if verified_role not in member.roles:       
+                                        if new_xp % 50 == 0: # staggers messages so we don't send one every time exp is earned
+                                            # claim exp (-30 for level 3, but +100 as bonus exp. This scales infinitely until the member verifies,
+                                            # so they can continue earning exp, it just won't translate to levels and the leaderboard.
+                                            # This way they can claim at any time and get a big boost in levels!
+                                            claim_exp = new_xp + 70
+                                                                 
+                                            # send embed 
+                                            embed = Embed(color=Color.red())
+                                            embed.set_author(name=f"{member}", icon_url=member.avatar.url if member.avatar else bot.user.avatar.url)
+                                            embed.title = f"⚠️Your account is not Verified! Unable to level up `{current_level-1}` -> `{current_level}` ❌"
+                                            msg = f'🤗 Hey {member}! You can continue leveling up in the Hugging Face Discord server by Verifying your account, and claim `{claim_exp}` bonus exp points!'
+                                            embed.description = f"{msg}"
+                                            verification_link = "https://discord.com/channels/879548962464493619/900125909984624713"
+                                            embed.add_field(name="Verify Here:", value=verification_link, inline=True)
+                                            u_1 = f"👑 Earn exp for activity on Discord and HF and climb the ⁠leaderboard !"
+                                            u_2 = f"🌎 Feature your content in weekly news and increase its visibility!"
+                                            u_3 = f"🚀 Early access to Beta features!"
+                                            u_4 = f"🛡️ Secure your progress, and restore if needed!"
+                                            embed.add_field(name="You can Unlock:", value=f"{u_1}\n{u_2}\n{u_3}\n{u_4}", inline=True)
+                                            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)  
+                                            print(f"Sent verification cap embed to {member}")
+                                            return
+                                    
+                                    
+                                # increment the old level value (better to replace outright)
+                                # only increment level column if you are lvl2 or 3+ with verified role
+                                global_df.loc[index, 'discord_level'] = current_level # do not change column name  
+                                
+                                await member.add_roles(current_role)
+                                print(f"Level Up! Gave {member} {current_role}")
+                                await member.remove_roles(lvls[current_level-1])
+                                print(f"Removed {lvls[current_level-1]} from {member}")  
+                                #print(f"{member} Level up! {current_level-1} -> {current_level}!")
+                                if current_role in member.roles: # needs update; reference exp reward for verification
+                                    #await member.send(f"Level up! {current_level-1} -> {current_level}!")  
+                                    #if member_id == 811235357663297546:
+        
+        
+                                    # send embed
+                                    embed = Embed(color=Color.blue())
                                     embed.set_author(name=f"{member}", icon_url=member.avatar.url if member.avatar else bot.user.avatar.url)
-                                    embed.title = f"⚠️Your account is not Verified! Unable to level up `{current_level-1}` -> `{current_level}` ❌"
-                                    msg = f'🤗 Hey {member}! You can continue leveling up in the Hugging Face Discord server by Verifying your account, and claim `{claim_exp}` bonus exp points!'
-                                    embed.description = f"{msg}"
+                                    embed.title = f"Level Up! `{current_level-1}` -> `{current_level}`"
+                                    msg = f'🤗 Congrats {member}! You just leveled up in the Hugging Face Discord server'
+                                    embed.description = f"{msg}."
+                                    embed.add_field(name="Leaderboard Ranking:", value=f"👑 **{rank}**\n\nhttps://discord.com/channels/879548962464493619/1197143964994773023", inline=True)
+                                    # can use ^ to track changes in leaderboard ranking and display in levelup message when climbing
+                                    # (green red arrow thingies)
+                                    # could also pull ranks above and below yourself (if they exist, i.e.)
+                                    # 1 nateraw
+                                    # 2 [you are here]
+                                    # 3 osanseviero
+                                    # also, ahead by how much exp, how many levels maybe
+                                    msg3 = "- Posting\n- Reacting / being reacted to\n- Being active on the Hugging Face Hub (verify to link your Hub + Discord accounts!)"
+                                    embed.add_field(name="How to Level Up:", value=msg3, inline=True)
                                     verification_link = "https://discord.com/channels/879548962464493619/900125909984624713"
                                     embed.add_field(name="Verify Here:", value=verification_link, inline=True)
-                                    u_1 = f"👑 Earn exp for activity on Discord and HF and climb the ⁠leaderboard !"
-                                    u_2 = f"🌎 Feature your content in weekly news and increase its visibility!"
-                                    u_3 = f"🚀 Early access to Beta features!"
-                                    u_4 = f"🛡️ Secure your progress, and restore if needed!"
-                                    embed.add_field(name="You can Unlock:", value=f"{u_1}\n{u_2}\n{u_3}\n{u_4}", inline=True)
-                                    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)  
-                                    print(f"Sent verification cap embed to {member}")
-                                    return
-                            
-                            
-                        # increment the old level value (better to replace outright)
-                        # only increment level column if you are lvl2 or 3+ with verified role
-                        global_df.loc[index, 'discord_level'] = current_level # do not change column name  
-                        
-                        await member.add_roles(current_role)
-                        print(f"Level Up! Gave {member} {current_role}")
-                        await member.remove_roles(lvls[current_level-1])
-                        print(f"Removed {lvls[current_level-1]} from {member}")  
-                        #print(f"{member} Level up! {current_level-1} -> {current_level}!")
-                        if current_role in member.roles: # needs update; reference exp reward for verification
-                            #await member.send(f"Level up! {current_level-1} -> {current_level}!")  
-                            #if member_id == 811235357663297546:
-
-
-                            # send embed
-                            embed = Embed(color=Color.blue())
-                            embed.set_author(name=f"{member}", icon_url=member.avatar.url if member.avatar else bot.user.avatar.url)
-                            embed.title = f"Level Up! `{current_level-1}` -> `{current_level}`"
-                            msg = f'🤗 Congrats {member}! You just leveled up in the Hugging Face Discord server'
-                            embed.description = f"{msg}."
-                            embed.add_field(name="Leaderboard Ranking:", value=f"👑 **{rank}**\n\nhttps://discord.com/channels/879548962464493619/1197143964994773023", inline=True)
-                            # can use ^ to track changes in leaderboard ranking and display in levelup message when climbing
-                            # (green red arrow thingies)
-                            # could also pull ranks above and below yourself (if they exist, i.e.)
-                            # 1 nateraw
-                            # 2 [you are here]
-                            # 3 osanseviero
-                            # also, ahead by how much exp, how many levels maybe
-                            msg3 = "- Posting\n- Reacting / being reacted to\n- Being active on the Hugging Face Hub (verify to link your Hub + Discord accounts!)"
-                            embed.add_field(name="How to Level Up:", value=msg3, inline=True)
-                            verification_link = "https://discord.com/channels/879548962464493619/900125909984624713"
-                            embed.add_field(name="Verify Here:", value=verification_link, inline=True)
-
-                            lunar = bot.get_user(811235357663297546)
-                            await member.send(embed=embed)                           
-                            print(f"Sent levelup embed to {member}")
-                            #You can verify your account to earn 100 points! To verify, do A.                            
+                                    await member.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, create new record
-            print(f"creating new record for {member}")            
+            print(f"Creating new record for {member}")            
             
             xp = 10 # define somewhere else?
+            if not xp.startswith("L") and not xp.endswith("L"): 
+                xp = f"L" + str(xp) + f"L"            
             member_id = str(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)
             current_level = calculate_level(xp)
             row_data = [member_id, member_name, xp, current_level]
-            global_df.loc[len(global_df.index)] = row_data 
-            
-            # initial role assignment
-            if current_level == 1:
-                if lvl1 not in member.roles:
-                    await member.add_roles(lvl1)
-                    print(f"Gave {member} {lvl1}")  # can log this better       
+            global_df.loc[len(global_df.index)] = row_data      
             print(f"------------------------------------------------------------------------")
     except Exception as e:
         print(f"add_exp Error: {e}")