update CRON jobs

bot.py

@@ -156,7 +156,7 @@ async def identify_image(ctx, id:int, label:str, confidence: str):
     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'label:image:{id}:{label_cnt}'.encode('utf-8'), b'authorid', author_id)
+    r.hset(f'label:image:{id}:{label_cnt}'.encode('utf-8'), b'author_id', author_id)
     r.hset(f'label:image:{id}:{label_cnt}'.encode('utf-8'), b'timestamp', timestamp)
 
     r.hset(f'image:{id}'.encode('utf-8'), b'label', label.encode('utf-8'))
@@ -227,7 +227,7 @@ async def identify_sound(ctx, id:int, label:str, timestamp:str, confidence: str)
     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}:{label_cnt}'.encode('utf-8'), b'confidence', conf_score)
-    r.hset(f'label:sound:{id}:{label_cnt}'.encode('utf-8'), b'authorid', author_id)
+    r.hset(f'label:sound:{id}:{label_cnt}'.encode('utf-8'), b'author_id', author_id)
     r.hset(f'label:sound:{id}:{label_cnt}'.encode('utf-8'), b'timestamp', timestamp)
 
     r.hset(f'sound:{id}'.encode('utf-8'), b'label', label.encode('utf-8'))

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', 'role', 'label', 'confidence (0 = low, 1 = medium, 2 = high)', 'image url', 'dashboard url', 'image preview']]
+rows = [['image id', 'label id', 'author', 'author_id', 'role', 'submitted_on', '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['role'], 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['author_id'], image_data['role'], image_data['timestamp'], 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

@@ -9,7 +9,7 @@ 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']]
+rows = [['sound id', 'label id', 'author', 'author_id', 'role', 'submitted on', 'label at', 'label', 'confidence (0 = low, 1 = medium, 2 = high)', 'sound url', 'dashboard url']]
 
 redis_keys = r.keys('label:sound:*')
 for i_key in redis_keys:
@@ -20,7 +20,7 @@ for i_key in redis_keys:
     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]
+    row = [sound_id, i_key.decode().split(':')[-1], sound_data['author'], sound_data['author_id'], sound_data['role'], sound_data['timestamp'], 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