change ismultiimages logic and add file upload function

app.py

@@ -22,55 +22,6 @@ MAX_SEED = np.iinfo(np.int32).max
 TMP_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'tmp')
 os.makedirs(TMP_DIR, exist_ok=True)
 
-def to_pil_list(
-    multiimages: List[
-        Union[
-            Image.Image,
-            Tuple[Image.Image, str],
-            gr.File,
-            Tuple[gr.File, str],
-            str,               # fallback: plain path
-            Path
-        ]
-    ]
-) -> List[Image.Image]:
-    """
-    Convert a heterogeneous `multiimages` list into a homogeneous
-    `List[Image.Image]`.
-
-    Accepts elements in any of the following forms:
-      • PIL.Image
-      • (PIL.Image, caption)
-      • gr.File        (gr.File.name is the temp‑file path)
-      • (gr.File, caption)
-      • str / pathlib.Path  (direct file path)
-
-    Returns:
-        List[Image.Image]  -- guaranteed PIL images
-    """
-    pil_imgs: List[Image.Image] = []
-
-    for item in multiimages:
-        # Unpack tuple/list, keep first element
-        if isinstance(item, (tuple, list)):
-            item = item[0]
-
-        if isinstance(item, Image.Image):          # already PIL
-            pil_imgs.append(item)
-
-        elif hasattr(item, "name"):                # gr.File
-            pil_imgs.append(Image.open(item.name))
-
-        elif isinstance(item, (str, Path)):        # file path
-            pil_imgs.append(Image.open(item))
-
-        else:
-            raise TypeError(
-                f"Unsupported element in multiimages: {type(item)}"
-            )
-
-    return pil_imgs
-
 def start_session(req: gr.Request):
     user_dir = os.path.join(TMP_DIR, str(req.session_hash))
     os.makedirs(user_dir, exist_ok=True)
@@ -109,6 +60,16 @@ def preprocess_images(images: List[Tuple[Image.Image, str]]) -> List[Image.Image
     processed_images = [pipeline.preprocess_image(image) for image in images]
     return processed_images
 
+def preprocess_upload_images(file_list: List[Any]) -> List[Tuple[Image.Image, str]]:
+    """
+    Resize all input images to 518x518 and return (image, filename) pairs.
+    """
+    images = [
+        (Image.open(f.name).convert("RGBA").resize((518, 518), Image.Resampling.LANCZOS), f.name)
+        for f in file_list
+    ]
+    return images
+
 
 def pack_state(gs: Gaussian, mesh: MeshExtractResult) -> dict:
     return {
@@ -160,7 +121,7 @@ def get_seed(randomize_seed: bool, seed: int) -> int:
 @spaces.GPU
 def image_to_3d(
     image: Image.Image,
-    multiimages: List[Tuple[Image.Image, str]],
+    multiimages: Union[List[Tuple[Image.Image, str]], List[Any]],
     is_multiimage: str,
     seed: int,
     ss_guidance_strength: float,
@@ -193,6 +154,9 @@ def image_to_3d(
     os.makedirs(user_dir, exist_ok=True)
     is_multiimage = is_multiimage.lower() == "true"
 
+    if multiimages and not isinstance(multiimages[0], tuple):
+        multiimages = preprocess_upload_images(multiimages)
+
     # Run pipeline depending on mode
     if not is_multiimage:
         outputs = pipeline.run(
@@ -210,7 +174,7 @@ def image_to_3d(
             },
         )
     else:
-        pil_images = to_pil_list(multiimages)
+        pil_images = [d[0] for d in multiimages]
         outputs = pipeline.run_multi_image(
             pil_images,
             seed=seed,
@@ -386,8 +350,14 @@ def test_for_api_gen(image: Image.Image) -> Image.Image:
     """
     return image
 
-def update_is_multiimage(event: SelectData):
-    return "true" if event.index == 1 else "false"
+def update_is_multiimage(event: gr.SelectData):
+    return gr.update("true" if event.index == 1 else "false")
+
+def toggle_multiimage_visibility(choice: str):
+    if choice == "true":
+        return gr.update(visible=True), gr.update(visible=False)
+    else:
+        return gr.update(visible=False), gr.update(visible=False)
 
 
 with gr.Blocks(delete_cache=(600, 600)) as demo:
@@ -428,17 +398,20 @@ with gr.Blocks(delete_cache=(600, 600)) as demo:
                         *NOTE: this is an experimental algorithm without training a specialized model. It may not produce the best results for all images, especially those having different poses or inconsistent details.*
                     """)
             
-            is_multiimage = gr.Radio(
-                choices=["true", "false"],
-                value="false",
-                label="Use multi-image mode",
-                visible=True         
-            )
+            is_multiimage = gr.Textbox(value="false", visible=True, interactive=False, label="is_multiimage")
 
             input_tabs.select(
                 fn=update_is_multiimage,
                 outputs=is_multiimage
             )
+            uploaded_api_images = gr.Files(file_types=["image"], label="Upload Images")
+            multiimage_combined = gr.State()
+
+            is_multiimage.change(
+                fn=toggle_multiimage_visibility,
+                inputs=is_multiimage,
+                outputs=[uploaded_api_images, multiimage_prompt]
+            )
             
             with gr.Accordion(label="Generation Settings", open=False):
                 seed = gr.Slider(0, MAX_SEED, label="Seed", value=0, step=1)
@@ -466,7 +439,7 @@ with gr.Blocks(delete_cache=(600, 600)) as demo:
             with gr.Row():
                 quick_generate_glb_btn = gr.Button("Quick Generate GLB")
                 quick_generate_gs_btn = gr.Button("Quick Generate Gaussian")
-                
+
             gr.Markdown("""
                         *NOTE: Gaussian file can be very large (~50MB), it will take a while to display and download.*
                         """)
@@ -499,7 +472,7 @@ with gr.Blocks(delete_cache=(600, 600)) as demo:
             examples=prepare_multi_example(),
             inputs=[image_prompt],
             fn=split_image,
-            outputs=[multiimage_prompt],
+            outputs=[multiimage_combined],
             run_on_click=True,
             examples_per_page=8,
         )
@@ -522,12 +495,24 @@ with gr.Blocks(delete_cache=(600, 600)) as demo:
         inputs=[image_prompt],
         outputs=[image_prompt],
     )
+    # multiimage_prompt.upload(
+    #     preprocess_images,
+    #     inputs=[multiimage_prompt],
+    #     outputs=[multiimage_prompt],
+    # )
     multiimage_prompt.upload(
-        preprocess_images,
+        fn=preprocess_images, 
         inputs=[multiimage_prompt],
-        outputs=[multiimage_prompt],
+        outputs=[multiimage_combined],
+    )
+    uploaded_api_images.upload(
+        fn=preprocess_upload_images,
+        inputs=[uploaded_api_images],
+        outputs=[multiimage_combined],
+        preprocess=False,
     )
 
+
     generate_btn.click(
         get_seed,
         inputs=[randomize_seed, seed],
@@ -535,7 +520,7 @@ with gr.Blocks(delete_cache=(600, 600)) as demo:
     ).then(
         image_to_3d,
         inputs=[
-            image_prompt, multiimage_prompt, is_multiimage, seed,
+            image_prompt, multiimage_combined, is_multiimage, seed,
             ss_guidance_strength, ss_sampling_steps,
             slat_guidance_strength, slat_sampling_steps, multiimage_algo
         ],
@@ -577,7 +562,7 @@ with gr.Blocks(delete_cache=(600, 600)) as demo:
         fn=quick_generate_glb,
         inputs=[
             image_prompt,
-            multiimage_prompt,
+            multiimage_combined,
             is_multiimage,
             seed,
             ss_guidance_strength,
@@ -595,7 +580,7 @@ with gr.Blocks(delete_cache=(600, 600)) as demo:
         fn=quick_generate_gs,
         inputs=[
             image_prompt,
-            multiimage_prompt,
+            multiimage_combined,
             is_multiimage,
             seed,
             ss_guidance_strength,
@@ -606,6 +591,24 @@ with gr.Blocks(delete_cache=(600, 600)) as demo:
         ],
         outputs=[model_output, download_gs],
     )
+    generate_btn.click(
+        fn=image_to_3d,
+        inputs=[
+            image_prompt,               # image: Image.Image
+            multiimage_combined,        # multiimages: List[UploadedFile] or List[Tuple[Image, str]]
+            is_multiimage,              # is_multiimage: str
+            seed,
+            ss_guidance_strength,
+            ss_sampling_steps,
+            slat_guidance_strength,
+            slat_sampling_steps,
+            multiimage_algo,
+        ],
+        outputs=[
+            output_buf,
+            video_output
+        ]
+    )