update battle mode

pages/Ranking.py

@@ -6,6 +6,7 @@ import pandas as pd
 import pymysql.cursors
 import streamlit as st
 
+from datetime import datetime
 from streamlit_elements import elements, mui, html, dashboard, nivo
 from streamlit_extras.switch_page_button import switch_page
 
@@ -224,6 +225,7 @@ class RankingApp:
 
     def next_battle(self, prompt_id, image_ids, winner, curr_position, total_num):
         loser = 'left' if winner == 'right' else 'right'
+        battletime = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
 
         curser = RANKING_CONN.cursor()
 
@@ -236,8 +238,8 @@ class RankingApp:
         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))
+        query = "INSERT INTO battle_results (username, timestamp, tag, prompt_id, winner, loser, battletime) VALUES (%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, winner_modelVersion_id, loser_modelVersion_id, battletime))
 
         curser.close()
         RANKING_CONN.commit()
@@ -282,22 +284,27 @@ class RankingApp:
         elif st.session_state.progress[prompt_id] == 'finished':
             st.write('## You have ranked all models for this tag!')
             st.write('Thank you for your participation! Feel free to do the following things:')
-            st.write('* Rank for other tags and prompts.')
-            st.write('* Back to the gallery page to see more images.')
-            st.write('* Rank again for this tag and prompt.')
-            st.write('*More functions are coming soon... Please stay tuned*')
-
-            gallery_btn = st.button('🖼️ Back to Gallery')
-            if gallery_btn:
-                switch_page('gallery')
-
-            restart_btn = st.button('🎖️ Rank Again')
+            # st.write('* Rank for other tags and prompts.')
+            # st.write('* Back to the gallery page to see more images.')
+            # st.write('* Rank again for this tag and prompt.')
+            # st.write('* Check the summary to see what model you like most.')
+            # st.write('*More functions are coming soon... Please stay tuned*')
+            st.button('👈 Rank for other tags and prompts')
+            restart_btn = st.button('🎖️ Rank this prompt again')
             if restart_btn:
                 st.session_state.progress[prompt_id] = 'ranking'
                 st.session_state.counter[prompt_id] = 0
                 st.session_state.pointer[prompt_id] = {'left': 0, 'right': 1}
                 st.experimental_rerun()
 
+            gallery_btn = st.button('🖼️ Back to Gallery')
+            if gallery_btn:
+                switch_page('gallery')
+
+            summary_btn = st.button('📊 See Summary')
+            if summary_btn:
+                switch_page('summary')
+
 
 def connect_to_db():
     conn = pymysql.connect(

pages/{Results.py → Summary.py}

@@ -49,20 +49,20 @@ class DashboardApp:
             n = 3
             metric_cols = st.columns(n)
             image_display = st.empty()
-            
+
             for i in range(n):
                 with metric_cols[i]:
                     modelVersion_id = modelVersion_standings[i][0]
                     winning_times = modelVersion_standings[i][1]
 
-                    model_name, modelVersion_name, url = self.roster[self.roster['modelVersion_id'] == modelVersion_id][['model_name', 'modelVersion_name', 'modelVersion_url']].values[0]
+                    model_id, model_name, modelVersion_name, url = self.roster[self.roster['modelVersion_id'] == modelVersion_id][['model_id', 'model_name', 'modelVersion_name', 'modelVersion_url']].values[0]
 
                     metric_card = stylable_container(
                         key="container_with_border",
                         css_styles="""
                         {
-                            border: 1.5px solid rgba(49, 51, 63, 0.8);
-                            border-left: 0.5rem solid silver;
+                            border: 1.5px solid rgba(49, 51, 63, 0.2);
+                            border-left: 0.5rem solid gold;
                             border-radius: 5px;
                             padding: calc(1em + 5px);
                             gap: 0.5em;
@@ -74,8 +74,8 @@ class DashboardApp:
 
                     with metric_card:
                         icon = '🥇'if i == 0 else '🥈' if i == 1 else '🥉'
-                        st.write(modelVersion_id)
-                        st.write(f'### {icon} {model_name}, [{modelVersion_name}](https://civitai.com/models/{modelVersion_id})')
+                        # st.write(model_id)
+                        st.write(f'### {icon} {model_name}, [{modelVersion_name}](https://civitai.com/models/{model_id}?modelVersionId={modelVersion_id})')
                         st.write(f'Ranking Score: {winning_times}')
 
                     show_image = st.button('Show Image', key=modelVersion_id, use_container_width=True)
@@ -105,20 +105,21 @@ class DashboardApp:
 
 
     def score_calculator(self, results, db_table):
+        # sort results by battle time
+        results = sorted(results, key=lambda x: x['battletime'])
+
         modelVersion_standings = {}
         if db_table == 'battle_results':
             for record in results:
                 modelVersion_standings[record['winner']] = modelVersion_standings.get(record['winner'], 0) + 1
-                # add the winning time of the loser
-                curser = RANKING_CONN.cursor()
-                curser.execute(f"SELECT COUNT(*) FROM {db_table} WHERE username = '{st.session_state.user_id[0]}' AND timestamp = '{st.session_state.user_id[1]}' AND winner = '{record['loser']}'")
-                modelVersion_standings[record['winner']] += curser.fetchone()['COUNT(*)']
-                curser.close()
 
                 # add the loser who never wins
                 if record['loser'] not in modelVersion_standings:
                     modelVersion_standings[record['loser']] = 0
 
+                # add the winning time of the loser to the winner
+                modelVersion_standings[record['winner']] += modelVersion_standings[record['loser']]
+
         elif db_table == 'sort_results':
             pts_map = {'position1': 5, 'position2': 3, 'position3': 1, 'position4': 0}
             for record in results:
@@ -128,11 +129,10 @@ class DashboardApp:
         return modelVersion_standings
 
 
-
     def app(self):
         st.title('Your Preferred Models', help="Scores are calculated based on your ranking results.")
 
-        mode = st.sidebar.radio('Ranking mode', ['Sort', 'Battle'], horizontal=True)
+        mode = st.sidebar.radio('Ranking mode', ['Sort', 'Battle'], horizontal=True, index=1)
         # get tags from database of the current user
         db_table = 'sort_results' if mode == 'Sort' else 'battle_results'