Update app.py

app.py

@@ -22,10 +22,6 @@ oneFormer_model = OneFormerForUniversalSegmentation.from_pretrained("shi-labs/on
 
 
 # Функции для обработки изображений
-from PIL import Image, ImageDraw
-from gradio_client import Client, handle_file
-import numpy as np
-
 def segment_image(image):
     image = Image.fromarray(image)
     inputs = oneFormer_processor(image, task_inputs=["panoptic"], return_tensors="pt")
@@ -183,7 +179,7 @@ def generate_3d_model(client, segment_output, segment_name):
                 api_name="/shape_generation"
             )
             print(result)
-            return result[0]
+            return (result[0], result[0])
 
 def generate_3d_model_texture(client, segment_output, segment_name):
     for i, (image_path, label) in enumerate(segment_output):
@@ -199,7 +195,7 @@ def generate_3d_model_texture(client, segment_output, segment_name):
                 api_name="/generation_all"
             )
             print(result)
-            return result[1]
+            return (result[1], result[1])
 
 def generate_3d_model2(client, segment_output, segment_name):
     for i, (image_path, label) in enumerate(segment_output):
@@ -209,7 +205,7 @@ def generate_3d_model2(client, segment_output, segment_name):
                 api_name="/step_1_generate_obj"
             )
             print(result)
-            return result[0]
+            return (result[0], result[0])
 
 
 # def classify_segments(segments):
@@ -254,22 +250,24 @@ with gr.Blocks() as demo:
                 vFusion_button = gr.Button("VFusion3D")
             with gr.Column(scale=5):
                 # trellis_output = gr.Video(label="Generated 3D Asset", autoplay=True, loop=True, height=300)
-                trellis_output2 = LitModel3D(
-                    clear_color=[0.1, 0.1, 0.1, 0],  # can adjust background color for better contrast
-                    label="3D Model Visualization",
-                    scale=1.0,
-                    tonemapping="aces",  # can use aces tonemapping for more realistic lighting
-                    exposure=1.0,        # can adjust exposure to control brightness
-                    contrast=1.1,        # can slightly increase contrast for better depth
-                    camera_position=(0, 0, 2),  # will set initial camera position to center the model
-                    zoom_speed=0.5,      # will adjust zoom speed for better control
-                    pan_speed=0.5,       # will adjust pan speed for better control
-                    interactive=True     # this allow users to interact with the model
-                )
+                # trellis_output2 = LitModel3D(
+                #     clear_color=[0.1, 0.1, 0.1, 0],  # can adjust background color for better contrast
+                #     label="3D Model Visualization",
+                #     scale=1.0,
+                #     tonemapping="aces",  # can use aces tonemapping for more realistic lighting
+                #     exposure=1.0,        # can adjust exposure to control brightness
+                #     contrast=1.1,        # can slightly increase contrast for better depth
+                #     camera_position=(0, 0, 2),  # will set initial camera position to center the model
+                #     zoom_speed=0.5,      # will adjust zoom speed for better control
+                #     pan_speed=0.5,       # will adjust pan speed for better control
+                #     interactive=True     # this allow users to interact with the model
+                # )
+                trellis_output = gr.Model3D(label="3D Model")
+                trellis_output2 = gr.Model3D(clear_color=[0.0, 0.0, 0.0, 0.0],  label="3D Model Wireframe")
                 # trellis_button.click(generate_3d_model, inputs=[client, segment_output, trellis_input], outputs=trellis_output)
-                hunyuan_button.click(generate_3d_model, inputs=[hunyuan_client, segment_output, trellis_input], outputs=trellis_output2)
-                hunyuan_button_texture.click(generate_3d_model_texture, inputs=[hunyuan_client, segment_output, trellis_input], outputs=trellis_output2)
-                vFusion_button.click(generate_3d_model2, inputs=[vFusion_client, segment_output, trellis_input], outputs=trellis_output2)
+                hunyuan_button.click(generate_3d_model, inputs=[hunyuan_client, segment_output, trellis_input], outputs=[trellis_output, trellis_output2])
+                hunyuan_button_texture.click(generate_3d_model_texture, inputs=[hunyuan_client, segment_output, trellis_input], outputs=[trellis_output, trellis_output2])
+                vFusion_button.click(generate_3d_model2, inputs=[vFusion_client, segment_output, trellis_input], outputs=[trellis_output, trellis_output2])
 
         segment_button.click(segment_image, inputs=image_input, outputs=segment_output)
         # segment_button.click(segment_full_image, inputs=image_input, outputs=segment_output)