beta development for new gallery view

pages/Gallery.py

@@ -2,6 +2,7 @@ import os
 import requests
 
 import altair as alt
+import extra_streamlit_components as stx
 import numpy as np
 import pandas as pd
 import streamlit as st
@@ -263,7 +264,6 @@ class GalleryApp:
 
         # return prompt_tags, tag, prompt_id, items
 
-
     def app(self):
         # st.title('Model Visualization and Retrieval')
         # st.write('This is a gallery of images generated by the models')
@@ -273,53 +273,60 @@ class GalleryApp:
         # sort tags by alphabetical order
         prompt_tags = np.sort(prompt_tags)[::1].tolist()
 
-        tabs = st.tabs(prompt_tags)
-        with st.spinner('Loading...'):
-            for i in range(len(prompt_tags)):
-                with tabs[i]:
-                    tag = prompt_tags[i]
-                    items = self.promptBook[self.promptBook['tag'] == tag].reset_index(drop=True)
+        # chosen_data = [stx.TabBarItemData(id=tag, title=tag, description='') for tag in prompt_tags]
+        # tag = stx.tab_bar(chosen_data, key='tag', default='food')
 
-                    prompts = np.sort(items['prompt'].unique())[::1]
+        tag = st.radio('Select a tag', prompt_tags, index=5, horizontal=True, key='tag')
 
-                    subset_selector = st.columns([3, 1])
-                    with subset_selector[0]:
-                        # selected_prompt = st.selectbox('Select prompt', prompts, index=3)
-                        selected_prompt = selectbox('Select prompt', prompts, key=f'prompt_{tag}', no_selection_label='---')
-                    with subset_selector[1]:
-                        subset = st.selectbox('Select a subset', ['All', 'Selected Only'], index=0, key=f'subset_{tag}')
+        # tabs = st.tabs(prompt_tags)
+        # for i in range(len(prompt_tags)):
+        #     with tabs[i]:
+        #         tag = prompt_tags[i]
+        items = self.promptBook[self.promptBook['tag'] == tag].reset_index(drop=True)
+
+        prompts = np.sort(items['prompt'].unique())[::1]
+
+        subset_selector = st.columns([3, 1])
+        with subset_selector[0]:
+            # selected_prompt = st.selectbox('Select prompt', prompts, index=3)
+            selected_prompt = selectbox('Select prompt', prompts, key=f'prompt_{tag}', no_selection_label='---')
+        with subset_selector[1]:
+            subset = st.selectbox('Select a subset', ['All', 'Selected Only'], index=0, key=f'subset_{tag}')
+
+        if selected_prompt is None:
+            st.markdown(':orange[Please select a prompt above👆]')
+            st.write('**Feel free to navigate among tags and pages! Your selection will be saved within one log-in session.**')
+        else:
+            items = items[items['prompt'] == selected_prompt].reset_index(drop=True)
+            prompt_id = items['prompt_id'].unique()[0]
+            note = items['note'].unique()[0]
+            print(prompt_id, note)
+
+            # add safety check for some prompts
+            safety_check = True
+            unsafe_prompts = {}
+            # initialize unsafe prompts
+            for prompt_tag in prompt_tags:
+                unsafe_prompts[prompt_tag] = []
+            # manually add unsafe prompts
+            unsafe_prompts['world knowledge'] = [83]
+            unsafe_prompts['abstract'] = [1, 3]
+
+            if int(prompt_id.item()) in unsafe_prompts[tag]:
+                st.warning('This prompt may contain unsafe content. They might be offensive, depressing, or sexual.')
+                safety_check = st.checkbox('I understand that this prompt may contain unsafe content. Show these images anyway.', key=f'safety_{prompt_id}')
+
+            if safety_check:
+
+                if subset == 'Selected Only' and 'selected_dict' in st.session_state:
+                    # try:
+                    items = items[items['modelVersion_id'].isin(st.session_state.selected_dict[prompt_id])].reset_index(drop=True)
+                    self.gallery_mode(prompt_id, items)
+                    # except:
+                    #     st.warning('No selected images found')
+                else:
+                    self.graph_mode(prompt_id, items)
 
-                    if selected_prompt is None:
-                        st.markdown(':orange[Please select a prompt above👆]')
-                    else:
-                        items = items[items['prompt'] == selected_prompt].reset_index(drop=True)
-                        prompt_id = items['prompt_id'].unique()[0]
-                        note = items['note'].unique()[0]
-
-                        # add safety check for some prompts
-                        safety_check = True
-                        unsafe_prompts = {}
-                        # initialize unsafe prompts
-                        for prompt_tag in prompt_tags:
-                            unsafe_prompts[prompt_tag] = []
-                        # manually add unsafe prompts
-                        unsafe_prompts['world knowledge'] = [83]
-                        unsafe_prompts['abstract'] = [1, 3]
-
-                        if int(prompt_id.item()) in unsafe_prompts[tag]:
-                            st.warning('This prompt may contain unsafe content. They might be offensive, depressing, or sexual.')
-                            safety_check = st.checkbox('I understand that this prompt may contain unsafe content. Show these images anyway.', key=f'safety_{prompt_id}')
-
-                        if safety_check:
-
-                            if subset == 'Selected Only' and 'selected_dict' in st.session_state:
-                                # try:
-                                items = items[items['modelVersion_id'].isin(st.session_state.selected_dict[prompt_id])].reset_index(drop=True)
-                                self.gallery_mode(prompt_id, items)
-                                # except:
-                                #     st.warning('No selected images found')
-                            else:
-                                self.graph_mode(prompt_id, items)
         try:
             self.sidebar(items, prompt_id, note)
         except:
@@ -383,6 +390,8 @@ class GalleryApp:
                     infos_df = infos_df.rename(index={'model_name': 'Model', 'modelVersion_name': 'Version', 'model_download_count': 'Downloads', 'clip_score': 'Clip Score', 'mcos_score': 'mcos Score', 'nsfw_score': 'NSFW Score'})
                     st.table(infos_df)
 
+                st.button('🎖️ Proceed selections to ranking', on_click=switch_page, args=("ranking",), use_container_width=True,)
+
                     # for info in infos:
                     #     st.write(f"**{info}**:")
                     #     st.write(item[info])
@@ -391,6 +400,7 @@ class GalleryApp:
                 st.info('Please click on an image to show')
 
 
+
     def gallery_mode(self, prompt_id, items):
         items, info, col_num = self.selection_panel(items)
 
@@ -627,9 +637,9 @@ def load_tsne_coordinates(items):
 
     # print(tsne_df['modelVersion_id'].dtype)
 
-    print('before merge:', items)
+    # print('before merge:', items)
     items = items.merge(tsne_df, on=['modelVersion_id', 'prompt_id'], how='left')
-    print('after merge:', items)
+    # print('after merge:', items)
     return items
 
 

pages/Ranking.py

@@ -255,7 +255,8 @@ class RankingApp:
 
     def app(self):
         st.title('Personal Image Ranking')
-        st.write('Here you can test out your selected images with any prompt you like.')
+        st.write('Here you can test out your selected images with any prompt you like. ')
+        st.caption("We might pair some other images that you haven't selected based on our evaluation matrix.")
         # st.write(self.promptBook)
 
         # save the current progress to session state

requirements.txt

@@ -6,3 +6,4 @@ altair<5
 streamlit-vega-lite
 scikit-learn
 pymysql
+extra_streamlit_components