Update app.py

app.py

@@ -6,6 +6,8 @@ import shutil
 import threading
 from concurrent.futures import ThreadPoolExecutor
 import logging
+import json
+
 
 logging.basicConfig(level=logging.INFO)
 
@@ -13,6 +15,10 @@ logging.basicConfig(level=logging.INFO)
 iframe_html = """
 <iframe src="http://localhost:8080" width="100%" height="500" style="border:none;"></iframe>
 """
+DEFAULT_PATTERN_SPEC = "GarmentCode/assets/Patterns/shirt_mean_specification.json"
+DEFAULT_SIM_CONFIG = "GarmentCode/assets/Sim_props/default_sim_props.yaml"
+
+
 
 async def run_simulation(data_path, config_path):
     proc = await asyncio.create_subprocess_exec(
@@ -23,6 +29,33 @@ async def run_simulation(data_path, config_path):
     await proc.wait()  # дождаться завершения процесса
     return
 
+async def run_garment_sim(pattern_spec_file, sim_config_file):
+    pattern_path = getattr(pattern_spec_file, 'name', pattern_spec_file) if pattern_spec_file else DEFAULT_PATTERN_SPEC
+    config_path = getattr(sim_config_file, 'name', sim_config_file) if sim_config_file else DEFAULT_SIM_CONFIG
+    if not pattern_path or not config_path:
+        logging.critical(ValueError, "Не выбран файл спецификации паттерна или конфигурации симуляции.")
+    proc = await asyncio.create_subprocess_exec(
+        "python3", "GarmentCode/test_garment_sim.py",
+        "-p", pattern_path,
+        "-s", config_path,
+        stdout=asyncio.subprocess.PIPE,
+        stderr=asyncio.subprocess.PIPE
+    )
+    stdout, stderr = await proc.communicate()
+    if proc.returncode != 0:
+        print(stderr.decode())
+        raise RuntimeError("Simulation failed")
+    # Найти последнюю строку с JSON
+    lines = stdout.decode().splitlines()
+    for line in reversed(lines):
+        try:
+            result = json.loads(line)
+            return gr.Files(result["result_dir"])
+        except Exception:
+            continue
+    raise RuntimeError("Result path not found in output")
+
+
 async def run_fitting(data_path, config_path):
     proc = await asyncio.create_subprocess_exec(
         "python3", "GarmentCode/pattern_fitter.py",
@@ -50,8 +83,8 @@ def run_smpl():
     global smpl_process
     # Запускаем процесс и храним ссылку на него
     smpl_process = subprocess.Popen([
-        "python3", "custom_utils/smpl_visualizer.py",
-        "--model-path", "custom_utils/SMPL_FEMALE.npz"
+        "python3", "smpl_visualizer.py",
+        "--model-path", "SMPL_FEMALE.npz"
     ])
     smpl_process.wait()  # Ждём завершения процесса
 
@@ -115,13 +148,13 @@ with gr.Blocks(title="3D Garment Generator", theme=gr.themes.Default(text_size="
         # Левая колонка: рендер и кнопки
         with gr.Column(scale=3):
             viewer = gr.HTML(iframe_html, label="3D Рендер")
-            sim_button = gr.Button("Запустить симуляцию",variant="primary",
-                                  scale=2,inputs=[gr.State("GarmentCode/pattern_data_sim.py"),
-                                                  gr.State("GarmentCode/configs/pattern_data_sim.json")],
+            sim_button = gr.Button("Запустить симуляцию",variant="primary",size="sm",
+                                  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")],
+            fit_button = gr.Button("Запустить фитинг",variant="primary",size="sm",
+                                  inputs=[gr.State("GarmentCode/pattern_fitter.py"),
+                                          gr.State("GarmentCode/configs/pattern_fitter.json")],
                                   )
             with gr.Row():
                 save_render_btn = gr.Button("Сохранить рендер")
@@ -139,19 +172,24 @@ with gr.Blocks(title="3D Garment Generator", theme=gr.themes.Default(text_size="
                     height=120
 
                 )
-                body_upload = gr.File(
-                    label="2. Тело (OBJ/GLB/GLTF/FBX)",
-                    file_types=[".obj", ".glb", ".gltf", ".fbx"],
+                # body_upload = gr.File(
+                #     label="2. Тело (OBJ/GLB/GLTF/FBX)",
+                #     file_types=[".obj", ".glb", ".gltf", ".fbx"],
+                #     height=120
+                # )
+            with gr.Row():
+                pattern_specs = gr.File(
+                    label="3. Спецификация паттерна (JSON/YAML)",
+                    file_types=[".json", ".yaml"],
                     height=120
                 )
             with gr.Row():
-                pattern_specs = gr.File(
-                    label="3.Спецификация (JSON/YAML)",
+                sim_config = gr.File(
+                    label="4. Конфигурация симуляции (JSON/YAML)",
                     file_types=[".json", ".yaml"],
                     height=120
                 )
-
-            with gr.Accordion("4. Параметры генерации", open=True):
+            with gr.Accordion("5. Параметры генерации", open=True):
                 clothing_type_dropdown = gr.Dropdown(
                     label="Тип одежды",
                     choices=["Top", "Down", "Full body"],
@@ -182,8 +220,8 @@ with gr.Blocks(title="3D Garment Generator", theme=gr.themes.Default(text_size="
                 )
     ## Button callbacks ##
     sim_button.click(
-        fn=run_simulation,
-        inputs=[gr.State("GarmentCode/pattern_data_sim.py"), gr.State("GarmentCode/configs/pattern_data_sim.json")],
+        fn=run_garment_sim,
+        inputs=[pattern_specs, sim_config],
         outputs=viewer
     )
     fit_button.click(
@@ -195,11 +233,6 @@ with gr.Blocks(title="3D Garment Generator", theme=gr.themes.Default(text_size="
         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)