allow for manual reorder in summary page

Home.py

@@ -48,18 +48,12 @@ def logout():
     st.session_state.pop('gallery_focus', None)
     st.session_state.pop('assigned_rank_mode', None)
     st.session_state.pop('show_NSFW', None)
+    st.session_state.pop('modelVersion_standings', None)
 
 
 def info():
     with st.sidebar:
         st.write('## About')
-        # st.write(
-        #     "This is an web application to collect personal preference to images synthesised by generative models fine-tuned on stable diffusion. \
-        #     **You might consider it as a tool for quickly digging out the most suitable text-to-image generation model for you from [civitai](https://civitai.com/).**"
-        # )
-        # st.write(
-        #     "After you picking images from gallery page, and ranking them in the ranking page, you will be able to see a dashboard showing your preferred models in the summary page, **with download links of the models ready to use in [Automatic1111 webui](https://github.com/AUTOMATIC1111/stable-diffusion-webui)!**"
-        # )
         st.write(
             "**This is a web application for individual users to quickly dig out the most suitable text-to-image generation model from [civitai](https://civitai.com).** Our research aims to understand personal preference to images synthesized by generative models fine-tuned on stable diffusion and you can contribute by playing with this tool and giving us your feedback! "
         )
@@ -75,12 +69,6 @@ if __name__ == '__main__':
     info()
     st.write('A Research by [MAPS Lab](https://whongyi.github.io/MAPS-research), [NYU Shanghai](https://shanghai.nyu.edu)')
     st.title("🙌 Welcome to GEMRec Gallery!")
-    # st.info("Getting obsessed with tons of different text-to-image generation models available online?  \n \
-    #         Want to find the most suitable one for your taste?  \n \
-    #         **GEMRec** is here to help you!"
-    # )
-    # st.write('### Getting obsessed with tons of different text-to-image generation models available online? Want to find the most suitable one for your taste?')
-    # st.write('**GEMRec** is here to help you! Try it out now 👇!')
 
     if 'user_id' not in st.session_state:
         login()

pages/Gallery.py

@@ -383,7 +383,7 @@ class GalleryApp:
                     default_expand = True
                 else:
                     default_expand = False
-                    
+
                 with st.expander(f'**{prompt}**', expanded=default_expand):
                     # st.caption('select info to show')
                     checkout_panel = st.columns([5, 3])

pages/Ranking.py

@@ -190,6 +190,8 @@ class RankingApp:
 
         if progress == 'finished':
             st.session_state.progress[prompt_id] = 'finished'
+            # drop 'modelVersion_standings' from session state if exists
+            st.session_state.pop('modelVersion_standings', None)
         else:
             st.session_state.counter[prompt_id] += 1
 
@@ -256,6 +258,10 @@ class RankingApp:
 
         if curr_position == total_num - 1:
             st.session_state.progress[prompt_id] = 'finished'
+
+            # drop 'modelVersion_standings' from session state if exists
+            st.session_state.pop('modelVersion_standings', None)
+
             # st.experimental_rerun()
         else:
             st.session_state.pointer[prompt_id][loser] = curr_position + 1

pages/Summary.py

@@ -23,6 +23,10 @@ class DashboardApp:
         self.promptBook = promptBook
         self.session_finished = session_finished
 
+        # init modelVersion_standings
+        if 'modelVersion_standings' not in st.session_state:
+            st.session_state.modelVersion_standings = {}
+
     def sidebar(self, tags, mode):
         with st.sidebar:
             tag = st.selectbox('Select a tag', tags, key='tag')
@@ -54,86 +58,61 @@ class DashboardApp:
         results = curser.fetchall()
         curser.close()
 
-        modelVersion_standings = self.score_calculator(results, db_table)
+        if tag not in st.session_state.modelVersion_standings:
+            st.session_state.modelVersion_standings[tag] = self.score_calculator(results, db_table)
 
-        # sort the modelVersion_standings by value into a list of tuples in descending order
-        modelVersion_standings = sorted(modelVersion_standings.items(), key=lambda x: x[1], reverse=True)
+            # sort the modelVersion_standings by value into a list of tuples in descending order
+            st.session_state.modelVersion_standings[tag] = sorted(st.session_state.modelVersion_standings[tag].items(), key=lambda x: x[1], reverse=True)
 
         tab1, tab2 = st.tabs(['Top Picks', 'Detailed Info'])
 
         with tab1:
             # self.podium(modelVersion_standings)
-            self.podium_expander(modelVersion_standings)
+            switch_stage = st.toggle('Manual Reorder', key='switch_stage')
+            if switch_stage:
+                self.podium_expander(tag, n=len(st.session_state.modelVersion_standings[tag]), summary_mode='edit')
+            else:
+                self.podium_expander(tag, n=3, summary_mode='display')
+            # if st.session_state.summary_mode == 'display':
+            #     switch_stage = st.button('Manual Reorder', key='switch_stage_edit', on_click=lambda: st.session_state.__setitem__('summary_mode', 'edit'))
+            #     self.podium_expander(tag, n=3, summary_mode='display')
+            #
+            # elif st.session_state.summary_mode == 'edit':
+            #     switch_stage = st.button('Done', key='switch_stage_done', type='primary', on_click=lambda: st.session_state.__setitem__('summary_mode', 'display'))
+            #     self.podium_expander(tag, n=len(st.session_state.modelVersion_standings[tag]), summary_mode='edit')
 
         with tab2:
             st.write('## Detailed information of all selected models')
-            detailed_info = pd.merge(pd.DataFrame(modelVersion_standings, columns=['modelVersion_id', 'ranking_score']), self.roster, on='modelVersion_id')
-            st.data_editor(detailed_info, hide_index=True, disabled=True)
-
-    def podium(self, modelVersion_standings, n=3):
-        st.write('## Top picks')
-        metric_cols = st.columns(n)
-        image_display = st.empty()
+            detailed_info = pd.merge(pd.DataFrame(st.session_state.modelVersion_standings[tag], columns=['modelVersion_id', 'ranking_score']), self.roster, on='modelVersion_id')
 
-        for i in range(n):
-            with metric_cols[i]:
-                modelVersion_id = modelVersion_standings[i][0]
-                winning_times = modelVersion_standings[i][1]
-
-                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.2);
-                        border-left: 0.5rem solid gold;
-                        border-radius: 5px;
-                        padding: calc(1em + 5px);
-                        gap: 0.5em;
-                        box-shadow: 0 0 2rem rgba(0, 0, 0, 0.08);
-                        overflow-x: scroll;
-                    }
-                    """,
-                )
-
-                with metric_card:
-                    icon = '🥇'if i == 0 else '🥈' if i == 1 else '🥉'
-                    # 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}')
+            st.data_editor(detailed_info, hide_index=False, disabled=True)
 
-                show_image = st.button('Show Image', key=modelVersion_id, use_container_width=True)
-                if show_image:
+    def podium_expander(self, tag, n=3, summary_mode: ['display', 'edit'] = 'display'):
 
-                    images = self.promptBook[self.promptBook['modelVersion_id'] == modelVersion_id]['image_id'].values
-                    with image_display.container():
-                        st.write('---')
-                        st.write(f'### Images generated with {icon} {model_name}, {modelVersion_name}')
-                        col_num = 4
-                        image_cols = st.columns(col_num)
-                        for i in range(len(images)):
-                            with image_cols[i % col_num]:
-                                image = f"https://modelcofferbucket.s3-accelerate.amazonaws.com/{images[i]}.png"
-                                st.image(image, use_column_width=True)
-
-    def podium_expander(self, modelVersion_standings, n=3):
-        # st.write('## Top picks')
-        # metric_cols = st.columns(n)
         for i in range(n):
-            # with metric_cols[i]:
-            modelVersion_id = modelVersion_standings[i][0]
-            winning_times = modelVersion_standings[i][1]
+            modelVersion_id = st.session_state.modelVersion_standings[tag][i][0]
+            winning_times = st.session_state.modelVersion_standings[tag][i][1]
 
             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]
 
-            icon = '🥇'if i == 0 else '🥈' if i == 1 else '🥉'
+            icon = '🥇'if i == 0 else '🥈' if i == 1 else '🥉' if i == 2 else '🎈'
             podium_display = st.columns([1, 14])
             with podium_display[0]:
-                st.title(f'{icon}')
+                if summary_mode == 'display':
+                    st.title(f'{icon}')
+                elif summary_mode == 'edit':
+                    moveup = st.button('⬆', key=f'moveup_{modelVersion_id}', help='Move this model up', disabled=i == 0, on_click=self.switch_order, args=(tag, i, i - 1))
+                    movedown = st.button('⬇', key=f'movedown_{modelVersion_id}', help='Move this model down', disabled=i == n - 1, on_click=self.switch_order, args=(tag, i, i + 1))
             with podium_display[1]:
-                st.write(f'##### {model_name}, {modelVersion_name}')
-                st.write(f'[Civitai Page](https://civitai.com/models/{model_id}?modelVersionId={modelVersion_id}), [Model Download Link]({url}), Ranking Score: {winning_times}')
+                title_display = st.columns([4, 1, 1])
+                with title_display[0]:
+                    st.write(f'##### {model_name}, {modelVersion_name}')
+                    st.write(f'Ranking Score: {winning_times}')
+                with title_display[1]:
+                    st.link_button('Download Model', url, use_container_width=True)
+                with title_display[2]:
+                    st.link_button('Civitai Page', f'https://civitai.com/models/{model_id}?modelVersionId={modelVersion_id}', use_container_width=True, type='primary')
+                # st.write(f'[Civitai Page](https://civitai.com/models/{model_id}?modelVersionId={modelVersion_id}), [Model Download Link]({url}), Ranking Score: {winning_times}')
                 # with st.expander(f'**{icon} {model_name}, [{modelVersion_name}](https://civitai.com/models/{model_id}?modelVersionId={modelVersion_id})**, Ranking Score: {winning_times}'):
                 with st.expander(f'Show Images'):
                     images = self.promptBook[self.promptBook['modelVersion_id'] == modelVersion_id]['image_id'].values
@@ -159,6 +138,10 @@ class DashboardApp:
             if i != n - 1:
                 st.write('---')
 
+    def switch_order(self, tag, current, target):
+        st.session_state.modelVersion_standings[tag][current], st.session_state.modelVersion_standings[tag][target] = st.session_state.modelVersion_standings[tag][target], st.session_state.modelVersion_standings[tag][current]
+
+
     def score_calculator(self, results, db_table):
         modelVersion_standings = {}
         if db_table == 'battle_results':