fix queue and update Model3D description

launch.py

@@ -16,15 +16,19 @@ from gradio_model3dcolor import Model3DColor
 from gradio_model3dnormal import Model3DNormal
 
 is_local_run = os.path.exists("../SpaRP_API")
-code_dir = snapshot_download("sudo-ai/SpaRP_API", token=os.environ['HF_TOKEN']) if not is_local_run else "../SpaRP_API"
+code_dir = (
+    snapshot_download("sudo-ai/SpaRP_API", token=os.environ["HF_TOKEN"])
+    if not is_local_run
+    else "../SpaRP_API"
+)
 
 if not is_local_run:
-    zip_file_path = f'{code_dir}/examples.zip'
+    zip_file_path = f"{code_dir}/examples.zip"
     # Unzipping the file into the current directory
-    with zipfile.ZipFile(zip_file_path, 'r') as zip_ref:
+    with zipfile.ZipFile(zip_file_path, "r") as zip_ref:
         zip_ref.extractall(os.getcwd())
 
-with open(f'{code_dir}/api.json', 'r') as file:
+with open(f"{code_dir}/api.json", "r") as file:
     api_dict = json.load(file)
     SEGM_i_CALL = api_dict["SEGM_i_CALL"]
     SEGM_CALL = api_dict["SEGM_CALL"]
@@ -40,6 +44,9 @@ _DESCRIPTION = (
 )
 _PR = """
 <div>
+<b><em>Project page: <a href="https://chaoxu.xyz/sparp/">https://chaoxu.xyz/sparp/</a></em></b>
+</div>
+<div>
 <b><em>Check out <a href="https://www.sudo.ai/3dgen">Hillbot (sudoAI)</a> for more details and advanced features.</em></b>
 </div>
 """
@@ -97,24 +104,19 @@ def create_tmp_dir():
     return tmp_dir
 
 
-def preprocess_imgs(tmp_dir, input_img, idx=None):
-    if isinstance(input_img, list) and idx is None:
-        for i, img_tuple in enumerate(input_img):
-            Image.open(img_tuple[0]).save(f"{tmp_dir}/input_{i}.png")
-            os.system(SEGM_i_CALL.replace("{tmp_dir}", tmp_dir).replace("{i}", str(i)))
-        return [Image.open(f"{tmp_dir}/seg_{i}.png") for i in range(len(input_img))]
-
-    if idx is not None:
-        print("image idx:", int(idx))
-        input_img = Image.open(input_img[int(idx)][0])
-    input_img.save(f"{tmp_dir}/input.png")
-    os.system(SEGM_CALL.replace("{tmp_dir}", tmp_dir))
-    processed_img = Image.open(f"{tmp_dir}/seg.png")
-    return processed_img.resize((320, 320), Image.Resampling.LANCZOS)
+def preprocess_imgs(tmp_dir, input_img):
+    for i, img_tuple in enumerate(input_img):
+        img = Image.open(img_tuple[0])
+        img.thumbnail([2048, 2048], Image.Resampling.LANCZOS)
+        img.save(f"{tmp_dir}/input_{i}.png")
+        os.system(
+            f"curl -L -F tmp_dir={tmp_dir} -F fn={tmp_dir}/seg_{i}.png -F image=@{tmp_dir}/input_{i}.png {SEGM_URL}/segm_img -o {tmp_dir}/seg_{i}.png"
+        )
+    return [Image.open(f"{tmp_dir}/seg_{i}.png") for i in range(len(input_img))]
 
 
 def ply_to_glb(ply_path):
-    script_path = f"{code_dir}/ply2glb.py"
+    script_path = "../utils/ply2glb.py"
     result = subprocess.run(
         ["python", script_path, "--", ply_path],
         capture_output=True,
@@ -129,8 +131,12 @@ def ply_to_glb(ply_path):
 
 
 def mesh_gen(tmp_dir, use_seg):
-    os.system(UNPOSED_CALL.replace("{tmp_dir}", tmp_dir).replace("{use_seg}", str(use_seg)))
-    os.system(MESH_CALL.replace("{tmp_dir}", tmp_dir))
+    os.system(
+        f"curl -L -F tmp_dir={tmp_dir} -F use_seg={use_seg} {UNPOSED_URL}/unposed_to_mv"
+    )
+    os.system(
+        f"curl -L -F tmp_dir={tmp_dir} {MESH_URL}/mv_to_mesh -o {tmp_dir}/mesh.ply"
+    )
 
     mesh = trimesh.load_mesh(f"{tmp_dir}/mesh.ply")
     vertex_normals = mesh.vertex_normals
@@ -204,7 +210,6 @@ with gr.Blocks(title=_TITLE, css="style.css", theme=custom_theme) as demo:
                         rows=[2],
                         object_fit="contain",
                         height=400,
-                        show_share_button=False,
                     )
                     input_image = gr.Image(
                         type="pil",
@@ -219,7 +224,6 @@ with gr.Blocks(title=_TITLE, css="style.css", theme=custom_theme) as demo:
                         object_fit="contain",
                         height=400,
                         interactive=False,
-                        show_share_button=False,
                     )
             with gr.Row():
                 with gr.Column(scale=5):
@@ -260,6 +264,7 @@ with gr.Blocks(title=_TITLE, css="style.css", theme=custom_theme) as demo:
                     )
 
     # Callbacks
+    generating_mesh = gr.State(False)
     disable_button = lambda: gr.Button(interactive=False)
     enable_button = lambda: gr.Button(interactive=True)
     update_guide = lambda GUIDE_TEXT, icon_type="info": gr.HTML(
@@ -272,7 +277,15 @@ with gr.Blocks(title=_TITLE, css="style.css", theme=custom_theme) as demo:
 
     def not_cleared(content):
         if not content:
-            raise ValueError  # gr.Error(visible=False) doesn't work, trick for not showing error message
+            raise ValueError
+
+    def toggle_mesh_generation_status(generating_mesh):
+        generating_mesh = not generating_mesh
+        return generating_mesh
+
+    def is_generating_mesh(generating_mesh):
+        if generating_mesh:
+            raise ValueError
 
     # Upload event listener for input gallery
     input_gallery.upload(
@@ -282,7 +295,7 @@ with gr.Blocks(title=_TITLE, css="style.css", theme=custom_theme) as demo:
     ).success(
         fn=create_tmp_dir,
         outputs=[tmp_dir_unposed],
-        queue=False,
+        queue=True,
     ).success(
         fn=partial(
             update_guide, "Removing background of the input image(s)...", "wait"
@@ -298,6 +311,10 @@ with gr.Blocks(title=_TITLE, css="style.css", theme=custom_theme) as demo:
         fn=partial(update_guide, "Click <b>Generate</b> to generate mesh.", "cursor"),
         outputs=[guide_text],
         queue=False,
+    ).success(
+        fn=is_generating_mesh,
+        inputs=[generating_mesh],
+        queue=False,
     ).success(
         fn=enable_button,
         outputs=[run_btn],
@@ -321,14 +338,6 @@ with gr.Blocks(title=_TITLE, css="style.css", theme=custom_theme) as demo:
         fn=lambda: None,
         outputs=[processed_gallery],
         queue=False,
-    ).success(
-        fn=lambda: None,
-        outputs=[mesh_output],
-        queue=False,
-    ).success(
-        fn=lambda: None,
-        outputs=[mesh_output_normal],
-        queue=False,
     ).success(
         fn=partial(
             update_guide,
@@ -348,18 +357,10 @@ with gr.Blocks(title=_TITLE, css="style.css", theme=custom_theme) as demo:
         fn=disable_button,
         outputs=run_btn,
         queue=False,
-    ).success(
-        fn=lambda: None,
-        outputs=[mesh_output],
-        queue=False,
-    ).success(
-        fn=lambda: None,
-        outputs=[mesh_output_normal],
-        queue=False,
     ).success(
         fn=create_tmp_dir,
         outputs=tmp_dir_unposed,
-        queue=False,
+        queue=True,
     ).success(
         fn=partial(
             update_guide, "Removing background of the input image(s)...", "wait"
@@ -375,6 +376,10 @@ with gr.Blocks(title=_TITLE, css="style.css", theme=custom_theme) as demo:
         fn=partial(update_guide, "Click <b>Generate</b> to generate mesh.", "cursor"),
         outputs=[guide_text],
         queue=False,
+    ).success(
+        fn=is_generating_mesh,
+        inputs=[generating_mesh],
+        queue=False,
     ).success(
         fn=enable_button,
         outputs=run_btn,
@@ -398,11 +403,21 @@ with gr.Blocks(title=_TITLE, css="style.css", theme=custom_theme) as demo:
         fn=partial(update_guide, "Generating the mesh...", "wait"),
         outputs=[guide_text],
         queue=False,
+    ).success(
+        fn=toggle_mesh_generation_status,
+        inputs=[generating_mesh],
+        outputs=[generating_mesh],
+        queue=False,
     ).success(
         fn=mesh_gen,
         inputs=[tmp_dir_unposed, bg_removed_checkbox],
         outputs=[mesh_output, mesh_output_normal],
         queue=True,
+    ).success(
+        fn=toggle_mesh_generation_status,
+        inputs=[generating_mesh],
+        outputs=[generating_mesh],
+        queue=False,
     ).success(
         fn=partial(
             update_guide,
@@ -411,6 +426,10 @@ with gr.Blocks(title=_TITLE, css="style.css", theme=custom_theme) as demo:
         ),
         outputs=[guide_text],
         queue=False,
+    ).success(
+        fn=not_cleared,
+        inputs=[input_gallery],
+        queue=False,
     ).success(
         fn=enable_button,
         outputs=[run_btn],
@@ -423,4 +442,4 @@ demo.queue().launch(
     inline=False,
     show_api=False,
     server_name="0.0.0.0",
-)
+)