Update setup_comfyui_wan22.sh

setup_comfyui_wan22.sh

@@ -2,8 +2,8 @@
 # setup_comfyui_wan22.sh
 # Requisitos: Linux + Python3 + git + (opcional) NVCC/CUDA para SageAttention
 
-set -e
-set -o pipefail
+set -Eeuo pipefail
+trap 'rc=$?; echo "[ERRO] linha $LINENO: \"$BASH_COMMAND\" saiu com código $rc"; exit $rc' ERR
 
 # -----------------------------
 # Configuráveis
@@ -14,9 +14,13 @@ COMFY_PORT="${COMFY_PORT:-8818}"
 
 # Repositórios no HF
 REPO_22="Comfy-Org/Wan_2.2_ComfyUI_Repackaged"
-REPO_21="Comfy-Org/Wan_2.1_ComfyUI_repackaged"  # (atenção ao 'repackaged' minúsculo)
+REPO_21="Comfy-Org/Wan_2.1_ComfyUI_repackaged"
 REPO_CN="xinsir/controlnet-union-sdxl-1.0"
 
+# Token do Civitai (pode sobrescrever via env)
+CIVITAI_TOKEN="${CIVITAI_TOKEN:-4fcb2834969399006a736ee402b061e5}"
+CIVITAI_URL="https://civitai.com/api/download/models/2122278?type=Model&format=SafeTensor&size=pruned&fp=fp16&token=${CIVITAI_TOKEN}"
+
 # Caminhos de destino dos modelos
 MODELS_DIR="$COMFY_DIR/models"
 mkdir -p "$MODELS_DIR"/{diffusion_models,loras,vae,text_encoders,clip_vision,controlnet}
@@ -26,11 +30,10 @@ TMPDL="$(mktemp -d)"
 cleanup() { rm -rf "$TMPDL"; }
 trap cleanup EXIT
 
-# -----------------------------
-# Funções utilitárias
-# -----------------------------
+need() { command -v "$1" >/dev/null 2>&1 || { echo "Falta dependência: $1"; exit 1; }; }
+need python3; need git; need wget
+
 clone_or_update() {
-  # $1=repo_url  $2=dest_dir
   local url="$1" dest="$2"
   if [ -d "$dest/.git" ]; then
     echo "   - Atualizando $(basename "$dest")..."
@@ -39,16 +42,12 @@ clone_or_update() {
     echo "   - Clonando $(basename "$dest")..."
     git clone --recursive "$url" "$dest"
   fi
-  # Se tiver requirements.txt, tenta instalar sem travar o script em caso de falha
   if [ -f "$dest/requirements.txt" ]; then
     echo "     > Instalando requirements de $(basename "$dest")..."
     python3 -m pip install -r "$dest/requirements.txt" || true
   fi
 }
 
-# -----------------------------
-# 1) comfy-cli + ComfyUI
-# -----------------------------
 echo "[1/6] Instalando comfy-cli..."
 python3 -m pip install -U pip wheel setuptools >/dev/null
 python3 -m pip install -U comfy-cli >/dev/null
@@ -56,18 +55,14 @@ python3 -m pip install -U comfy-cli >/dev/null
 echo "[2/6] Preparando/instalando ComfyUI (GPU NVIDIA, fast deps)..."
 comfy --skip-prompt install --fast-deps --nvidia
 
-# Garante estrutura de pastas
 mkdir -p "$MODELS_DIR" "$COMFY_DIR/custom_nodes"
 
-# -----------------------------
-# 2) Downloads principais em background (HF Hub)
-# -----------------------------
 echo "[3/6] Iniciando downloads dos modelos (HF Hub) em background..."
 python3 -m pip install -U "huggingface_hub>=0.23.0" hf_transfer >/dev/null 2>&1 || true
 export HF_HUB_ENABLE_HF_TRANSFER=1
 
 (
-  set -e
+  set -Eeuo pipefail
   echo "   - Baixando pacotes do repo: $REPO_22"
   huggingface-cli download "$REPO_22" \
     split_files/diffusion_models/wan2.2_fun_control_low_noise_14B_fp8_scaled.safetensors \
@@ -87,7 +82,6 @@ export HF_HUB_ENABLE_HF_TRANSFER=1
     --local-dir-use-symlinks False \
     --resume-download
 
-  # Distribui arquivos para as pastas do ComfyUI
   install -m 644 "$TMPDL/wan22/split_files/diffusion_models/"*.safetensors "$MODELS_DIR/diffusion_models/" 2>/dev/null || true
   install -m 644 "$TMPDL/wan22/split_files/loras/"*.safetensors            "$MODELS_DIR/loras/"            2>/dev/null || true
   install -m 644 "$TMPDL/wan22/split_files/vae/"*.safetensors              "$MODELS_DIR/vae/"              2>/dev/null || true
@@ -98,85 +92,67 @@ export HF_HUB_ENABLE_HF_TRANSFER=1
 ) &
 DL_PID=$!
 
-# -----------------------------
-# 3) SageAttention em paralelo
-# -----------------------------
-echo "[4/6] Instalando dependências de atenção (em paralelo aos downloads)..."
-echo "   - Instalando Triton (>=3.0.0)..."
+echo "[4/6] Instalando SageAttention (em paralelo aos downloads)..."
 python3 -m pip install "triton>=3.0.0"
-
-echo "   - Clonando e instalando SageAttention..."
 if [ -d "SageAttention" ]; then
   (cd SageAttention && git pull --ff-only)
 else
   git clone https://github.com/thu-ml/SageAttention.git
 fi
-
-export EXT_PARALLEL=4
-export NVCC_APPEND_FLAGS="--threads 8"
-export MAX_JOBS=32
-
+export EXT_PARALLEL=4 NVCC_APPEND_FLAGS="--threads 8" MAX_JOBS=32
 (
-  set -e
+  set -Eeuo pipefail
   cd SageAttention
   python3 setup.py install
 ) &
 SA_PID=$!
 
-# -----------------------------
-# 4) Assim que downloads acabarem:
-#    - baixa controlnet extra e renomeia
-#    - instala custom nodes
-#    (tudo isso acontece enquanto o SageAttention compila)
-# -----------------------------
+# === Espera especificamente os downloads principais terminarem ===
+echo "[5/6] Aguardando downloads principais para etapa pós-downloads..."
+wait "$DL_PID"
+
+# === Pós-downloads em primeiro plano (enquanto o SageAttention ainda compila) ===
+echo "     > Baixando ControlNet extra e renomeando..."
+huggingface-cli download "$REPO_CN" diffusion_pytorch_model_promax.safetensors \
+  --local-dir "$TMPDL/controlnet" \
+  --local-dir-use-symlinks False \
+  --resume-download
+install -m 644 "$TMPDL/controlnet/diffusion_pytorch_model_promax.safetensors" \
+  "$MODELS_DIR/controlnet/controlnet-union.safetensors"
+
+echo "     > Baixando modelo do Civitai (após o ControlNet)..."
+CIVITAI_DIR="$MODELS_DIR/loras"
+mkdir -p "$CIVITAI_DIR"
 (
-  # Espera downloads principais
-  wait "$DL_PID"
-
-  echo "[5/6] Baixando modelo extra (controlnet) pós-downloads..."
-  huggingface-cli download "$REPO_CN" diffusion_pytorch_model_promax.safetensors \
-    --local-dir "$TMPDL/controlnet" \
-    --local-dir-use-symlinks False \
-    --resume-download
-  install -m 644 "$TMPDL/controlnet/diffusion_pytorch_model_promax.safetensors" \
-    "$MODELS_DIR/controlnet/controlnet-union.safetensors"
-
-  echo "[5/6] Instalando custom nodes (em paralelo ao SageAttention)..."
-  CN_DIR="$COMFY_DIR/custom_nodes"
-  mkdir -p "$CN_DIR"
-
-  # Lista de repositórios -> destino
-  declare -A REPOS=(
-    ["https://github.com/kijai/ComfyUI-Florence2"]="$CN_DIR/ComfyUI-Florence2"
-    ["https://github.com/kijai/ComfyUI-WanVideoWrapper"]="$CN_DIR/ComfyUI-WanVideoWrapper"
-    ["https://github.com/Fannovel16/ComfyUI-Frame-Interpolation"]="$CN_DIR/ComfyUI-Frame-Interpolation"
-    ["https://github.com/kijai/ComfyUI-GIMM-VFI"]="$CN_DIR/ComfyUI-GIMM-VFI"
-    ["https://github.com/Kosinkadink/ComfyUI-VideoHelperSuite"]="$CN_DIR/ComfyUI-VideoHelperSuite"
-    ["https://github.com/kijai/ComfyUI-KJNodes"]="$CN_DIR/ComfyUI-KJNodes"
-    ["https://github.com/Fannovel16/comfyui_controlnet_aux"]="$CN_DIR/comfyui_controlnet_aux"
-    ["https://github.com/Artificial-Sweetener/comfyui-WhiteRabbit"]="$CN_DIR/comfyui-WhiteRabbit"
-    ["https://github.com/LucipherDev/ComfyUI-AniDoc"]="$CN_DIR/ComfyUI-AniDoc"
-    ["https://github.com/shiimizu/ComfyUI_smZNodes"]="$CN_DIR/ComfyUI_smZNodes"
-    ["https://github.com/yuvraj108c/ComfyUI-Dwpose-Tensorrt"]="$CN_DIR/ComfyUI-Dwpose-Tensorrt"
-    ["https://github.com/grmchn/ComfyUI-ProportionChanger"]="$CN_DIR/ComfyUI-ProportionChanger"
-  )
-
-  # Para cada repo: clonar/atualizar e instalar requirements se existirem
-  for url in "${!REPOS[@]}"; do
-    dest="${REPOS[$url]}"
-    clone_or_update "$url" "$dest"
-  done
-
-  echo "   - Custom nodes prontos."
-) &
-CN_PID=$!
-
-# -----------------------------
-# 5) Espera SageAttention + Custom Nodes
-# -----------------------------
-echo "[6/6] Finalizando: aguardando SageAttention e custom nodes..."
+  cd "$CIVITAI_DIR"
+  wget --content-disposition "$CIVITAI_URL"
+)
+
+echo "     > Instalando custom nodes..."
+CN_DIR="$COMFY_DIR/custom_nodes"
+mkdir -p "$CN_DIR"
+declare -A REPOS=(
+  ["https://github.com/kijai/ComfyUI-Florence2"]="$CN_DIR/ComfyUI-Florence2"
+  ["https://github.com/kijai/ComfyUI-WanVideoWrapper"]="$CN_DIR/ComfyUI-WanVideoWrapper"
+  ["https://github.com/Fannovel16/ComfyUI-Frame-Interpolation"]="$CN_DIR/ComfyUI-Frame-Interpolation"
+  ["https://github.com/kijai/ComfyUI-GIMM-VFI"]="$CN_DIR/ComfyUI-GIMM-VFI"
+  ["https://github.com/Kosinkadink/ComfyUI-VideoHelperSuite"]="$CN_DIR/ComfyUI-VideoHelperSuite"
+  ["https://github.com/kijai/ComfyUI-KJNodes"]="$CN_DIR/ComfyUI-KJNodes"
+  ["https://github.com/Fannovel16/comfyui_controlnet_aux"]="$CN_DIR/comfyui_controlnet_aux"
+  ["https://github.com/Artificial-Sweetener/comfyui-WhiteRabbit"]="$CN_DIR/comfyui-WhiteRabbit"
+  ["https://github.com/LucipherDev/ComfyUI-AniDoc"]="$CN_DIR/ComfyUI-AniDoc"
+  ["https://github.com/shiimizu/ComfyUI_smZNodes"]="$CN_DIR/ComfyUI_smZNodes"
+  ["https://github.com/yuvraj108c/ComfyUI-Dwpose-Tensorrt"]="$CN_DIR/ComfyUI-Dwpose-Tensorrt"
+  ["https://github.com/grmchn/ComfyUI-ProportionChanger"]="$CN_DIR/ComfyUI-ProportionChanger"
+)
+for url in "${!REPOS[@]}"; do
+  clone_or_update "$url" "${REPOS[$url]}"
+done
+echo "     > Custom nodes prontos."
+
+# === Agora esperamos o SageAttention terminar, se ainda não terminou ===
+echo "[6/6] Aguardando final do SageAttention..."
 wait "$SA_PID"
-wait "$CN_PID"
 
 echo "[OK] Tudo pronto. Abrindo o ComfyUI com SageAttention na porta $COMFY_PORT..."
 exec comfy launch -- --use-sage-attention --listen "$COMFY_HOST" --port "$COMFY_PORT"