Upload 2 files

UmeAiRT-WAN2.1-Missing_nodes.bat

@@ -1,28 +1,56 @@
 @echo off
 setlocal enabledelayedexpansion
 
-set "comfyUIPath=%CD%"
+set "basePath=%CD%"
+set "comfyPath=%basePath%\ComfyUI"
+set "pythonPath=%basePath%\python_embeded"
+set "customNodesPath=%comfyPath%\custom_nodes"
+
+if not exist "%basePath%\logs" mkdir "%basePath%\logs"
 
 :check_folder
-if exist "%comfyUIPath%\ComfyUI" (
+if exist "%basePath%\ComfyUI" (
     echo ComfyUI folder detected
-) else if exist "%comfyUIPath%\ComfyUI_windows_portable" (
-	cd ComfyUI_windows_portable
+	set "comfyPath=%basePath%\ComfyUI"
+	if exist "%basePath%\python_embeded" (
+		echo Python folder detected
+		set "pythonPath=%basePath%\python_embeded"
+	) else (
+		echo Python folder not detected, give Python folder path :
+	pause
+	)
+) else if exist "%basePath%\ComfyUI_windows_portable" (
+	set "comfyPath=%basePath%\ComfyUI_windows_portable\ComfyUI"
+	set "pythonPath=%basePath%\ComfyUI_windows_portable\python_embeded"
     echo ComfyUI folder detected
 ) else (
-	echo ComfyUI folder not detected
+	echo ComfyUI folder not detected, give ComfyUi folder path :
+	echo Python folder not detected, give Python folder path :
 	pause
-	exit /b
 )
 
+set "customNodesPath=%comfyPath%\custom_nodes"
+
 echo Update ComfyUI
-cd update
-..\python_embeded\python.exe -m pip install --upgrade pip
-..\python_embeded\python.exe .\update.py ..\ComfyUI\
-if exist update_new.py (
-  move /y update_new.py update.py
-  echo Running updater again since it got updated.
-  ..\python_embeded\python.exe .\update.py ..\ComfyUI\ --skip_self_update
+if exist "%basePath%\update" (
+	"%pythonPath%\python.exe" -m pip install --upgrade pip  >> "%basePath%\logs\Missing_nodes.txt" 2>&1
+	"%pythonPath%\python.exe" "%basePath%\update\update.py" "%basePath%\ComfyUI"  >> "%basePath%\logs\Missing_nodes.txt" 2>&1
+	if exist update_new.py (
+		move /y update_new.py update.py
+		echo Running updater again since it got updated.
+		"%pythonPath%\python.exe" "%basePath%\update\update.py" "%basePath%\ComfyUI" --skip_self_update  >> "%basePath%\logs\Missing_nodes.txt" 2>&1
+	)
+) else if exist "%basePath%\ComfyUI_windows_portable\update" (
+	"%pythonPath%\python.exe" -m pip install --upgrade pip  >> "%basePath%\logs\Missing_nodes.txt" 2>&1
+	"%pythonPath%\python.exe" "%basePath%\ComfyUI_windows_portable\update\update.py" "%comfyPath%"  >> "%basePath%\logs\Missing_nodes.txt" 2>&1
+	if exist update_new.py (
+		move /y update_new.py update.py
+		echo Running updater again since it got updated.
+		"%pythonPath%\python.exe" "%basePath%\ComfyUI_windows_portable\update\update.py" "%comfyPath%" --skip_self_update  >> "%basePath%\logs\Missing_nodes.txt" 2>&1
+	)
+) else (
+	git --git-dir="%comfyPath%" --work-tree="%comfyPath%" pull
+	"%pythonPath%\python.exe" -s -m pip install -r "%comfyPath%/requirements.txt" --no-warn-script-location
 )
 
 :CHOOSE_CLEAN
@@ -33,8 +61,8 @@ echo B) No
 set /p "CHOOSE_CLEAN=Enter your choice (A or B) and press Enter: "
 
 if /i "%CHOOSE_CLEAN%"=="A" (
-del /s /q "%comfyUIPath%\ComfyUI\custom_nodes\*.*"  >nul 2>&1
-for /d %%i in ("%comfyUIPath%\ComfyUI\custom_nodes\*") do rmdir /s /q "%%i"  >nul 2>&1
+del /s /q "%customNodesPath%\*.*"  >> "%basePath%\logs\Missing_nodes.txt" 2>&1
+for /d %%i in ("%customNodesPath%\*") do rmdir /s /q "%%i"  >> "%basePath%\logs\Missing_nodes.txt" 2>&1
 ) else if /i "%CHOOSE_CLEAN%"=="B" (
     set "CHOOSE_CLEANL=no"
 ) else (
@@ -42,88 +70,96 @@ echo Invalid choice. Please enter A or B.
     goto CHOOSE_CLEAN
 )
 
-
-cd ..
-cd python_embeded
 echo Installing xformers...
-.\python.exe -s -m pip install xformers >nul 2>&1
+"%pythonPath%\python.exe" -s -m pip install xformers >> "%basePath%\logs\Missing_nodes.txt" 2>&1
 echo Installing NVIDIA Apex...
-git clone https://github.com/NVIDIA/apex >nul 2>&1
-cd apex
-..\python.exe -s -m pip install -e . >nul 2>&1
+git clone https://github.com/NVIDIA/apex "%pythonPath%/apex" >> "%basePath%\logs\Missing_nodes.txt" 2>&1
+"%pythonPath%\python.exe" -s -m pip install -e "%pythonPath%/apex" >> "%basePath%\logs\Missing_nodes.txt" 2>&1
+echo Installing Triton...
+curl -L -o "%pythonPath%\triton-3.2.0-cp310-cp310-win_amd64.whl" https://github.com/woct0rdho/triton-windows/releases/download/v3.2.0-windows.post10/triton-3.2.0-cp310-cp310-win_amd64.whl  >> "%basePath%\logs\Missing_nodes.txt" 2>&1
+curl -L -o "%pythonPath%\triton-3.2.0-cp311-cp311-win_amd64.whl" https://github.com/woct0rdho/triton-windows/releases/download/v3.2.0-windows.post10/triton-3.2.0-cp311-cp311-win_amd64.whl  >> "%basePath%\logs\Missing_nodes.txt" 2>&1
+curl -L -o "%pythonPath%\triton-3.2.0-cp312-cp312-win_amd64.whl" https://github.com/woct0rdho/triton-windows/releases/download/v3.2.0-windows.post10/triton-3.2.0-cp312-cp312-win_amd64.whl  >> "%basePath%\logs\Missing_nodes.txt" 2>&1
+"%pythonPath%\python.exe" -m pip install "%pythonPath%\triton-3.2.0-cp310-cp310-win_amd64.whl"  >> "%basePath%\logs\Missing_nodes.txt" 2>&1
+"%pythonPath%\python.exe" -m pip install "%pythonPath%\triton-3.2.0-cp311-cp311-win_amd64.whl"  >> "%basePath%\logs\Missing_nodes.txt" 2>&1
+"%pythonPath%\python.exe" -m pip install "%pythonPath%\triton-3.2.0-cp312-cp312-win_amd64.whl"  >> "%basePath%\logs\Missing_nodes.txt" 2>&1
+
 cd ..\..
 cd ComfyUI\custom_nodes
 
 REM Clone ComfyUI-Manager
 echo Installing ComfyUI-Manager...
-git clone https://github.com/ltdrdata/ComfyUI-Manager.git >nul 2>&1
+git clone https://github.com/ltdrdata/ComfyUI-Manager.git "%customNodesPath%/ComfyUI-Manager" >> "%basePath%\logs\Missing_nodes.txt" 2>&1
+
 echo Installing additional nodes...
+
 echo   - Impact-Pack
-git clone https://github.com/ltdrdata/ComfyUI-Impact-Pack >nul 2>&1
-cd ComfyUI-Impact-Pack
-git clone https://github.com/ltdrdata/ComfyUI-Impact-Subpack impact_subpack >nul 2>&1
-..\..\..\python_embeded\python.exe -s -m pip install -r requirements.txt --no-warn-script-location >nul 2>&1
-..\..\..\python_embeded\python.exe -s -m pip install ultralytics --no-warn-script-location >nul 2>&1
-cd ..
+git clone https://github.com/ltdrdata/ComfyUI-Impact-Pack "%customNodesPath%/ComfyUI-Impact-Pack" >> "%basePath%\logs\Missing_nodes.txt" 2>&1
+"%pythonPath%\python.exe" -s -m pip install -r "%customNodesPath%/ComfyUI-Impact-Pack/requirements.txt" --no-warn-script-location >> "%basePath%\logs\Missing_nodes.txt" 2>&1
+git clone https://github.com/ltdrdata/ComfyUI-Impact-Subpack "%customNodesPath%/ComfyUI-Impact-Pack/impact_subpack" >> "%basePath%\logs\Missing_nodes.txt" 2>&1
+"%pythonPath%\python.exe" -s -m pip install -r "%customNodesPath%/ComfyUI-Impact-Pack/impact_subpack/requirements.txt" --no-warn-script-location >> "%basePath%\logs\Missing_nodes.txt" 2>&1
+"%pythonPath%\python.exe" -s -m pip install ultralytics --no-warn-script-location >> "%basePath%\logs\Missing_nodes.txt" 2>&1
 
 echo   - GGUF
-git clone https://github.com/city96/ComfyUI-GGUF >nul 2>&1
-cd ComfyUI-GGUF
-..\..\..\python_embeded\python.exe -s -m pip install -r requirements.txt --no-warn-script-location >nul 2>&1
-cd ..
+git clone https://github.com/city96/ComfyUI-GGUF "%customNodesPath%/ComfyUI-GGUF" >> "%basePath%\logs\Missing_nodes.txt" 2>&1
+"%pythonPath%\python.exe" -s -m pip install -r "%customNodesPath%/ComfyUI-GGUF/requirements.txt" --no-warn-script-location >> "%basePath%\logs\Missing_nodes.txt" 2>&1
 
 echo   - mxToolkit
-git clone https://github.com/Smirnov75/ComfyUI-mxToolkit >nul 2>&1
+git clone https://github.com/Smirnov75/ComfyUI-mxToolkit "%customNodesPath%/ComfyUI-mxToolkit" >> "%basePath%\logs\Missing_nodes.txt" 2>&1
 
 echo   - Custom-Scripts
-git clone https://github.com/pythongosssss/ComfyUI-Custom-Scripts >nul 2>&1
+git clone https://github.com/pythongosssss/ComfyUI-Custom-Scripts "%customNodesPath%/ComfyUI-Custom-Scripts" >> "%basePath%\logs\Missing_nodes.txt" 2>&1
 
 echo   - KJNodes
-git clone https://github.com/kijai/ComfyUI-KJNodes >nul 2>&1
-cd ComfyUI-KJNodes
-..\..\..\python_embeded\python.exe -s -m pip install -r requirements.txt --no-warn-script-location >nul 2>&1
-cd ..
-
-echo   - ComfyUI-VideoHelperSuite
-git clone https://github.com/Kosinkadink/ComfyUI-VideoHelperSuite >nul 2>&1
-cd ComfyUI-VideoHelperSuite
-..\..\..\python_embeded\python.exe -s -m pip install -r requirements.txt --no-warn-script-location >nul 2>&1
-cd ..
-
-echo   - ComfyUI-Frame-Interpolation
-git clone https://github.com/Fannovel16/ComfyUI-Frame-Interpolation >nul 2>&1
-cd ComfyUI-Frame-Interpolation
-..\..\..\python_embeded\python.exe -s -m pip install -r requirements-with-cupy.txt --no-warn-script-location >nul 2>&1
-cd ..
+git clone https://github.com/kijai/ComfyUI-KJNodes "%customNodesPath%/ComfyUI-KJNodes" >> "%basePath%\logs\Missing_nodes.txt" 2>&1
+"%pythonPath%\python.exe" -s -m pip install -r "%customNodesPath%/ComfyUI-KJNodes/requirements.txt" --no-warn-script-location >> "%basePath%\logs\Missing_nodes.txt" 2>&1
+
+echo   - VideoHelperSuite
+git clone https://github.com/Kosinkadink/ComfyUI-VideoHelperSuite "%customNodesPath%/ComfyUI-VideoHelperSuite" >> "%basePath%\logs\Missing_nodes.txt" 2>&1
+"%pythonPath%\python.exe" -s -m pip install -r "%customNodesPath%/ComfyUI-VideoHelperSuite/requirements.txt" --no-warn-script-location >> "%basePath%\logs\Missing_nodes.txt" 2>&1
+
+echo   - Frame-Interpolation
+git clone https://github.com/Fannovel16/ComfyUI-Frame-Interpolation "%customNodesPath%/ComfyUI-Frame-Interpolation" >> "%basePath%\logs\Missing_nodes.txt" 2>&1
+"%pythonPath%\python.exe" -s -m pip install -r "%customNodesPath%/ComfyUI-Frame-Interpolation/requirements-with-cupy.txt" --no-warn-script-location >> "%basePath%\logs\Missing_nodes.txt" 2>&1
 
 echo   - rgthree
-git clone https://github.com/rgthree/rgthree-comfy >nul 2>&1
-cd rgthree-comfy
-..\..\..\python_embeded\python.exe -s -m pip install -r requirements.txt --no-warn-script-location >nul 2>&1
-cd ..
-
-echo   - ComfyUI-Easy-Use
-git clone https://github.com/yolain/ComfyUI-Easy-Use >nul 2>&1
-cd ComfyUI-Easy-Use
-..\..\..\python_embeded\python.exe -s -m pip install -r requirements.txt --no-warn-script-location >nul 2>&1
-cd ..
-
-echo   - ComfyUI_PuLID_Flux_ll
-git clone https://github.com/lldacing/ComfyUI_PuLID_Flux_ll >nul 2>&1
-cd ComfyUI_PuLID_Flux_ll
-..\..\..\python_embeded\python.exe -s -m pip install -r requirements.txt --no-warn-script-location >nul 2>&1
-curl -L -o "insightface-0.7.3-cp310-cp310-win_amd64.whl" https://huggingface.co/UmeAiRT/ComfyUI-Auto_installer/resolve/main/others/insightface-0.7.3-cp310-cp310-win_amd64.whl?download=true  >nul 2>&1
-curl -L -o "insightface-0.7.3-cp311-cp311-win_amd64.whl" https://huggingface.co/UmeAiRT/ComfyUI-Auto_installer/resolve/main/others/insightface-0.7.3-cp311-cp311-win_amd64.whl?download=true  >nul 2>&1
-curl -L -o "insightface-0.7.3-cp312-cp312-win_amd64.whl" https://huggingface.co/UmeAiRT/ComfyUI-Auto_installer/resolve/main/others/insightface-0.7.3-cp312-cp312-win_amd64.whl?download=true  >nul 2>&1
-..\..\..\python_embeded\python.exe -m pip install --use-pep517 facexlib  >nul 2>&1
-..\..\..\python_embeded\python.exe -m pip install git+https://github.com/rodjjo/filterpy.git  >nul 2>&1
-..\..\..\python_embeded\python.exe -m pip install onnxruntime==1.19.2 onnxruntime-gpu==1.15.1 insightface-0.7.3-cp310-cp310-win_amd64.whl  >nul 2>&1
-..\..\..\python_embeded\python.exe -m pip install onnxruntime==1.19.2 onnxruntime-gpu==1.15.1 insightface-0.7.3-cp311-cp311-win_amd64.whl  >nul 2>&1
-..\..\..\python_embeded\python.exe -m pip install onnxruntime==1.19.2 onnxruntime-gpu==1.17.1 insightface-0.7.3-cp312-cp312-win_amd64.whl  >nul 2>&1
-cd ..
-
-echo   - ComfyUI-HunyuanVideoMultiLora
-git clone https://github.com/facok/ComfyUI-HunyuanVideoMultiLora >nul 2>&1
+git clone https://github.com/rgthree/rgthree-comfy "%customNodesPath%/rgthree-comfy" >> "%basePath%\logs\Missing_nodes.txt" 2>&1
+"%pythonPath%\python.exe" -s -m pip install -r "%customNodesPath%/rgthree-comfy/requirements.txt" --no-warn-script-location >> "%basePath%\logs\Missing_nodes.txt" 2>&1
+
+echo   - Easy-Use
+git clone https://github.com/yolain/ComfyUI-Easy-Use "%customNodesPath%/ComfyUI-Easy-Use" >> "%basePath%\logs\Missing_nodes.txt" 2>&1
+"%pythonPath%\python.exe" -s -m pip install -r "%customNodesPath%/ComfyUI-Easy-Use/requirements.txt" --no-warn-script-location >> "%basePath%\logs\Missing_nodes.txt" 2>&1
+
+echo   - PuLID_Flux_ll
+git clone https://github.com/lldacing/ComfyUI_PuLID_Flux_ll "%customNodesPath%/ComfyUI_PuLID_Flux_ll" >> "%basePath%\logs\Missing_nodes.txt" 2>&1
+"%pythonPath%\python.exe" -s -m pip install -r "%customNodesPath%/ComfyUI_PuLID_Flux_ll/requirements.txt" --no-warn-script-location >> "%basePath%\logs\Missing_nodes.txt" 2>&1
+curl -L -o "%pythonPath%\insightface-0.7.3-cp310-cp310-win_amd64.whl" https://huggingface.co/UmeAiRT/ComfyUI-Auto_installer/resolve/main/others/insightface-0.7.3-cp310-cp310-win_amd64.whl?download=true  >> "%basePath%\logs\Missing_nodes.txt" 2>&1
+curl -L -o "%pythonPath%\insightface-0.7.3-cp311-cp311-win_amd64.whl" https://huggingface.co/UmeAiRT/ComfyUI-Auto_installer/resolve/main/others/insightface-0.7.3-cp311-cp311-win_amd64.whl?download=true  >> "%basePath%\logs\Missing_nodes.txt" 2>&1
+curl -L -o "%pythonPath%\insightface-0.7.3-cp312-cp312-win_amd64.whl" https://huggingface.co/UmeAiRT/ComfyUI-Auto_installer/resolve/main/others/insightface-0.7.3-cp312-cp312-win_amd64.whl?download=true  >> "%basePath%\logs\Missing_nodes.txt" 2>&1
+"%pythonPath%\python.exe" -m pip install --use-pep517 facexlib  >> "%basePath%\logs\Missing_nodes.txt" 2>&1
+"%pythonPath%\python.exe" -m pip install git+https://github.com/rodjjo/filterpy.git  >> "%basePath%\logs\Missing_nodes.txt" 2>&1
+"%pythonPath%\python.exe" -m pip install onnxruntime==1.19.2 onnxruntime-gpu==1.15.1 "%pythonPath%\insightface-0.7.3-cp310-cp310-win_amd64.whl"  >> "%basePath%\logs\Missing_nodes.txt" 2>&1
+"%pythonPath%\python.exe" -m pip install onnxruntime==1.19.2 onnxruntime-gpu==1.15.1 "%pythonPath%\insightface-0.7.3-cp311-cp311-win_amd64.whl"  >> "%basePath%\logs\Missing_nodes.txt" 2>&1
+"%pythonPath%\python.exe" -m pip install onnxruntime==1.19.2 onnxruntime-gpu==1.17.1 "%pythonPath%\insightface-0.7.3-cp312-cp312-win_amd64.whl"  >> "%basePath%\logs\Missing_nodes.txt" 2>&1
+
+echo   - HunyuanVideoMultiLora
+git clone https://github.com/facok/ComfyUI-HunyuanVideoMultiLora "%customNodesPath%/ComfyUI-HunyuanVideoMultiLora" >> "%basePath%\logs\Missing_nodes.txt" 2>&1
+
+echo   - was-node-suite-comfyui
+git clone https://github.com/WASasquatch/was-node-suite-comfyui "%customNodesPath%/was-node-suite-comfyui" >> "%basePath%\logs\Missing_nodes.txt" 2>&1
+"%pythonPath%\python.exe" -s -m pip install -r "%customNodesPath%/was-node-suite-comfyui/requirements.txt" --no-warn-script-location >> "%basePath%\logs\Missing_nodes.txt" 2>&1
+
+echo   - Florence2
+git clone https://github.com/kijai/ComfyUI-Florence2  "%customNodesPath%/ComfyUI-Florence2">> "%basePath%\logs\Missing_nodes.txt" 2>&1
+"%pythonPath%\python.exe" -m pip install transformers==4.49.0 --upgrade >> "%basePath%\logs\Missing_nodes.txt" 2>&1
+"%pythonPath%\python.exe" -s -m pip install -r "%customNodesPath%/ComfyUI-Florence2/requirements.txt" --no-warn-script-location >> "%basePath%\logs\Missing_nodes.txt" 2>&1
+
+echo   - Upscaler-Tensorrt
+git clone https://github.com/yuvraj108c/ComfyUI-Upscaler-Tensorrt "%customNodesPath%/ComfyUI-Upscaler-Tensorrt" >> "%basePath%\logs\Missing_nodes.txt" 2>&1
+"%pythonPath%\python.exe" -s -m pip install wheel-stub >> "%basePath%\logs\Missing_nodes.txt" 2>&1
+"%pythonPath%\python.exe" -s -m pip install -r "%customNodesPath%/ComfyUI-Upscaler-Tensorrt/requirements.txt" --no-warn-script-location >> "%basePath%\logs\Missing_nodes.txt" 2>&1
+
+echo   - MultiGPU
+git clone https://github.com/pollockjj/ComfyUI-MultiGPU "%customNodesPath%/ComfyUI-MultiGPU" >> "%basePath%\logs\Missing_nodes.txt" 2>&1
 
 echo Installation complete
 pause

UmeAiRT-WAN2.1-Model_downloader.bat

@@ -1,18 +1,20 @@
 @echo off
 setlocal enabledelayedexpansion
 
-set "comfyUIPath=%CD%"
+set "basePath=%CD%"
+
+if not exist "%basePath%\logs" mkdir "%basePath%\logs"
 
 :check_folder
-if exist "%comfyUIPath%\ComfyUI" (
+if exist "%basePath%\ComfyUI" (
     echo ComfyUI folder detected
-) else if exist "%comfyUIPath%\ComfyUI_windows_portable" (
-	cd ComfyUI_windows_portable
+	set "modelsPath=%basePath%\ComfyUI\models"
+) else if exist "%basePath%\ComfyUI_windows_portable" (
     echo ComfyUI folder detected
+	set "modelsPath=%basePath%\ComfyUI_windows_portable\ComfyUI\models"
 ) else (
-	echo ComfyUI folder not detected
+	echo ComfyUI folder not detected, give ComfyUi folder path :
 	pause
-	exit /b
 )
 
 :CHOOSE_OPTION
@@ -56,68 +58,59 @@ set /p "FLUX_GGUF_CHOICE=Enter your choice (A,B,C,D or E) and press Enter: "
 	goto CHOOSE_FLUX_GGUF
 )
 
-cd ComfyUI\models
 REM Download VAE file
 echo Downloading VAE file...
-cd vae
-curl -L -o wan_2.1_vae.safetensors https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/vae/wan_2.1_vae.safetensors?download=true
-
-cd ..
+curl -L -o "%modelsPath%/vae/wan_2.1_vae.safetensors" https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/vae/wan_2.1_vae.safetensors?download=true
 
 REM Download CLIP files
 echo Downloading CLIP files...
-cd clip
-curl -L -o "umt5_xxl_fp8_e4m3fn_scaled.safetensors" https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/text_encoders/umt5_xxl_fp8_e4m3fn_scaled.safetensors?download=true
-cd ..
+curl -L -o "%modelsPath%/clip/umt5_xxl_fp8_e4m3fn_scaled.safetensors" https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/text_encoders/umt5_xxl_fp8_e4m3fn_scaled.safetensors?download=true
 
 REM Download Diffusion models files
-cd diffusion_models
 if "%INSTALL_TYPE%"=="unoptimized" (
 	echo Downloading diffusion models file...
 	echo T2V Quant Model :
-	curl -L -o wan2.1_i2v_480p_14B_bf16.safetensors https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_i2v_480p_14B_bf16.safetensors?download=true
+	curl -L -o "%modelsPath%/diffusion_models/wan2.1_i2v_480p_14B_bf16.safetensors" https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_i2v_480p_14B_bf16.safetensors?download=true
 	echo I2V Quant Model :
-	curl -L -o wan2.1_t2v_1.3B_bf16.safetensors https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_t2v_1.3B_bf16.safetensors?download=true
+	curl -L -o "%modelsPath%/diffusion_models/wan2.1_t2v_1.3B_bf16.safetensors" https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_t2v_1.3B_bf16.safetensors?download=true
 )
 if "%DOWNLOAD_GGUF%"=="yes" (
     echo Downloading GGUF T2V Quant Model...
     if /i "%FLUX_GGUF_CHOICE%"=="A" (
-	curl -L -o wan2.1-t2v-14b-Q8_0.gguf https://huggingface.co/city96/Wan2.1-T2V-14B-gguf/resolve/main/wan2.1-t2v-14b-Q8_0.gguf?download=true
+	curl -L -o "%modelsPath%/diffusion_models/wan2.1-t2v-14b-Q8_0.gguf" https://huggingface.co/city96/Wan2.1-T2V-14B-gguf/resolve/main/wan2.1-t2v-14b-Q8_0.gguf?download=true
 	) else if /i "%FLUX_GGUF_CHOICE%"=="B" (
-	curl -L -o wan2.1-t2v-14b-Q5_K_M.gguf https://huggingface.co/city96/Wan2.1-T2V-14B-gguf/resolve/main/wan2.1-t2v-14b-Q5_K_M.gguf?download=true
+	curl -L -o "%modelsPath%/diffusion_models/wan2.1-t2v-14b-Q5_K_M.gguf" https://huggingface.co/city96/Wan2.1-T2V-14B-gguf/resolve/main/wan2.1-t2v-14b-Q5_K_M.gguf?download=true
 	) else if /i "%FLUX_GGUF_CHOICE%"=="C" (
-	curl -L -o wan2.1-t2v-14b-Q3_K_S.gguf https://huggingface.co/city96/Wan2.1-T2V-14B-gguf/resolve/main/wan2.1-t2v-14b-Q3_K_S.gguf?download=true
+	curl -L -o "%modelsPath%/diffusion_models/wan2.1-t2v-14b-Q3_K_S.gguf" https://huggingface.co/city96/Wan2.1-T2V-14B-gguf/resolve/main/wan2.1-t2v-14b-Q3_K_S.gguf?download=true
 	) else if /i "%FLUX_GGUF_CHOICE%"=="D" (
-	curl -L -o wan2.1-t2v-14b-Q8_0.gguf https://huggingface.co/city96/Wan2.1-T2V-14B-gguf/resolve/main/wan2.1-t2v-14b-Q8_0.gguf?download=true
-	curl -L -o wan2.1-t2v-14b-Q5_K_M.gguf https://huggingface.co/city96/Wan2.1-T2V-14B-gguf/resolve/main/wan2.1-t2v-14b-Q5_K_M.gguf?download=true
-	curl -L -o wan2.1-t2v-14b-Q3_K_S.gguf https://huggingface.co/city96/Wan2.1-T2V-14B-gguf/resolve/main/wan2.1-t2v-14b-Q3_K_S.gguf?download=true
+	curl -L -o "%modelsPath%/diffusion_models/wan2.1-t2v-14b-Q8_0.gguf" https://huggingface.co/city96/Wan2.1-T2V-14B-gguf/resolve/main/wan2.1-t2v-14b-Q8_0.gguf?download=true
+	curl -L -o "%modelsPath%/diffusion_models/wan2.1-t2v-14b-Q5_K_M.gguf" https://huggingface.co/city96/Wan2.1-T2V-14B-gguf/resolve/main/wan2.1-t2v-14b-Q5_K_M.gguf?download=true
+	curl -L -o "%modelsPath%/diffusion_models/wan2.1-t2v-14b-Q3_K_S.gguf" https://huggingface.co/city96/Wan2.1-T2V-14B-gguf/resolve/main/wan2.1-t2v-14b-Q3_K_S.gguf?download=true
 	)
 )
 if "%DOWNLOAD_GGUF%"=="yes" (
     echo Downloading GGUF I2V Quant Model...
     if /i "%FLUX_GGUF_CHOICE%"=="A" (
-	curl -L -o wan2.1-i2v-14b-480p-Q8_0.gguf https://huggingface.co/city96/Wan2.1-I2V-14B-480P-gguf/resolve/main/wan2.1-i2v-14b-480p-Q8_0.gguf?download=true
+	curl -L -o "%modelsPath%/diffusion_models/wan2.1-i2v-14b-480p-Q8_0.gguf" https://huggingface.co/city96/Wan2.1-I2V-14B-480P-gguf/resolve/main/wan2.1-i2v-14b-480p-Q8_0.gguf?download=true
 	) else if /i "%FLUX_GGUF_CHOICE%"=="B" (
-	curl -L -o wan2.1-i2v-14b-480p-Q5_K_M.gguf https://huggingface.co/city96/Wan2.1-I2V-14B-480P-gguf/resolve/main/wan2.1-i2v-14b-480p-Q5_K_M.gguf?download=true
+	curl -L -o "%modelsPath%/diffusion_models/wan2.1-i2v-14b-480p-Q5_K_M.gguf" https://huggingface.co/city96/Wan2.1-I2V-14B-480P-gguf/resolve/main/wan2.1-i2v-14b-480p-Q5_K_M.gguf?download=true
 	) else if /i "%FLUX_GGUF_CHOICE%"=="C" (
-	curl -L -o wan2.1-i2v-14b-480p-Q3_K_S.gguf https://huggingface.co/city96/Wan2.1-I2V-14B-480P-gguf/resolve/main/wan2.1-i2v-14b-480p-Q3_K_S.gguf?download=true
+	curl -L -o "%modelsPath%/diffusion_models/wan2.1-i2v-14b-480p-Q3_K_S.gguf" https://huggingface.co/city96/Wan2.1-I2V-14B-480P-gguf/resolve/main/wan2.1-i2v-14b-480p-Q3_K_S.gguf?download=true
 	) else if /i "%FLUX_GGUF_CHOICE%"=="D" (
-	curl -L -o wan2.1-i2v-14b-480p-Q8_0.gguf https://huggingface.co/city96/Wan2.1-I2V-14B-480P-gguf/resolve/main/wan2.1-i2v-14b-480p-Q8_0.gguf?download=true
-	curl -L -o wan2.1-i2v-14b-480p-Q5_K_M.gguf https://huggingface.co/city96/Wan2.1-I2V-14B-480P-gguf/resolve/main/wan2.1-i2v-14b-480p-Q5_K_M.gguf?download=true
-	curl -L -o wan2.1-i2v-14b-480p-Q3_K_S.gguf https://huggingface.co/city96/Wan2.1-I2V-14B-480P-gguf/resolve/main/wan2.1-i2v-14b-480p-Q3_K_S.gguf?download=true
+	curl -L -o "%modelsPath%/diffusion_models/wan2.1-i2v-14b-480p-Q8_0.gguf" https://huggingface.co/city96/Wan2.1-I2V-14B-480P-gguf/resolve/main/wan2.1-i2v-14b-480p-Q8_0.gguf?download=true
+	curl -L -o "%modelsPath%/diffusion_models/wan2.1-i2v-14b-480p-Q5_K_M.gguf" https://huggingface.co/city96/Wan2.1-I2V-14B-480P-gguf/resolve/main/wan2.1-i2v-14b-480p-Q5_K_M.gguf?download=true
+	curl -L -o "%modelsPath%/diffusion_models/wan2.1-i2v-14b-480p-Q3_K_S.gguf" https://huggingface.co/city96/Wan2.1-I2V-14B-480P-gguf/resolve/main/wan2.1-i2v-14b-480p-Q3_K_S.gguf?download=true
 	)
 )
-cd ..
 
 REM Download clip vision
-cd clip_vision
 echo Downloading clip vision file...
-curl -L -o clip_vision_h.safetensors https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/clip_vision/clip_vision_h.safetensors?download=true
-cd ..
+curl -L -o "%modelsPath%/clip_vision/clip_vision_h.safetensors" https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/clip_vision/clip_vision_h.safetensors?download=true
 
 REM Download upscale model
 echo Downloading upscale models...
-cd upscale_models
-curl -L -o 4x_foolhardy_Remacri.pth https://huggingface.co/FacehugmanIII/4x_foolhardy_Remacri/resolve/main/4x_foolhardy_Remacri.pth?download=true
+curl -L -o "%modelsPath%/upscale_models/RealESRGAN_x4plus.pth" https://huggingface.co/spaces/Marne/Real-ESRGAN/resolve/main/RealESRGAN_x4plus.pth?download=true
+curl -L -o "%modelsPath%/upscale_models/RealESRGAN_x4plus_anime_6B.pth" https://huggingface.co/spaces/Marne/Real-ESRGAN/resolve/main/RealESRGAN_x4plus_anime_6B.pth?download=true
 
-cd ..\..
+echo Models downloaded.
+pause