update

app.py

@@ -35,12 +35,19 @@ with gr.Blocks(
                 with gr.Tab(
                     label="Image(auto seg)", id=0
                 ) as single_image_input_tab:
+                    image_prompt_raw = gr.Image(
+                        label="Input Image(raw)",
+                        format="png",
+                        image_mode="RGBA",
+                        type="pil",
+                        height=300,
+                    )
                     image_prompt = gr.Image(
                         label="Input Image",
                         format="png",
                         image_mode="RGBA",
                         type="pil",
-                        height=400,
+                        visible=False,
                     )
                     gr.Markdown(
                         """
@@ -52,6 +59,9 @@ with gr.Blocks(
                 ) as samimage_input_tab:
                     with gr.Row():
                         with gr.Column(scale=1):
+                            image_prompt_sam_raw = gr.Image(
+                                label="Input Image(raw)", type="numpy", visible=False,
+                            )
                             image_prompt_sam = gr.Image(
                                 label="Input Image", type="numpy", height=400
                             )
@@ -183,15 +193,15 @@ with gr.Blocks(
                 examples = gr.Examples(
                     label="Image Gallery",
                     examples=[
-                        [f"assets/example_image/{image}"]
+                        [f"scripts/apps/assets/example_image/{image}"]
                         for image in os.listdir(
-                            "assets/example_image"
+                            "scripts/apps/assets/example_image"
                         )
                     ],
-                    inputs=[image_prompt],
-                    # fn=preprocess_image_fn,
-                    # outputs=[image_prompt],
-                    # run_on_click=True,
+                    inputs=[image_prompt_raw],
+                    fn=preprocess_image_fn,
+                    outputs=[image_prompt],
+                    run_on_click=True,
                     examples_per_page=10,
                 )
 
@@ -199,15 +209,15 @@ with gr.Blocks(
                 examples = gr.Examples(
                     label="Image Gallery",
                     examples=[
-                        f"assets/example_image/{image}"
+                        f"scripts/apps/assets/example_image/{image}"
                         for image in os.listdir(
-                            "assets/example_image"
+                            "scripts/apps/assets/example_image"
                         )
                     ],
-                    inputs=[image_prompt_sam],
-                    # fn=preprocess_sam_image_fn,
-                    # outputs=[image_prompt_sam],
-                    # run_on_click=True,
+                    inputs=[image_prompt_sam_raw],
+                    fn=preprocess_sam_image_fn,
+                    outputs=[image_prompt_sam],
+                    run_on_click=True,
                     examples_per_page=10,
                 )
         with gr.Column(scale=1):
@@ -221,12 +231,22 @@ with gr.Blocks(
                 label="Gaussian Representation", height=300, interactive=False
             )
             aligned_gs = gr.Textbox(visible=False)
+
+            lighting_css = """
+            <style>
+            #lighter_mesh canvas {
+                filter: brightness(2.8) !important;
+            }
+            </style>
+            """
+            gr.HTML(lighting_css)
             with gr.Row():
                 model_output_mesh = gr.Model3D(
                     label="Mesh Representation",
                     height=300,
                     interactive=False,
                     clear_color=[1, 1, 1, 1],
+                    elem_id="lighter_mesh"
                 )
             gr.Markdown(
                 """ The rendering of `Gaussian Representation` takes additional 10s. """  # noqa
@@ -252,11 +272,11 @@ with gr.Blocks(
         outputs=[is_samimage, single_sam_image_example, single_image_example],
     )
 
-    # image_prompt.upload(
-    #     preprocess_image_fn,
-    #     inputs=[image_prompt],
-    #     outputs=[image_prompt],
-    # )
+    image_prompt_raw.upload(
+        preprocess_image_fn,
+        inputs=[image_prompt_raw],
+        outputs=[image_prompt],
+    )
     image_prompt.change(
         lambda: tuple(
             [
@@ -296,20 +316,17 @@ with gr.Blocks(
         ],
     )
     image_prompt.change(
-        preprocess_image_fn,
-        inputs=image_prompt,
-        outputs=image_prompt,
-    ).success(
         active_btn_by_content,
         inputs=image_prompt,
         outputs=generate_btn,
     )
 
-    # image_prompt_sam.upload(
-    #     preprocess_sam_image_fn,
-    #     inputs=[image_prompt_sam],
-    #     outputs=[image_prompt_sam],
-    # )
+    image_prompt_sam_raw.upload(
+        preprocess_sam_image_fn,
+        inputs=[image_prompt_sam_raw],
+        outputs=[image_prompt_sam],
+    )
+
     image_prompt_sam.change(
         lambda: tuple(
             [
@@ -349,10 +366,6 @@ with gr.Blocks(
             image_mask_sam,
             selected_points,
         ],
-    ).success(
-        preprocess_sam_image_fn,
-        inputs=[image_prompt_sam],
-        outputs=[image_prompt_sam],
     )
 
     image_prompt_sam.select(

common.py

@@ -208,17 +208,13 @@ def render_video(
 @spaces.GPU
 def preprocess_image_fn(
     image: str | np.ndarray | Image.Image,
-    req: gr.Request,
 ) -> Image.Image:
-    if image is None:
-        return
-        
     if isinstance(image, str):
         image = Image.open(image)
     elif isinstance(image, np.ndarray):
         image = Image.fromarray(image)
 
-    image.save(f"{TMP_DIR}/{req.session_hash}/raw_image.png")
+    # image.save(f"{TMP_DIR}/{req.session_hash}/raw_image.png")
     image = RBG_REMOVER(image)
     image = trellis_preprocess(image)
 
@@ -227,12 +223,12 @@ def preprocess_image_fn(
 
 @spaces.GPU
 def preprocess_sam_image_fn(
-    image: Image.Image, req: gr.Request
+    image: Image.Image,
 ) -> Image.Image:
     if isinstance(image, np.ndarray):
         image = Image.fromarray(image)
 
-    image.save(f"{TMP_DIR}/{req.session_hash}/raw_image.png")
+    # image.save(f"{TMP_DIR}/{req.session_hash}/raw_image.png")
     sam_image = SAM_PREDICTOR.preprocess_image(image)
     SAM_PREDICTOR.predictor.set_image(sam_image)
 
@@ -654,7 +650,7 @@ def text2image_fn(
     if postprocess:
         for idx in range(len(images)):
             image = images[idx]
-            images[idx] = preprocess_image_fn(image, req)
+            images[idx] = preprocess_image_fn(image)
 
     save_paths = []
     for idx, image in enumerate(images):