add set top methods

pages/Gallery.py

@@ -272,21 +272,20 @@ class GalleryApp:
         if safety_check:
             items, info, col_num, preprocessor = self.selection_panel(items)
 
-            # method = st.radio('Select a method to set dynamic weight', ['Grid Search', 'SVM', 'Greedy', 'Disable dynamic weight'], index=0, horizontal=True)
-            #
-            # if method != 'Disable dynamic weight':
-            #     if len(st.session_state.selected_dict[prompt_id]) > 0:
-            #         selected = items[
-            #             items['modelVersion_id'].isin(st.session_state.selected_dict[prompt_id])].reset_index(
-            #             drop=True)
-            #         st.session_state.score_weights[0: 3] = self.dynamic_weight(selected, items, preprocessor,
-            #                                                                    method=method)
-            #         # st.experimental_rerun()
-            #
-            #     else:
-            #         print('no selected models')
-            #
-            # st.write(st.session_state.selected_dict.get(prompt_id, []))
+            if 'selected_dict' in st.session_state:
+                st.write('checked: ', str(st.session_state.selected_dict.get(prompt_id, [])))
+                dynamic_weight_options = ['Grid Search', 'SVM', 'Greedy']
+                dynamic_weight_panel = st.columns(len(dynamic_weight_options))
+
+                if len(st.session_state.selected_dict.get(prompt_id, [])) > 0:
+                    btn_disable = False
+                else:
+                    btn_disable = True
+
+                for i in range(len(dynamic_weight_options)):
+                    method = dynamic_weight_options[i]
+                    with dynamic_weight_panel[i]:
+                        btn = st.button(method, use_container_width=True, disabled=btn_disable, on_click=self.dynamic_weight, args=(prompt_id, items, preprocessor, method))
 
             with st.form(key=f'{prompt_id}'):
                 # buttons = st.columns([1, 1, 1])
@@ -315,9 +314,6 @@ class GalleryApp:
                     with st.spinner('Loading images...'):
                         self.gallery_standard(items, col_num, info)
 
-                with st.sidebar:
-                    st.write(str(st.session_state.selected_dict[prompt_id]))
-
     def submit_actions(self, status, prompt_id):
         if status == 'Select':
             modelVersions = self.promptBook[self.promptBook['prompt_id'] == prompt_id]['modelVersion_id'].unique()
@@ -329,7 +325,6 @@ class GalleryApp:
             print(st.session_state.selected_dict, 'deselect')
             st.experimental_rerun()
             # self.promptBook.loc[self.promptBook['prompt_id'] == prompt_id, 'checked'] = False
-            pass
         elif status == 'Continue':
             st.session_state.selected_dict[prompt_id] = []
             for key in st.session_state:
@@ -339,10 +334,13 @@ class GalleryApp:
                         st.session_state.selected_dict[prompt_id].append(int(keys[2]))
             # switch_page("ranking")
             print(st.session_state.selected_dict, 'continue')
-            pass
+            st.experimental_rerun()
 
-    def dynamic_weight(self, selected, items, preprocessor='crop', method='Grid Search'):
+    def dynamic_weight(self, prompt_id, items, preprocessor='crop', method='Grid Search'):
+        selected = items[
+            items['modelVersion_id'].isin(st.session_state.selected_dict[prompt_id])].reset_index(drop=True)
         optimal_weight = [0, 0, 0]
+
         if method == 'Grid Search':
             # grid search method
             top_ranking = len(items) * len(selected)
@@ -350,9 +348,10 @@ class GalleryApp:
             for clip_weight in np.arange(-1, 1, 0.1):
                 for mcos_weight in np.arange(-1, 1, 0.1):
                     for pop_weight in np.arange(-1, 1, 0.1):
-                        weight_all = clip_weight*items[f'norm_clip_{preprocessor}'] + mcos_weight*items[f'norm_mcos_{preprocessor}'] + pop_weight*items['norm_pop']
-                        weight_all_sorted = weight_all.sort_values(ascending=False)
 
+                        weight_all = clip_weight*items[f'norm_clip_{preprocessor}'] + mcos_weight*items[f'norm_mcos_{preprocessor}'] + pop_weight*items['norm_pop']
+                        weight_all_sorted = weight_all.sort_values(ascending=False).reset_index(drop=True)
+                        # print('weight_all_sorted:', weight_all_sorted)
                         weight_selected = clip_weight*selected[f'norm_clip_{preprocessor}'] + mcos_weight*selected[f'norm_mcos_{preprocessor}'] + pop_weight*selected['norm_pop']
 
                         # get the index of values of weight_selected in weight_all_sorted
@@ -361,6 +360,7 @@ class GalleryApp:
                             rankings.append(weight_all_sorted.index[weight_all_sorted == weight].tolist()[0])
                         if sum(rankings) <= top_ranking:
                             top_ranking = sum(rankings)
+                            print('current top ranking:', top_ranking, rankings)
                             optimal_weight = [clip_weight, mcos_weight, pop_weight]
             print('optimal weight:', optimal_weight)
 
@@ -401,7 +401,7 @@ class GalleryApp:
             optimal_weight = [round(weight/len(selected), 2) for weight in optimal_weight]
             print('optimal weight:', optimal_weight)
 
-        return optimal_weight
+        st.session_state.score_weights[0: 3] = optimal_weight