Update WANcomfyui_installer_fixed.sh

WANcomfyui_installer_fixed.sh

@@ -351,58 +351,133 @@ download_models() {
     
     for dir in "${dirs[@]}"; do
         mkdir -p "$dir"
+        log_info "Diretório criado: $dir"
     done
     
-    # Lista de modelos Wan 2.2
-    local models=(
-        # Diffusion Models
-        "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/diffusion_models/wan2.2_i2v_high_noise_14B_fp8_scaled.safetensors:$WORKSPACE_DIR/models/diffusion_models:wan2.2_i2v_high_noise_14B_fp8_scaled.safetensors"
-        "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/diffusion_models/wan2.2_i2v_low_noise_14B_fp8_scaled.safetensors:$WORKSPACE_DIR/models/diffusion_models:wan2.2_i2v_low_noise_14B_fp8_scaled.safetensors"
+    # Lista de modelos Wan 2.2 - usando huggingface-cli quando possível
+    log_info "Configurando lista de modelos para download..."
+    
+    # Verifica se huggingface-cli está disponível
+    if command_exists huggingface-cli; then
+        log_info "Usando huggingface-cli para downloads (mais confiável)"
+        export HF_HUB_ENABLE_HF_TRANSFER=1
         
-        # LoRAs
-        "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/loras/wan2.2_i2v_lightx2v_4steps_lora_v1_high_noise.safetensors:$WORKSPACE_DIR/models/loras:wan2.2_i2v_lightx2v_4steps_lora_v1_high_noise.safetensors"
-        "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/loras/wan2.2_i2v_lightx2v_4steps_lora_v1_low_noise.safetensors:$WORKSPACE_DIR/models/loras:wan2.2_i2v_lightx2v_4steps_lora_v1_low_noise.safetensors"
-        "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/loras/wan2.2_t2v_lightx2v_4steps_lora_v1.1_high_noise.safetensors:$WORKSPACE_DIR/models/loras:wan2.2_t2v_lightx2v_4steps_lora_v1.1_high_noise.safetensors"
-        "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/loras/wan2.2_t2v_lightx2v_4steps_lora_v1.1_low_noise.safetensors:$WORKSPACE_DIR/models/loras:wan2.2_t2v_lightx2v_4steps_lora_v1.1_low_noise.safetensors"
+        # Download com huggingface-cli
+        local hf_downloads=(
+            # Diffusion Models
+            "Comfy-Org/Wan_2.2_ComfyUI_Repackaged:split_files/diffusion_models/wan2.2_i2v_high_noise_14B_fp8_scaled.safetensors:$WORKSPACE_DIR/models/diffusion_models"
+            "Comfy-Org/Wan_2.2_ComfyUI_Repackaged:split_files/diffusion_models/wan2.2_i2v_low_noise_14B_fp8_scaled.safetensors:$WORKSPACE_DIR/models/diffusion_models"
+            
+            # LoRAs
+            "Comfy-Org/Wan_2.2_ComfyUI_Repackaged:split_files/loras/wan2.2_i2v_lightx2v_4steps_lora_v1_high_noise.safetensors:$WORKSPACE_DIR/models/loras"
+            "Comfy-Org/Wan_2.2_ComfyUI_Repackaged:split_files/loras/wan2.2_i2v_lightx2v_4steps_lora_v1_low_noise.safetensors:$WORKSPACE_DIR/models/loras"
+            "Comfy-Org/Wan_2.2_ComfyUI_Repackaged:split_files/loras/wan2.2_t2v_lightx2v_4steps_lora_v1.1_high_noise.safetensors:$WORKSPACE_DIR/models/loras"
+            "Comfy-Org/Wan_2.2_ComfyUI_Repackaged:split_files/loras/wan2.2_t2v_lightx2v_4steps_lora_v1.1_low_noise.safetensors:$WORKSPACE_DIR/models/loras"
+            
+            # Text Encoders
+            "Comfy-Org/Wan_2.2_ComfyUI_Repackaged:split_files/text_encoders/umt5_xxl_fp16.safetensors:$WORKSPACE_DIR/models/text_encoders"
+            "Comfy-Org/Wan_2.2_ComfyUI_Repackaged:split_files/text_encoders/umt5_xxl_fp8_e4m3fn_scaled.safetensors:$WORKSPACE_DIR/models/text_encoders"
+            
+            # VAE
+            "Comfy-Org/Wan_2.1_ComfyUI_repackaged:split_files/vae/wan_2.1_vae.safetensors:$WORKSPACE_DIR/models/vae"
+            
+            # CLIP Vision
+            "Comfy-Org/Wan_2.1_ComfyUI_repackaged:split_files/clip_vision/clip_vision_h.safetensors:$WORKSPACE_DIR/models/clip_vision"
+        )
         
-        # Text Encoders
-        "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/text_encoders/umt5_xxl_fp16.safetensors:$WORKSPACE_DIR/models/text_encoders:umt5_xxl_fp16.safetensors"
-        "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/text_encoders/umt5_xxl_fp8_e4m3fn_scaled.safetensors:$WORKSPACE_DIR/models/text_encoders:umt5_xxl_fp8_e4m3fn_scaled.safetensors"
+        local total=${#hf_downloads[@]}
+        local current=0
+        local failed_downloads=()
         
-        # VAE (mantido do original)
-        "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/vae/wan_2.1_vae.safetensors:$WORKSPACE_DIR/models/vae:wan_2.1_vae.safetensors"
+        for download_info in "${hf_downloads[@]}"; do
+            IFS=':' read -r repo file dest_dir <<< "$download_info"
+            current=$((current + 1))
+            local filename=$(basename "$file")
+            
+            log_info "[$current/$total] Baixando: $filename"
+            log_info "  Repositório: $repo"
+            log_info "  Arquivo: $file"
+            log_info "  Destino: $dest_dir"
+            
+            # Tenta download com huggingface-cli
+            if huggingface-cli download "$repo" "$file" \
+                --local-dir "$dest_dir" \
+                --local-dir-use-symlinks False \
+                2>&1 | tee -a "$LOG_FILE"; then
+                
+                # Move o arquivo para o local correto se necessário
+                if [ -f "$dest_dir/$file" ]; then
+                    mv "$dest_dir/$file" "$dest_dir/$filename"
+                    log_info "✓ Download concluído: $filename"
+                elif [ -f "$dest_dir/$filename" ]; then
+                    log_info "✓ Download concluído: $filename"
+                else
+                    log_warning "Arquivo baixado mas não encontrado no destino esperado"
+                    failed_downloads+=("$filename")
+                fi
+            else
+                log_warning "Falha ao baixar com huggingface-cli: $filename"
+                failed_downloads+=("$filename")
+            fi
+        done
         
-        # CLIP Vision (mantido do original)
-        "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/clip_vision/clip_vision_h.safetensors:$WORKSPACE_DIR/models/clip_vision:clip_vision_h.safetensors"
-    )
-    
-    local failed_downloads=()
-    
-    # Download sequencial com progresso
-    local total=${#models[@]}
-    local current=0
-    
-    for model_info in "${models[@]}"; do
-        IFS=':' read -r url dest_dir filename <<< "$model_info"
-        current=$((current + 1))
+    else
+        # Fallback para wget/curl
+        log_info "huggingface-cli não disponível, usando wget/curl"
         
-        log_info "[$current/$total] Baixando modelo: $filename"
+        local models=(
+            # URLs completas com destinos
+            "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/diffusion_models/wan2.2_i2v_high_noise_14B_fp8_scaled.safetensors:$WORKSPACE_DIR/models/diffusion_models:wan2.2_i2v_high_noise_14B_fp8_scaled.safetensors"
+            "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/diffusion_models/wan2.2_i2v_low_noise_14B_fp8_scaled.safetensors:$WORKSPACE_DIR/models/diffusion_models:wan2.2_i2v_low_noise_14B_fp8_scaled.safetensors"
+            "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/loras/wan2.2_i2v_lightx2v_4steps_lora_v1_high_noise.safetensors:$WORKSPACE_DIR/models/loras:wan2.2_i2v_lightx2v_4steps_lora_v1_high_noise.safetensors"
+            "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/loras/wan2.2_i2v_lightx2v_4steps_lora_v1_low_noise.safetensors:$WORKSPACE_DIR/models/loras:wan2.2_i2v_lightx2v_4steps_lora_v1_low_noise.safetensors"
+            "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/loras/wan2.2_t2v_lightx2v_4steps_lora_v1.1_high_noise.safetensors:$WORKSPACE_DIR/models/loras:wan2.2_t2v_lightx2v_4steps_lora_v1.1_high_noise.safetensors"
+            "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/loras/wan2.2_t2v_lightx2v_4steps_lora_v1.1_low_noise.safetensors:$WORKSPACE_DIR/models/loras:wan2.2_t2v_lightx2v_4steps_lora_v1.1_low_noise.safetensors"
+            "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/text_encoders/umt5_xxl_fp16.safetensors:$WORKSPACE_DIR/models/text_encoders:umt5_xxl_fp16.safetensors"
+            "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/text_encoders/umt5_xxl_fp8_e4m3fn_scaled.safetensors:$WORKSPACE_DIR/models/text_encoders:umt5_xxl_fp8_e4m3fn_scaled.safetensors"
+            "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/vae/wan_2.1_vae.safetensors:$WORKSPACE_DIR/models/vae:wan_2.1_vae.safetensors"
+            "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/clip_vision/clip_vision_h.safetensors:$WORKSPACE_DIR/models/clip_vision:clip_vision_h.safetensors"
+        )
         
-        if ! download_file_with_retry "$url" "$dest_dir" "$filename"; then
-            failed_downloads+=("$filename")
-            log_warning "Falha ao baixar: $filename. Continuando com outros downloads..."
-        fi
-    done
+        local total=${#models[@]}
+        local current=0
+        local failed_downloads=()
+        
+        for model_info in "${models[@]}"; do
+            IFS=':' read -r url dest_dir filename <<< "$model_info"
+            current=$((current + 1))
+            
+            log_info "[$current/$total] Baixando: $filename"
+            
+            if ! download_file_with_retry "$url" "$dest_dir" "$filename"; then
+                failed_downloads+=("$filename")
+                log_warning "Falha ao baixar: $filename"
+            fi
+        done
+    fi
     
+    # Relatório final
+    log_info "================================================="
     if [ ${#failed_downloads[@]} -gt 0 ]; then
-        log_warning "Os seguintes modelos falharam ao baixar:"
+        log_warning "Downloads com falha:"
         for model in "${failed_downloads[@]}"; do
-            log_warning "  - $model"
+            log_warning "  ✗ $model"
         done
-        log_warning "Você pode tentar baixá-los manualmente mais tarde."
+        log_warning "Execute o script novamente ou baixe manualmente os modelos faltando."
+        return 1
     else
-        log_info "Todos os modelos foram baixados com sucesso!"
+        log_info "✓ Todos os modelos foram baixados com sucesso!"
     fi
+    log_info "================================================="
+    
+    # Lista arquivos baixados para verificação
+    log_info "Verificando modelos baixados:"
+    for dir in "${dirs[@]}"; do
+        if [ -d "$dir" ]; then
+            local count=$(ls -1 "$dir" 2>/dev/null | wc -l)
+            log_info "  $dir: $count arquivo(s)"
+        fi
+    done
     
     return 0
 }