Update app.py

app.py

@@ -53,37 +53,40 @@ api = HfApi()
 """"""
 #csv_file = 'data.csv'
 global_df = pd.DataFrame()
+worksheet2_df = pd.DataFrame()
 print(type(global_df))
 community_global_df = pd.DataFrame() 
 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/edit#gid=0")
+
 
 @bot.event
 async def on_ready():
     try:
         global global_df
+        global worksheet2_df
         await asyncio.sleep(1.1)
         print(f'Logged in as {bot.user.name}')
         print(f"XP_PER_MESSAGE: {XP_PER_MESSAGE}")
-        # testing sheet -> read -> paste sheet
-    
-        """import data from google sheets -> HF Space .csv (doesn't make API call this way, as it's read-only)""" 
     
+        """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
         print(f"csv successfully retrieved: \n {global_df}")
-        #data.to_csv(csv_file, index=False)
+        worksheet2_df = data2
 
+        # updates both leaderboards
         remove_huggingfolks.start()
+        await(periodic_api_test)
         print(f"------------------------------------------------------------------------")
     except Exception as e:
         print(f"on_message Error: {e}")
 
 
 def update_google_sheet():
-    """save data from HF Space -> google sheets (makes 1 API call)"""
-    # run this in separate thread?
+    """save data from HF Space -> google sheets (makes 2 API calls)"""
     try:
-        print("Updating...")
+        print("Updating google sheets...")
         name = "levelbot"
         #worksheet = gspread_bot.open(name).sheet1
         global_df['discord_user_id'] = global_df['discord_user_id'].astype(str)
@@ -104,15 +107,9 @@ def update_google_sheet():
 
 executor = ThreadPoolExecutor(max_workers=1)
 scheduler = BackgroundScheduler(executors={'default': executor})
-scheduler.add_job(update_google_sheet, trigger='interval', minutes=2, max_instances=1)
-scheduler.start()
-"""
-scheduler = BackgroundScheduler()
-scheduler.add_job(update_google_sheet, "interval", seconds=60)
+scheduler.add_job(update_google_sheet, trigger='interval', minutes=1, max_instances=1)
 scheduler.start()
 
-"""
-
 
 def calculate_level(xp):
     return int(xp ** (1.0 / 3.0))
@@ -126,14 +123,14 @@ processed_users = set()
 
 async def periodic_api_test(): # needs rewrite, can do same thing and interact with csv -> push to google sheets
     try:
-        await asyncio.sleep(0.1)
-        column_values_3 = worksheet2.col_values(3)
-        column_values_8 = worksheet2.col_values(8)
-    
-        for i, user in enumerate(column_values_3):
+        # this should be gspread type function (do not mix with discord at all)
+        global worksheet2_df
+        await asyncio.sleep(5)
+        # get 
+        for index, user in enumerate(worksheet2_df['hf_user_name']):
             if user in processed_users:
                 continue
-    
+
             url = f"https://huggingface.co/api/users/{user}/overview"
             response = requests.get(url)
     
@@ -147,9 +144,10 @@ async def periodic_api_test(): # needs rewrite, can do same thing and interact w
                 discussions = data["numDiscussions"]
                 papers = data["numPapers"]
                 upvotes = data["numUpvotes"]
-    
-                worksheet2.update(values=[[likes, models, datasets, spaces, discussions, papers, upvotes]],
-                                  range_name=f'G{i+1}:M{i+1}')
+
+                worksheet2_df.loc[index:index, 'likes':'upvotes'] = [[likes, models, datasets, spaces, discussions, papers, upvotes]]
+                print(worksheet2_df)
+                
     
                 processed_users.add(user)
             else:
@@ -268,7 +266,7 @@ async def add_exp(member_id):
 
                             #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.                            
 
                             
@@ -311,7 +309,7 @@ async def on_message(message):
 async def on_reaction_add(reaction, user):
     try:
         if user.id not in bot_ids:
-            print(f"adding exp from react {user.id}")
+            print(f"adding exp from react {user}")
             await asyncio.sleep(0.1)            
             await add_exp(user.id)
             await asyncio.sleep(0.1)
@@ -335,25 +333,25 @@ async def remove_huggingfolks():
         for member_id in members_with_role:
             community_global_df = community_global_df[community_global_df.iloc[:, 0] != str(member_id)]
 
-        print(community_global_df)
+        #print(community_global_df)
 
         community_global_df.drop(community_global_df.columns[0], axis=1, inplace=True)
         community_global_df['discord_exp'] = pd.to_numeric(community_global_df['discord_exp'])
         community_global_df = community_global_df.nlargest(len(community_global_df), 'discord_exp')        
         
         top_30_exp = community_global_df.nlargest(30, 'discord_exp')
-        #community_global_df = top_30_exp.copy() # for gradio
         
         top_30_exp['D'] = ['🥇','🥈','🥉','','','','','','','','','','','','','','','','','','','','','','','','','','','']
         top_30_rows = top_30_exp.values.tolist()
 
-        print(top_30_rows)
+        #print(top_30_rows)
         channel = bot.get_channel(1197143964994773023)
         message = await channel.fetch_message(1197148293164187678)
 
         # put into message / leaderboard
         new_table = tabulate(top_30_rows, headers=["Name", "Experience", "Level", "Rank"], tablefmt="plain")
         await message.edit(content=f"Updated Leaderboard:\n```\n{new_table}\n```")
+        print(f"Updated discord leaderboard!")
         
     except Exception as e:
         print(f"remove_huggingfolks Error: {e}")
@@ -379,24 +377,13 @@ async def count_users_with_role(ctx, role_id):
 # embeds with user pfps? 
 # name, pfp, time in server....
 
-# discord_level column
-# pick 10 highest
-# update
-
 # weekly do different count
 # count number of messages per user for every channel (total messages)
 # fix sheet if necessary
-
-# might need cell location data to pull both level and username at same time
 # add emojis for some color
 # check if members are still in the server 
 
 
-
-
-    
-
-
 """"""
 DISCORD_TOKEN = os.environ.get("DISCORD_TOKEN", None)
 def run_bot():
@@ -413,10 +400,7 @@ def get_data():
         return community_global_df   
     except Exception as e:
         print(f"on_message Error: {e}")
-# csv
-# read into pandas dataframe1
-# read levels column and create pandas dataframe2 with first column containing levels from 2-max found in dataframe1
-# create second column in dataframe2 for number of each level found in dataframe1 levels column
+
 
 demo = gr.Blocks()
 with demo: