Update app.py

app.py

@@ -238,18 +238,73 @@ def run_demo_server(pipe_depth, pipe_normal, pipe_dis):
         )
 
         with gr.Tabs(elem_classes=["tabs"]):
-            # with gr.Tab("Depth"):
+            with gr.Tab("Depth"):
+                with gr.Row():
+                    with gr.Column():
+                        depth_image_input = gr.Image(
+                            label="Input Image",
+                            type="filepath",
+                        )
+                        with gr.Row():
+                            depth_image_submit_btn = gr.Button(
+                                value="Estimate Depth", variant="primary"
+                            )
+                            depth_image_reset_btn = gr.Button(value="Reset")
+                        with gr.Accordion("Advanced options", open=False):
+                            image_processing_res = gr.Radio(
+                                [
+                                    ("Native", 0),
+                                    ("Recommended", 768),
+                                ],
+                                label="Processing resolution",
+                                value=default_image_processing_res,
+                            )
+                    with gr.Column():
+                        depth_image_output_slider = ImageSlider(
+                            label="Predicted depth of gray / color (red-near, blue-far)",
+                            type="filepath",
+                            show_download_button=True,
+                            show_share_button=True,
+                            interactive=False,
+                            elem_classes="slider",
+                            position=0.25,
+                        )
+                        depth_image_output_files = gr.Files(
+                            label="Depth outputs",
+                            elem_id="download",
+                            interactive=False,
+                        )
+
+                filenames = []
+                filenames.extend(["anime_%d.jpg" %(i+1) for i in range(7)])
+                filenames.extend(["line_%d.jpg" %(i+1) for i in range(6)])
+                filenames.extend(["real_%d.jpg" %(i+1) for i in range(24)])
+
+                example_folder = os.path.join(os.path.dirname(__file__), "./images")
+                Examples(
+                    fn=process_pipe_depth,
+                    examples=[
+                        os.path.join(example_folder, "depth", name)
+                        for name in filenames
+                    ],
+                    inputs=[depth_image_input],
+                    outputs=[depth_image_output_slider, depth_image_output_files],
+                    cache_examples=True,
+                    directory_name="examples_depth",
+                )
+            
+            # with gr.Tab("Normal"):
             #     with gr.Row():
             #         with gr.Column():
-            #             depth_image_input = gr.Image(
+            #             normal_image_input = gr.Image(
             #                 label="Input Image",
             #                 type="filepath",
             #             )
             #             with gr.Row():
-            #                 depth_image_submit_btn = gr.Button(
-            #                     value="Estimate Depth", variant="primary"
+            #                 normal_image_submit_btn = gr.Button(
+            #                     value="Estimate Normal", variant="primary"
             #                 )
-            #                 depth_image_reset_btn = gr.Button(value="Reset")
+            #                 normal_image_reset_btn = gr.Button(value="Reset")
             #             with gr.Accordion("Advanced options", open=False):
             #                 image_processing_res = gr.Radio(
             #                     [
@@ -260,8 +315,8 @@ def run_demo_server(pipe_depth, pipe_normal, pipe_dis):
             #                     value=default_image_processing_res,
             #                 )
             #         with gr.Column():
-            #             depth_image_output_slider = ImageSlider(
-            #                 label="Predicted depth of gray / color (red-near, blue-far)",
+            #             normal_image_output_slider = ImageSlider(
+            #                 label="Predicted surface normal",
             #                 type="filepath",
             #                 show_download_button=True,
             #                 show_share_button=True,
@@ -269,82 +324,26 @@ def run_demo_server(pipe_depth, pipe_normal, pipe_dis):
             #                 elem_classes="slider",
             #                 position=0.25,
             #             )
-            #             depth_image_output_files = gr.Files(
-            #                 label="Depth outputs",
+            #             normal_image_output_files = gr.Files(
+            #                 label="Normal outputs",
             #                 elem_id="download",
             #                 interactive=False,
             #             )
 
             #     filenames = []
-            #     filenames.extend(["anime_%d.jpg" %(i+1) for i in range(7)])
-            #     filenames.extend(["line_%d.jpg" %(i+1) for i in range(6)])
-            #     filenames.extend(["real_%d.jpg" %(i+1) for i in range(24)])
-
+            #     filenames.extend(["%d.jpg" %(i+1) for i in range(10)])
             #     example_folder = os.path.join(os.path.dirname(__file__), "./images")
             #     Examples(
-            #         fn=process_pipe_depth,
+            #         fn=process_pipe_normal,
             #         examples=[
-            #             os.path.join(example_folder, "depth", name)
+            #             os.path.join(example_folder, "normal", name)
             #             for name in filenames
             #         ],
-            #         inputs=[depth_image_input],
-            #         outputs=[depth_image_output_slider, depth_image_output_files],
+            #         inputs=[normal_image_input],
+            #         outputs=[normal_image_output_slider, normal_image_output_files],
             #         cache_examples=True,
-            #         directory_name="examples_image",
+            #         directory_name="examples_normal",
             #     )
-            
-            with gr.Tab("Normal"):
-                with gr.Row():
-                    with gr.Column():
-                        normal_image_input = gr.Image(
-                            label="Input Image",
-                            type="filepath",
-                        )
-                        with gr.Row():
-                            normal_image_submit_btn = gr.Button(
-                                value="Estimate Normal", variant="primary"
-                            )
-                            normal_image_reset_btn = gr.Button(value="Reset")
-                        with gr.Accordion("Advanced options", open=False):
-                            image_processing_res = gr.Radio(
-                                [
-                                    ("Native", 0),
-                                    ("Recommended", 768),
-                                ],
-                                label="Processing resolution",
-                                value=default_image_processing_res,
-                            )
-                    with gr.Column():
-                        normal_image_output_slider = ImageSlider(
-                            label="Predicted surface normal",
-                            type="filepath",
-                            show_download_button=True,
-                            show_share_button=True,
-                            interactive=False,
-                            elem_classes="slider",
-                            position=0.25,
-                        )
-                        normal_image_output_files = gr.Files(
-                            label="Normal outputs",
-                            elem_id="download",
-                            interactive=False,
-                        )
-
-                filenames = []
-                filenames.extend(["%d.jpg" %(i+1) for i in range(10)])
-                example_folder = os.path.join(os.path.dirname(__file__), "./images")
-                print('example_folder :', example_folder)
-                Examples(
-                    fn=process_pipe_normal,
-                    examples=[
-                        os.path.join(example_folder, "normal", name)
-                        for name in filenames
-                    ],
-                    inputs=[normal_image_input],
-                    outputs=[normal_image_output_slider, normal_image_output_files],
-                    # cache_examples=True,
-                    # directory_name="examples_image",
-                )
                 
             # with gr.Tab("Dichotomous Segmentation"):
             #     with gr.Row():
@@ -395,61 +394,28 @@ def run_demo_server(pipe_depth, pipe_normal, pipe_dis):
             #         inputs=[dis_image_input],
             #         outputs=[dis_image_output_slider, dis_image_output_files],
             #         cache_examples=True,
-            #         directory_name="examples_image",
+            #         directory_name="examples_dis",
             #     )
 
 
-        # ### Image tab
-        # depth_image_submit_btn.click(
-        #     fn=process_image_check,
-        #     inputs=depth_image_input,
-        #     outputs=None,
-        #     preprocess=False,
-        #     queue=False,
-        # ).success(
-        #     fn=process_pipe_depth,
-        #     inputs=[
-        #         depth_image_input,
-        #         image_processing_res,
-        #     ],
-        #     outputs=[depth_image_output_slider, depth_image_output_files],
-        #     concurrency_limit=1,
-        # )
-
-        # depth_image_reset_btn.click(
-        #     fn=lambda: (
-        #         None,
-        #         None,
-        #         None,
-        #         default_image_processing_res,
-        #     ),
-        #     inputs=[],
-        #     outputs=[
-        #         depth_image_input,
-        #         depth_image_output_slider,
-        #         depth_image_output_files,
-        #         image_processing_res,
-        #     ],
-        #     queue=False,
-        # )
-        
-        normal_image_submit_btn.click(
+        ### Image tab
+        depth_image_submit_btn.click(
             fn=process_image_check,
-            inputs=normal_image_input,
+            inputs=depth_image_input,
             outputs=None,
             preprocess=False,
             queue=False,
         ).success(
-            fn=process_pipe_normal,
+            fn=process_pipe_depth,
             inputs=[
-                normal_image_input,
+                depth_image_input,
                 image_processing_res,
             ],
-            outputs=[normal_image_output_slider, normal_image_output_files],
+            outputs=[depth_image_output_slider, depth_image_output_files],
             concurrency_limit=1,
         )
 
-        normal_image_reset_btn.click(
+        depth_image_reset_btn.click(
             fn=lambda: (
                 None,
                 None,
@@ -458,14 +424,47 @@ def run_demo_server(pipe_depth, pipe_normal, pipe_dis):
             ),
             inputs=[],
             outputs=[
-                normal_image_input,
-                normal_image_output_slider,
-                normal_image_output_files,
+                depth_image_input,
+                depth_image_output_slider,
+                depth_image_output_files,
                 image_processing_res,
             ],
             queue=False,
         )
         
+        # normal_image_submit_btn.click(
+        #     fn=process_image_check,
+        #     inputs=normal_image_input,
+        #     outputs=None,
+        #     preprocess=False,
+        #     queue=False,
+        # ).success(
+        #     fn=process_pipe_normal,
+        #     inputs=[
+        #         normal_image_input,
+        #         image_processing_res,
+        #     ],
+        #     outputs=[normal_image_output_slider, normal_image_output_files],
+        #     concurrency_limit=1,
+        # )
+
+        # normal_image_reset_btn.click(
+        #     fn=lambda: (
+        #         None,
+        #         None,
+        #         None,
+        #         default_image_processing_res,
+        #     ),
+        #     inputs=[],
+        #     outputs=[
+        #         normal_image_input,
+        #         normal_image_output_slider,
+        #         normal_image_output_files,
+        #         image_processing_res,
+        #     ],
+        #     queue=False,
+        # )
+        
         # dis_image_submit_btn.click(
         #     fn=process_image_check,
         #     inputs=dis_image_input,