misc cleanup

app.py

@@ -1,20 +1,13 @@
 import asyncio
-import csv
 import datetime
 import json
-import logging
 import os
 import os.path
-import random
-import re
 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
 
@@ -23,20 +16,15 @@ from apscheduler.executors.pool import ThreadPoolExecutor
 from apscheduler.schedulers.background import BackgroundScheduler
 from discord import Color, Embed
 from discord.ext import commands, tasks
-from gradio_client import Client
-from gspread_dataframe import get_as_dataframe, set_with_dataframe
-from gspread_formatting.dataframe import format_with_dataframe
-from huggingface_hub import HfApi, list_liked_repos, list_metrics, list_models
+from gspread_dataframe import set_with_dataframe
+from huggingface_hub import HfApi
 from tabulate import tabulate
-from datetime import datetime
+
 
 DISCORD_TOKEN = os.environ.get("DISCORD_TOKEN", None)
 intents = discord.Intents.all() 
 bot = commands.Bot(command_prefix='!', intents=intents)
 
-#logger = logging.getLogger(__name__)
-#logging.basicConfig(level=logging.DEBUG)
-
 
 """"""
 XP_PER_MESSAGE = 10 # 100k messages = 1M exp = lvl 100
@@ -53,14 +41,13 @@ bot_ids = [1136614989411655780, 1166392942387265536, 1158038249835610123, 113077
 """"""
 api = HfApi()
 """"""
-#csv_file = 'data.csv'
 global_df = pd.DataFrame()
 print(type(global_df))
 community_global_df = pd.DataFrame() 
 community_global_df_with_id = pd.DataFrame()
 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")
-data = pd.read_csv("https://docs.google.com/spreadsheets/d/1hQSsIg1Y9WdBF_CdNM1L1rUUREoxKqRTe3_ILo-WK8w/export?format=csv&gid=0")
+
 
 @bot.event
 async def on_ready():
@@ -76,7 +63,7 @@ async def on_ready():
 
         # updates both leaderboards
         remove_huggingfolks.start()
-        print(f"------------------------------------------------------------------------")
+        print("------------------------------------------------------------------------")
     except Exception as e:
         print(f"on_ready Error: {e}")
 
@@ -85,13 +72,13 @@ def update_google_sheet():
     """save data from HF Space -> google sheets (makes 1 API call)"""
     try:
         print("Updating google sheets...")
-        print(f"------------------------------------------------------------------------")
+        print("------------------------------------------------------------------------")
         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("------------------------------------------------------------------------")
         print(f"Google sheet {name} {test_merge_worksheet} successfully updated at {timestamp}! \n{global_df}")
-        print(f"------------------------------------------------------------------------")
+        print("------------------------------------------------------------------------")
     except Exception as e:
         print(f"update_google_sheet Error: {e}")
 
@@ -100,7 +87,7 @@ def update_hub_stats():
     try:
         global global_df
         print("Updating hub stats...")
-        print(f"------------------------------------------------------------------------")
+        print("------------------------------------------------------------------------")
 
         for index, row in global_df.iterrows():
             user = row['hf_user_name']
@@ -133,7 +120,7 @@ def update_hub_stats():
 
                         total_hub_activity = likes + models + datasets + spaces + discussions + papers + upvotes
                         total_hub_exp = total_hub_activity * 20 #2x better than discord
-                        total_hub_exp_string = f"L" + str(total_hub_exp) + f"L"
+                        total_hub_exp_string = "L" + str(total_hub_exp) + "L"
 
                         # hub exp
                         global_df.loc[index, 'hub_exp'] = total_hub_exp_string
@@ -142,7 +129,7 @@ def update_hub_stats():
                         discord_exp = row['discord_exp']
                         discord_exp_int = discord_exp.strip('L')
                         total_exp = int(discord_exp_int) + int(total_hub_exp)
-                        total_exp_string = f"L" + str(total_exp) + f"L"
+                        total_exp_string = "L" + str(total_exp) + "L"
                         global_df.loc[index, 'total_exp'] = total_exp_string
 
                         # level
@@ -159,9 +146,9 @@ def update_hub_stats():
     except Exception as e:
         print(f"Failed to parse data for user {user}. {e}")
     timestamp = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-    print(f"------------------------------------------------------------------------")
+    print("------------------------------------------------------------------------")
     print(f"Hub stats successfully updated at {timestamp}! \n{global_df}")
-    print(f"------------------------------------------------------------------------")
+    print("------------------------------------------------------------------------")
         
 executor = ThreadPoolExecutor(max_workers=2)
 scheduler = BackgroundScheduler(executors={'default': executor})
@@ -292,7 +279,7 @@ async def add_exp(member_id):
 
                     # set old level; use this for more accurate logging and jumping multiple levels at once (for example, verifying)
                     old_total_xp = int(total_exp)
-                    old_level = calculate_level(old_total_xp)                    
+                    #old_level = calculate_level(old_total_xp)                    
 
                     # check if hub exp not empty
                     if hub_xp.strip():  
@@ -306,13 +293,13 @@ async def add_exp(member_id):
                     # convert back to string + google sheet proofing
                     new_xp = str(new_xp)
                     if not new_xp.startswith("L") and not new_xp.endswith("L"): 
-                        new_xp = f"L" + str(new_xp) + f"L"
+                        new_xp = "L" + str(new_xp) + "L"
                     global_df.loc[index, 'discord_exp'] = new_xp # do not change column name
 
                     # after
                     total_exp = str(total_exp)
                     if not total_exp.startswith("L") and not total_exp.endswith("L"): 
-                        total_exp = f"L" + str(total_exp) + f"L" 
+                        total_exp = "L" + str(total_exp) + "L" 
                     
                     # add back to dataframe in memory after checking redundantly; 
                     if total_exp.startswith("L") and total_exp.endswith("L"): 
@@ -340,7 +327,7 @@ async def add_exp(member_id):
                                     rank = (copy_df['total_exp'] > target_exp).sum() + 1
                                     print(f"The rank for {member} based on total_exp is: {rank}")
                                 except Exception as e:
-                                    print(f"Discord ID {member} {member_id} not found in the DataFrame.") 
+                                    print(f"Discord ID {member} {member_id} not found in the DataFrame. {e}") 
                                     rank = "🤗"
         
                                 # if level 3 -> then send embed, remove some exp
@@ -365,18 +352,18 @@ async def add_exp(member_id):
                                             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!"
+                                            u_1 = "👑 Earn exp for activity on Discord and HF and climb the ⁠leaderboard !"
+                                            u_2 = "🌎 Feature your content in weekly news and increase its visibility!"
+                                            u_3 = "🚀 Early access to Beta features!"
+                                            u_4 = "🛡️ 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)  
                                             await lunar.send(embed=embed)  
-                                            print(f"Sent verification cap embed to {member}")
-                                            print(f"------------------------------------------------------------------------")
+                                            print("Sent verification cap embed to {member}")
+                                            print("------------------------------------------------------------------------")
                                             return
                                     
                                 # increment the old level value (better to replace outright)
@@ -430,7 +417,7 @@ async def add_exp(member_id):
                                     await member.send(embed=embed)
                                     await lunar.send(embed=embed)  
                                     print(f"Sent levelup embed to {member}")                                    
-                    print(f"------------------------------------------------------------------------")
+                    print("------------------------------------------------------------------------")
         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}")            
@@ -439,10 +426,10 @@ async def add_exp(member_id):
             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"            
+                xp = "L" + str(xp) + "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_id = "L" + str(member_id) + "L"
             member_name = str(member.name)
             hf_user_name = "n/a"
             hub_exp = "L0L"
@@ -461,7 +448,7 @@ async def add_exp(member_id):
             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  
 
-            print(f"------------------------------------------------------------------------")
+            print("------------------------------------------------------------------------")
     except Exception as e:
         print(f"add_exp Error: {e}")   
 
@@ -487,7 +474,7 @@ async def on_message(message):
                 try:
                     user = HfApi().whoami(token)
                 except HTTPError as e:
-                    await message.channel.send("Error occured when trying to authenticate. Likely invalid API Token.")
+                    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':
@@ -552,21 +539,21 @@ async def on_message(message):
                     print(f"verification Error: {e}")
 
                     # -----------------------------------------------------------------------------------------
+                    # If creating new record (edge case)
                     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"            
+                    discord_exp = "L10L"
                     hub_exp = "L0L"
-                    total_exp = xp
+                    total_exp = "L10L"
+                    current_level = calculate_level(xp)
                     
                     row_data = [altered_member_id, 
                                 member.name, 
-                                xp, 
+                                discord_exp, 
                                 current_level, 
                                 user['name'], 
                                 "L0L", 
-                                xp, 
+                                hub_exp, 
+                                total_exp,
                                 verified_date,
                                 likes,
                                 models,
@@ -580,7 +567,7 @@ async def on_message(message):
                     await member.add_roles(role)
                     if role in member.roles: 
                         print(f"New record created for {member}")
-                print(f"------------------------------------------------------------------------")                  
+                print("------------------------------------------------------------------------")                  
         await bot.process_commands(message)
     except Exception as e:
         print(f"on_message Error: {e}")
@@ -592,7 +579,7 @@ async def on_reaction_add(reaction, user):
         if user.id not in bot_ids:
             print(f"adding exp from react {user}")
             await asyncio.sleep(0.1) 
-            if not isinstance(message.channel, discord.DMChannel): # can't earn exp from DMing the bot, which is harder to track
+            if not isinstance(reaction.message.channel, discord.DMChannel): # can't earn exp from reacting in bot DMs, which is harder to track
                 await add_exp(user.id)
             await asyncio.sleep(0.1)
             if reaction.message.author.id != user.id: # can't earn while self-reacting, which is abuseable
@@ -660,8 +647,8 @@ async def remove_huggingfolks():
         # 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(f"Updated discord leaderboard!")
-        print(f"------------------------------------------------------------------------")        
+        print("Updated discord leaderboard!")
+        print("------------------------------------------------------------------------")        
     except Exception as e:
         print(f"remove_huggingfolks Error: {e}") 
 
@@ -710,23 +697,18 @@ def get_data2():
 demo = gr.Blocks()
 with demo:
     try:
-        dataframe1 = pd.read_csv("https://docs.google.com/spreadsheets/d/1C8aLqgCqLYcMiIFf-P_Aosaa03C_WLIB_UyqvjSdWg8/export?format=csv&gid=0")
-        #data = dataframe1.copy()
-        print(dataframe1)
+        dataframe1 = pd.read_csv("https://docs.google.com/spreadsheets/d/1C8aLqgCqLYcMiIFf-P_Aosaa03C_WLIB_UyqvjSdWg8/export?format=csv&gid=0") # required for timing
         column_values_unique = sorted(dataframe1.iloc[:, 3].unique())
-        print(column_values_unique)
         dataframe2 = pd.DataFrame({'Levels': column_values_unique})
-        print(dataframe2)
+
         counts = {}
         try:
             for value in dataframe1.iloc[:, 3]:
-                print(value)
-                print(type(value))
                 counts[value] = counts.get(value, 0) + 1
             dataframe2['Members'] = dataframe2['Levels'].map(counts)
         except Exception as e:
-            print(f"dataframe2 Error: {e}")  
-        print(dataframe2)
+            print(f"gradio display error Error: {e}")  
+        print(f"dataframe2: {dataframe2}")
     
         TITLE = """<h1 align="center" id="space-title">🤗 Hugging Face Level Leaderboard</h1>"""
         gr.HTML(TITLE)