Update wanForProduction.sh

wanForProduction.sh

@@ -37,7 +37,15 @@ export PYTORCH_CUDA_ALLOC_CONF="expandable_segments:True"
 
 # Lista de downloads (formato: URL|TIPO|NOME_OPCIONAL)
 DOWNLOAD_FILES=(
-    # Wan 2.2 principais (HF)
+    "https://huggingface.co/Kijai/WanVideo_comfy_fp8_scaled/resolve/main/I2V/Wan2_2-I2V-A14B-LOW_fp8_e4m3fn_scaled_KJ.safetensors|diffusion_models|"
+    "https://huggingface.co/Kijai/WanVideo_comfy_fp8_scaled/resolve/main/I2V/Wan2_2-I2V-A14B-HIGH_fp8_e4m3fn_scaled_KJ.safetensors|diffusion_models|"
+    "https://huggingface.co/Kijai/WanVideo_comfy/resolve/main/LoRAs/Wan22-Lightning/Wan22_A14B_T2V_HIGH_Lightning_4steps_lora_250928_rank128_fp16.safetensors|loras|"
+    "https://huggingface.co/Kijai/WanVideo_comfy/resolve/main/LoRAs/Wan22-Lightning/Wan22_A14B_T2V_LOW_Lightning_4steps_lora_250928_rank64_fp16.safetensors|loras|"
+    "https://huggingface.co/Kijai/WanVideo_comfy/resolve/main/LoRAs/AniSora/Wan2_2_I2V_AniSora_3_2_HIGH_rank_64_fp16.safetensors|loras|"
+    "https://huggingface.co/Kijai/WanVideo_comfy/resolve/main/Wan2_1_VAE_bf16.safetensors|vae|"
+    "https://huggingface.co/Kijai/WanVideo_comfy/resolve/main/open-clip-xlm-roberta-large-vit-huge-14_visual_fp16.safetensors|clip_vision|"
+    "https://huggingface.co/Kijai/WanVideo_comfy/resolve/main/umt5-xxl-enc-bf16.safetensors|text_encoders|"
+    "https://huggingface.co/ABDALLALSWAITI/Upscalers/resolve/main/general/Swin2SR_ClassicalSR_X2_64.pth|upscale_models|"
     "mega://https://mega.nz/file/QFxREJpZ#0dge8TyRgb52lMFKdsk-Ac-rwcoG49hvBHvaqNsZkuk|loras|"
     "mega://https://mega.nz/file/lIhQETjT#nKlQ01Euw6fUxo8P5bfwlQrxAkWEedXQQOqHv5u4yrM|loras|"
     "mega://https://mega.nz/file/UIAESACY#Qlei1Pj5Nwno3Sz-wsTekvD-YgCkN1A5QbFKoRHXG9E|loras|"
@@ -51,15 +59,6 @@ DOWNLOAD_FILES=(
     "mega://https://mega.nz/file/hZhhhCQS#4je0Im2g1kEvTCuPotjVWkA-g6XICkqMb-mKxMt6R3Y|loras|"
     "mega://https://mega.nz/file/qdQwAJSC#rPY2Hg4x-_RbHiHUBFW-YU8xZUqPpq5Gpl1uPFiJvW4|upscale_models|"
     "mega://https://mega.nz/file/KIh2marA#CehVNXxQhGfp1bqUL0K1YPWNqrCUoLPCZGq2W6XqmWo|upscale_models|"
-    "https://huggingface.co/Kijai/WanVideo_comfy_fp8_scaled/resolve/main/I2V/Wan2_2-I2V-A14B-LOW_fp8_e4m3fn_scaled_KJ.safetensors|diffusion_models|"
-    "https://huggingface.co/Kijai/WanVideo_comfy_fp8_scaled/resolve/main/I2V/Wan2_2-I2V-A14B-HIGH_fp8_e4m3fn_scaled_KJ.safetensors|diffusion_models|"
-    "https://huggingface.co/Kijai/WanVideo_comfy/resolve/main/LoRAs/Wan22-Lightning/Wan22_A14B_T2V_HIGH_Lightning_4steps_lora_250928_rank128_fp16.safetensors|loras|"
-    "https://huggingface.co/Kijai/WanVideo_comfy/resolve/main/LoRAs/Wan22-Lightning/Wan22_A14B_T2V_LOW_Lightning_4steps_lora_250928_rank64_fp16.safetensors|loras|"
-    "https://huggingface.co/Kijai/WanVideo_comfy/resolve/main/LoRAs/AniSora/Wan2_2_I2V_AniSora_3_2_HIGH_rank_64_fp16.safetensors|loras|"
-    "https://huggingface.co/Kijai/WanVideo_comfy/resolve/main/Wan2_1_VAE_bf16.safetensors|vae|"
-    "https://huggingface.co/Kijai/WanVideo_comfy/resolve/main/open-clip-xlm-roberta-large-vit-huge-14_visual_fp16.safetensors|clip_vision|"
-    "https://huggingface.co/Kijai/WanVideo_comfy/resolve/main/umt5-xxl-enc-bf16.safetensors|text_encoders|"
-    "https://huggingface.co/ABDALLALSWAITI/Upscalers/resolve/main/general/Swin2SR_ClassicalSR_X2_64.pth|upscale_models|"
 )
 
 # Custom nodes (do CODE2)
@@ -95,9 +94,10 @@ download_hf() {
     local hf_path="$1"
     local target_dir="$2"
     local filename="$3"
+    local revision="${4:-}"
 
     if [[ -z "$filename" ]]; then
-        filename="$(basename "$hf_path")"
+        filename="$(basename "${hf_path%%\?*}")"
     fi
 
     mkdir -p "$target_dir"
@@ -112,28 +112,54 @@ download_hf() {
 
     local owner="${hf_path%%/*}"
     local remainder="${hf_path#*/}"
-    local repo="${remainder%%/*}"
-    local file_path="${remainder#*/}"
-
-    if [[ -z "$owner" || -z "$repo" || -z "$file_path" || "$file_path" == "$remainder" ]]; then
+    if [[ "$owner" == "$hf_path" ]]; then
         log_error "Caminho HuggingFace inválido: $hf_path"
         return 1
     fi
 
-    local repo_id="$owner/$repo"
+    local repo_segment="${remainder%%/*}"
+    if [[ "$repo_segment" == "$remainder" ]]; then
+        log_error "Arquivo não especificado no caminho: $hf_path"
+        return 1
+    fi
+
+    remainder="${remainder#*/}"
+    if [[ -z "$remainder" ]]; then
+        log_error "Arquivo não especificado no caminho: $hf_path"
+        return 1
+    fi
+
+    if [[ "$repo_segment" == *@* ]]; then
+        if [[ -z "$revision" ]]; then
+            revision="${repo_segment#*@}"
+        fi
+        repo_segment="${repo_segment%@*}"
+    fi
+
+    local repo_id="$owner/$repo_segment"
+    local file_path="$remainder"
     local attempt success temp_dir
     for attempt in 1 2 3; do
         temp_dir="$(mktemp -d)"
         success=false
 
         if command -v hf >/dev/null 2>&1; then
-            if HF_HUB_ENABLE_HF_TRANSFER=1 hf download "$repo_id" "$file_path" --local-dir "$temp_dir" --quiet; then
+            local hf_cmd=(hf download "$repo_id" "$file_path")
+            if [[ -n "$revision" ]]; then
+                hf_cmd+=(--revision "$revision")
+            fi
+            hf_cmd+=(--local-dir "$temp_dir" --quiet)
+            if [[ -n "$HF_TOKEN" ]]; then
+                hf_cmd+=(--token "$HF_TOKEN")
+            fi
+            if HF_HUB_ENABLE_HF_TRANSFER=1 "${hf_cmd[@]}"; then
                 success=true
             fi
         fi
 
         if [[ "$success" == false ]]; then
-            local direct_url="https://huggingface.co/${repo_id}/resolve/main/${file_path}"
+            local fallback_revision="${revision:-main}"
+            local direct_url="https://huggingface.co/${repo_id}/resolve/${fallback_revision}/${file_path}"
             if command -v aria2c >/dev/null 2>&1; then
                 local aria_cmd=(aria2c -c -s 16 -x 16 -k 1M --console-log-level=warn --summary-interval=10 --dir "$temp_dir" --out "$filename")
                 if [[ -n "$HF_TOKEN" ]]; then
@@ -294,6 +320,37 @@ process_downloads() {
             if ! download_hf "$hf_path" "$target_dir" "$filename"; then
                 ((failed++))
             fi
+        elif [[ "$raw_url" == https://huggingface.co/* ]]; then
+            local sanitized_url="${raw_url%%\?*}"
+            local hf_relative="${sanitized_url#https://huggingface.co/}"
+            IFS='/' read -ra hf_parts <<< "$hf_relative"
+            if (( ${#hf_parts[@]} >= 4 )) && [[ "${hf_parts[2]}" == "resolve" || "${hf_parts[2]}" == "blob" || "${hf_parts[2]}" == "raw" ]]; then
+                local hf_owner="${hf_parts[0]}"
+                local hf_repo="${hf_parts[1]}"
+                local hf_revision="${hf_parts[3]}"
+                local start_index=4
+                local hf_file_path=""
+                for ((i=start_index; i<${#hf_parts[@]}; i++)); do
+                    if [[ -n "$hf_file_path" ]]; then
+                        hf_file_path+='/'
+                    fi
+                    hf_file_path+="${hf_parts[i]}"
+                done
+                if [[ -n "$hf_file_path" ]]; then
+                    local hf_path_combined="${hf_owner}/${hf_repo}/${hf_file_path}"
+                    if ! download_hf "$hf_path_combined" "$target_dir" "$filename" "$hf_revision"; then
+                        ((failed++))
+                    fi
+                else
+                    if ! download_file "$raw_url" "$target_dir" "$filename"; then
+                        ((failed++))
+                    fi
+                fi
+            else
+                if ! download_file "$raw_url" "$target_dir" "$filename"; then
+                    ((failed++))
+                fi
+            fi
         else
             if ! download_file "$raw_url" "$target_dir" "$filename"; then
                 ((failed++))
@@ -436,4 +493,4 @@ log_info "Iniciando ComfyUI em http://${COMFY_HOST}:${COMFY_PORT}"
 log_info "========================================="
 
 cd "$COMFY_DIR"
-exec comfy launch -- ${SAGE_FLAG:+$SAGE_FLAG} --listen "$COMFY_HOST" --port "$COMFY_PORT"
+exec comfy launch -- ${SAGE_FLAG:+$SAGE_FLAG} --listen "$COMFY_HOST" --port "$COMFY_PORT"