Upload 3 files

scripts/Model_downloader/UmeAiRT-FLUX-Model_downloader.bat

@@ -29,7 +29,18 @@ echo B) fp8
 echo C) All
 echo D) No
 set /p "CHOICE=Enter your choice (A,B,C or D) and press Enter: "
-
+	if /i "%CHOICE%"=="A" (
+	set "DOWNLOAD=yes"
+) else if /i "%CHOICE%"=="B" (
+	set "DOWNLOAD=yes"
+) else if /i "%CHOICE%"=="C" (
+	set "DOWNLOAD=yes"
+) else if /i "%CHOICE%"=="D" (
+	set "DOWNLOAD=yes"
+) else (
+	echo Invalid choice. Please enter A,B,C or D.
+	goto CHOOSE_OPTION
+)
 
 :CHOOSE_FLUX_GGUF
 REM Ask user if they FLUXt to download FLUX GGUF Model
@@ -121,14 +132,15 @@ echo Invalid choice. Please enter A or B.
 
 if /i "%CHOICE%"=="A" (
     echo Downloading unet models file...
-	curl -L -o "%modelsPath%/unet/flux1-dev.sft" https://huggingface.co/UmeAiRT/ComfyUI-Auto_installer/resolve/main/models/unet/flux1-dev.sft?download=true
+	powershell -NoProfile -Command "$p = Join-Path $env:modelsPath 'diffusion_models\FLUX'; if (-Not (Test-Path $p)) { New-Item -ItemType Directory -Path $p | Out-Null }"
+	curl -L -o "%modelsPath%/diffusion_models/FLUX/flux1-dev.sft" https://huggingface.co/UmeAiRT/ComfyUI-Auto_installer/resolve/main/models/diffusion_models/FLUX/flux1-dev.sft?download=true
 ) else if /i "%CHOICE%"=="B" (
     echo Downloading unet models file...
-	curl -L -o "%modelsPath%/unet/flux1-dev-fp8.safetensors" https://huggingface.co/Kijai/flux-fp8/resolve/main/flux1-dev-fp8.safetensors?download=true
+	curl -L -o "%modelsPath%/diffusion_models/FLUX/flux1-dev-fp8.safetensors" https://huggingface.co/UmeAiRT/ComfyUI-Auto_installer/resolve/main/models/diffusion_models/FLUX/flux1-dev-fp8.safetensors?download=true
 ) else if /i "%CHOICE%"=="C" (
     echo Downloading unet models file...
-	curl -L -o "%modelsPath%/unet/flux1-dev.sft" https://huggingface.co/UmeAiRT/ComfyUI-Auto_installer/resolve/main/models/unet/flux1-dev.sft?download=true
-    curl -L -o "%modelsPath%/unet/flux1-dev-fp8.safetensors" https://huggingface.co/Kijai/flux-fp8/resolve/main/flux1-dev-fp8.safetensors?download=true
+	curl -L -o "%modelsPath%/diffusion_models/FLUX/flux1-dev.sft" https://huggingface.co/UmeAiRT/ComfyUI-Auto_installer/resolve/main/models/diffusion_models/FLUX/flux1-dev.sft?download=true
+    curl -L -o "%modelsPath%/diffusion_models/FLUX/flux1-dev-fp8.safetensors" https://huggingface.co/UmeAiRT/ComfyUI-Auto_installer/resolve/main/models/diffusion_models/FLUX/flux1-dev-fp8.safetensors?download=true
 ) else if /i "%CHOICE%"=="D" (
     set "INSTALL_TYPE=optimized"
 ) else (
@@ -150,22 +162,23 @@ curl -L -o "%modelsPath%/clip/ViT-L-14-TEXT-detail-improved-hiT-GmP-TE-only-HF.s
 
 if "%DOWNLOAD_GGUF%"=="yes" (
     echo Downloading FLUX GGUF Quant Model...
+	powershell -NoProfile -Command "$p = Join-Path $env:modelsPath 'unet\FLUX'; if (-Not (Test-Path $p)) { New-Item -ItemType Directory -Path $p | Out-Null }"
     if /i "%FLUX_GGUF_CHOICE%"=="A" (
 	curl -L -o "%modelsPath%/clip/t5-v1_1-xxl-encoder-Q8_0.gguf" https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf/resolve/main/t5-v1_1-xxl-encoder-Q8_0.gguf?download=true
-	curl -L -o "%modelsPath%/unet/flux1-dev-Q8_0.gguf" https://huggingface.co/city96/FLUX.1-dev-gguf/resolve/main/flux1-dev-Q8_0.gguf?download=true
+	curl -L -o "%modelsPath%/unet/FLUX/flux1-dev-Q8_0.gguf" https://huggingface.co/city96/FLUX.1-dev-gguf/resolve/main/flux1-dev-Q8_0.gguf?download=true
 	) else if /i "%FLUX_GGUF_CHOICE%"=="B" (
 	curl -L -o "%modelsPath%/clip/t5-v1_1-xxl-encoder-Q5_K_M.gguf" https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf/resolve/main/t5-v1_1-xxl-encoder-Q5_K_M.gguf?download=true
-	curl -L -o "%modelsPath%/unet/flux1-dev-Q5_K_S.gguf" https://huggingface.co/city96/FLUX.1-dev-gguf/resolve/main/flux1-dev-Q5_K_S.gguf?download=true
+	curl -L -o "%modelsPath%/unet/FLUX/flux1-dev-Q5_K_S.gguf" https://huggingface.co/city96/FLUX.1-dev-gguf/resolve/main/flux1-dev-Q5_K_S.gguf?download=true
 	) else if /i "%FLUX_GGUF_CHOICE%"=="C" (
 	curl -L -o "%modelsPath%/clip/t5-v1_1-xxl-encoder-Q3_K_L.gguf" https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf/resolve/main/t5-v1_1-xxl-encoder-Q3_K_L.gguf?download=true
-	curl -L -o "%modelsPath%/unet/flux1-dev-Q4_K_S.gguf" https://huggingface.co/city96/FLUX.1-dev-gguf/resolve/main/flux1-dev-Q4_K_S.gguf?download=true
+	curl -L -o "%modelsPath%/unet/FLUX/flux1-dev-Q4_K_S.gguf" https://huggingface.co/city96/FLUX.1-dev-gguf/resolve/main/flux1-dev-Q4_K_S.gguf?download=true
 	) else if /i "%FLUX_GGUF_CHOICE%"=="D" (
 	curl -L -o "%modelsPath%/clip/t5-v1_1-xxl-encoder-Q8_0.gguf" https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf/resolve/main/t5-v1_1-xxl-encoder-Q8_0.gguf?download=true
 	curl -L -o "%modelsPath%/clip/t5-v1_1-xxl-encoder-Q5_K_M.gguf" https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf/resolve/main/t5-v1_1-xxl-encoder-Q5_K_M.gguf?download=true
 	curl -L -o "%modelsPath%/clip/t5-v1_1-xxl-encoder-Q3_K_L.gguf" https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf/resolve/main/t5-v1_1-xxl-encoder-Q3_K_L.gguf?download=true
-	curl -L -o "%modelsPath%/unet/flux1-dev-Q8_0.gguf" https://huggingface.co/city96/FLUX.1-dev-gguf/resolve/main/flux1-dev-Q8_0.gguf?download=true
-	curl -L -o "%modelsPath%/unet/flux1-dev-Q5_K_S.gguf" https://huggingface.co/city96/FLUX.1-dev-gguf/resolve/main/flux1-dev-Q5_K_S.gguf?download=true
-	curl -L -o "%modelsPath%/unet/flux1-dev-Q4_K_S.gguf" https://huggingface.co/city96/FLUX.1-dev-gguf/resolve/main/flux1-dev-Q4_K_S.gguf?download=true
+	curl -L -o "%modelsPath%/unet/FLUX/flux1-dev-Q8_0.gguf" https://huggingface.co/city96/FLUX.1-dev-gguf/resolve/main/flux1-dev-Q8_0.gguf?download=true
+	curl -L -o "%modelsPath%/unet/FLUX/flux1-dev-Q5_K_S.gguf" https://huggingface.co/city96/FLUX.1-dev-gguf/resolve/main/flux1-dev-Q5_K_S.gguf?download=true
+	curl -L -o "%modelsPath%/unet/FLUX/flux1-dev-Q4_K_S.gguf" https://huggingface.co/city96/FLUX.1-dev-gguf/resolve/main/flux1-dev-Q4_K_S.gguf?download=true
 	)
 )
 REM Download clip vision
@@ -180,7 +193,7 @@ curl -L -o "%modelsPath%/upscale_models/RealESRGAN_x4plus_anime_6B.pth" https://
 REM Download FLUX SCHNELL Model if user chose to
 if "%DOWNLOAD_FLUX_SCHNELL%"=="yes" (
     echo Downloading FLUX SCHNELL Model...
-    curl -L -o "%modelsPath%/unet/flux1-schnell-fp8.safetensors" https://huggingface.co/UmeAiRT/ComfyUI-Auto_installer/resolve/main/models/unet/flux1-schnell-fp8.safetensors?download=true
+    curl -L -o "%modelsPath%/diffusion_models/FLUX/flux1-schnell-fp8.safetensors" https://huggingface.co/UmeAiRT/ComfyUI-Auto_installer/resolve/main/models/diffusion_models/FLUX/flux1-schnell-fp8.safetensors?download=true
 )
 
 mkdir "%modelsPath%/LLM"
@@ -188,6 +201,7 @@ mkdir "%modelsPath%/xlabs/controlnets"
 
 if "%DOWNLOAD_FLUX_CONTROLNET%"=="yes" (
     echo Downloading FLUX ControlNet Models...
+	powershell -NoProfile -Command "$p = Join-Path $env:modelsPath 'unet\FLUX'; if (-Not (Test-Path $p)) { New-Item -ItemType Directory -Path $p | Out-Null }"
     curl -L -o "%modelsPath%/xlabs/controlnets/flux-canny-controlnet-v3.safetensors" https://huggingface.co/XLabs-AI/flux-controlnet-canny-v3/resolve/main/flux-canny-controlnet-v3.safetensors?download=true
     curl -L -o "%modelsPath%/xlabs/controlnets/flux-depth-controlnet-v3.safetensors" https://huggingface.co/XLabs-AI/flux-controlnet-depth-v3/resolve/main/flux-depth-controlnet-v3.safetensors?download=true
     curl -L -o "%modelsPath%/xlabs/controlnets/flux-hed-controlnet-v3.safetensors" https://huggingface.co/XLabs-AI/flux-controlnet-hed-v3/resolve/main/flux-hed-controlnet-v3.safetensors?download=true
@@ -196,21 +210,21 @@ if "%DOWNLOAD_FLUX_CONTROLNET%"=="yes" (
 	if "%DOWNLOAD_GGUF%"=="yes" (
 		echo Downloading ControlNet GGUF Model...
 		if /i "%FLUX_GGUF_CHOICE%"=="A" (
-		curl -L -o "%modelsPath%/unet/flux1-depth-dev-fp16-Q8_0-GGUF.gguf" https://huggingface.co/SporkySporkness/FLUX.1-Depth-dev-GGUF/resolve/main/flux1-depth-dev-fp16-Q8_0-GGUF.gguf?download=true
-		curl -L -o "%modelsPath%/unet/flux1-canny-dev-fp16-Q8_0-GGUF.gguf" https://huggingface.co/SporkySporkness/FLUX.1-Canny-dev-GGUF/resolve/main/flux1-canny-dev-fp16-Q8_0-GGUF.gguf?download=true
+		curl -L -o "%modelsPath%/unet/FLUX/flux1-depth-dev-fp16-Q8_0-GGUF.gguf" https://huggingface.co/SporkySporkness/FLUX.1-Depth-dev-GGUF/resolve/main/flux1-depth-dev-fp16-Q8_0-GGUF.gguf?download=true
+		curl -L -o "%modelsPath%/unet/FLUX/flux1-canny-dev-fp16-Q8_0-GGUF.gguf" https://huggingface.co/SporkySporkness/FLUX.1-Canny-dev-GGUF/resolve/main/flux1-canny-dev-fp16-Q8_0-GGUF.gguf?download=true
 		) else if /i "%FLUX_GGUF_CHOICE%"=="B" (
-		curl -L -o "%modelsPath%/unet/flux1-depth-dev-fp16-Q5_0-GGUF.gguf" https://huggingface.co/SporkySporkness/FLUX.1-Depth-dev-GGUF/resolve/main/flux1-depth-dev-fp16-Q5_0-GGUF.gguf?download=true
-		curl -L -o "%modelsPath%/unet/flux1-canny-dev-fp16-Q5_0-GGUF.gguf" https://huggingface.co/SporkySporkness/FLUX.1-Canny-dev-GGUF/resolve/main/flux1-canny-dev-fp16-Q5_0-GGUF.gguf?download=true
+		curl -L -o "%modelsPath%/unet/FLUX/flux1-depth-dev-fp16-Q5_0-GGUF.gguf" https://huggingface.co/SporkySporkness/FLUX.1-Depth-dev-GGUF/resolve/main/flux1-depth-dev-fp16-Q5_0-GGUF.gguf?download=true
+		curl -L -o "%modelsPath%/unet/FLUX/flux1-canny-dev-fp16-Q5_0-GGUF.gguf" https://huggingface.co/SporkySporkness/FLUX.1-Canny-dev-GGUF/resolve/main/flux1-canny-dev-fp16-Q5_0-GGUF.gguf?download=true
 		) else if /i "%FLUX_GGUF_CHOICE%"=="C" (
-		curl -L -o "%modelsPath%/unet/flux1-depth-dev-fp16-Q4_0-GGUF.gguf" https://huggingface.co/SporkySporkness/FLUX.1-Depth-dev-GGUF/resolve/main/flux1-depth-dev-fp16-Q4_0-GGUF.gguf?download=true
-		curl -L -o "%modelsPath%/unet/flux1-canny-dev-fp16-Q4_0-GGUF.gguf" https://huggingface.co/SporkySporkness/FLUX.1-Canny-dev-GGUF/resolve/main/flux1-canny-dev-fp16-Q4_0-GGUF.gguf?download=true
+		curl -L -o "%modelsPath%/unet/FLUX/flux1-depth-dev-fp16-Q4_0-GGUF.gguf" https://huggingface.co/SporkySporkness/FLUX.1-Depth-dev-GGUF/resolve/main/flux1-depth-dev-fp16-Q4_0-GGUF.gguf?download=true
+		curl -L -o "%modelsPath%/unet/FLUX/flux1-canny-dev-fp16-Q4_0-GGUF.gguf" https://huggingface.co/SporkySporkness/FLUX.1-Canny-dev-GGUF/resolve/main/flux1-canny-dev-fp16-Q4_0-GGUF.gguf?download=true
 		) else if /i "%FLUX_GGUF_CHOICE%"=="D" (
-		curl -L -o "%modelsPath%/unet/flux1-depth-dev-fp16-Q8_0-GGUF.gguf" https://huggingface.co/SporkySporkness/FLUX.1-Depth-dev-GGUF/resolve/main/flux1-depth-dev-fp16-Q8_0-GGUF.gguf?download=true
-		curl -L -o "%modelsPath%/unet/flux1-depth-dev-fp16-Q5_0-GGUF.gguf" https://huggingface.co/SporkySporkness/FLUX.1-Depth-dev-GGUF/resolve/main/flux1-depth-dev-fp16-Q5_0-GGUF.gguf?download=true
-		curl -L -o "%modelsPath%/unet/flux1-depth-dev-fp16-Q4_0-GGUF.gguf" https://huggingface.co/SporkySporkness/FLUX.1-Depth-dev-GGUF/resolve/main/flux1-depth-dev-fp16-Q4_0-GGUF.gguf?download=true
-		curl -L -o "%modelsPath%/unet/flux1-canny-dev-fp16-Q8_0-GGUF.gguf" https://huggingface.co/SporkySporkness/FLUX.1-Canny-dev-GGUF/resolve/main/flux1-canny-dev-fp16-Q8_0-GGUF.gguf?download=true
-		curl -L -o "%modelsPath%/unet/flux1-canny-dev-fp16-Q5_0-GGUF.gguf" https://huggingface.co/SporkySporkness/FLUX.1-Canny-dev-GGUF/resolve/main/flux1-canny-dev-fp16-Q5_0-GGUF.gguf?download=true
-		curl -L -o "%modelsPath%/unet/flux1-canny-dev-fp16-Q4_0-GGUF.gguf" https://huggingface.co/SporkySporkness/FLUX.1-Canny-dev-GGUF/resolve/main/flux1-canny-dev-fp16-Q4_0-GGUF.gguf?download=true
+		curl -L -o "%modelsPath%/unet/FLUX/flux1-depth-dev-fp16-Q8_0-GGUF.gguf" https://huggingface.co/SporkySporkness/FLUX.1-Depth-dev-GGUF/resolve/main/flux1-depth-dev-fp16-Q8_0-GGUF.gguf?download=true
+		curl -L -o "%modelsPath%/unet/FLUX/flux1-depth-dev-fp16-Q5_0-GGUF.gguf" https://huggingface.co/SporkySporkness/FLUX.1-Depth-dev-GGUF/resolve/main/flux1-depth-dev-fp16-Q5_0-GGUF.gguf?download=true
+		curl -L -o "%modelsPath%/unet/FLUX/flux1-depth-dev-fp16-Q4_0-GGUF.gguf" https://huggingface.co/SporkySporkness/FLUX.1-Depth-dev-GGUF/resolve/main/flux1-depth-dev-fp16-Q4_0-GGUF.gguf?download=true
+		curl -L -o "%modelsPath%/unet/FLUX/flux1-canny-dev-fp16-Q8_0-GGUF.gguf" https://huggingface.co/SporkySporkness/FLUX.1-Canny-dev-GGUF/resolve/main/flux1-canny-dev-fp16-Q8_0-GGUF.gguf?download=true
+		curl -L -o "%modelsPath%/unet/FLUX/flux1-canny-dev-fp16-Q5_0-GGUF.gguf" https://huggingface.co/SporkySporkness/FLUX.1-Canny-dev-GGUF/resolve/main/flux1-canny-dev-fp16-Q5_0-GGUF.gguf?download=true
+		curl -L -o "%modelsPath%/unet/FLUX/flux1-canny-dev-fp16-Q4_0-GGUF.gguf" https://huggingface.co/SporkySporkness/FLUX.1-Canny-dev-GGUF/resolve/main/flux1-canny-dev-fp16-Q4_0-GGUF.gguf?download=true
 		)
 	)
 	curl -L -o "%modelsPath%/controlnet/diffusion_pytorch_model_promax.safetensors" https://huggingface.co/UmeAiRT/ComfyUI-Auto_installer/resolve/main/models/controlnet/diffusion_pytorch_model_promax.safetensors?download=true
@@ -220,12 +234,13 @@ if "%DOWNLOAD_FLUX_CONTROLNET%"=="yes" (
 REM Download FLUX SCHNELL Model if user chose to
 if "%DOWNLOAD_FLUX_LORA%"=="yes" (
     echo Downloading UmeAiRT LoRAs...
-    curl -L -o "%modelsPath%/loras/ume_sky_v2.safetensors" https://huggingface.co/UmeAiRT/FLUX.1-dev-LoRA-Ume_Sky/resolve/main/ume_sky_v2.safetensors?download=true
-    curl -L -o "%modelsPath%/loras/ume_modern_pixelart.safetensors" https://huggingface.co/UmeAiRT/FLUX.1-dev-LoRA-Modern_Pixel_art/resolve/main/ume_modern_pixelart.safetensors?download=true
-    curl -L -o "%modelsPath%/loras/ume_classic_Romanticism.safetensors" https://huggingface.co/UmeAiRT/FLUX.1-dev-LoRA-Romanticism/resolve/main/ume_classic_Romanticism.safetensors?download=true
-    curl -L -o "%modelsPath%/loras/ume_classic_impressionist.safetensors" https://huggingface.co/UmeAiRT/FLUX.1-dev-LoRA-Impressionism/resolve/main/ume_classic_impressionist.safetensors?download=true
-    curl -L -o "%modelsPath%/loras/ume_the-little-newspaper.safetensors" https://huggingface.co/UmeAiRT/FLUX.1-dev-LoRA-Ume_J1900/resolve/main/umej1900.safetensors?download=true
-    curl -L -o "%modelsPath%/loras/ume_knight.safetensors" https://huggingface.co/UmeAiRT/FLUX.1-dev-LoRA-Ume_Knight/resolve/main/ume_gachaak.safetensors?download=true
+	powershell -NoProfile -Command "$p = Join-Path $env:modelsPath 'loras\FLUX'; if (-Not (Test-Path $p)) { New-Item -ItemType Directory -Path $p | Out-Null }"
+    curl -L -o "%modelsPath%/loras/FLUX/ume_sky_v2.safetensors" https://huggingface.co/UmeAiRT/FLUX.1-dev-LoRA-Ume_Sky/resolve/main/ume_sky_v2.safetensors?download=true
+    curl -L -o "%modelsPath%/loras/FLUX/ume_modern_pixelart.safetensors" https://huggingface.co/UmeAiRT/FLUX.1-dev-LoRA-Modern_Pixel_art/resolve/main/ume_modern_pixelart.safetensors?download=true
+    curl -L -o "%modelsPath%/loras/FLUX/ume_classic_Romanticism.safetensors" https://huggingface.co/UmeAiRT/FLUX.1-dev-LoRA-Romanticism/resolve/main/ume_classic_Romanticism.safetensors?download=true
+    curl -L -o "%modelsPath%/loras/FLUX/ume_classic_impressionist.safetensors" https://huggingface.co/UmeAiRT/FLUX.1-dev-LoRA-Impressionism/resolve/main/ume_classic_impressionist.safetensors?download=true
+    curl -L -o "%modelsPath%/loras/FLUX/ume_the-little-newspaper.safetensors" https://huggingface.co/UmeAiRT/FLUX.1-dev-LoRA-Ume_J1900/resolve/main/umej1900.safetensors?download=true
+    curl -L -o "%modelsPath%/loras/FLUX/ume_knight.safetensors" https://huggingface.co/UmeAiRT/FLUX.1-dev-LoRA-Ume_Knight/resolve/main/ume_gachaak.safetensors?download=true
 )
 
 REM Download FLUX SCHNELL Model if user chose to