functional update for summary

pages/Summary.py

@@ -91,10 +91,13 @@ class DashboardApp:
             #     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')
+            st.write('**Detailed information of all selected models**')
             detailed_info = pd.merge(pd.DataFrame(st.session_state.modelVersion_standings[tag], columns=['modelVersion_id', 'ranking_score']), self.roster, on='modelVersion_id')
 
+            detailed_info = detailed_info[['model_name', 'modelVersion_name', 'model_download_count', 'tag', 'baseModel']]
+
             st.data_editor(detailed_info, hide_index=False, disabled=True)
+            st.caption('You can click the header to sort the table by that column.')
 
     def podium_expander(self, tag, example_prompts, n=3, summary_mode: ['display', 'edit'] = 'display'):
 
@@ -105,20 +108,22 @@ class DashboardApp:
             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 '🥉' if i == 2 else '🎈'
-            podium_display = st.columns([1, 14])
+            podium_display = st.columns([1, 14], gap='medium')
             with podium_display[0]:
                 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))
+                    settop = st.button('🔝', key=f'settop_{modelVersion_id}', help='Set this model to the top', disabled=i == 0, on_click=self.switch_order, args=(tag, i, 0), use_container_width=True)
+                    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), use_container_width=True)
+                    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), use_container_width=True)
             with podium_display[1]:
                 title_display = st.columns([3, 1, 1, 1])
                 with title_display[0]:
                     st.write(f'##### {model_name}, {modelVersion_name}')
                     # st.write(f'Ranking Score: {winning_times}')
                 with title_display[1]:
-                    image_display = st.selectbox('image display', ['Featured', 'All Images'], key=f'image_display_{modelVersion_id}', label_visibility='collapsed')
+                    # image_display = st.selectbox('image display', ['Featured', 'All Images'], key=f'image_display_{modelVersion_id}', label_visibility='collapsed')
+                    image_display = st.checkbox('Show all images', key=f'image_display_{modelVersion_id}')
 
                 with title_display[2]:
                     st.link_button('Download Model', url, use_container_width=True)
@@ -127,7 +132,9 @@ class DashboardApp:
                 # 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}'):
 
-                if image_display == 'Featured':
+
+
+                if not image_display:
                     example_images = self.promptBook[self.promptBook['prompt_id'].isin(example_prompts) & (self.promptBook['modelVersion_id']==modelVersion_id)]['image_id'].values
                     example_images = [f"https://modelcofferbucket.s3-accelerate.amazonaws.com/{image}.png" for image in example_images]
                     clickable_images(
@@ -135,11 +142,12 @@ class DashboardApp:
                         img_style={"margin": "5px", "height": "100px"}
                     )
 
-                elif image_display == 'All Images':
+                else:
+                    st.toast('🐌 It may take a while to load all images. Please be patient.')
                 # with st.expander(f'Show Images'):
                     images = self.promptBook[self.promptBook['modelVersion_id'] == modelVersion_id]['image_id'].values
 
-                    safety_check = st.toggle('Include potentially unsafe or offensive images', value=False, key=modelVersion_id)
+                    safety_check = st.checkbox('Include potentially unsafe or offensive images', value=False, key=modelVersion_id)
                     unsafe_prompts = json.load(open('data/unsafe_prompts.json', 'r'))
                     # merge dict values into one list
                     unsafe_prompts = [item for sublist in unsafe_prompts.values() for item in sublist]
@@ -168,8 +176,9 @@ class DashboardApp:
                 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]
-
+        # 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]
+        # insert the current before the target
+        st.session_state.modelVersion_standings[tag].insert(target, st.session_state.modelVersion_standings[tag].pop(current))
 
     def score_calculator(self, results, db_table):
         modelVersion_standings = {}
@@ -217,18 +226,21 @@ class DashboardApp:
         else:
             tag = self.sidebar(tags, mode)
             self.leaderboard(tag, db_table)
-        #
-        # comment = st.chat_input('Please leave your comments here.', key='comment')
-        # if comment:
-        #     commenttime = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-        #     curser = RANKING_CONN.cursor()
-        #     # parse the comment to at most 300 to avoid SQL injection
-        #     for i in range(0, len(comment), 300):
-        #         curser.execute(f"INSERT INTO comments (username, timestamp, comment, commenttime) VALUES ('{st.session_state.user_id[0]}', '{st.session_state.user_id[1]}', '{comment[i:i+300]}', '{commenttime}')")
-        #     RANKING_CONN.commit()
-        #     curser.close()
-        #
-        #     st.toast('Thanks for your feedback! We will take it into consideration in our future work.')
+
+        with st.sidebar:
+            with st.form('overall_feedback'):
+                comment = st.text_area('Please leave your comments here.', key='comment')
+                submit_feedback = st.form_submit_button('Submit Feedback')
+                if submit_feedback:
+                    commenttime = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+                    curser = RANKING_CONN.cursor()
+                    # parse the comment to at most 300 to avoid SQL injection
+                    for i in range(0, len(comment), 300):
+                        curser.execute(f"INSERT INTO comments (username, timestamp, comment, commenttime) VALUES ('{st.session_state.user_id[0]}', '{st.session_state.user_id[1]}', '{comment[i:i+300]}', '{commenttime}')")
+                    RANKING_CONN.commit()
+                    curser.close()
+
+                    st.toast('Thanks for your feedback! We will take it into consideration in our future work.')
 
 
 if __name__ == "__main__":