Fix diso undefined symbol (clone with --recurse-submodules); remove RMBG preview/controls from UI

app.py

@@ -45,9 +45,10 @@ _NO_DEPS_PACKAGES = [
 ]
 
 # 3. Packages requiring nvcc (CUDA compiler only in runtime GPU containers)
+# NOTE: diso is NOT listed here — it's cloned with --recurse-submodules below
+# because pip install git+... doesn't fetch submodules, causing undefined symbols.
 _CUDA_PACKAGES = [
     "nvdiffrast @ git+https://github.com/NVlabs/nvdiffrast.git@253ac4fcea7de5f396371124af597e6cc957bfae",
-    "diso @ git+https://github.com/SarahWeiii/diso.git@9792ad928ccb09bdec938779651ee03e395758a6",
     "detectron2 @ git+https://github.com/facebookresearch/detectron2.git@8a9d885b3d4dcf1bef015f0593b872ed8d32b4ab",
 ]
 
@@ -83,6 +84,20 @@ def _install_runtime_packages():
         [sys.executable, "-m", "pip", "install", "--quiet", "--no-build-isolation"]
         + _CUDA_PACKAGES, env=_cuda_env, check=True,
     )
+    # diso: pip install git+... does not fetch git submodules, causing undefined
+    # CUDA symbols at import time. Clone with --recurse-submodules first.
+    _diso_src = Path("/tmp/diso-build")
+    if not _diso_src.exists():
+        subprocess.run(
+            ["git", "clone", "--recurse-submodules", "--depth=1",
+             "https://github.com/SarahWeiii/diso.git", str(_diso_src)],
+            env=_cuda_env, check=True,
+        )
+    subprocess.run(
+        [sys.executable, "-m", "pip", "install", "--quiet", "--no-build-isolation",
+         str(_diso_src)],
+        env=_cuda_env, check=True,
+    )
     _RUNTIME_PKG_MARKER.touch()
     print("[startup] Runtime packages installed.")
 
@@ -174,6 +189,35 @@ def load_triposg():
     if str(triposg_src) not in sys.path:
         sys.path.insert(0, str(triposg_src))
 
+    # Safety net: patch inference_utils.py to make diso import optional.
+    # Even if diso compiled with submodules, guard against any residual link errors.
+    _iu_path = triposg_src / "triposg" / "inference_utils.py"
+    if _iu_path.exists():
+        _iu_text = _iu_path.read_text()
+        if "DiffDMC = None" not in _iu_text and "from diso import DiffDMC" in _iu_text:
+            _iu_text = _iu_text.replace(
+                "from diso import DiffDMC",
+                "try:\n    from diso import DiffDMC\n"
+                "except Exception as _diso_err:\n"
+                "    print(f'[TripoSG] diso unavailable ({_diso_err}), using flash fallback')\n"
+                "    DiffDMC = None",
+            )
+            if ("def hierarchical_extract_geometry(" in _iu_text
+                    and "flash_extract_geometry" in _iu_text):
+                _iu_text = _iu_text.replace(
+                    "def hierarchical_extract_geometry(",
+                    "def _hierarchical_extract_geometry_impl(",
+                )
+                _iu_text += (
+                    "\n\n"
+                    "def hierarchical_extract_geometry(*args, **kwargs):\n"
+                    "    if DiffDMC is None:\n"
+                    "        return flash_extract_geometry(*args, **kwargs)\n"
+                    "    return _hierarchical_extract_geometry_impl(*args, **kwargs)\n"
+                )
+            _iu_path.write_text(_iu_text)
+            print("[load_triposg] Patched inference_utils.py: diso optional")
+
     weights_path = snapshot_download("VAST-AI/TripoSG")
 
     from triposg.pipelines.pipeline_triposg import TripoSGPipeline
@@ -593,17 +637,16 @@ def render_views(glb_file):
 
 # ── Full pipeline ─────────────────────────────────────────────────────────────
 
-def run_full_pipeline(input_image, remove_background, num_steps, guidance, seed, face_count,
-                      variant, tex_seed, enhance_face, rembg_threshold, rembg_erode,
+def run_full_pipeline(input_image, num_steps, guidance, seed, face_count,
+                      variant, tex_seed, enhance_face,
                       export_fbx, mdm_prompt, mdm_n_frames, progress=gr.Progress()):
     progress(0.0, desc="Stage 1/3: Generating shape...")
-    glb, status = generate_shape(input_image, remove_background, num_steps, guidance, seed, face_count)
+    glb, status = generate_shape(input_image, True, num_steps, guidance, seed, face_count)
     if not glb:
         return None, None, None, None, None, None, status
 
     progress(0.33, desc="Stage 2/3: Applying texture...")
-    glb, mv_img, status = apply_texture(glb, input_image, remove_background, variant, tex_seed,
-                                         enhance_face, rembg_threshold, rembg_erode)
+    glb, mv_img, status = apply_texture(glb, input_image, True, variant, tex_seed, enhance_face)
     if not glb:
         return None, None, None, None, None, None, status
 
@@ -626,12 +669,6 @@ with gr.Blocks(title="Image2Model") as demo:
             with gr.Row():
                 with gr.Column(scale=1):
                     input_image    = gr.Image(label="Input Image", type="numpy")
-                    remove_bg_check = gr.Checkbox(label="Remove Background", value=True)
-                    with gr.Row():
-                        rembg_threshold = gr.Slider(0.1, 0.95, value=0.5, step=0.05,
-                                                    label="BG Threshold")
-                        rembg_erode     = gr.Slider(0, 8, value=2, step=1,
-                                                    label="Edge Erode (px)")
 
                     with gr.Accordion("Shape Settings", open=True):
                         num_steps  = gr.Slider(20, 100, value=50, step=5,  label="Inference Steps")
@@ -653,7 +690,6 @@ with gr.Blocks(title="Image2Model") as demo:
                     run_all_btn = gr.Button("▶ Run Full Pipeline", variant="primary", interactive=False)
 
                 with gr.Column(scale=1):
-                    rembg_preview  = gr.Image(label="BG Removed Preview", type="numpy", interactive=False)
                     status         = gr.Textbox(label="Status", lines=3, interactive=False)
                     model_3d       = gr.Model3D(label="3D Preview", clear_color=[0.9, 0.9, 0.9, 1.0])
                     download_file  = gr.File(label="Download GLB")
@@ -661,7 +697,6 @@ with gr.Blocks(title="Image2Model") as demo:
 
             render_gallery = gr.Gallery(label="Rendered Views", columns=5, height=300)
 
-            _rembg_inputs  = [input_image, remove_bg_check, rembg_threshold, rembg_erode]
             _pipeline_btns = [shape_btn, run_all_btn]
 
             input_image.upload(
@@ -672,14 +707,10 @@ with gr.Blocks(title="Image2Model") as demo:
                 fn=lambda: (gr.update(interactive=False), gr.update(interactive=False)),
                 inputs=[], outputs=_pipeline_btns,
             )
-            input_image.upload(fn=preview_rembg,      inputs=_rembg_inputs, outputs=[rembg_preview])
-            remove_bg_check.change(fn=preview_rembg,  inputs=_rembg_inputs, outputs=[rembg_preview])
-            rembg_threshold.release(fn=preview_rembg, inputs=_rembg_inputs, outputs=[rembg_preview])
-            rembg_erode.release(fn=preview_rembg,     inputs=_rembg_inputs, outputs=[rembg_preview])
 
             shape_btn.click(
-                fn=generate_shape,
-                inputs=[input_image, remove_bg_check, num_steps, guidance, seed, face_count],
+                fn=lambda img, ns, gs, sd, fc: generate_shape(img, True, ns, gs, sd, fc),
+                inputs=[input_image, num_steps, guidance, seed, face_count],
                 outputs=[glb_state, status],
             ).then(
                 fn=lambda p: (p, p) if p else (None, None),
@@ -687,9 +718,8 @@ with gr.Blocks(title="Image2Model") as demo:
             )
 
             texture_btn.click(
-                fn=apply_texture,
-                inputs=[glb_state, input_image, remove_bg_check, variant, tex_seed,
-                        enhance_face_check, rembg_threshold, rembg_erode],
+                fn=lambda glb, img, v, ts, ef: apply_texture(glb, img, True, v, ts, ef),
+                inputs=[glb_state, input_image, variant, tex_seed, enhance_face_check],
                 outputs=[glb_state, multiview_img, status],
             ).then(
                 fn=lambda p: (p, p) if p else (None, None),
@@ -791,8 +821,8 @@ with gr.Blocks(title="Image2Model") as demo:
         run_all_btn.click(
             fn=run_full_pipeline,
             inputs=[
-                input_image, remove_bg_check, num_steps, guidance, seed, face_count,
-                variant, tex_seed, enhance_face_check, rembg_threshold, rembg_erode,
+                input_image, num_steps, guidance, seed, face_count,
+                variant, tex_seed, enhance_face_check,
                 export_fbx_check, mdm_prompt_box, mdm_frames_slider,
             ],
             outputs=[glb_state, download_file, multiview_img,