Upload UmeAiRT-WAN2.1-AllinOne-Auto_install.bat

UmeAiRT-WAN2.1-AllinOne-Auto_install.bat

@@ -14,7 +14,7 @@ echo ---------------------------------------------------------------------------
 type banner.txt
 echo -------------------------------------------------------------------------------
 echo                     ComfyUI - WAN2.1 - All in one installer                          
-echo                                                                     V2.0          
+echo                                                            V2.3 for CUDA 12.8         
 echo -------------------------------------------------------------------------------
 del /f banner.txt
 
@@ -52,10 +52,12 @@ if %errorlevel% NEQ 0 (
     start /wait Git-2.41.0.3-64-bit.exe /VERYSILENT
     del Git-2.41.0.3-64-bit.exe
 ) 
+echo Enabling long paths for git...
+powershell -Command "Start-Process git -WindowStyle Hidden -ArgumentList 'config','--system','core.longpaths','true' -Verb RunAs"
 
 REM Download ComfyUI
 echo Downloading ComfyUI...
-curl -L -o ComfyUI_windows_portable_nvidia.7z https://github.com/comfyanonymous/ComfyUI/releases/download/v0.3.27/ComfyUI_windows_portable_nvidia.7z
+curl -L -o ComfyUI_windows_portable_nvidia.7z https://github.com/comfyanonymous/ComfyUI/releases/download/v0.3.31/ComfyUI_windows_portable_nvidia.7z
 
 REM Extract ComfyUI
 echo Extracting ComfyUI...
@@ -83,27 +85,7 @@ if exist update_new.py (
 )
 "%basePath%\python_embeded\python.exe" -s -m pip install -r "%basePath%/ComfyUI/requirements.txt"  >> "%installPath%\logs\install.txt" 2>&1
 
-echo Installing xformers...
-"%basePath%\python_embeded\python.exe" -s -m pip install xformers >> "%installPath%\logs\install.txt" 2>&1
-"%basePath%\python_embeded\python.exe" -s -m pip install pytorch-pretrained-bert >> "%installPath%\logs\install.txt" 2>&1
-"%basePath%\python_embeded\python.exe" -s -m pip install pytorch-extension >> "%installPath%\logs\install.txt" 2>&1
-echo Installing NVIDIA Apex...
-git clone https://github.com/NVIDIA/apex "%basePath%/python_embeded/apex" >> "%installPath%\logs\install.txt" 2>&1
-"%basePath%\python_embeded\python.exe" -s -m pip install -e "%basePath%/python_embeded/apex" >> "%installPath%\logs\install.txt" 2>&1
 
-echo Installing Visual Studio Build Tools...
-winget install --id Microsoft.VisualStudio.2022.BuildTools -e --source winget --override "--quiet --wait --norestart --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 --add Microsoft.VisualStudio.Component.Windows10SDK.20348"
-
-echo Installing Triton...
-"%basePath%\python_embeded\python.exe" -s -m pip install triton-windows==3.2.0.post17 >> "%installPath%\logs\install.txt" 2>&1
-
-echo Downloading Python include/libs...
-curl -L -o "%basePath%\python_embeded\python_3.12.9_include_libs.zip" https://huggingface.co/UmeAiRT/ComfyUI-Auto_installer/resolve/main/others/python_3.12.9_include_libs.zip?download=true >> "%installPath%\logs\install.txt" 2>&1
-tar -xf "%basePath%\python_embeded\python_3.12.9_include_libs.zip" -C "%basePath%\python_embeded" >> "%installPath%\logs\install.txt" 2>&1
-
-echo Installing SageAttention...
-git clone https://github.com/thu-ml/SageAttention "%basePath%/python_embeded/SageAttention" >> "%installPath%\logs\install.txt" 2>&1
-"%basePath%\python_embeded\python.exe" -s -m pip install -e "%basePath%/python_embeded/SageAttention" >> "%installPath%\logs\install.txt" 2>&1
 
 REM Clone ComfyUI-Manager
 echo Installing ComfyUI-Manager...
@@ -132,6 +114,10 @@ echo   - KJNodes
 git clone https://github.com/kijai/ComfyUI-KJNodes "%customNodesPath%/ComfyUI-KJNodes" >> "%installPath%\logs\install.txt" 2>&1
 "%basePath%\python_embeded\python.exe" -s -m pip install -r "%customNodesPath%/ComfyUI-KJNodes/requirements.txt" --no-warn-script-location >> "%installPath%\logs\install.txt" 2>&1
 
+echo   - WanVideoWrapper
+git clone https://github.com/kijai/ComfyUI-WanVideoWrapper "%customNodesPath%/ComfyUI-WanVideoWrapper" >> "%installPath%\logs\install.txt" 2>&1
+"%basePath%\python_embeded\python.exe" -s -m pip install -r "%customNodesPath%/ComfyUI-WanVideoWrapper/requirements.txt" --no-warn-script-location >> "%installPath%\logs\install.txt" 2>&1
+
 echo   - VideoHelperSuite
 git clone https://github.com/Kosinkadink/ComfyUI-VideoHelperSuite "%customNodesPath%/ComfyUI-VideoHelperSuite" >> "%installPath%\logs\install.txt" 2>&1
 "%basePath%\python_embeded\python.exe" -s -m pip install -r "%customNodesPath%/ComfyUI-VideoHelperSuite/requirements.txt" --no-warn-script-location >> "%installPath%\logs\install.txt" 2>&1
@@ -151,13 +137,9 @@ git clone https://github.com/yolain/ComfyUI-Easy-Use "%customNodesPath%/ComfyUI-
 echo   - PuLID_Flux_ll
 git clone https://github.com/lldacing/ComfyUI_PuLID_Flux_ll "%customNodesPath%/ComfyUI_PuLID_Flux_ll" >> "%installPath%\logs\install.txt" 2>&1
 "%basePath%\python_embeded\python.exe" -s -m pip install -r "%customNodesPath%/ComfyUI_PuLID_Flux_ll/requirements.txt" --no-warn-script-location >> "%installPath%\logs\install.txt" 2>&1
-curl -L -o "%basePath%\python_embeded\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  >> "%installPath%\logs\install.txt" 2>&1
-curl -L -o "%basePath%\python_embeded\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  >> "%installPath%\logs\install.txt" 2>&1
 curl -L -o "%basePath%\python_embeded\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  >> "%installPath%\logs\install.txt" 2>&1
 "%basePath%\python_embeded\python.exe" -m pip install --use-pep517 facexlib  >> "%installPath%\logs\install.txt" 2>&1
 "%basePath%\python_embeded\python.exe" -m pip install git+https://github.com/rodjjo/filterpy.git  >> "%installPath%\logs\install.txt" 2>&1
-"%basePath%\python_embeded\python.exe" -m pip install onnxruntime==1.19.2 onnxruntime-gpu==1.15.1 "%basePath%\python_embeded\insightface-0.7.3-cp310-cp310-win_amd64.whl"  >> "%installPath%\logs\install.txt" 2>&1
-"%basePath%\python_embeded\python.exe" -m pip install onnxruntime==1.19.2 onnxruntime-gpu==1.15.1 "%basePath%\python_embeded\insightface-0.7.3-cp311-cp311-win_amd64.whl"  >> "%installPath%\logs\install.txt" 2>&1
 "%basePath%\python_embeded\python.exe" -m pip install onnxruntime==1.19.2 onnxruntime-gpu==1.17.1 "%basePath%\python_embeded\insightface-0.7.3-cp312-cp312-win_amd64.whl"  >> "%installPath%\logs\install.txt" 2>&1
 
 echo   - HunyuanVideoMultiLora
@@ -183,6 +165,25 @@ git clone https://github.com/pollockjj/ComfyUI-MultiGPU "%customNodesPath%/Comfy
 echo   - WanStartEndFramesNative
 git clone https://github.com/Flow-two/ComfyUI-WanStartEndFramesNative "%customNodesPath%/ComfyUI-WanStartEndFramesNative" >> "%installPath%\logs\install.txt" 2>&1
 
+echo   - ComfyUI-Image-Saver
+git clone https://github.com/alexopus/ComfyUI-Image-Saver "%customNodesPath%/ComfyUI-Image-Saver" >> "%installPath%\logs\install.txt" 2>&1
+"%basePath%\python_embeded\python.exe" -s -m pip install -r "%customNodesPath%/ComfyUI-Image-Saver/requirements.txt" --no-warn-script-location >> "%installPath%\logs\install.txt" 2>&1
+
+echo   - ComfyUI_UltimateSDUpscale
+git clone https://github.com/ssitu/ComfyUI_UltimateSDUpscale "%customNodesPath%/ComfyUI_UltimateSDUpscale" >> "%installPath%\logs\install.txt" 2>&1
+
+echo   - Controlnet_Aux
+git clone https://github.com/Fannovel16/comfyui_controlnet_aux "%customNodesPath%/comfyui_controlnet_aux" >> "%installPath%\logs\install.txt" 2>&1
+"%basePath%\python_embeded\python.exe" -s -m pip install -r "%customNodesPath%/comfyui_controlnet_aux/requirements.txt" --no-warn-script-location >> "%installPath%\logs\install.txt" 2>&1
+
+echo   - X-Flux
+git clone https://github.com/XLabs-AI/x-flux-comfyui "%customNodesPath%/x-flux-comfyui" >> "%installPath%\logs\install.txt" 2>&1
+"%basePath%\python_embeded\python.exe" -s -m pip install -r "%customNodesPath%/x-flux-comfyui/requirements.txt" --no-warn-script-location >> "%installPath%\logs\install.txt" 2>&1
+
+echo   - RMBG
+git clone https://github.com/1038lab/ComfyUI-RMBG "%customNodesPath%/ComfyUI-RMBG" >> "%installPath%\logs\install.txt" 2>&1
+"%basePath%\python_embeded\python.exe" -s -m pip install -r "%customNodesPath%/ComfyUI-RMBG/requirements.txt" --no-warn-script-location >> "%installPath%\logs\install.txt" 2>&1
+
 mkdir "%comfyPath%\user\default\workflows"
 echo Downloading comfy settings...
 curl -L -o "%comfyPath%\user\default\comfy.settings.json" https://huggingface.co/UmeAiRT/ComfyUI-Auto_installer/resolve/main/others/comfy.settings.json?download=true >> "%installPath%\logs\install.txt" 2>&1
@@ -191,17 +192,53 @@ curl -L -o "%comfyPath%\user\default\workflows\UmeAiRT-WAN21_workflow.7z" https:
 "%SEVEN_ZIP_PATH%" x "%comfyPath%\user\default\workflows\UmeAiRT-WAN21_workflow.7z" -o"%comfyPath%\user\default\workflows\" -y   >> "%installPath%\logs\install.txt" 2>&1
 del /f "%comfyPath%\user\default\workflows\UmeAiRT-WAN21_workflow.7z" -force   >> "%installPath%\logs\install.txt" 2>&1
 
-curl -L -o "%installPath%/UmeAiRT-WAN2.1-Missing_nodes.bat" "https://huggingface.co/UmeAiRT/ComfyUI-Auto_installer/resolve/main/UmeAiRT-WAN2.1-Missing_nodes.bat?download=true"  >> "%installPath%\logs\install.txt" 2>&1
+curl -L -o "%comfyPath%\user\default\workflows\UmeAiRT-Flux_Workflow.7z" https://huggingface.co/UmeAiRT/ComfyUI-Auto_installer/resolve/main/workflows/UmeAiRT-Flux_Workflow.7z?download=true >> "%installPath%\logs\install.txt" 2>&1
+"%SEVEN_ZIP_PATH%" x "%comfyPath%\user\default\workflows\UmeAiRT-Flux_Workflow.7z" -o"%comfyPath%\user\default\workflows\" -y   >> "%installPath%\logs\install.txt" 2>&1
+del /f "%comfyPath%\user\default\workflows\UmeAiRT-Flux_Workflow.7z" -force   >> "%installPath%\logs\install.txt" 2>&1
+
+curl -L -o "%installPath%/UmeAiRT-Missing_nodes.bat" "https://huggingface.co/UmeAiRT/ComfyUI-Auto_installer/resolve/main/UmeAiRT-Missing_nodes.bat?download=true"  >> "%installPath%\logs\install.txt" 2>&1
 curl -L -o "%installPath%/UmeAiRT-WAN2.1-Model_downloader.bat" "https://huggingface.co/UmeAiRT/ComfyUI-Auto_installer/resolve/main/UmeAiRT-WAN2.1-Model_downloader.bat?download=true"  >> "%installPath%\logs\install.txt" 2>&1
-curl -L -o "%installPath%/UmeAiRT-WAN2.1-Sageattention_install.bat" "https://huggingface.co/UmeAiRT/ComfyUI-Auto_installer/resolve/main/UmeAiRT-WAN2.1-Sageattention_install.bat?download=true"  >> "%installPath%\logs\install.txt" 2>&1
+curl -L -o "%installPath%/UmeAiRT-FLUX-Model_downloader.bat" "https://huggingface.co/UmeAiRT/ComfyUI-Auto_installer/resolve/main/UmeAiRT-FLUX-Model_downloader.bat?download=true"  >> "%installPath%\logs\install.txt" 2>&1
 
 REM Final steps based on user choice
-curl -L -o "%basePath%/run_nvidia_gpu-LOWVRAM.bat" https://huggingface.co/UmeAiRT/ComfyUI-Auto_installer/resolve/main/scripts/run_nvidia_gpu-LOWVRAM.bat?download=true  >> "%installPath%\logs\install.txt" 2>&1
-curl -L -o "%basePath%/run_nvidia_gpu-sageattention.bat" https://huggingface.co/UmeAiRT/ComfyUI-Auto_installer/resolve/main/scripts/run_nvidia_gpu-sageattention.bat?download=true  >> "%installPath%\logs\install.txt" 2>&1
-
-:CHOOSE_DOWNLOAD_MODELS
+curl -L -o "%basePath%/run_nvidia_gpu-LOWVRAM.bat" https://huggingface.co/UmeAiRT/ComfyUI-Auto_installer/resolve/main/scripts/run_nvidia_gpu-LOWVRAM.bat?download=true
+curl -L -o "%basePath%/run_nvidia_gpu-sageattention.bat" https://huggingface.co/UmeAiRT/ComfyUI-Auto_installer/resolve/main/scripts/run_nvidia_gpu-sageattention.bat?download=true
+
+echo Installing additional modules for Python...
+
+echo   - Visual Studio Build Tools
+powershell -Command "Start-Process winget -WindowStyle Hidden -ArgumentList 'install','--id','Microsoft.VisualStudio.2022.BuildTools','-e','--source','winget','--override','--quiet --wait --norestart --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 --add Microsoft.VisualStudio.Component.Windows10SDK.20348' -Verb RunAs"
+
+echo   - Python include/libs
+curl -L -o "%basePath%\python_embeded\python_3.12.9_include_libs.zip" https://huggingface.co/UmeAiRT/ComfyUI-Auto_installer/resolve/main/others/python_3.12.9_include_libs.zip?download=true  >> "%installPath%\logs\install.txt" 2>&1
+tar -xf "%basePath%\python_embeded\python_3.12.9_include_libs.zip" -C "%basePath%\python_embeded"  >> "%installPath%\logs\install.txt" 2>&1
+
+echo   - NVIDIA Apex
+curl -L -o apex-0.1.zip https://huggingface.co/UmeAiRT/ComfyUI-Auto_installer/resolve/main/others/apex-0.1.zip  >> "%installPath%\logs\install.txt" 2>&1
+"%SEVEN_ZIP_PATH%" x apex-0.1.zip -o"%basePath%\python_embeded\Lib\site-packages" >> "%installPath%\logs\install.txt" 2>&1
+del /f apex-0.1.zip -force
+
+echo   - Triton
+curl -L -o "%basePath%\python_embeded\triton-3.3.0-py3-none-any.whl" https://github.com/woct0rdho/triton-windows/releases/download/empty/triton-3.3.0-py3-none-any.whl  >> "%installPath%\logs\install.txt" 2>&1
+"%basePath%\python_embeded\python.exe" -m pip install "%basePath%\python_embeded\triton-3.3.0-py3-none-any.whl"  >> "%installPath%\logs\install.txt" 2>&1
+"%basePath%\python_embeded\python.exe" -s -m pip install triton-windows  >> "%installPath%\logs\install.txt" 2>&1
+
+echo   - xformers
+curl -L -o "%basePath%\python_embeded\mpmath-1.3.0-py3-none-any.whl" https://huggingface.co/UmeAiRT/ComfyUI-Auto_installer/resolve/main/others/mpmath-1.3.0-py3-none-any.whl  >> "%installPath%\logs\install.txt" 2>&1
+curl -L -o xformers-0.0.30.zip https://huggingface.co/UmeAiRT/ComfyUI-Auto_installer/resolve/main/others/xformers-0.0.30.zip  >> "%installPath%\logs\install.txt" 2>&1
+"%SEVEN_ZIP_PATH%" x xformers-0.0.30.zip -o"%basePath%\python_embeded\Lib\site-packages" >> "%installPath%\logs\install.txt" 2>&1
+del /f xformers-0.0.30.zip -force
+rem curl -L -o "%basePath%\python_embeded\xformers-0.0.30+3abeaa9e.d20250426-cp312-cp312-win_amd64.whl" https://huggingface.co/UmeAiRT/ComfyUI-Auto_installer/resolve/main/others/xformers-0.0.30%2B3abeaa9e.d20250426-cp312-cp312-win_amd64.whl  >> "%installPath%\logs\install.txt" 2>&1
+"%basePath%\python_embeded\python.exe" -m pip install "%basePath%\python_embeded\mpmath-1.3.0-py3-none-any.whl"  >> "%installPath%\logs\install.txt" 2>&1
+rem "%basePath%\python_embeded\python.exe" -m pip install --no-deps "%basePath%\python_embeded\xformers-0.0.30+3abeaa9e.d20250426-cp312-cp312-win_amd64.whl"  >> "%installPath%\logs\install.txt" 2>&1
+
+echo   - SageAttention
+curl -L -o "%basePath%\python_embeded\sageattention-2.1.1-cp312-cp312-win_amd64.whl" https://huggingface.co/UmeAiRT/ComfyUI-Auto_installer/resolve/main/others/sageattention-2.1.1-cp312-cp312-win_amd64.whl  >> "%installPath%\logs\install.txt" 2>&1
+"%basePath%\python_embeded\python.exe" -m pip install "%basePath%\python_embeded\sageattention-2.1.1-cp312-cp312-win_amd64.whl"  >> "%installPath%\logs\install.txt" 2>&1
+
+:CHOOSE_DOWNLOAD_WAN
 REM Ask user for installation type
-echo Would you like to download models?
+echo Would you like to download WAN models?
 set /p "MODELS=Enter your choice (Y or N) and press Enter: "
 
 if /i "%MODELS%"=="Y" (
@@ -210,7 +247,22 @@ if /i "%MODELS%"=="Y" (
     REM Do nothing, just continue
 ) else (
     echo Invalid choice. Please enter Y or N.
-    goto CHOOSE_DOWNLOAD_MODELS
+    goto CHOOSE_DOWNLOAD_WAN
 )
+
+:CHOOSE_DOWNLOAD_FLUX
+REM Ask user for installation type
+echo Would you like to download FLUX models?
+set /p "MODELS=Enter your choice (Y or N) and press Enter: "
+
+if /i "%MODELS%"=="Y" (
+    call "%installPath%\UmeAiRT-FLUX-Model_downloader.bat"
+) else if /i "%MODELS%"=="N" (
+    REM Do nothing, just continue
+) else (
+    echo Invalid choice. Please enter Y or N.
+    goto CHOOSE_DOWNLOAD_FLUX
+)
+
 echo ComfyUI installed.
 pause