big update for database structure

add two seperate databases: battle_results and sort_results

pages/Ranking.py

@@ -148,26 +148,34 @@ class RankingApp:
                           kwargs={'prompt_id': prompt_id}, use_container_width=True)
 
     def next_batch(self, prompt_id, progress=None):
-        # save ranking to dataset
-        # print(st.session_state.ranking)
-        # ranking_dataset = datasets.load_dataset('MAPS-research/GEMRec-Ranking', split='train')
+
         curser = RANKING_CONN.cursor()
-        for image_id in st.session_state.ranking[prompt_id][st.session_state.counter[prompt_id]].keys():
+
+        # a not so elegant way to get the modelVersion_id of each image, but it works
+        position_version_dict = {}
+        for image_id, position in st.session_state.ranking[prompt_id][st.session_state.counter[prompt_id]].items():
             modelVersion_id = self.promptBook[self.promptBook['image_id'] == image_id]['modelVersion_id'].values[0]
-            ranking = st.session_state.ranking[prompt_id][st.session_state.counter[prompt_id]][image_id]
-            # print({'image_id': image_id, 'modelVersion_id': modelVersion_id, 'ranking': ranking, "user_name": st.session_state.user_id[0], "timestamp": st.session_state.user_id[1]})
-            # ranking_dataset = ranking_dataset.add_item({'image_id': image_id, 'modelVersion_id': modelVersion_id, 'ranking': ranking, "user_name": st.session_state.user_id[0], "timestamp": st.session_state.user_id[1]})
+            position_version_dict[position] = modelVersion_id
+
+        # get all records of this user and prompt
+        query = "SELECT * FROM sort_results WHERE username = %s AND timestamp = %s AND prompt_id = %s"
+        curser.execute(query, (st.session_state.user_id[0], st.session_state.user_id[1], prompt_id))
+        results = curser.fetchall()
+        print(results)
 
-            # remove the old ranking if exists
-            query = "DELETE FROM rankings WHERE image_id = %s AND user_name = %s AND timestamp = %s"
-            curser.execute(query, (image_id, st.session_state.user_id[0], st.session_state.user_id[1]))
+        # remove the old ranking with the same modelVersion_id if exists
+        for result in results:
+            prev_ids = [result['position1'], result['position2'], result['position3'], result['position4']]
+            curr_ids = [position_version_dict[0], position_version_dict[1], position_version_dict[2], position_version_dict[3]]
+            if len(set(prev_ids).intersection(set(curr_ids))) == 4:
+                query = "DELETE FROM sort_results WHERE username = %s AND timestamp = %s AND prompt_id = %s AND position1 = %s AND position2 = %s AND position3 = %s AND position4 = %s"
+                curser.execute(query, (st.session_state.user_id[0], st.session_state.user_id[1], prompt_id, result['position1'], result['position2'], result['position3'], result['position4']))
 
-            query = "INSERT INTO rankings (image_id, modelVersion_id, ranking, user_name, timestamp) VALUES (%s, %s, %s, %s, %s)"
-            curser.execute(query, (image_id, modelVersion_id, ranking, st.session_state.user_id[0], st.session_state.user_id[1]))
+        query = "INSERT INTO sort_results (username, timestamp, tag, prompt_id, position1, position2, position3, position4) VALUES (%s, %s, %s, %s, %s, %s, %s, %s)"
+        curser.execute(query, (st.session_state.user_id[0], st.session_state.user_id[1], self.promptBook[self.promptBook['prompt_id'] == prompt_id]['tag'].values[0], prompt_id, position_version_dict[0], position_version_dict[1], position_version_dict[2], position_version_dict[3]))
 
         curser.close()
         RANKING_CONN.commit()
-        # ranking_dataset.push_to_hub('MAPS-research/GEMRec-Ranking', split='train')
 
         if progress == 'finished':
             st.session_state.progress[prompt_id] = 'finished'
@@ -201,7 +209,7 @@ class RankingApp:
             total_score = items['total_score'][st.session_state.pointer[prompt_id]['left']]
             st.write(f'Total Score: {total_score}')
 
-            btn_left = st.button('Left is better', key='left', on_click=self.next_battle, kwargs={'prompt_id': prompt_id, 'winner': 'left', 'curr_position': curr_position, 'total_num': len(items)}, use_container_width=True)
+            btn_left = st.button('Left is better', key='left', on_click=self.next_battle, kwargs={'prompt_id': prompt_id, 'image_ids': items['image_id'], 'winner': 'left', 'curr_position': curr_position, 'total_num': len(items)}, use_container_width=True)
 
         with right:
             image_id = items['image_id'][st.session_state.pointer[prompt_id]['right']]
@@ -212,11 +220,28 @@ class RankingApp:
             total_score = items['total_score'][st.session_state.pointer[prompt_id]['right']]
             st.write(f'Total Score: {total_score}')
 
-            btn_right = st.button('Right is better', key='right', on_click=self.next_battle, kwargs={'prompt_id': prompt_id, 'winner': 'right', 'curr_position': curr_position, 'total_num': len(items)}, use_container_width=True)
+            btn_right = st.button('Right is better', key='right', on_click=self.next_battle, kwargs={'prompt_id': prompt_id, 'image_ids': items['image_id'], 'winner': 'right', 'curr_position': curr_position, 'total_num': len(items)}, use_container_width=True)
 
-    def next_battle(self, prompt_id, winner, curr_position, total_num):
+    def next_battle(self, prompt_id, image_ids, winner, curr_position, total_num):
         loser = 'left' if winner == 'right' else 'right'
 
+        curser = RANKING_CONN.cursor()
+
+        winner_modelVersion_id = self.promptBook[self.promptBook['image_id'] == image_ids[st.session_state.pointer[prompt_id][winner]]]['modelVersion_id'].values[0]
+        loser_modelVersion_id = self.promptBook[self.promptBook['image_id'] == image_ids[st.session_state.pointer[prompt_id][loser]]]['modelVersion_id'].values[0]
+
+        # remove the old battle result if exists
+        query = "DELETE FROM battle_results WHERE username = %s AND timestamp = %s AND prompt_id = %s AND winner = %s AND loser = %s"
+        curser.execute(query, (st.session_state.user_id[0], st.session_state.user_id[1], prompt_id, winner_modelVersion_id, loser_modelVersion_id))
+        curser.execute(query, (st.session_state.user_id[0], st.session_state.user_id[1], prompt_id, loser_modelVersion_id, winner_modelVersion_id))
+
+        # insert the battle result into the database
+        query = "INSERT INTO battle_results (username, timestamp, tag, prompt_id, winner, loser) VALUES (%s, %s, %s, %s, %s, %s)"
+        curser.execute(query, (st.session_state.user_id[0], st.session_state.user_id[1], self.promptBook[self.promptBook['prompt_id'] == prompt_id]['tag'].values[0], prompt_id, winner_modelVersion_id, loser_modelVersion_id))
+
+        curser.close()
+        RANKING_CONN.commit()
+
         if curr_position == total_num - 1:
             st.session_state.progress[prompt_id] = 'finished'
             # st.experimental_rerun()