Update app.py

app.py

@@ -151,14 +151,15 @@ def patch_asset_py():
 def run_unirig_command(script_path: str, args: List[str], step_name: str):
     """
     Runs a specific UniRig SHELL script (.sh) using bash in a subprocess,
-    ensuring the correct environment (PYTHONPATH, etc.) is set.
+    ensuring the correct environment (PYTHONPATH, etc.) is set within Blender's context.
 
     Args:
         script_path: Absolute path to the .sh script to execute.
         args: A list of command-line arguments for the script.
         step_name: Name of the step for logging.
     """
-    cmd = ["bash", script_path] + args
+    # Use xvfb-run to enable headless execution of Blender
+    cmd = ["xvfb-run", "-a", "bash", script_path] + args
 
     print(f"\n--- Running UniRig Step: {step_name} ---")
     print(f"Command: {' '.join(cmd)}")
@@ -167,7 +168,7 @@ def run_unirig_command(script_path: str, args: List[str], step_name: str):
     process_env = os.environ.copy()
     unirig_src_dir = os.path.join(UNIRIG_REPO_DIR, "src")
 
-    # 1. Set PYTHONPATH: Blender’s site-packages + UniRig source
+    # Set PYTHONPATH: Blender’s site-packages + UniRig source
     pythonpath_parts = [
         BLENDER_PYTHON_SITE_PACKAGES,
         unirig_src_dir,
@@ -176,22 +177,27 @@ def run_unirig_command(script_path: str, args: List[str], step_name: str):
     process_env["PYTHONPATH"] = os.pathsep.join(filter(None, pythonpath_parts))
     print(f"Subprocess PYTHONPATH: {process_env['PYTHONPATH']}")
 
-    # 2. Set LD_LIBRARY_PATH: Include Blender’s Python library directory
+    # Set LD_LIBRARY_PATH: Include Blender’s Python library directory
     blender_lib_path = os.path.join(BLENDER_PYTHON_DIR, "lib")
     existing_ld_path = process_env.get('LD_LIBRARY_PATH', '')
     process_env["LD_LIBRARY_PATH"] = f"{blender_lib_path}{os.pathsep}{existing_ld_path}" if existing_ld_path else blender_lib_path
     print(f"Subprocess LD_LIBRARY_PATH: {process_env['LD_LIBRARY_PATH']}")
 
-    # 3. Set PATH with a temporary 'python' symlink to Blender’s Python
-    temp_dir = tempfile.mkdtemp()
-    try:
-        python_link = os.path.join(temp_dir, "python")
-        os.symlink(BLENDER_PYTHON_EXEC, python_link)  # Links 'python' to 'python3.11'
-        existing_path = process_env.get('PATH', '')
-        process_env["PATH"] = f"{temp_dir}{os.pathsep}{BLENDER_PYTHON_BIN_DIR}{os.pathsep}{existing_path}"
-        print(f"Subprocess PATH: {process_env['PATH']}")
+    # Set PATH to prioritize Blender's Python bin directory
+    existing_path = process_env.get('PATH', '')
+    process_env["PATH"] = f"{BLENDER_PYTHON_BIN_DIR}{os.pathsep}{existing_path}"
+    print(f"Subprocess PATH: {process_env['PATH']}")
+
+    # Debug: Check which Python is used
+    python_bin = subprocess.run(["which", "python"], env=process_env, capture_output=True, text=True)
+    print(f"Python binary used: {python_bin.stdout.strip()}")
+
+    # Debug: Check Blender version
+    blender_check = subprocess.run([os.path.join(BLENDER_INSTALL_DIR, "blender"), "--version"], capture_output=True, text=True)
+    print(f"Blender version: {blender_check.stdout.strip()}")
 
-        # Execute the shell script
+    try:
+        # Execute the shell script with xvfb-run
         result = subprocess.run(
             cmd,
             cwd=UNIRIG_REPO_DIR,
@@ -229,9 +235,6 @@ def run_unirig_command(script_path: str, args: List[str], step_name: str):
         traceback.print_exc()
         raise gr.Error(f"Unexpected Python error during '{step_name}' execution: {str(e_general)[:500]}")
 
-    finally:
-        shutil.rmtree(temp_dir)  # Clean up the temporary directory
-
     print(f"--- Finished UniRig Step: {step_name} ---")
 
 
@@ -273,6 +276,19 @@ def rig_glb_mesh_multistep(input_glb_file_obj):
         print(f"Failed to import torch in Blender's Python: {e.stderr}")
         raise gr.Error("PyTorch import failed in Blender's Python environment. Check installation.")
 
+    # Test Blender execution
+    try:
+        blender_test = subprocess.run(
+            [os.path.join(BLENDER_INSTALL_DIR, "blender"), "--version"],
+            capture_output=True,
+            text=True,
+            check=True
+        )
+        print(f"Blender version: {blender_test.stdout.strip()}")
+    except subprocess.CalledProcessError as e:
+        print(f"Failed to run Blender: {e.stderr}")
+        raise gr.Error("Blender is not accessible. Check installation.")
+
     # --- Setup Temporary Directory ---
     processing_temp_dir = tempfile.mkdtemp(prefix="unirig_processing_")
     print(f"Using temporary processing directory: {processing_temp_dir}")