Update setup_comfyui_wan22.sh

setup_comfyui_wan22.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
-# setup_comfyui_wan22_clean.sh
-# Script limpo e funcional para instalação do ComfyUI com Wan 2.2
+# setup_comfyui_wan22_fixed.sh
+# Script corrigido para instalação do ComfyUI com Wan 2.2
 
 set -euo pipefail
 
@@ -26,8 +26,9 @@ MODELS_DIR="$COMFY_DIR/models"
 COMFY_HOST="${COMFY_HOST:-0.0.0.0}"
 COMFY_PORT="${COMFY_PORT:-8818}"
 CIVITAI_TOKEN="${CIVITAI_TOKEN:-4fcb2834969399006a736ee402b061e5}"
+HF_TOKEN="${HF_TOKEN:-}"  # Token opcional do HuggingFace para login
 
-# Configurações de performance (fixas, sem detecção complexa)
+# Configurações de performance
 export MAX_JOBS=32
 export NVCC_APPEND_FLAGS="--threads 8"
 export UV_SYSTEM_PYTHON=1
@@ -40,40 +41,38 @@ export EXT_PARALLEL=4
 # Lista de downloads
 # -----------------------------
 # Formato: "URL|TIPO|NOME_ARQUIVO_OPCIONAL"
-# TIPO pode ser: checkpoints, loras, vae, text_encoders, clip_vision, controlnet, upscale_models
 readonly DOWNLOAD_FILES=(
     # Wan 2.2 models
-    "hf://Comfy-Org/Wan_2.2_ComfyUI_Repackaged/split_files/diffusion_models/wan2.2_fun_control_low_noise_14B_fp8_scaled.safetensors|checkpoints|"
-    "hf://Comfy-Org/Wan_2.2_ComfyUI_Repackaged/split_files/diffusion_models/wan2.2_fun_control_high_noise_14B_fp8_scaled.safetensors|checkpoints|"
-    "hf://Comfy-Org/Wan_2.2_ComfyUI_Repackaged/split_files/loras/wan2.2_i2v_lightx2v_4steps_lora_v1_high_noise.safetensors|loras|"
-    "hf://Comfy-Org/Wan_2.2_ComfyUI_Repackaged/split_files/loras/wan2.2_i2v_lightx2v_4steps_lora_v1_low_noise.safetensors|loras|"
-    "hf://Comfy-Org/Wan_2.2_ComfyUI_Repackaged/split_files/vae/wan_2.1_vae.safetensors|vae|"
-    "hf://Comfy-Org/Wan_2.2_ComfyUI_Repackaged/split_files/text_encoders/umt5_xxl_fp16.safetensors|text_encoders|"
-    
+    #"hf://Comfy-Org/Wan_2.2_ComfyUI_Repackaged/split_files/diffusion_models/wan2.2_fun_control_low_noise_14B_fp8_scaled.safetensors|diffusion_models|"
+    #"hf://Comfy-Org/Wan_2.2_ComfyUI_Repackaged/split_files/diffusion_models/wan2.2_fun_control_high_noise_14B_fp8_scaled.safetensors|diffusion_models|"
+    #"hf://Comfy-Org/Wan_2.2_ComfyUI_Repackaged/split_files/loras/wan2.2_i2v_lightx2v_4steps_lora_v1_high_noise.safetensors|loras|"
+    #"hf://Comfy-Org/Wan_2.2_ComfyUI_Repackaged/split_files/loras/wan2.2_i2v_lightx2v_4steps_lora_v1_low_noise.safetensors|loras|"
+    #"hf://Comfy-Org/Wan_2.2_ComfyUI_Repackaged/split_files/vae/wan_2.1_vae.safetensors|vae|"
+    #"hf://Comfy-Org/Wan_2.2_ComfyUI_Repackaged/split_files/text_encoders/umt5_xxl_fp16.safetensors|text_encoders|"
     # Wan 2.1 clip vision
-    "hf://Comfy-Org/Wan_2.1_ComfyUI_repackaged/split_files/clip_vision/clip_vision_h.safetensors|clip_vision|"
-    
+    #"hf://Comfy-Org/Wan_2.1_ComfyUI_repackaged/split_files/clip_vision/clip_vision_h.safetensors|clip_vision|"
     # ControlNet
     "hf://xinsir/controlnet-union-sdxl-1.0/diffusion_pytorch_model_promax.safetensors|controlnet|controlnet-union.safetensors"
-    
+    "https://huggingface.co/ABDALLALSWAITI/Upscalers/resolve/main/anime/2x-AnimeSharpV2_MoSR_Soft.pth|upscale_models|2x-AnimeSharpV2_MoSR_Soft.pth"
     # Civitai model
-    "https://civitai.com/api/download/models/2122278?type=Model&format=SafeTensor&size=pruned&fp=fp16|loras|"
+    "https://civitai.com/api/download/models/2122278?type=Model&format=SafeTensor&size=pruned&fp=fp16|checkpoints|raehoshiIllustXL_v60.safetensors"
 )
 
 # Custom nodes para instalar
 readonly CUSTOM_NODES=(
-    "https://github.com/kijai/ComfyUI-Florence2"
-    "https://github.com/kijai/ComfyUI-WanVideoWrapper"
-    "https://github.com/Fannovel16/ComfyUI-Frame-Interpolation"
-    "https://github.com/kijai/ComfyUI-GIMM-VFI"
-    "https://github.com/Kosinkadink/ComfyUI-VideoHelperSuite"
-    "https://github.com/kijai/ComfyUI-KJNodes"
-    "https://github.com/Fannovel16/comfyui_controlnet_aux"
-    "https://github.com/Artificial-Sweetener/comfyui-WhiteRabbit"
-    "https://github.com/LucipherDev/ComfyUI-AniDoc"
-    "https://github.com/shiimizu/ComfyUI_smZNodes"
-    "https://github.com/yuvraj108c/ComfyUI-Dwpose-Tensorrt"
-    "https://github.com/grmchn/ComfyUI-ProportionChanger"
+    #"https://github.com/kijai/ComfyUI-Florence2"
+    #"https://github.com/kijai/ComfyUI-WanVideoWrapper"
+    #"https://github.com/Fannovel16/ComfyUI-Frame-Interpolation"
+    #"https://github.com/kijai/ComfyUI-GIMM-VFI"
+    #"https://github.com/Kosinkadink/ComfyUI-VideoHelperSuite"
+    #"https://github.com/kijai/ComfyUI-KJNodes"
+    #"https://github.com/Fannovel16/comfyui_controlnet_aux"
+    #"https://github.com/Artificial-Sweetener/comfyui-WhiteRabbit"
+    #"https://github.com/shiimizu/ComfyUI_smZNodes"
+    "https://github.com/CoreyCorza/ComfyUI-CRZnodes"
+    #"https://github.com/yuvraj108c/ComfyUI-Dwpose-Tensorrt"
+    #"https://github.com/Suzie1/ComfyUI_Comfyroll_CustomNodes"
+    #"https://github.com/grmchn/ComfyUI-ProportionChanger"
 )
 
 # -----------------------------
@@ -93,7 +92,7 @@ add_civitai_token() {
     fi
 }
 
-# Download HuggingFace usando HF Transfer ou huggingface-cli
+# Download HuggingFace usando huggingface-cli com hf_transfer
 download_hf() {
     local repo="$1"
     local file_path="$2"
@@ -115,32 +114,28 @@ download_hf() {
     
     log_info "Baixando de HF: $filename"
     
-    # Tentar com HF Transfer primeiro
-    if python3 -c "import hf_transfer" 2>/dev/null; then
-        HF_HUB_ENABLE_HF_TRANSFER=1 huggingface-cli download "$repo" "$file_path" \
-            --local-dir "$target_dir" \
-            --local-dir-use-symlinks False \
-            --resume-download 2>/dev/null && {
-            # Renomear se necessário
-            if [ "$filename" != "$(basename "$file_path")" ]; then
-                mv "$target_dir/$file_path" "$target_file" 2>/dev/null || true
-            fi
-            return 0
-        }
-    fi
-    
-    # Fallback para método padrão
-    huggingface-cli download "$repo" "$file_path" \
+    # Usar huggingface-cli com hf_transfer habilitado para velocidade máxima
+    if HF_HUB_ENABLE_HF_TRANSFER=1 huggingface-cli download "$repo" "$file_path" \
         --local-dir "$target_dir" \
         --local-dir-use-symlinks False \
-        --resume-download && {
-        # Renomear se necessário
-        if [ "$filename" != "$(basename "$file_path")" ]; then
-            mv "$target_dir/$file_path" "$target_file" 2>/dev/null || true
+        --resume-download 2>/dev/null; then
+        
+        # Verificar se arquivo foi baixado
+        if [ -f "$target_file" ]; then
+            log_success "Download concluído: $filename"
+            return 0
         fi
-        return 0
-    }
+        
+        # Procurar arquivo em subdiretórios se não estiver no local esperado
+        local downloaded_file=$(find "$target_dir" -name "$filename" -type f 2>/dev/null | head -1)
+        if [ -n "$downloaded_file" ] && [ "$downloaded_file" != "$target_file" ]; then
+            mv "$downloaded_file" "$target_file"
+            log_success "Download concluído e movido: $filename"
+            return 0
+        fi
+    fi
     
+    log_error "Falha ao baixar: $filename"
     return 1
 }
 
@@ -185,14 +180,11 @@ download_file() {
         if [ -n "$filename" ]; then
             curl -L -# -C - -o "$target_dir/$filename" "$url" && return 0
         else
-            # Tentar obter nome do arquivo do header
             local headers=$(curl -sI -L "$url")
             local detected_name=$(echo "$headers" | grep -i "content-disposition" | sed -n 's/.*filename="\([^"]*\)".*/\1/p' | tr -d '\r')
-            
             if [ -z "$detected_name" ]; then
                 detected_name="downloaded_$(date +%s).safetensors"
             fi
-            
             curl -L -# -C - -o "$target_dir/$detected_name" "$url" && return 0
         fi
     fi
@@ -216,7 +208,7 @@ process_downloads() {
         # Determinar diretório de destino
         local target_dir="$MODELS_DIR"
         case "$type" in
-            checkpoints) target_dir="$MODELS_DIR/diffusion_models" ;;
+            checkpoints) target_dir="$MODELS_DIR/checkpoints" ;;
             loras) target_dir="$MODELS_DIR/loras" ;;
             vae) target_dir="$MODELS_DIR/vae" ;;
             text_encoders) target_dir="$MODELS_DIR/text_encoders" ;;
@@ -233,8 +225,6 @@ process_downloads() {
         if [[ "$url" == hf://* ]]; then
             # HuggingFace download
             url="${url#hf://}"  # Remove prefixo hf://
-            
-            # Separar repo e caminho
             repo=$(echo "$url" | cut -d'/' -f1-2)
             file_path=$(echo "$url" | cut -d'/' -f3-)
             
@@ -245,6 +235,20 @@ process_downloads() {
         fi
     done
     
+    # Limpar arquivos órfãos em split_files (se existirem)
+    if [ -d "$MODELS_DIR/diffusion_models/split_files" ]; then
+        log_info "Movendo arquivos de split_files para diretórios corretos..."
+        find "$MODELS_DIR" -path "*/split_files/*" -name "*.safetensors" | while read -r file; do
+            local base_dir=$(dirname "$(dirname "$file")")
+            local target_name=$(basename "$file")
+            if [ ! -f "$base_dir/$target_name" ]; then
+                mv "$file" "$base_dir/" 2>/dev/null && log_success "Movido: $target_name"
+            fi
+        done
+        # Remover diretórios split_files vazios
+        find "$MODELS_DIR" -type d -name "split_files" -empty -delete 2>/dev/null
+    fi
+    
     return $failed_count
 }
 
@@ -252,19 +256,31 @@ process_downloads() {
 clone_or_update() {
     local url="$1"
     local dest="$2"
+    local node_name=$(basename "$dest")
     
+    # Timeout de 60 segundos para operações git
     if [ -d "$dest/.git" ]; then
-        log_info "Atualizando $(basename "$dest")..."
-        git -C "$dest" pull --ff-only 2>/dev/null || true
+        log_info "Atualizando $node_name..."
+        timeout 60 git -C "$dest" pull --ff-only 2>/dev/null || {
+            log_warn "Timeout ou erro ao atualizar $node_name"
+            return 0  # Não falhar, apenas avisar
+        }
     else
-        log_info "Clonando $(basename "$dest")..."
-        git clone --recursive --depth 1 "$url" "$dest" 2>/dev/null || return 1
+        log_info "Clonando $node_name..."
+        timeout 60 git clone --recursive --depth 1 "$url" "$dest" 2>/dev/null || {
+            log_warn "Falha ao clonar $node_name"
+            return 0  # Não falhar, apenas avisar
+        }
     fi
     
-    # Instalar requirements se existir
+    # Instalar requirements se existir (com timeout)
     if [ -f "$dest/requirements.txt" ]; then
-        python3 -m pip install --no-warn-script-location -q -r "$dest/requirements.txt" 2>/dev/null || true
+        timeout 120 python3 -m pip install --no-warn-script-location -q -r "$dest/requirements.txt" 2>/dev/null || {
+            log_warn "Falha ao instalar requirements para $node_name"
+        }
     fi
+    
+    return 0
 }
 
 # -----------------------------
@@ -272,12 +288,19 @@ clone_or_update() {
 # -----------------------------
 echo ""
 log_info "========================================="
-log_info "  ComfyUI + Wan 2.2 Setup (Clean)"
+log_info " ComfyUI + Wan 2.2 Setup (Fixed)"
 log_info "========================================="
 echo ""
 
-# [1] Verificar dependências
-log_info "[1/6] Verificando dependências..."
+# [1] Verificar e instalar dependências
+log_info "[1/8] Verificando e instalando dependências..."
+
+# Instalar aria2c do sistema se não existir
+if ! command_exists aria2c; then
+    log_info "Instalando aria2c do sistema..."
+    apt-get update -qq && apt-get install -y -qq aria2 2>/dev/null
+fi
+
 for cmd in python3 git wget curl; do
     if ! command_exists "$cmd"; then
         log_error "Dependência faltando: $cmd"
@@ -287,13 +310,38 @@ done
 log_success "Dependências OK"
 
 # [2] Atualizar pip e instalar ferramentas
-log_info "[2/6] Preparando ferramentas Python..."
+log_info "[2/8] Preparando ferramentas Python..."
 python3 -m pip install --upgrade pip wheel setuptools -q
-python3 -m pip install --upgrade comfy-cli "huggingface_hub>=0.23.0" hf_transfer aria2 -q
+
+# Instalar huggingface_hub com CLI e hf_transfer para velocidade máxima
+python3 -m pip install --upgrade "huggingface_hub[cli]>=0.26.0" hf_transfer comfy-cli -q
+
+# Configurar token HF se disponível (opcional)
+HF_TOKEN="${HF_TOKEN:-}"
+if [ -n "$HF_TOKEN" ]; then
+    if huggingface-cli login --token "$HF_TOKEN" 2>/dev/null; then
+        log_success "Login HF configurado"
+    else
+        log_warn "Falha ao configurar login HF, continuando sem autenticação"
+    fi
+fi
+
+# Verificar se hf está disponível
+if command_exists huggingface-cli; then
+    log_success "huggingface-cli disponível"
+else
+    log_warn "huggingface-cli não encontrado"
+fi
+
 log_success "Ferramentas instaladas"
 
-# [3] Instalar ComfyUI
-log_info "[3/6] Instalando ComfyUI..."
+# [3] Instalar PyTorch com CUDA 12.8
+log_info "[3/8] Instalando PyTorch com CUDA 12.8..."
+python3 -m pip install --upgrade torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cu128
+log_success "PyTorch com CUDA 12.8 instalado"
+
+# [4] Instalar ComfyUI
+log_info "[4/8] Instalando ComfyUI..."
 if [ -f "$COMFY_DIR/main.py" ]; then
     log_warn "ComfyUI já existe, pulando instalação base"
 else
@@ -307,36 +355,31 @@ else
 fi
 log_success "ComfyUI instalado em: $COMFY_DIR"
 
-# [4] Instalar SageAttention (em background)
-log_info "[4/6] Instalando SageAttention..."
-(
-    if command_exists nvcc; then
-        python3 -m pip install "triton>=3.0.0" nvidia-ml-py -q
-        
-        SAGE_DIR="/tmp/SageAttention"
-        rm -rf "$SAGE_DIR"
-        git clone --depth 1 https://github.com/thu-ml/SageAttention.git "$SAGE_DIR" 2>/dev/null
-        
-        cd "$SAGE_DIR"
-        python3 setup.py install --quiet 2>/dev/null
-        
-        log_success "SageAttention instalado"
+# [5] Instalar SageAttention (wheel pré-compilada)
+log_info "[5/8] Instalando SageAttention..."
+if command_exists nvcc || python3 -c "import torch; print(torch.cuda.is_available())" 2>/dev/null | grep -q "True"; then
+    log_info "Instalando SageAttention pré-compilada..."
+    python3 -m pip install "https://huggingface.co/adbrasi/comfywheel/resolve/main/sageattention-2.2.0-cp311-cp311-linux_x86_64.whl" -q
+    
+    # Verificar instalação
+    if python3 -c "import sageattention" 2>/dev/null; then
+        log_success "SageAttention instalado com sucesso"
     else
-        log_warn "CUDA não detectado, pulando SageAttention"
+        log_warn "SageAttention instalado mas não pôde ser importado"
     fi
-) &
-SAGE_PID=$!
+else
+    log_warn "CUDA não detectado, pulando SageAttention"
+fi
 
-# [5] Baixar modelos
-log_info "[5/6] Baixando modelos..."
+# [6] Baixar modelos
+log_info "[6/8] Baixando modelos..."
 mkdir -p "$MODELS_DIR"/{diffusion_models,loras,vae,text_encoders,clip_vision,controlnet,upscale_models}
 
-# Verificar se aria2c está disponível
+# Verificar ferramentas de download
 if command_exists aria2c; then
     log_success "Usando aria2c para downloads (rápido)"
 else
     log_warn "aria2c não encontrado, usando wget/curl (mais lento)"
-    log_info "Instale aria2c para downloads mais rápidos: apt-get install aria2"
 fi
 
 # Processar downloads
@@ -346,26 +389,22 @@ else
     log_warn "Alguns downloads falharam, mas continuando..."
 fi
 
-# [6] Instalar custom nodes
-log_info "[6/6] Instalando custom nodes..."
+# [7] Instalar custom nodes
+log_info "[7/8] Instalando custom nodes..."
 CN_DIR="$COMFY_DIR/custom_nodes"
 mkdir -p "$CN_DIR"
 
+# Instalar nodes sequencialmente para evitar travamentos
 for repo_url in "${CUSTOM_NODES[@]}"; do
     node_name=$(basename "$repo_url")
-    clone_or_update "$repo_url" "$CN_DIR/$node_name" &
+    clone_or_update "$repo_url" "$CN_DIR/$node_name"
 done
-wait
 
 log_success "Custom nodes instalados"
 
-# Aguardar SageAttention
-wait $SAGE_PID 2>/dev/null || true
-
-# Verificação final
+# [8] Verificação final
 echo ""
-log_info "========================================="
-log_info "Verificando instalação..."
+log_info "[8/8] Verificando instalação..."
 
 # Verificar arquivos principais
 check_critical_files() {
@@ -392,10 +431,11 @@ check_critical_files() {
 
 if check_critical_files; then
     log_success "Instalação concluída com sucesso!"
-    
     echo ""
+    log_info "========================================="
     log_info "Iniciando ComfyUI..."
     log_info "URL: http://localhost:$COMFY_PORT"
+    log_info "========================================="
     
     # Tentar usar SageAttention se disponível
     SAGE_FLAG=""
@@ -408,5 +448,10 @@ if check_critical_files; then
     exec comfy launch -- $SAGE_FLAG --listen "$COMFY_HOST" --port "$COMFY_PORT"
 else
     log_error "Arquivos críticos faltando. Verifique os erros acima."
+    
+    # Mostrar onde os arquivos podem estar
+    log_info "Procurando arquivos mal posicionados..."
+    find "$MODELS_DIR" -name "*.safetensors" -type f | head -20
+    
     exit 1
 fi