Update app.py

app.py

@@ -132,7 +132,7 @@ def update_image(filepath, z):
     filepath_show = norm_path(filepath_show)
     print(filepath_show)
     print(filepath)
-    return filepath_show, filepath, (fp0, [((5, 5, 10, 10), 'nothing')])
+    return (filepath_show,  [((5, 5, 10, 10), 'nothing')]), filepath, (fp0, [((5, 5, 10, 10), 'nothing')])
 
 def update_button(filepath, z):
     print('update_btn')
@@ -140,7 +140,7 @@ def update_button(filepath, z):
     filepath_show = tif_view(filepath, z)
     filepath_show = norm_path(filepath_show)
     print(filepath_show)
-    return filepath_show, [filepath], (fp0, [((5, 5, 10, 10), 'nothing')])
+    return (filepath_show, [((5, 5, 10, 10), 'nothing')]), [filepath], (fp0, [((5, 5, 10, 10), 'nothing')])
 
 def update_z(filepath, filepath_result, filepath_coordinates, z): 
     print('update_img')   
@@ -164,7 +164,7 @@ def update_z(filepath, filepath_result, filepath_coordinates, z):
     else:
         display_boxes = filter_coordinates(filepath_coordinates, z)
     
-    return filepath_show, (filepath_result_show, display_boxes)
+    return (filepath_show, display_boxes), (filepath_result_show, display_boxes)
 
 def detect_cells(filepath, z):
     model = tf.keras.models.load_model('./model_positions', compile=False)
@@ -241,7 +241,8 @@ with gr.Blocks(title = "Hello",
             </div>""")
             gr.HTML("""<h4 style="color:white;">You may need to login/refresh for 5 minutes of free GPU compute per day (enough to process hundreds of images). </h4>""")
             
-            input_image = gr.Image(label = "Input", type = "filepath")
+            #input_image = gr.Image(label = "Input", type = "filepath")
+            input_image = gr.AnnotatedImage(label = "Input", show_legend=False, color_map = {'nothing': '#FFFF00'})
 
             with gr.Row():
                 with gr.Column(scale=1):                    
@@ -271,7 +272,7 @@ with gr.Blocks(title = "Hello",
     #    sample_list.append("samples/img%0.2d.png"%j)
         
     #gr.Examples(sample_list, fn = update_button, inputs=input_image, outputs = [input_image, up_btn, outlines, flows], examples_per_page=50, label = "Click on an example to try it")
-    input_image.upload(update_button, [input_image, depth], [input_image, up_btn, output_image])
+    #input_image.upload(update_button, [input_image, depth], [input_image, up_btn, output_image])
     up_btn.upload(update_image, [up_btn, depth], [input_image, up_btn, output_image])
     depth.change(update_z, [up_btn, down_btn, down_btn2, depth], [input_image, output_image])
     #depth.change(update_depth, [up_btn, depth], depth)