Update app.py

app.py

@@ -1,5 +1,4 @@
 import gradio as gr
-# from custom_utils.setup_env import run_setup_script
 import asyncio
 import os
 import subprocess
@@ -44,6 +43,37 @@ def organize_images_into_structure(source_folder, new_folder):
             destination_file = os.path.join(subfolder_path, file_name)
             shutil.copy(source_file, destination_file)
 
+smpl_thread = None
+smpl_process = None
+
+def run_smpl():
+    global smpl_process
+    # Запускаем процесс и храним ссылку на него
+    smpl_process = subprocess.Popen([
+        "python3", "smpl_visualizer.py",
+        "--model-path", "./SMPL_FEMALE.npz"
+    ])
+    smpl_process.wait()  # Ждём завершения процесса
+
+def stop_smpl():
+    global smpl_process
+    if smpl_process and smpl_process.poll() is None:
+        smpl_process.terminate()  # Мягко завершить
+        try:
+            smpl_process.wait(timeout=1)
+        except subprocess.TimeoutExpired:
+            smpl_process.kill()  # Форсированно убить, если не завершился
+        smpl_process = None
+
+def clear_render():
+    global smpl_thread
+    stop_smpl()
+    if smpl_thread and smpl_thread.is_alive():
+        smpl_thread.join()
+    smpl_thread = threading.Thread(target=run_smpl, daemon=True)
+    smpl_thread.start()
+    return gr.skip()
+
 def update_submenu(clothing_type):
     if clothing_type == "Top":
         return (
@@ -80,17 +110,24 @@ def update_submenu(clothing_type):
 with gr.Blocks(title="3D Garment Generator", theme=gr.themes.Default(text_size="sm")) as demo:
     front_collar = gr.State()
     back_collar = gr.State()
-    render_engine = gr.State()
 
     with gr.Row():
         # Левая колонка: рендер и кнопки
         with gr.Column(scale=3):
             viewer = gr.HTML(iframe_html, label="3D Рендер")
-            start_sim = gr.Button("Запустить симуляцию",variant="primary",scale=2)
+            sim_button = gr.Button("Запустить симуляцию",variant="primary",
+                                  scale=2,inputs=[gr.State("GarmentCode/pattern_data_sim.py"),
+                                                  gr.State("GarmentCode/configs/pattern_data_sim.json")],
+                                  )
+            fit_button = gr.Button("Запустить фитинг",variant="primary",
+                                  scale=2,inputs=[gr.State("GarmentCode/pattern_fitter.py"),
+                                                  gr.State("GarmentCode/configs/pattern_fitter.json")],
+                                  )
             with gr.Row():
                 save_render_btn = gr.Button("Сохранить рендер")
                 save_obj_btn = gr.Button("Сохранить OBJ")
-                zip_file = gr.File(label="Download Zip File")
+                clear_button = gr.Button("Очистить")
+            zip_file = gr.File(label="Download Zip File")
 
         # Правая колонка: загрузки и параметры
         with gr.Column(scale=1):
@@ -143,13 +180,26 @@ with gr.Blocks(title="3D Garment Generator", theme=gr.themes.Default(text_size="
                     inputs=clothing_type_dropdown,
                     outputs=[front_dropdown, back_dropdown]
                 )
-
-
-def run_smpl():
-    subprocess.run([
-        "python3", "smpl_visualizer.py",
-        "--model-path", "/Users/user/Downloads/SMPL/SMPL_julia/SMPL_FEMALE.npz"
-    ])
+    ## Button callbacks ##
+    sim_button.click(
+        fn=run_simulation,
+        inputs=[gr.State("GarmentCode/pattern_data_sim.py"), gr.State("GarmentCode/configs/pattern_data_sim.json")],
+        outputs=viewer
+    )
+    fit_button.click(
+        fn=run_fitting,
+        inputs=[gr.State("GarmentCode/pattern_fitter.py"), gr.State("GarmentCode/configs/pattern_fitter.json")],
+        outputs=viewer
+    )
+    clear_button.click(
+        fn=clear_render,
+        outputs=viewer
+    )
+# def run_smpl():
+#     subprocess.run([
+#         "python3", "smpl_visualizer.py",
+#         "--model-path", "/Users/user/Downloads/SMPL/SMPL_julia/SMPL_FEMALE.npz"
+#     ])
 
 if __name__ == "__main__":
     smpl_thread = threading.Thread(target=run_smpl)