adding next commands

bot.py

@@ -2,6 +2,7 @@ import discord
 from discord import Option, commands
 import redis
 import os
+import random
 
 # Function to generate auto-incremented IDs
 def generate_id(key):
@@ -136,13 +137,17 @@ def get_conf_score(confidence: str):
     ])
 async def identify_image(ctx, id:int, label:str, confidence: str):
 
-    improve_player_stats_image(ctx)
+    role = "Hobbyist"
+    role_names = [role.name for role in ctx.author.roles]
+    if "Expert" in role_names:
+        expert = "Expert"
     
     label_cnt = generate_id(f'cnt:label:image:{id}')
     r.hset(f'label:image:{id}:{label_cnt}'.encode('utf-8'), b'label', label.encode('utf-8'))
     r.hset(f'label:image:{id}:{label_cnt}'.encode('utf-8'), b'author', ctx.author.name.encode('utf-8'))
     conf_score = get_conf_score(confidence)
     r.hset(f'label:image:{id}:{label_cnt}'.encode('utf-8'), b'confidence', conf_score)
+    r.hset(f'label:image:{id}:{label_cnt}'.encode('utf-8'), b'role', role)
 
     r.hset(f'image:{id}'.encode('utf-8'), b'label', label.encode('utf-8'))
     r.hset(f'image:{id}'.encode('utf-8'), b'author', ctx.author.mention.encode('utf-8'))
@@ -197,12 +202,18 @@ async def sound(ctx, id): # a slash command will be created with the name "ping"
     ])
 async def identify_sound(ctx, id:int, label:str, timestamp:str, confidence: str):
 
-    sound_cnt = generate_id(f'cnt:label:sound:{id}')
-    r.hset(f'label:sound:{id}:{sound_cnt}'.encode('utf-8'), b'label', label.encode('utf-8'))
-    r.hset(f'label:sound:{id}:{sound_cnt}'.encode('utf-8'), b'author', ctx.author.mention.encode('utf-8'))
-    r.hset(f'label:sound:{id}:{sound_cnt}'.encode('utf-8'), b'label_at', timestamp.encode('utf-8'))
+    role = "Hobbyist"
+    role_names = [role.name for role in ctx.author.roles]
+    if "Expert" in role_names:
+        expert = "Expert"
+
+    label_cnt = generate_id(f'cnt:label:sound:{id}')
+    r.hset(f'label:sound:{id}:{label_cnt}'.encode('utf-8'), b'label', label.encode('utf-8'))
+    r.hset(f'label:sound:{id}:{label_cnt}'.encode('utf-8'), b'author', ctx.author.name.encode('utf-8'))
+    r.hset(f'label:sound:{id}:{label_cnt}'.encode('utf-8'), b'role', role)
+    r.hset(f'label:sound:{id}:{label_cnt}'.encode('utf-8'), b'label_at', timestamp.encode('utf-8'))
     conf_score = get_conf_score(confidence)
-    r.hset(f'label:sound:{id}:{sound_cnt}'.encode('utf-8'), b'confidence', conf_score)
+    r.hset(f'label:sound:{id}:{label_cnt}'.encode('utf-8'), b'confidence', conf_score)
 
     r.hset(f'sound:{id}'.encode('utf-8'), b'label', label.encode('utf-8'))
     r.hset(f'sound:{id}'.encode('utf-8'), b'label_at', timestamp.encode('utf-8'))
@@ -225,6 +236,22 @@ async def identify_sound(ctx, id:int, label:str, timestamp:str, confidence: str)
 
     await ctx.respond(f'{ctx.author.mention} labeled sound observation **{id}** as **{label}** at **{timestamp}**  🎉 (Earned 10 XP).\nListen here:\nhttps://gainforest.app/observations/{sound_data["uuid"]} 🦜🎵', embed=embed)
 
+@bot.command(
+        description="Get a random unlabeled image observation"
+    )
+async def next_image(ctx):
+    total_images = r.get(b'cnt:image').decode('utf-8')
+    id = random.randint(1, int(total_images))
+    await image(ctx, id)
+
+@bot.command(
+        description="Get a random unlabeled sound observation"
+    )
+async def next_sound(ctx):
+    total_sound = r.get(b'cnt:sound').decode('utf-8')
+    id = random.randint(1, int(total_sound))
+    await sound(ctx, id)
+
 @bot.command(
         description="Check your profile"
     )
@@ -233,10 +260,6 @@ async def profile(ctx):
     if not r.exists(xp_key):
         r.set(xp_key, 0)
 
-    role_key = f'{ctx.author.name}:role'.encode('utf-8')
-    if not r.exists(role_key):
-        r.set(role_key, 'NATURALIST')
-
     img_oc_key = f'{ctx.author.name}:image'.encode('utf-8')
     if not r.exists(img_oc_key):
         r.set(img_oc_key, 0)
@@ -251,7 +274,7 @@ async def profile(ctx):
     embed.add_field(name="**PROGRESS**", value=f"**Level**: 1\n**XP**: {r.get(xp_key).decode()}/1000\n", inline=False)
     embed.add_field(name="**STATS**", value=f"**🌱 Images labeled**: {r.get(img_oc_key).decode()}", inline=False)
     embed.set_thumbnail(url=ctx.author.display_avatar.url)
-    embed.set_footer(text=f"🏆 RANK: {r.get(role_key).decode()}")
+    # embed.set_footer(text=f"🏆 RANK: {r.get(role_key).decode()}")
     await ctx.respond(embed=embed)
 
 bot.run('MTA5NzMzMDI2MDI4NDAzNTEyMg.GNFiQP.hZC_2HLTvVAROlKKUmnVQjviT0G4wHeQq23-rs')

redis2sheets.py → redis2sheets_img.py

@@ -9,7 +9,7 @@ gc = gspread.service_account()
 # Open a sheet from a spreadsheet in one go
 wks = gc.open("Labels").sheet1
 
-rows = [['image id', 'label id', 'author', 'label', 'confidence (0 = low, 1 = medium, 2 = high)', 'image url', 'dashboard url', 'image preview']]
+rows = [['image id', 'label id', 'author', 'role', 'label', 'confidence (0 = low, 1 = medium, 2 = high)', 'image url', 'dashboard url', 'image preview']]
 
 redis_keys = r.keys('label:image:*')
 for i_key in redis_keys:
@@ -20,7 +20,7 @@ for i_key in redis_keys:
     raw_image_data = {k.decode('utf-8'): v.decode('utf-8') for k, v in raw_image_data_bytes.items()}
     path = f'https://gainforest-transparency-dashboard.s3.amazonaws.com/{raw_image_data["awsCID"]}'
     dashboard_url = f'https://gainforest.app/observations/{raw_image_data["uuid"]}'
-    row = [image_id, i_key.decode().split(':')[-1], image_data['author'], image_data['label'], image_data['confidence'], path, dashboard_url,'=IMAGE("{}", 2)'.format(path)]
+    row = [image_id, i_key.decode().split(':')[-1], image_data['author'], image_data['role'], image_data['label'], image_data['confidence'], path, dashboard_url,'=IMAGE("{}", 2)'.format(path)]
     rows.append(row)
 
 # Update a range of cells using the top left corner address

redis2sheets_sound.py

@@ -0,0 +1,28 @@
+import redis
+import gspread
+
+redis_url = 'redis://default:[email protected]:7369'
+r = redis.from_url(redis_url)
+
+gc = gspread.service_account()
+
+# Open a sheet from a spreadsheet in one for sound
+wks = gc.open("Labels").get_worksheet(1)
+
+rows = [['sound id', 'label id', 'author', 'role', 'timestamp', 'label', 'confidence (0 = low, 1 = medium, 2 = high)', 'sound url', 'dashboard url']]
+
+redis_keys = r.keys('label:sound:*')
+for i_key in redis_keys:
+    sound_data_bytes = r.hgetall(i_key)
+    sound_data = {k.decode('utf-8'): v.decode('utf-8') for k, v in sound_data_bytes.items()}
+    sound_id = i_key.decode().split(':')[-2]
+    raw_sound_data_bytes = r.hgetall(f'sound:{sound_id}'.encode('utf-8'))
+    raw_sound_data = {k.decode('utf-8'): v.decode('utf-8') for k, v in raw_sound_data_bytes.items()}
+    path = f'https://gainforest-transparency-dashboard.s3.amazonaws.com/{raw_sound_data["awsCID"]}'
+    dashboard_url = f'https://gainforest.app/observations/{raw_sound_data["uuid"]}'
+    row = [sound_id, i_key.decode().split(':')[-1], sound_data['author'], sound_data['role'], sound_data['label_at'], sound_data['label'], sound_data['confidence'], path, dashboard_url]
+    rows.append(row)
+
+# Update a range of cells using the top left corner address
+wks.update('A1', rows, value_input_option='USER_ENTERED')
+wks.format('A1:I1', {'textFormat': {'bold': True}})