Add image type filter

app.py

@@ -87,10 +87,7 @@ def same_auth(username, password):
     return(username == os.environ['username']) & (password == os.environ['password'])
 
 
-
-
-
-def search_index(search_text, sd, ks, sort_by, max_results, user_num, search_title, increase = None):
+def search_index(search_text, sd, ks, sort_by, max_results, user_num, search_title, image_type, increase = None):
     max_results_list = ['10', '25', '50', '75', '100', '250', '500', '1000', '5000', '10000', 'All']
     if increase:
         max_results = max_results_list[max_results_list.index(max_results) + 1] 
@@ -141,7 +138,10 @@ def search_index(search_text, sd, ks, sort_by, max_results, user_num, search_tit
             output_df2 = output_df2.sort_values(by = ['Date Created'], ascending = False)
         elif sort_by == 'A-Z':
             output_df2 = output_df2.sort_values(by = ['title'], ascending = True)
-
+        
+        image_type_filter = '$|'.join(image_type).lower().replace("jpeg", "jpg") + '$'
+        
+        output_df2 = output_df2[output_df2['filepath'].str.contains(image_type_filter, regex = True)].reset_index(drop = True)
         total_returned = 'No. of Results to Return (Total: ' + str(output_df2.shape[0]) + ')'
         
         if max_results != 'All':
@@ -257,6 +257,8 @@ with gr.Blocks(css=style) as app:
             # with gr.Row():
                 shared_drive = gr.Dropdown(choices = ['Illustrations - 01-10 to 07-22', 'Illustrations - Now', 'Shutter Stock Images'], multiselect = True, label = 'Shared Drive', value = ['Illustrations - 01-10 to 07-22', 'Illustrations - Now'])
                 key_stage = gr.Dropdown(choices = ['EYFS', 'KS1', 'KS2'], multiselect = True, label = 'Key Stage', value = ['EYFS', 'KS1', 'KS2'])
+                image_type = gr.Dropdown(choices = ['JPEG', 'PNG', 'TIF'], multiselect = True, label = 'Image Type', value = ['PNG', 'JPEG', 'TIF'])
+
                 sort_by = gr.Dropdown(choices = ['Relevance', 'Date Created', 'A-Z'], value = 'Relevance', multiselect = False, label = 'Sort By')
                 max_return = gr.Dropdown(choices = ['10', '25', '50', '75', '100', '250', '500', '1000', '5000', '10000', 'All'], value = '50', multiselect = False, label = 'No. of Results to Return (Total: 0)')
             with gr.Row():
@@ -265,11 +267,11 @@ with gr.Blocks(css=style) as app:
                 output_df = gr.HTML()
             back_top_btn = gr.HTML(back_to_top_btn_html)
             load_more_results_btn = gr.Button(value = 'Load More Results', interactive = True, visible = False)
-    search_button.click(search_index, inputs=[search_prompt, shared_drive, key_stage, sort_by, max_return, user_num, title_search], outputs=[output_df, max_return, load_more_results_btn]) 
-    search_prompt.submit(search_index, inputs=[search_prompt, shared_drive, key_stage, sort_by, max_return, user_num, title_search], outputs=[output_df, max_return, load_more_results_btn])
+    search_button.click(search_index, inputs=[search_prompt, shared_drive, key_stage, sort_by, max_return, user_num, title_search, image_type], outputs=[output_df, max_return, load_more_results_btn]) 
+    search_prompt.submit(search_index, inputs=[search_prompt, shared_drive, key_stage, sort_by, max_return, user_num, title_search, image_type], outputs=[output_df, max_return, load_more_results_btn])
     search_button.click(search_logging, inputs=[search_prompt], outputs=None) 
     search_prompt.submit(search_logging, inputs=[search_prompt], outputs=None)
-    load_more_results_btn.click(search_index, inputs=[search_prompt, shared_drive, key_stage, sort_by, max_return, user_num, title_search, load_more_results_btn], outputs=[output_df, max_return, load_more_results_btn])
+    load_more_results_btn.click(search_index, inputs=[search_prompt, shared_drive, key_stage, sort_by, max_return, user_num, title_search, image_type, load_more_results_btn], outputs=[output_df, max_return, load_more_results_btn])
     app.load(_js = logging_js)
 
 app.auth = (same_auth)