brute force revert commit

app.py

@@ -28,8 +28,6 @@ def main():
         # Main App Components
         title = gr.Markdown("# Saliency evaluation - experiment 1")
         user_state = gr.State(0)
-        images_list = gr.State([])
-        current_image_id = gr.State(0)
         answers = gr.State([])
         start_time = gr.State(time.time())
 
@@ -70,13 +68,11 @@ def main():
         with gr.Row():
             count = user_state if isinstance(user_state, int) else user_state.value
             images = load_image_and_saliency(count, data_dir)
-            id = images[0]
-            current_image_id = gr.State(id)
-            target_img = gr.Image(images[1], elem_classes="main-image delay", visible=False)
-            saliency_gradcam = gr.Image(images[2], elem_classes="main-image", visible=False)
-            saliency_lime = gr.Image(images[3], elem_classes="main-image", visible=False)
-            saliency_sidu = gr.Image(images[5], elem_classes="main-image", visible=False)
-            saliency_rise = gr.Image(images[4], elem_classes="main-image", visible=False)
+            target_img = gr.Image(images[0], elem_classes="main-image delay", visible=False)
+            saliency_gradcam = gr.Image(images[1], elem_classes="main-image", visible=False)
+            saliency_lime = gr.Image(images[2], elem_classes="main-image", visible=False)
+            saliency_sidu = gr.Image(images[4], elem_classes="main-image", visible=False)
+            saliency_rise = gr.Image(images[3], elem_classes="main-image", visible=False)
             
                 
         with gr.Row():
@@ -92,7 +88,7 @@ def main():
         def update_images(user_state):
             count = user_state if isinstance(user_state, int) else user_state.value
             if count < config['dataset'][config['dataset']['name']]['n_classes']:
-                #images = load_image_and_saliency(count, data_dir)
+                images = load_image_and_saliency(count, data_dir)
                 
                 # image examples
                 images = load_example_images(count, data_dir)
@@ -120,16 +116,14 @@ def main():
             count = user_state if isinstance(user_state, int) else user_state.value
             if count < config['dataset'][config['dataset']['name']]['n_classes']:
                 images = load_image_and_saliency(count, data_dir)
-                id = images[0]
-                current_image_id = gr.State(id)
-                target_img = gr.Image(images[1], elem_classes="main-image", visible=True)
-                saliency_gradcam = gr.Image(images[2], elem_classes="main-image", visible=True)
-                saliency_lime = gr.Image(images[3], elem_classes="main-image", visible=True)
-                saliency_sidu = gr.Image(images[5], elem_classes="main-image", visible=True)
-                saliency_rise = gr.Image(images[4], elem_classes="main-image", visible=True)
-                return current_image_id, target_img, saliency_gradcam, saliency_lime, saliency_rise, saliency_sidu
+                target_img = gr.Image(images[0], elem_classes="main-image", visible=True)
+                saliency_gradcam = gr.Image(images[1], elem_classes="main-image", visible=True)
+                saliency_lime = gr.Image(images[2], elem_classes="main-image", visible=True)
+                saliency_sidu = gr.Image(images[4], elem_classes="main-image", visible=True)
+                saliency_rise = gr.Image(images[3], elem_classes="main-image", visible=True)
+                return target_img, saliency_gradcam, saliency_lime, saliency_rise, saliency_sidu
             else:
-                return current_image_id, target_img, saliency_gradcam, saliency_lime, saliency_rise, saliency_sidu
+                return target_img, saliency_gradcam, saliency_lime, saliency_rise, saliency_sidu
 
         def update_state(state):
             count = state if isinstance(state, int) else state.value
@@ -154,11 +148,11 @@ def main():
 
 
         def hide_view():
-            target_img = gr.Image(images[1], elem_classes="main-image", visible=False)
-            saliency_gradcam = gr.Image(images[2], elem_classes="main-image", visible=False)
-            saliency_lime = gr.Image(images[3], elem_classes="main-image", visible=False)
-            saliency_sidu = gr.Image(images[5], elem_classes="main-image", visible=False)
-            saliency_rise = gr.Image(images[4], elem_classes="main-image", visible=False)
+            target_img = gr.Image(images[0], elem_classes="main-image", visible=False)
+            saliency_gradcam = gr.Image(images[1], elem_classes="main-image", visible=False)
+            saliency_lime = gr.Image(images[2], elem_classes="main-image", visible=False)
+            saliency_sidu = gr.Image(images[4], elem_classes="main-image", visible=False)
+            saliency_rise = gr.Image(images[3], elem_classes="main-image", visible=False)
             question = gr.Markdown(f"### Sort the following saliency maps according to which of them better explains the class {class_names[count]}.", visible=False)
             dropdown1 = gr.Dropdown(choices=options, label="grad-cam", visible=False)
             dropdown2 = gr.Dropdown(choices=options, label="lime", visible=False)
@@ -205,11 +199,9 @@ def main():
             info_to_push = {
                 "user_id": time.time(), 
                 "answer": {i: answer for i, answer in enumerate(answers)},
-                "image_id_list": images_list,
-                "duration": duration,
+                "duration": duration
             }
 
-            print(f"Saving results {info_to_push}")
             # Save the results into huggingface hub
             with scheduler.lock:
                 with JSON_DATASET_PATH.open("a") as f:
@@ -235,11 +227,6 @@ def main():
             answers.append(rank)
             return answers
 
-        def add_image_id(id, images_list):
-            images_list.append(id.value)
-            print(f"Image ID: {id.value} added to the list")
-            return images_list
-
         submit_button.click(
             check_answer, 
             inputs=[dropdown1, dropdown2, dropdown3, dropdown4]
@@ -251,10 +238,6 @@ def main():
             add_answer,
             inputs=[dropdown1, dropdown2, dropdown3, dropdown4, answers],
             outputs=answers
-        ).then(
-            add_image_id,
-            inputs=[current_image_id, images_list],
-            outputs=images_list
         ).then(
             update_img_label,
             inputs=user_state,
@@ -282,7 +265,7 @@ def main():
         ).then(
             update_saliencies, 
             inputs=[dropdown1, dropdown2, dropdown3, dropdown4, user_state], 
-            outputs={current_image_id, target_img, saliency_gradcam, saliency_lime, saliency_sidu, saliency_rise},
+            outputs={target_img, saliency_gradcam, saliency_lime, saliency_sidu, saliency_rise},
         ).then(
             update_questions,
             inputs=user_state,
@@ -295,10 +278,6 @@ def main():
 
         finish_button.click(
             add_answer, inputs=[dropdown1, dropdown2, dropdown3, dropdown4, answers],outputs=answers
-        ).then(
-            add_image_id,
-            inputs=[current_image_id, images_list],
-            outputs=images_list
         ).then(
             save_results, inputs=answers
         ).then(
@@ -308,4 +287,4 @@ def main():
     demo.launch()
 
 if __name__ == "__main__":
-    main()
+    main()

src/utils.py

@@ -19,7 +19,7 @@ def load_image_and_saliency(class_idx, data_dir):
     lime_image = os.path.join(data_dir, 'saliency', 'lime', images[id])
     sidu_image = os.path.join(data_dir, 'saliency', 'sidu', images[id])
     rise_image = os.path.join(data_dir, 'saliency', 'rise', images[id])
-    return id, image, gradcam_image, lime_image, sidu_image, rise_image
+    return image, gradcam_image, lime_image, sidu_image, rise_image
 
 def load_example_images(class_idx, data_dir, max_images=16):
     path = os.path.join(data_dir, 'images', str(class_idx))
@@ -41,6 +41,3 @@ def load_csv_concepts(data_dir):
     data = pd.read_csv(os.path.join(data_dir, 'concepts_by_class.csv'))
     return data
 
-
-
-