It be done

bot.py

@@ -7,14 +7,14 @@ import os
 def generate_id(key):
     return r.incr(key)
 
-def generate_progress_bar(num_labels, width=20):
+def generate_progress_bar(num_labels, width=20, n=300):
     print(num_labels)
-    percentage = int(int(num_labels) / 300 * 100)
+    percentage = int(int(num_labels) / n * 100)
     completed_blocks = int(percentage * width / 100)
     remaining_blocks = width - completed_blocks
 
     progress_bar = '▓' * completed_blocks + '░' * remaining_blocks
-    percentage_text = f' {num_labels}/50 identified 🦜🌱 '
+    percentage_text = f' {num_labels}/{n} identified 🦜🌱 '
 
     return f'🏆 {progress_bar} {percentage_text}'
 
@@ -25,7 +25,7 @@ r = redis.from_url(redis_url)
 
 r.set('species_identified', 0)
 
-def improve_player_stats(ctx):
+def improve_player_stats_image(ctx):
     # add 1 to the number of species identified
     value = r.get(b'species_identified').decode('utf-8')
     r.set(b'species_identified', int(value) + 1)
@@ -38,11 +38,14 @@ def improve_player_stats(ctx):
     if not r.exists(role_key):
         r.set(role_key, 'Naturalist')
 
-    oc_key = f'{ctx.author.name}:occurances'.encode('utf-8')
-    if not r.exists(oc_key):
-        r.set(oc_key, 0)
+    img_oc_key = f'{ctx.author.name}:image'.encode('utf-8')
+    if not r.exists(img_oc_key):
+        r.set(img_oc_key, 0)
+
     r.set(xp_key, int(r.get(xp_key)) + 10)
-    r.set(oc_key, int(r.get(oc_key)) + 1)
+
+    r.set(img_oc_key, int(r.get(img_oc_key)) + 1)
+
 
 bot = discord.Bot()
 
@@ -103,7 +106,9 @@ async def image(ctx, id):
     embed = discord.Embed(color=discord.Colour.blurple())
     embed.set_author(name=f"Image Observation {id} - Task", icon_url=ctx.author.display_avatar.url)
     embed.add_field(name="Sensor", value=image_data['sensor'], inline=True)
-    # embed.add_field(name="Latest Label by", value=image_data['author'], inline=True)
+    embed.add_field(name="Recorded at", value=image_data['timestamp'], inline=True)
+    embed.add_field(name="Recent Label", value=image_data['label'], inline=True)
+    embed.add_field(name="Proposed by", value=image_data['author'], inline=True)
     path = f'https://gainforest-transparency-dashboard.s3.amazonaws.com/{image_data["awsCID"]}'
     embed.set_image(url=path)
     await ctx.respond(embed=embed)
@@ -127,19 +132,21 @@ def get_conf_score(confidence: str):
         options=[
             Option(name="id", description="The ID of the image"),
             Option(name="label", description="The label for the image"),
-            Option(name="confidence", description="Choose your confidence", autocomplete=confAutocomplete)
+            Option(name="confidence", description="Choose your confidence: high, medium, low", autocomplete=confAutocomplete)
     ])
 async def label_image(ctx, id:int, label:str, confidence: str):
-    label_cnt = generate_id(f'label:{id}')
-    r.hset(f'label:{id}:{label_cnt}'.encode('utf-8'), b'label', label.encode('utf-8'))
-    r.hset(f'label:{id}:{label_cnt}'.encode('utf-8'), b'author', ctx.author.mention.encode('utf-8'))
+
+    improve_player_stats_image(ctx)
+    
+    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.mention.encode('utf-8'))
     conf_score = get_conf_score(confidence)
-    r.hset(f'label:{id}:{label_cnt}'.encode('utf-8'), b'confidence', conf_score)
+    r.hset(f'label:image:{id}:{label_cnt}'.encode('utf-8'), b'confidence', conf_score)
 
     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'))
 
-
     # Fetch the image data from Redis
     image_data_bytes = r.hgetall(f'image:{id}'.encode('utf-8'))
     image_data = {k.decode('utf-8'): v.decode('utf-8') for k, v in image_data_bytes.items()}
@@ -149,13 +156,12 @@ async def label_image(ctx, id:int, label:str, confidence: str):
     embed = discord.Embed(color=discord.Colour.blurple())
     embed.set_author(name=f"Image Observation {id} - New Label 🎉", icon_url=ctx.author.display_avatar.url)
     embed.add_field(name="Sensor", value=image_data['sensor'], inline=True)
-    embed.add_field(name="Label", value=image_data['label'], inline=True)
+    embed.add_field(name="Recorded at", value=image_data['timestamp'], inline=True)
+    embed.add_field(name="Recent Label", value=image_data['label'], inline=True)
     embed.add_field(name="Proposed by", value=image_data['author'], inline=True)
     path = f'https://gainforest-transparency-dashboard.s3.amazonaws.com/{image_data["awsCID"]}'
     embed.set_image(url=path)
 
-    improve_player_stats(ctx)
-
     await ctx.respond(f"{ctx.author.mention} labeled observation **{id}** as **{label}**  🎉 (Earned 10 XP)", embed=embed)
 
 @bot.command(description="Get progress bar.")
@@ -174,14 +180,12 @@ async def sound(ctx, id): # a slash command will be created with the name "ping"
     embed = discord.Embed(color=discord.Colour.blurple())
     embed.set_author(name=f"Sound Observation {id} - Task", icon_url=ctx.author.display_avatar.url)
     embed.add_field(name="Sensor", value=sound_data['sensor'], inline=True)
-    embed.add_field(name="Label", value=sound_data['label'], inline=True)
+    embed.add_field(name="Recorded at", value=sound_data['timestamp'], inline=True)
+    embed.add_field(name="Recent Label", value=sound_data['label'], inline=True)
     embed.add_field(name="Proposed by", value=sound_data['author'], inline=True)
-    embed.add_field(name="Timestamp", value=sound_data['time'], inline=True)
+    embed.add_field(name="Detected at Timestamp", value=sound_data['label_at'], inline=True)
 
-    with open(sound_data['path'], 'rb') as f:
-        sound = discord.File(f)
-        message = await ctx.respond(file=sound, embed=embed)
-        print('The ID of the message is:', message.id)
+    await ctx.respond(f'Please listen to the sound here:\nhttps://gainforest.app/observations/{sound_data["uuid"]} 🦜🎵', embed=embed)
 
 @bot.command(
         description="Label sound observation",
@@ -189,77 +193,37 @@ async def sound(ctx, id): # a slash command will be created with the name "ping"
             Option(name="id", description="The ID of the sound"),
             Option(name="label", description="The label for the sound"),
             Option(name="timestamp", description="The timestamp of the observation"),
+            Option(name="confidence", description="Choose your confidence: high, medium, low", autocomplete=confAutocomplete)
     ])
-async def label_sound(ctx, id:int, label:str, timestamp:str):
+async def label_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'))
+    conf_score = get_conf_score(confidence)
+    r.hset(f'label:sound:{id}:{sound_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'time', timestamp.encode('utf-8'))
+    r.hset(f'sound:{id}'.encode('utf-8'), b'label_at', timestamp.encode('utf-8'))
     r.hset(f'sound:{id}'.encode('utf-8'), b'author', ctx.author.mention.encode('utf-8'))
 
     # Fetch the sound data from Redis
     sound_data_bytes = r.hgetall(f'sound:{id}'.encode('utf-8'))
     sound_data = {k.decode('utf-8'): v.decode('utf-8') for k, v in sound_data_bytes.items()}
 
+    print(sound_data)
+
     # Create an embed
     embed = discord.Embed(color=discord.Colour.blurple())
     embed.set_author(name=f"Sound Observation {id} - New Label 🎉", icon_url=ctx.author.display_avatar.url)
     embed.add_field(name="Sensor", value=sound_data['sensor'], inline=True)
-    embed.add_field(name="Label", value=sound_data['label'], inline=True)
+    embed.add_field(name="Recorded at", value=sound_data['timestamp'], inline=True)
+    embed.add_field(name="Recent Label", value=sound_data['label'], inline=True)
     embed.add_field(name="Proposed by", value=sound_data['author'], inline=True)
-    embed.add_field(name="Time", value=sound_data['time'], inline=True)
+    embed.add_field(name="Detected at Timestamp", value=sound_data['label_at'], inline=True)
 
-    improve_player_stats(ctx)
-
-    with open(sound_data['path'], 'rb') as f:
-        sound = discord.File(f)
-        await ctx.respond(f"{ctx.author.mention} labeled sound observation **{id}** as **{label}** at **{timestamp}**  🎉 (Earned 10 XP)", file=sound, embed=embed)
-
-@bot.command(
-        description="List all unlabeled sound observations"
-)
-async def list_unlabeled_sound(ctx):
-
-    unlabeled_ids = []
-
-    # Fetch all the sound data from Redis
-    keys = r.keys('sound:*'.encode('utf-8'))
-    for key in keys:
-        sound_data_bytes = r.hgetall(key)
-        sound_data = {k.decode('utf-8'): v.decode('utf-8') for k, v in sound_data_bytes.items()}
-        if '❓' == sound_data['label']:
-            unlabeled_ids = unlabeled_ids + [key.decode('utf-8')]
-
-    # Create an embed
-    embed = discord.Embed(color=discord.Colour.blurple())
-    embed.set_author(name=f"Unlabeled Sound Observations", icon_url=ctx.author.display_avatar.url)
-
-    for id in unlabeled_ids:
-        embed.add_field(name=f"{id}", value="❓", inline=True)
-
-    await ctx.respond(embed=embed)
-
-@bot.command(
-        description="List all unlabeled image observations"
-)
-async def list_unlabeled_image(ctx):
-
-    unlabeled_ids = []
-
-    # Fetch all the image data from Redis
-    keys = r.keys('image:*'.encode('utf-8'))
-    for key in keys:
-        image_data_bytes = r.hgetall(key)
-        image_data = {k.decode('utf-8'): v.decode('utf-8') for k, v in image_data_bytes.items()}
-        if '❓' == image_data['label']:
-            unlabeled_ids = unlabeled_ids + [key.decode('utf-8')]
-
-    # Create an embed
-    embed = discord.Embed(color=discord.Colour.blurple())
-    embed.set_author(name=f"Unlabeled Image Observations", icon_url=ctx.author.display_avatar.url)
-
-    for id in unlabeled_ids:
-        embed.add_field(name=f"{id}", value="❓", inline=True)
-
-    await ctx.respond(embed=embed)
+    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="Check your profile"
@@ -273,15 +237,19 @@ async def profile(ctx):
     if not r.exists(role_key):
         r.set(role_key, 'NATURALIST')
 
-    oc_key = f'{ctx.author.name}:occurances'.encode('utf-8')
-    if not r.exists(oc_key):
-        r.set(oc_key, 0)
+    img_oc_key = f'{ctx.author.name}:image'.encode('utf-8')
+    if not r.exists(img_oc_key):
+        r.set(img_oc_key, 0)
+
+    s_oc_key = f'{ctx.author.name}:sound'.encode('utf-8')
+    if not r.exists(s_oc_key):
+        r.set(s_oc_key, 0)
 
      # Create an embed
     embed = discord.Embed(color=discord.Colour.blurple())
     embed.set_author(name=f"{ctx.author.name} - Profile", icon_url=ctx.author.display_avatar.url)
     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"**🦜 Labels**: {r.get(oc_key).decode()}", 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()}")
     await ctx.respond(embed=embed)

redis2sheets.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 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']]
+
+redis_keys = r.keys('label:image:*')
+for i_key in redis_keys:
+    image_data_bytes = r.hgetall(i_key)
+    image_data = {k.decode('utf-8'): v.decode('utf-8') for k, v in image_data_bytes.items()}
+    image_id = i_key.decode().split(':')[-2]
+    raw_image_data_bytes = r.hgetall(f'image:{image_id}'.encode('utf-8'))
+    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)]
+    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}})

sql2redis.py

@@ -36,7 +36,7 @@ def get_all_images():
         # Fetch all the data returned by the database
         rows = cur.fetchall()
         for row in rows:
-            image_cnt = generate_id('image_cnt')
+            image_cnt = generate_id('cnt:image')
             # Set multiple field-value pairs using HMSET
             fields_values = {
                 'uuid': row[0],
@@ -65,7 +65,7 @@ def get_all_images():
 
             # Store labels and confidences in Redis using HMSET
             for label, confidence in zip(labels, confidences):
-                pred_cnt = generate_id(f'prediction:{image_cnt}')
+                pred_cnt = generate_id(f'cnt:prediction:{image_cnt}')
                 fields_values = {
                     'label': label,
                     'confidence': confidence,
@@ -94,7 +94,7 @@ def get_all_sounds():
         # Fetch all the data returned by the database
         rows = cur.fetchall()
         for row in rows:
-            sound_cnt = generate_id('sound_cnt')
+            sound_cnt = generate_id('cnt:sound')
             # Set multiple field-value pairs using HMSET
             fields_values = {
                 'uuid': row[0],
@@ -122,4 +122,4 @@ def generate_id(key):
 
 r.flushdb()
 get_all_images()
-get_all_sounds()
+get_all_sounds()