Refactoring environment installs and removing debugging code

app.py

@@ -15,43 +15,19 @@ import subprocess
 import sys
 import datetime
 
-# Verify base dependencies are available
-print("===== Checking Base Environment Dependencies =====", flush=True)
+# Verbose mode: set ROBOEVAL_VERBOSE=1 to see detailed output
+ROBOEVAL_VERBOSE = os.environ.get("ROBOEVAL_VERBOSE", "0") == "1"
 
-try:
-    import gradio as gr
-    print(f"✓ gradio imported successfully (version: {gr.__version__})", flush=True)
-except ImportError as e:
-    print(f"✗ gradio import failed: {e}", flush=True)
-    print("ERROR: Gradio is required but not installed. Please install it:", flush=True)
-    print("  pip install gradio>=4.0.0", flush=True)
-    sys.exit(1)
+def log_verbose(*args, **kwargs):
+    """Print only if verbose mode is enabled"""
+    if ROBOEVAL_VERBOSE:
+        print(*args, **kwargs)
 
-try:
-    import numpy
-    print(f"✓ numpy imported successfully (version: {numpy.__version__})", flush=True)
-except ImportError as e:
-    print(f"✗ numpy import failed: {e}", flush=True)
-    print("ERROR: NumPy is required but not installed.", flush=True)
-    sys.exit(1)
-
-try:
-    from PIL import Image
-    print("✓ pillow imported successfully", flush=True)
-except ImportError as e:
-    print(f"✗ pillow import failed: {e}", flush=True)
-    print("ERROR: Pillow is required but not installed.", flush=True)
-    sys.exit(1)
-
-try:
-    import huggingface_hub
-    print(f"✓ huggingface_hub imported successfully (version: {huggingface_hub.__version__})", flush=True)
-except ImportError as e:
-    print(f"✗ huggingface_hub import failed: {e}", flush=True)
-    print("ERROR: huggingface_hub is required but not installed.", flush=True)
-    sys.exit(1)
-
-print("===== All base dependencies verified successfully =====\n", flush=True)
+# Import base dependencies
+import gradio as gr
+import numpy
+from PIL import Image
+import huggingface_hub
 
 # --- Headless defaults ---
 os.environ.setdefault("MUJOCO_GL", "egl")
@@ -61,17 +37,18 @@ os.environ.setdefault("XDG_RUNTIME_DIR", "/tmp")
 # Note: Model dependencies are installed in separate conda environments
 # RoboEval and git packages are installed at runtime using GH_TOKEN environment variable
 
-print(f"===== Application Startup at {datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')} =====\n")
+log_verbose(f"===== Application Startup at {datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')} =====\n")
 
 # Check and install RoboEval if needed (runtime installation)
 def check_and_install_roboeval():
     """Check if RoboEval is installed, install if missing"""
     try:
         import roboeval
-        print("✓ RoboEval is already installed", flush=True)
+        log_verbose("✓ RoboEval is already installed", flush=True)
         return True
     except ImportError:
-        print("⚠️  RoboEval not found. Checking if installation is needed...", flush=True)
+        if ROBOEVAL_VERBOSE:
+            print("⚠️  RoboEval not found. Checking if installation is needed...", flush=True)
         # RoboEval installation is handled by run.sh before app.py starts
         # If we get here, it means installation failed or is in progress
         return False
@@ -95,12 +72,12 @@ def verify_environments():
             import shutil
             conda_path = shutil.which("conda")
             if not conda_path:
-                print("⚠️  Warning: conda not found in PATH. Skipping environment verification.")
-                print("  Assuming environments will be available when needed.")
+                log_verbose("⚠️  Warning: conda not found in PATH. Skipping environment verification.")
+                log_verbose("  Assuming environments will be available when needed.")
                 return True, False  # Assume OpenPI exists, OpenVLA disabled
     except (FileNotFoundError, subprocess.TimeoutExpired):
-        print("⚠️  Warning: Could not check for conda. Skipping environment verification.")
-        print("  Assuming environments will be available when needed.")
+        log_verbose("⚠️  Warning: Could not check for conda. Skipping environment verification.")
+        log_verbose("  Assuming environments will be available when needed.")
         return True, False  # Assume OpenPI exists, OpenVLA disabled
     
     # If conda is available, check environments
@@ -113,29 +90,30 @@ def verify_environments():
         )
         
         if result.returncode != 0:
-            print(f"⚠️  Warning: conda env list failed: {result.stderr}")
-            print("  Assuming environments will be available when needed.")
+            log_verbose(f"⚠️  Warning: conda env list failed: {result.stderr}")
+            log_verbose("  Assuming environments will be available when needed.")
             return True, False
         
         has_openpi = "openpi_env" in result.stdout
         has_openvla = "openvla_env" in result.stdout
         
-        print("Environment check:")
-        print(f"  {'✓' if has_openpi else '✗'} openpi_env")
-        print(f"  {'✓' if has_openvla else '✗'} openvla_env (optional)")
+        if ROBOEVAL_VERBOSE:
+            print("Environment check:")
+            print(f"  {'✓' if has_openpi else '✗'} openpi_env")
+            print(f"  {'✓' if has_openvla else '✗'} openvla_env (optional)")
         
-        if not has_openpi:
+        if not has_openpi and ROBOEVAL_VERBOSE:
             print("⚠️  Warning: openpi_env not found in conda env list.")
             print("  Will attempt to use it anyway - check will happen when worker starts.")
         
         return has_openpi, has_openvla
         
     except subprocess.TimeoutExpired:
-        print("⚠️  Warning: conda env list timed out. Skipping verification.")
+        log_verbose("⚠️  Warning: conda env list timed out. Skipping verification.")
         return True, False
     except Exception as e:
-        print(f"⚠️  Warning: Error checking conda environments: {e}")
-        print("  Assuming environments will be available when needed.")
+        log_verbose(f"⚠️  Warning: Error checking conda environments: {e}")
+        log_verbose("  Assuming environments will be available when needed.")
         return True, False
 
 HAS_OPENPI, HAS_OPENVLA = verify_environments()
@@ -208,10 +186,10 @@ def _stderr_reader(proc: subprocess.Popen, model_key: str):
                 # EOF - process likely exited
                 break
             _WORKER_STDERR[model_key].append(line)
-            # Also print to console for debugging
-            print(f"[{model_key} worker stderr] {line}", end="", flush=True)
+            # Only print to console in verbose mode
+            log_verbose(f"[{model_key} worker stderr] {line}", end="", flush=True)
     except Exception as e:
-        # Log any errors in the stderr reader itself
+        # Always log errors in the stderr reader itself
         print(f"[{model_key} stderr reader error] {e}", flush=True)
     finally:
         # Try to read any remaining buffered output
@@ -219,7 +197,8 @@ def _stderr_reader(proc: subprocess.Popen, model_key: str):
             remaining = proc.stderr.read()
             if remaining:
                 _WORKER_STDERR[model_key].append(remaining)
-                print(f"[{model_key} worker stderr (remaining)] {remaining}", flush=True)
+                # Only print remaining output in verbose mode
+                log_verbose(f"[{model_key} worker stderr (remaining)] {remaining}", flush=True)
         except:
             pass
 

install_roboeval_runtime.sh

@@ -4,7 +4,17 @@
 
 set -e
 
-echo "===== Installing RoboEval at Runtime ====="
+# Verbose mode: set ROBOEVAL_VERBOSE=1 to see detailed output
+VERBOSE=${ROBOEVAL_VERBOSE:-0}
+log_verbose() {
+    if [ "$VERBOSE" = "1" ]; then
+        echo "$@"
+    fi
+}
+
+if [ "$VERBOSE" = "1" ]; then
+    echo "===== Installing RoboEval at Runtime ====="
+fi
 
 # Source conda if available
 if [ -f "/opt/conda/etc/profile.d/conda.sh" ]; then
@@ -13,7 +23,7 @@ fi
 
 # Check if RoboEval is already installed
 if python -c "import roboeval" 2>/dev/null; then
-    echo "✓ RoboEval is already installed, skipping installation"
+    log_verbose "✓ RoboEval is already installed, skipping installation"
     exit 0
 fi
 
@@ -29,212 +39,189 @@ CLONE_DIR="/tmp/roboeval_install"
 rm -rf $CLONE_DIR
 
 # Clone with submodules
-echo "Cloning RoboEval repository with submodules..."
+log_verbose "Cloning RoboEval repository with submodules..."
 git clone --recurse-submodules https://${GH_TOKEN}@github.com/helen9975/RoboEval.git $CLONE_DIR
 
-# Set environment variables for building
-export PYO3_USE_ABI3_FORWARD_COMPATIBILITY=1
-export USE_BAZEL_VERSION=7.5.0
-
-# Check if Bazel is available (should be in /usr/local/bin if installed in Dockerfile)
-if ! command -v bazel &> /dev/null; then
-    if [ -f "/usr/local/bin/bazel" ]; then
-        export PATH="/usr/local/bin:${PATH}"
-    else
-        echo "⚠️  Warning: Bazel not found. RoboEval installation may fail."
-    fi
-fi
-
-# Check if Rust is available (should be in /root/.cargo if installed in Dockerfile)
-# Rust is installed in /root/.cargo but script may run as non-root user
-# Add to PATH directly if the bin directory exists and is readable
-if [ -d "/root/.cargo/bin" ] && [ -x "/root/.cargo/bin/cargo" ]; then
-    export PATH="/root/.cargo/bin:${PATH}"
-    echo "✓ Added /root/.cargo/bin to PATH"
-elif [ -f "/root/.cargo/env" ]; then
-    # Try to source if we have permission
-    source /root/.cargo/env 2>/dev/null || export PATH="/root/.cargo/bin:${PATH}"
-    echo "✓ Sourced Rust environment from /root/.cargo/env"
-elif [ -f "${HOME}/.cargo/env" ]; then
-    source ${HOME}/.cargo/env
-    export PATH="${HOME}/.cargo/bin:${PATH}"
-    echo "✓ Sourced Rust environment from ${HOME}/.cargo/env"
-fi
-
-# Verify Rust is available
-if command -v cargo &> /dev/null; then
-    echo "✓ Rust/Cargo found: $(which cargo)"
-    cargo --version || true
-else
-    echo "⚠️  Warning: Rust/Cargo not found. RoboEval installation may fail."
-    echo "   Checked paths: /root/.cargo/bin, /root/.cargo/env, ${HOME}/.cargo/env"
-    echo "   PATH: ${PATH}"
-fi
-
-# Install RoboEval
-echo "Installing RoboEval from cloned repository..."
-echo "Note: This may take several minutes as it builds labmaze with bazel..."
-
-pip install $CLONE_DIR --no-cache-dir || {
-    echo "⚠️  RoboEval installation had some errors, but continuing..."
-    echo "Trying to install pre-built safetensors wheel..."
-    pip install safetensors --only-binary :all: || pip install "safetensors>=0.4.1" --no-build-isolation || true
-}
-
-# Get site-packages location
-SITE_PACKAGES=$(python -c "import site; print(site.getsitepackages()[0])")
-
-# Copy thirdparty directory
-cp -r $CLONE_DIR/thirdparty $SITE_PACKAGES/ || true
-
-echo "✓ RoboEval installed in base environment"
-
-# Install git-based packages in openpi_env if it exists
-if conda env list | grep -q "openpi_env"; then
-    echo "Installing git-based packages in openpi_env..."
-    conda run -n openpi_env pip install --no-cache-dir \
-        git+https://github.com/huggingface/lerobot@0cf864870cf29f4738d3ade893e6fd13fbd7cdb5 \
-        git+https://${GH_TOKEN}@github.com/tan7271/OpenPiRoboEval.git#subdirectory=packages/openpi-client --no-deps \
-        git+https://${GH_TOKEN}@github.com/tan7271/OpenPiRoboEval.git --no-deps --force-reinstall || {
-        echo "⚠️  Warning: Failed to install git packages in openpi_env"
-    }
-    
-    # Install missing pip-only dependencies that may not be in the environment file yet
-    # Note: torchvision and torchaudio should be installed via conda, not pip
-    echo "Installing additional OpenPI dependencies in openpi_env..."
-    conda run -n openpi_env pip install --no-cache-dir \
-        draccus>=0.1.0 \
-        jsonlines>=4.0.0 || {
-        echo "⚠️  Warning: Failed to install some additional dependencies in openpi_env"
-    }
-    
-    # Install RoboEval directly into openpi_env (handles permissions and dependencies automatically)
-    echo "Installing RoboEval into openpi_env..."
+# Helper function: Ensure build tools (Bazel and Rust) are in PATH
+ensure_build_tools() {
     # Set environment variables for building
     export PYO3_USE_ABI3_FORWARD_COMPATIBILITY=1
     export USE_BAZEL_VERSION=7.5.0
     
-    # Ensure Bazel is in PATH
-    if [ -f "/usr/local/bin/bazel" ]; then
-        export PATH="/usr/local/bin:${PATH}"
+    # Check if Bazel is available
+    if ! command -v bazel &> /dev/null; then
+        if [ -f "/usr/local/bin/bazel" ]; then
+            export PATH="/usr/local/bin:${PATH}"
+        else
+            log_verbose "⚠️  Warning: Bazel not found. RoboEval installation may fail."
+        fi
+    fi
+    
+    # Check if Rust is available
+    if [ -d "/root/.cargo/bin" ] && [ -x "/root/.cargo/bin/cargo" ]; then
+        export PATH="/root/.cargo/bin:${PATH}"
+        log_verbose "✓ Added /root/.cargo/bin to PATH"
+    elif [ -f "/root/.cargo/env" ]; then
+        source /root/.cargo/env 2>/dev/null || export PATH="/root/.cargo/bin:${PATH}"
+        log_verbose "✓ Sourced Rust environment from /root/.cargo/env"
+    elif [ -f "${HOME}/.cargo/env" ]; then
+        source ${HOME}/.cargo/env
+        export PATH="${HOME}/.cargo/bin:${PATH}"
+        log_verbose "✓ Sourced Rust environment from ${HOME}/.cargo/env"
+    fi
+    
+    # Verify Rust is available
+    if command -v cargo &> /dev/null; then
+        log_verbose "✓ Rust/Cargo found: $(which cargo)"
+        log_verbose "$(cargo --version || true)"
+    else
+        log_verbose "⚠️  Warning: Rust/Cargo not found. RoboEval installation may fail."
+        log_verbose "   Checked paths: /root/.cargo/bin, /root/.cargo/env, ${HOME}/.cargo/env"
+        log_verbose "   PATH: ${PATH}"
     fi
+}
+
+# Helper function: Install RoboEval from cloned directory
+install_roboeval_from_clone() {
+    local env_name=$1
+    local clone_dir=$2
     
-    # Source cargo env if it exists
-    if [ -f "/root/.cargo/env" ]; then
-        source /root/.cargo/env
+    log_verbose "Installing RoboEval from cloned repository..."
+    if [ "$VERBOSE" = "1" ]; then
+        echo "Note: This may take several minutes as it builds labmaze with bazel..."
     fi
     
-    # Install RoboEval into openpi_env
-    # Pass CLONE_DIR as an environment variable to the subshell
-    CLONE_DIR_ESC=$(echo "$CLONE_DIR" | sed 's/"/\\"/g')
-    conda run -n openpi_env bash -c "
-        export PYO3_USE_ABI3_FORWARD_COMPATIBILITY=1;
-        export USE_BAZEL_VERSION=7.5.0;
-        export PATH=\"/usr/local/bin:\$PATH\";
-        if [ -f \"/root/.cargo/env\" ]; then source /root/.cargo/env; fi;
-        pip install \"${CLONE_DIR_ESC}\" --no-cache-dir || {
-            echo '⚠️  RoboEval installation had some errors, but continuing...';
-            pip install safetensors --only-binary :all: || pip install 'safetensors>=0.4.1' --no-build-isolation || true;
+    if [ -z "$env_name" ] || [ "$env_name" = "base" ]; then
+        # Install in base environment
+        pip install "$clone_dir" --no-cache-dir || {
+            log_verbose "⚠️  RoboEval installation had some errors, but continuing..."
+            log_verbose "Trying to install pre-built safetensors wheel..."
+            pip install safetensors --only-binary :all: || pip install "safetensors>=0.4.1" --no-build-isolation || true
+        }
+    else
+        # Install in specified conda environment
+        local clone_dir_esc=$(echo "$clone_dir" | sed 's/"/\\"/g')
+        conda run -n "$env_name" bash -c "
+            export PYO3_USE_ABI3_FORWARD_COMPATIBILITY=1;
+            export USE_BAZEL_VERSION=7.5.0;
+            export PATH=\"/usr/local/bin:\$PATH\";
+            if [ -f \"/root/.cargo/env\" ]; then source /root/.cargo/env; fi;
+            pip install \"${clone_dir_esc}\" --no-cache-dir || {
+                echo '⚠️  RoboEval installation had some errors, but continuing...';
+                pip install safetensors --only-binary :all: || pip install 'safetensors>=0.4.1' --no-build-isolation || true;
+            }
+        " || {
+            log_verbose "⚠️  Warning: RoboEval installation into $env_name had errors"
         }
-    " || {
-        echo "⚠️  Warning: RoboEval installation into openpi_env had errors"
-    }
+    fi
+}
+
+# Helper function: Copy thirdparty to user site-packages
+copy_thirdparty_to_user_site() {
+    local py_minor=$1  # e.g., "3.12" or "3.10"
+    local site_packages=$2
+    local clone_dir=$3
     
-    # Also copy thirdparty to user's local site-packages (Python might check there too)
-    echo "Copying thirdparty to user's local site-packages..."
-    USER_SITE_PACKAGES="/home/user/.local/lib/python3.12/site-packages"
-    mkdir -p "$USER_SITE_PACKAGES" 2>/dev/null || true
+    log_verbose "Copying thirdparty to user's local site-packages..."
+    local user_site_packages="/home/user/.local/lib/python${py_minor}/site-packages"
+    mkdir -p "$user_site_packages" 2>/dev/null || true
     
     # Find thirdparty source
-    THIRDPARTY_SOURCE=""
-    if [ -d "${SITE_PACKAGES}/thirdparty" ]; then
-        THIRDPARTY_SOURCE="${SITE_PACKAGES}/thirdparty"
-    elif [ -d "$CLONE_DIR/thirdparty" ]; then
-        THIRDPARTY_SOURCE="$CLONE_DIR/thirdparty"
+    local thirdparty_source=""
+    if [ -d "${site_packages}/thirdparty" ]; then
+        thirdparty_source="${site_packages}/thirdparty"
+    elif [ -d "$clone_dir/thirdparty" ]; then
+        thirdparty_source="$clone_dir/thirdparty"
     fi
     
-    if [ -n "$THIRDPARTY_SOURCE" ] && [ -d "$THIRDPARTY_SOURCE" ]; then
-        # Copy to user's local site-packages (user has write access here)
-        cp -r "$THIRDPARTY_SOURCE" "$USER_SITE_PACKAGES/" 2>/dev/null || {
-            echo "⚠️  Warning: Failed to copy thirdparty to user site-packages"
+    if [ -n "$thirdparty_source" ] && [ -d "$thirdparty_source" ]; then
+        cp -r "$thirdparty_source" "$user_site_packages/" 2>/dev/null || {
+            log_verbose "⚠️  Warning: Failed to copy thirdparty to user site-packages"
         }
         
         # Verify
-        if [ -d "$USER_SITE_PACKAGES/thirdparty" ]; then
-            echo "✓ thirdparty copied to user site-packages: $USER_SITE_PACKAGES"
+        if [ -d "$user_site_packages/thirdparty" ]; then
+            log_verbose "✓ thirdparty copied to user site-packages: $user_site_packages"
         fi
     fi
-    
-    echo "✓ RoboEval installed in openpi_env"
-fi
+}
 
-# Install git-based packages in openvla_env if it exists
-if conda env list | grep -q "openvla_env"; then
-    echo "Installing git-based packages in openvla_env..."
-    conda run -n openvla_env pip install --no-cache-dir \
-        git+https://github.com/openvla/openvla.git || {
-        echo "⚠️  Warning: Failed to install OpenVLA in openvla_env"
-    }
+# Helper function: Install RoboEval into a conda environment
+install_roboeval_into_env() {
+    local env_name=$1
+    local py_minor=$2  # Python minor version (e.g., "3.12" or "3.10")
     
-    # Install RoboEval directly into openvla_env (handles permissions and dependencies automatically)
-    echo "Installing RoboEval into openvla_env..."
-    # Set environment variables for building
-    export PYO3_USE_ABI3_FORWARD_COMPATIBILITY=1
-    export USE_BAZEL_VERSION=7.5.0
-    
-    # Ensure Bazel is in PATH
-    if [ -f "/usr/local/bin/bazel" ]; then
-        export PATH="/usr/local/bin:${PATH}"
+    if ! conda env list | grep -q "$env_name"; then
+        return 0  # Environment doesn't exist, skip
     fi
     
-    # Source cargo env if it exists
-    if [ -f "/root/.cargo/env" ]; then
-        source /root/.cargo/env
-    fi
+    log_verbose "Installing RoboEval into $env_name..."
     
-    # Install RoboEval into openvla_env
-    # Pass CLONE_DIR as an environment variable to the subshell
-    CLONE_DIR_ESC=$(echo "$CLONE_DIR" | sed 's/"/\\"/g')
-    conda run -n openvla_env bash -c "
-        export PYO3_USE_ABI3_FORWARD_COMPATIBILITY=1;
-        export USE_BAZEL_VERSION=7.5.0;
-        export PATH=\"/usr/local/bin:\$PATH\";
-        if [ -f \"/root/.cargo/env\" ]; then source /root/.cargo/env; fi;
-        pip install \"${CLONE_DIR_ESC}\" --no-cache-dir || {
-            echo '⚠️  RoboEval installation had some errors, but continuing...';
-            pip install safetensors --only-binary :all: || pip install 'safetensors>=0.4.1' --no-build-isolation || true;
-        }
-    " || {
-        echo "⚠️  Warning: RoboEval installation into openvla_env had errors"
-    }
+    # Ensure build tools are set up
+    ensure_build_tools
     
-    # Also copy thirdparty to user's local site-packages (Python 3.10 for OpenVLA)
-    echo "Copying thirdparty to user's local site-packages for OpenVLA..."
-    USER_SITE_PACKAGES="/home/user/.local/lib/python3.10/site-packages"
-    mkdir -p "$USER_SITE_PACKAGES" 2>/dev/null || true
+    # Install RoboEval
+    install_roboeval_from_clone "$env_name" "$CLONE_DIR"
     
-    # Find thirdparty source
-    THIRDPARTY_SOURCE=""
-    if [ -d "${SITE_PACKAGES}/thirdparty" ]; then
-        THIRDPARTY_SOURCE="${SITE_PACKAGES}/thirdparty"
-    elif [ -d "$CLONE_DIR/thirdparty" ]; then
-        THIRDPARTY_SOURCE="$CLONE_DIR/thirdparty"
-    fi
+    # Get site-packages location for base env (for thirdparty source)
+    local base_site_packages=$(python -c "import site; print(site.getsitepackages()[0])" 2>/dev/null || echo "")
+    
+    # Copy thirdparty to user site-packages
+    copy_thirdparty_to_user_site "$py_minor" "$base_site_packages" "$CLONE_DIR"
     
-    if [ -n "$THIRDPARTY_SOURCE" ] && [ -d "$THIRDPARTY_SOURCE" ]; then
-        # Copy to user's local site-packages (user has write access here)
-        cp -r "$THIRDPARTY_SOURCE" "$USER_SITE_PACKAGES/" 2>/dev/null || {
-            echo "⚠️  Warning: Failed to copy thirdparty to user site-packages for OpenVLA"
+    log_verbose "✓ RoboEval installed in $env_name"
+}
+
+# Ensure build tools are available
+ensure_build_tools
+
+# Install RoboEval in base environment
+install_roboeval_from_clone "base" "$CLONE_DIR"
+
+# Get site-packages location
+SITE_PACKAGES=$(python -c "import site; print(site.getsitepackages()[0])")
+
+# Copy thirdparty directory to base environment
+cp -r $CLONE_DIR/thirdparty $SITE_PACKAGES/ || true
+
+log_verbose "✓ RoboEval installed in base environment"
+
+# Install git-based packages and RoboEval in openpi_env if it exists
+# Gate behind INSTALL_GIT_DEPS flag (default: install if not set, but can be disabled)
+if [ "${INSTALL_GIT_DEPS:-1}" = "1" ]; then
+    if conda env list | grep -q "openpi_env"; then
+        log_verbose "Installing git-based packages in openpi_env..."
+        conda run -n openpi_env pip install --no-cache-dir \
+            git+https://github.com/huggingface/lerobot@0cf864870cf29f4738d3ade893e6fd13fbd7cdb5 \
+            git+https://${GH_TOKEN}@github.com/tan7271/OpenPiRoboEval.git#subdirectory=packages/openpi-client --no-deps \
+            git+https://${GH_TOKEN}@github.com/tan7271/OpenPiRoboEval.git --no-deps --force-reinstall || {
+            log_verbose "⚠️  Warning: Failed to install git packages in openpi_env"
         }
         
-        # Verify
-        if [ -d "$USER_SITE_PACKAGES/thirdparty" ]; then
-            echo "✓ thirdparty copied to user site-packages: $USER_SITE_PACKAGES"
-        fi
+        log_verbose "Installing additional OpenPI dependencies in openpi_env..."
+        conda run -n openpi_env pip install --no-cache-dir \
+            draccus>=0.1.0 \
+            jsonlines>=4.0.0 || {
+            log_verbose "⚠️  Warning: Failed to install some additional dependencies in openpi_env"
+        }
+    fi
+fi
+
+# Install RoboEval into openpi_env
+install_roboeval_into_env "openpi_env" "3.12"
+
+# Install git-based packages and RoboEval in openvla_env if it exists
+if [ "${INSTALL_GIT_DEPS:-1}" = "1" ]; then
+    if conda env list | grep -q "openvla_env"; then
+        log_verbose "Installing git-based packages in openvla_env..."
+        conda run -n openvla_env pip install --no-cache-dir \
+            git+https://github.com/openvla/openvla.git || {
+            log_verbose "⚠️  Warning: Failed to install OpenVLA in openvla_env"
+        }
     fi
-    
-    echo "✓ RoboEval installed in openvla_env"
 fi
 
-echo "✓ RoboEval installation complete"
+# Install RoboEval into openvla_env
+install_roboeval_into_env "openvla_env" "3.10"
 
+log_verbose "✓ RoboEval installation complete"

run.sh

@@ -24,10 +24,16 @@ fi
 # Install RoboEval at runtime if not already installed
 # This uses GH_TOKEN environment variable (available at runtime in HuggingFace Spaces)
 if [ -n "$GH_TOKEN" ]; then
-    echo "Installing RoboEval at runtime (if not already installed)..."
-    bash install_roboeval_runtime.sh || {
-        echo "⚠️  Warning: RoboEval installation failed. The app will continue but some features may not work."
-    }
+    # Check if RoboEval is already installed before running installer
+    if python -c "import roboeval" 2>/dev/null; then
+        # Already installed, skip
+        :
+    else
+        echo "Installing RoboEval at runtime (if not already installed)..."
+        bash install_roboeval_runtime.sh || {
+            echo "⚠️  Warning: RoboEval installation failed. The app will continue but some features may not work."
+        }
+    fi
 else
     echo "⚠️  Warning: GH_TOKEN not set. Skipping RoboEval installation."
     echo "   Some features may not work. Set GH_TOKEN as a secret in Space settings."