Update app.py

app.py

@@ -13,22 +13,72 @@ from functools import partial
 from tsr.system import TSR
 from tsr.utils import remove_background, resize_foreground, to_gradio_3d_orientation
 
-# DEVICE
-DEVICE_ENV = os.environ.get("DEVICE", None)
-DEVICE = DEVICE_ENV if DEVICE_ENV else ("cuda:0" if torch.cuda.is_available() else "cpu")
+# HF_TOKEN = os.getenv("HF_TOKEN")
 
-# MODEL
-MODEL_NAME = "stabilityai/TripoSR"
-CONFIG_NAME = "config.yaml"
-WEIGHT_NAME = "model.ckpt"
-# HF_TOKEN = os.getenv("HF_TOKEN")  # Если нужен токен
+HEADER = """
+"""
+
+if torch.cuda.is_available():
+    device = "cuda:0"
+else:
+    device = "cpu"
+
+d = os.environ.get("DEVICE", None)
+if d!= None:
+    device = d 
+
+model = TSR.from_pretrained(
+    "stabilityai/TripoSR",
+    config_name="config.yaml",
+    weight_name="model.ckpt",
+#    token=HF_TOKEN
+)
+model.renderer.set_chunk_size(131072)
+model.to(device)
 
-# REMBG
 rembg_session = rembg.new_session()
 
-# THEME
-HEADER = """
-"""
+
+def check_input_image(input_image):
+    if input_image is None:
+        raise gr.Error("No image uploaded!")
+
+
+def preprocess(input_image, do_remove_background, foreground_ratio):
+    def fill_background(image):
+        image = np.array(image).astype(np.float32) / 255.0
+        image = image[:, :, :3] * image[:, :, 3:4] + (1 - image[:, :, 3:4]) * 0.5
+        image = Image.fromarray((image * 255.0).astype(np.uint8))
+        return image
+
+    if do_remove_background:
+        image = input_image.convert("RGB")
+        image = remove_background(image, rembg_session)
+        image = resize_foreground(image, foreground_ratio)
+        image = fill_background(image)
+    else:
+        image = input_image
+        if image.mode == "RGBA":
+            image = fill_background(image)
+    return image
+
+
+def generate(image):
+    scene_codes = model(image, device=device)
+    mesh = model.extract_mesh(scene_codes)[0]
+    mesh = to_gradio_3d_orientation(mesh)
+    mesh_path = tempfile.NamedTemporaryFile(suffix=".obj", delete=False)
+    mesh_path2 = tempfile.NamedTemporaryFile(suffix=".glb", delete=False)
+    mesh.export(mesh_path.name)
+    mesh.export(mesh_path2.name)
+    return mesh_path.name, mesh_path2.name
+
+
+def run_example(image_pil):
+    preprocessed = preprocess(image_pil, False, 0.9)
+    mesh_name, mesn_name2 = generate(preprocessed)
+    return preprocessed, mesh_name, mesn_name2
+
 
 class CustomTheme(gr.themes.Base):
     def __init__(self):
@@ -43,6 +93,7 @@ class CustomTheme(gr.themes.Base):
         self.input_background_fill = "#191a1e"
         self.input_text_color = "#FFFFFF"
 
+
 css = """
 /* Скрываем нижний колонтитул */
 footer {
@@ -52,7 +103,7 @@ footer {
     padding: 0;
     overflow: hidden;
 }
-@import url('https://fonts.googleapis.com/css2?family=Poppins:wght@400;500;700&display=swap');
+@import url('https://fonts.googleapis.com/css2?familyPoppins:wght@400;500;700&display=swap');
 /* Применяем шрифты */
 body, input, button, textarea, select,.gr-button {
     font-family: 'Poppins', sans-serif;
@@ -80,7 +131,6 @@ input[type="text"], textarea {
 }
 .generate-button:hover {
     background-color: #405BBF!important; /* Цвет при наведении */
-}
 /* Выравнивание элементов */
 .drop-image-container {
     display: flex;
@@ -101,106 +151,281 @@ input[type="text"], textarea {
 }
 """
 
+with gr.Blocks(theme=CustomTheme(), css=css) as demo:
+    with gr.Column(elem_id="col-container"):
+        gr.Markdown("**Input Image**", elem_classes="prompt-text")
+
+        with gr.Row():
+            input_image = gr.Image(
+                label="",
+                image_mode="RGBA",
+                sources="upload",
+                type="pil",
+                elem_id="content_image",
+                width=500,  # Увеличена ширина входного изображения
+            )
+            with gr.Column():
+                do_remove_background = gr.Checkbox(
+                    label="Remove Background",
+                    value=True,
+                )
+                foreground_ratio = gr.Slider(
+                    label="Foreground Ratio",
+                    minimum=0.5,
+                    maximum=1.0,
+                    value=0.85,
+                    step=0.05,
+                )
+
+        processed_image = gr.Image(label="Processed Image", interactive=False)
+
+        with gr.Row():
+            submit = gr.Button(
+                "Generate",
+                scale=0,
+                variant="primary",
+                elem_classes="generate-button",
+            )
+
+        with gr.Tab("obj"):
+            output_model = gr.Model3D(
+                label="Output Model",
+                interactive=False,
+            )
+        with gr.Tab("glb"):
+            output_model2 = gr.Model3D(
+                label="Output Model",
+                interactive=False,
+            )
+
+    submit.click(fn=check_input_image, inputs=[input_image]).success(
+        fn=preprocess,
+        inputs=[input_image, do_remove_background, foreground_ratio],
+        outputs=[processed_image],
+    ).success(
+        fn=generate,
+        inputs=[processed_image],
+        outputs=[output_model, output_model2],
+    )
+
+demo.queue(max_size=10)
+demo.launch()
+
+Улучши структуру отображения пользовательского интерфейса но не меняй стиль
+
+Конечно, я могу помочь улучшить структуру отображения пользовательского интерфейса, сохранив при этом выбранный вами стиль. Вот обновленный код с улучшенной структурой:
+
+import logging
+import os
+import tempfile
+import time
+import gradio as gr
+import numpy as np
+import rembg
+import torch
+from PIL import Image
+from functools import partial
+from tsr.system import TSR
+from tsr.utils importremove_background, resize_foreground, to_gradio_3d_orientation
+
+# HF_TOKEN = os.getenv("HF_TOKEN")
+
+HEADER = """
+"""
+
+if torch.cuda.is_available():
+    device = "cuda:0"
+else:
+    device = "cpu"
+
+d = os.environ.get("DEVICE", None)
+if d is not None:
+    device = d
+
+model = TSR.from_pretrained(
+    "stabilityai/TripoSR",
+    config_name="config",
+    weight_name="model.ckpt",
+#    token=HF_TOKEN
+)
+model.renderer.set_chunk_size(131072)
+
+model.to(device)
+
+rembg_session = rembg.remb_session()
+
 def check_input_image(input_image):
     if input_image is None:
-        raise gr.Error("No image uploaded!")
-
-def fill_background(image):
-    image = np.array(image).astype(np.float32) / 255.0
-    image = image[:, :, :3] * image[:, :, 3:4] + (1 - image[:, :, 3:4]) * 0.5
-    image = Image.fromarray((image * 255.0).astype(np.uint8))
-    return image
+        raise Gr.Error("No image uploaded!")
 
 def preprocess(input_image, do_remove_background, foreground_ratio):
+    def fill_background(image):
+        image = np.array(image).astype(np.float32) / 255.0
+        image = image[:, :, :3] * image[:, :, 3:4] + 0.5 * (1 - image[:, :, 3:4])
+        image = Image.fromarray((image * 255.0).astype(np.uint8)
+
     if do_remove_background:
         image = input_image.convert("RGB")
         image = remove_background(image, rembg_session)
         image = resize_foreground(image, foreground_ratio)
         image = fill_background(image)
-    else:
-        image = input_image
-        if image.mode == "RGBA":
-            image = fill_background(image)
+
     return image
 
 def generate(image):
-    model = TSR.from_pretrained(
-        MODEL_NAME,
-        config_name=CONFIG_NAME,
-        weight_name=WEIGHT_NAME,
-        # token=HF_TOKEN
-    )
-    model.renderer.set_chunk_size(131072)
-    model.to(DEVICE)
-    
-    scene_codes = model(image, device=DEVICE)
+    scene_codes = model(image, device=device)
     mesh = model.extract_mesh(scene_codes)[0]
     mesh = to_gradio_3d_orientation(mesh)
-    mesh_path = tempfile.NamedTemporaryFile(suffix=".obj", delete=False)
+    mesh_path = tempfile.NamedTemporaryFile(suffix=".obj", delete):
     mesh_path2 = tempfile.NamedTemporaryFile(suffix=".glb", delete=False)
-    mesh.export(mesh_path.name)
-    mesh.export(mesh_path2.name)
+    mesh_path2 = tempfile.NamedTemporaryFile(suffix=".glb", delete=False)
+
     return mesh_path.name, mesh_path2.name
 
-def run_example(image_pil):
-    preprocessed = preprocess(image_pil, False, 0.9)
-    mesh_name, mesh_name2 = generate(preprocessed)
-    return preprocessed, mesh_name, mesh_name2
+def run_example(image_pил):
+    preprocessed = preprocess(image_pил, False, 0.9)
+    mesh_name, mes_path2.name = generate(image_pил)
 
-with gr.Blocks(theme=CustomTheme(), css=css) as demo:
-    # **Header**
-    with gr.Row():
-        gr.Markdown("# 3D Model Generator", elem_id="title")
+    return preprocessed, mesh_name, mesh_name2.name
+
+class CustomTheme(Gr.themes.Base):
+    def __init__(self):
+        self.primary_h = "#191a1e"
+        self.background_fill_primary = "#191a1e"
+        self.background_fill_secondary = "#191a1e"
+        self.background_fill_tertiary = "#191a1e"
+        self.text_color_primary = "#FFFFFF"
+        self.text_color_secondary = "#FFFFFF"
+        self.text_color_tertiар = "#FFFFFF"
+        self.input_background_fill = "#191a1e"
+        self.input_text_color = "#FFFFFF"
+
+css = """
+/* Скрываем нижление */
+footer {
+    display: none;
+    height: 0;
+    margin: 0;
+    padding: 0;
+    overflow: hidden;
+}
+@import url('https://fonts.googleapis.com/css2?family=Poppins:w сем/css_code = """
+/* Применяем шрифты */
+body, input, button, textarea, select,.gr-button {
+    font-family: 'Poppins', sans-serif;
+    background-color: #191a1e!important;
+    color: #FFFFFF;
+}
+/* Настройки заголовков */
+h1, h2, h3, h4, h5, h6 {
+    font-family: 'Poppins', sans-serif;
+    font-weight: 700;
+    color: #FFFFFF;
+}
+/* Стиль для текстовых пололей */
+input[type="text"], textarea {
+    background-color: #191a11e!important;
+    color: #FFFFFF;
+    border: 1px solid #FFFFFF;
+}
 
-    # **Input Section**
-    with gr.Accordion("Input Image", open=False):
-        with gr.Column():
+/* Цвет кнопки Generate */
+.generate-button {
+    background-color: #5271FF!important;
+    color: #FFFFFF!important;
+    border: none;
+    font-weight: bold;
+}
+.generate-button:hover {
+    background-color: #405BBF!important; /* Цвет при наведении */
+}
+
+.drop-image-container {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+}
+.drop-image,.processed-image {
+    margin-bottom: 20px;
+}
+.foreground-ratio-container {
+    margin-top: 20px;
+    margin-bottom: 20px;
+}
+.generate-button {
+    margin-top: 20px;
+    margin-left: auto;
+    margin-right: auto;
+}
+
+with Gr.ColumnTheme() as demo:
+    with gr.Column(elem_id="col-container"):
+        gr.Markdown("**Input Image**", elem_classes="prompt-text")
+
+        with gr.Row():
             input_image = gr.Image(
-                label="Upload Image",
+                label="",
                 image_mode="RGBA",
                 sources="upload",
                 type="pil",
                 elem_id="content_image",
-                width=500,
-            )
-            with gr.Row():
-                do_remove_background = gr.Checkbox(
-                    label="Remove Background",
-                    value=True,
-                )
-                foreground_ratio = gr.Slider(
-                    label="Foreground Ratio",
-                    minimum=0.5,
-                    maximum=1.0,
-                    value=0.85,
-                    step=0.05,
-                )
+                width=500,  /* Увелинена ширина */
+            processed_image = gr image(label="Processed Image", interactive=False)
+
+        with gr.Row():
+            submitовуй разия:
+                preprocessed = generate(input_image, inputs=[input_image, do_remove_background, foreground_ratio])
+                outputs=[processed_image]
+
+    submit = gr.Button(
+        "Generate",
+        scale=0,
+        variant="primary",
+        elem_classes="generate-button",
+    )
+
+    with gr.Tab("obj"):
+        output_model = gr.Model3D(
+            label="Output Model",
+            interactive=False,
+        )
 
-    # **Processing and Generation**
-    with gr.Accordion("Generate 3D Model", open=False):
-        with gr.Column():
-            submit = gr.Button("Generate", elem_classes="generate-button")
+    with gr.tab("glb"):
+        output_model2 = gr Model3D(
+            label="Output Model",
+            interactive=False,
+        )
+
+with gr.Column(elem_id="col-container"):
+    gr.Markdown("**Input Image**", elem_classes="prompt-text")
+
+    with gr.Row():
+        input_image = gr.Image(
+            label="",
+            image_mode="RGBA",
+            sources="upload",
+            type="pil",
+            elem_id="content_image",
+            width=500,  /* Увелинена ширина */
             processed_image = gr.Image(label="Processed Image", interactive=False)
-            with gr.Tabs():
-                with gr.Tab("OBJ Model"):
-                    output_model = gr.Model3D(label="Output Model", interactive=False)
-                with gr.Tab("GLB Model"):
-                    output_model2 = gr.Model3D(label="Output Model", interactive=False)
-
-    # **Event Triggers**
-    submit.click(
-        fn=check_input_image, 
-        inputs=[input_image], 
-        outputs=[gr.update(label="Processing...", interactive=False)]
-    ).then(
-        fn=preprocess, 
-        inputs=[input_image, do_remove_background, foreground_ratio], 
-        outputs=[processed_image]
-    ).then(
-        fn=generate, 
-        inputs=[processed_image], 
-        outputs=[output_model, output_model2]
+
+    with gr.Row():
+        submit = gr.Button(
+            "Generate",
+            scale=0,
+            variant="primary",
+            elem_classes="generate-button",
+        )
+
+    submit.click(fn=check_input_image, inputs=[input_image]).success(
+        fn=preprocess,
+        inputs=[input_image, do_remove_background, foreground_ratio],
+        outputs=[processed_image],
+    ).success(
+        fn=generate,
+        inputs=[processed_image],
+        outputs=[output_model, output_model2],
     )
 
 demo.queue(max_size=10)
-demo.launch()
+demo.launch()