Update provision.sh

provision.sh

@@ -1,47 +1,113 @@
 #!/bin/bash
 
-# Vast.ai ComfyUI Provisioning Script
-# Updated: Includes update command and model verification
-
 echo "Starting provisioning script..."
 
-# 1. Ensure all required directories exist
+############################################
+# 0. HUGGING FACE AUTH
+############################################
+if [ -z "$HF_TOKEN" ]; then
+    echo "⚠️ HF_TOKEN not set — private Hugging Face repos will fail."
+else
+    echo "Logging into Hugging Face..."
+    pip install -q huggingface_hub
+    huggingface-cli login --token $HF_TOKEN
+fi
+
+HF_HEADER="Authorization: Bearer $HF_TOKEN"
+AUTH_HEADER="Authorization: Bearer 50d5f37a60d5bb4b1148bbc7addfe2a0"
+
+############################################
+# 1. DIRECTORIES
+############################################
 mkdir -p /workspace/ComfyUI/models/{text_encoders,checkpoints,vae,clip,loras,diffusion_models,upscale_models}
 mkdir -p /workspace/ComfyUI/models/ultralytics/bbox
 
-# 2. Define Helper for Civitai Downloads
-AUTH_HEADER="Authorization: Bearer 50d5f37a60d5bb4b1148bbc7addfe2a0"
+############################################
+# 2. HELPER FOR PRIVATE HF DOWNLOADS
+############################################
+hf_wget () {
+    DEST=$1
+    URL=$2
+    if [ ! -f "$DEST" ]; then
+        echo "Downloading $(basename $DEST)"
+        wget --header="$HF_HEADER" -O "$DEST" "$URL"
+    else
+        echo "Exists: $(basename $DEST)"
+    fi
+}
 
-# 3. === MODEL DOWNLOADS (Hugging Face) ===
+############################################
+# 3. MODEL DOWNLOADS (Hugging Face)
+############################################
 echo "Checking Hugging Face models..."
 
-# Flux & Qwen Base Models
-[ ! -f /workspace/ComfyUI/models/text_encoders/t5xxl_fp8_e4m3fn_scaled.safetensors ] && wget -P /workspace/ComfyUI/models/text_encoders https://huggingface.co/comfyanonymous/flux_text_encoders/resolve/main/t5xxl_fp8_e4m3fn_scaled.safetensors
-[ ! -f /workspace/ComfyUI/models/checkpoints/Qwen-Rapid-AIO-SFW-v23.safetensors ] && wget -P /workspace/ComfyUI/models/checkpoints https://huggingface.co/Phr00t/Qwen-Image-Edit-Rapid-AIO/resolve/main/v23/Qwen-Rapid-AIO-SFW-v23.safetensors
-[ ! -f /workspace/ComfyUI/models/checkpoints/Qwen-Rapid-AIO-NSFW-v23.safetensors ] && wget -P /workspace/ComfyUI/models/checkpoints https://huggingface.co/Phr00t/Qwen-Image-Edit-Rapid-AIO/resolve/main/v23/Qwen-Rapid-AIO-NSFW-v23.safetensors
-[ ! -f /workspace/ComfyUI/models/vae/qwen_image_vae.safetensors ] && wget -P /workspace/ComfyUI/models/vae "https://huggingface.co/Comfy-Org/Qwen-Image_ComfyUI/resolve/main/split_files/vae/qwen_image_vae.safetensors"
-[ ! -f /workspace/ComfyUI/models/clip/qwen_3_4b.safetensors ] && wget -P /workspace/ComfyUI/models/clip https://huggingface.co/Comfy-Org/z_image_turbo/resolve/main/split_files/text_encoders/qwen_3_4b.safetensors
-[ ! -f /workspace/ComfyUI/models/text_encoders/qwen_2.5_vl_7b_fp8_scaled.safetensors ] && wget -P /workspace/ComfyUI/models/text_encoders "https://huggingface.co/Comfy-Org/Qwen-Image_ComfyUI/resolve/main/split_files/text_encoders/qwen_2.5_vl_7b_fp8_scaled.safetensors"
-[ ! -f /workspace/ComfyUI/models/diffusion_models/z_image_turbo_bf16.safetensors ] && wget -P /workspace/ComfyUI/models/diffusion_models https://huggingface.co/Comfy-Org/z_image_turbo/resolve/main/split_files/diffusion_models/z_image_turbo_bf16.safetensors
-[ ! -f /workspace/ComfyUI/models/vae/flux_vae.safetensors ] && wget -P /workspace/ComfyUI/models/vae https://huggingface.co/StableDiffusionVN/Flux/resolve/main/Vae/flux_vae.safetensors
-[ ! -f /workspace/ComfyUI/models/ultralytics/bbox/FacesV1.pt ] && wget -P /workspace/ComfyUI/models/ultralytics/bbox "https://huggingface.co/ashllay/YOLO_Models/resolve/e07b01219ff1807e1885015f439d788b038f49bd/bbox/FacesV1.pt"
-[ ! -f /workspace/ComfyUI/models/upscale_models/1x-ITF-SkinDiffDetail-Lite-v1.pth ] && wget -P /workspace/ComfyUI/models/upscale_models/ "https://huggingface.co/cozyga/test/resolve/main/1x-ITF-SkinDiffDetail-Lite-v1.pth"
-[ ! -f /workspace/ComfyUI/models/checkpoints/LustifyENDGAME.safetensors ] && curl -L -H "$AUTH_HEADER" -o /workspace/ComfyUI/models/checkpoints/LustifyENDGAME.safetensors "https://civitai.com/api/download/models/1094291?type=Model&format=SafeTensor&size=pruned&fp=fp16"
-[ ! -f /workspace/ComfyUI/models/checkpoints/analogMadnessXL.safetensors ] && curl -L -H "$AUTH_HEADER" -o /workspace/ComfyUI/models/checkpoints/analogMadnessXL.safetensors "https://civitai.com/api/download/models/2207703?type=Model&format=SafeTensor&size=full&fp=fp16"
+[ ! -f /workspace/ComfyUI/models/text_encoders/t5xxl_fp8_e4m3fn_scaled.safetensors ] && \
+hf_wget /workspace/ComfyUI/models/text_encoders/t5xxl_fp8_e4m3fn_scaled.safetensors \
+https://huggingface.co/comfyanonymous/flux_text_encoders/resolve/main/t5xxl_fp8_e4m3fn_scaled.safetensors
+
+[ ! -f /workspace/ComfyUI/models/checkpoints/Qwen-Rapid-AIO-SFW-v23.safetensors ] && \
+hf_wget /workspace/ComfyUI/models/checkpoints/Qwen-Rapid-AIO-SFW-v23.safetensors \
+https://huggingface.co/Phr00t/Qwen-Image-Edit-Rapid-AIO/resolve/main/v23/Qwen-Rapid-AIO-SFW-v23.safetensors
+
+[ ! -f /workspace/ComfyUI/models/checkpoints/Qwen-Rapid-AIO-NSFW-v23.safetensors ] && \
+hf_wget /workspace/ComfyUI/models/checkpoints/Qwen-Rapid-AIO-NSFW-v23.safetensors \
+https://huggingface.co/Phr00t/Qwen-Image-Edit-Rapid-AIO/resolve/main/v23/Qwen-Rapid-AIO-NSFW-v23.safetensors
+
+[ ! -f /workspace/ComfyUI/models/vae/qwen_image_vae.safetensors ] && \
+hf_wget /workspace/ComfyUI/models/vae/qwen_image_vae.safetensors \
+https://huggingface.co/Comfy-Org/Qwen-Image_ComfyUI/resolve/main/split_files/vae/qwen_image_vae.safetensors
+
+[ ! -f /workspace/ComfyUI/models/clip/qwen_3_4b.safetensors ] && \
+hf_wget /workspace/ComfyUI/models/clip/qwen_3_4b.safetensors \
+https://huggingface.co/Comfy-Org/z_image_turbo/resolve/main/split_files/text_encoders/qwen_3_4b.safetensors
+
+[ ! -f /workspace/ComfyUI/models/text_encoders/qwen_2.5_vl_7b_fp8_scaled.safetensors ] && \
+hf_wget /workspace/ComfyUI/models/text_encoders/qwen_2.5_vl_7b_fp8_scaled.safetensors \
+https://huggingface.co/Comfy-Org/Qwen-Image_ComfyUI/resolve/main/split_files/text_encoders/qwen_2.5_vl_7b_fp8_scaled.safetensors
+
+[ ! -f /workspace/ComfyUI/models/diffusion_models/z_image_turbo_bf16.safetensors ] && \
+hf_wget /workspace/ComfyUI/models/diffusion_models/z_image_turbo_bf16.safetensors \
+https://huggingface.co/Comfy-Org/z_image_turbo/resolve/main/split_files/diffusion_models/z_image_turbo_bf16.safetensors
+
+[ ! -f /workspace/ComfyUI/models/vae/flux_vae.safetensors ] && \
+hf_wget /workspace/ComfyUI/models/vae/flux_vae.safetensors \
+https://huggingface.co/StableDiffusionVN/Flux/resolve/main/Vae/flux_vae.safetensors
+
+[ ! -f /workspace/ComfyUI/models/ultralytics/bbox/FacesV1.pt ] && \
+hf_wget /workspace/ComfyUI/models/ultralytics/bbox/FacesV1.pt \
+https://huggingface.co/ashllay/YOLO_Models/resolve/e07b01219ff1807e1885015f439d788b038f49bd/bbox/FacesV1.pt
+
+[ ! -f /workspace/ComfyUI/models/upscale_models/1x-ITF-SkinDiffDetail-Lite-v1.pth ] && \
+hf_wget /workspace/ComfyUI/models/upscale_models/1x-ITF-SkinDiffDetail-Lite-v1.pth \
+https://huggingface.co/cozyga/test/resolve/main/1x-ITF-SkinDiffDetail-Lite-v1.pth
+
+############################################
+# CIVITAI MODELS
+############################################
+[ ! -f /workspace/ComfyUI/models/checkpoints/LustifyENDGAME.safetensors ] && \
+curl -L -H "$AUTH_HEADER" -o /workspace/ComfyUI/models/checkpoints/LustifyENDGAME.safetensors \
+"https://civitai.com/api/download/models/1094291?type=Model&format=SafeTensor&size=pruned&fp=fp16"
+
+[ ! -f /workspace/ComfyUI/models/checkpoints/analogMadnessXL.safetensors ] && \
+curl -L -H "$AUTH_HEADER" -o /workspace/ComfyUI/models/checkpoints/analogMadnessXL.safetensors \
+"https://civitai.com/api/download/models/2207703?type=Model&format=SafeTensor&size=full&fp=fp16"
+
+############################################
+# REMAINING FILES (UNCHANGED)
+############################################
 wget --content-disposition -P /workspace/ComfyUI/models/ultralytics/bbox/ \
 https://huggingface.co/cozyga/test/resolve/main/nipple.pt \
 https://huggingface.co/cozyga/test/resolve/main/pussyV2.pt
 
-# 3. Download SDXL Checkpoint
 wget --content-disposition -P /workspace/ComfyUI/models/checkpoints/ \
 https://huggingface.co/cozyga/test/resolve/main/lustifySDXLNSFW_endgame.safetensors
 
-# 4. Download LoRA
 wget --content-disposition -P /workspace/ComfyUI/models/loras/ \
 https://huggingface.co/cozyga/test/resolve/main/dmd2_sdxl_4step_lora_fp16.safetensors
 
-
-# LoRAs (Hugging Face)
+############################################
+# (Your LoRAs + Civitai section stays identical)
+############################################
 LORA_DIR="/workspace/ComfyUI/models/loras"
 [ ! -f "$LORA_DIR/Z-Isla_3K_0002_000003500.safetensors" ] && wget -P "$LORA_DIR" https://huggingface.co/cozyga/test/resolve/main/Z-Isla_3K_0002_000003500.safetensors
 [ ! -f "$LORA_DIR/z-kyla-v1.safetensors" ] && wget -P "$LORA_DIR" https://huggingface.co/cozyga/test/resolve/main/z-kyla-v1.safetensors
@@ -55,9 +121,6 @@ LORA_DIR="/workspace/ComfyUI/models/loras"
 [ ! -f "$LORA_DIR/s0fia_v2_000003700.safetensors" ] && wget -P "$LORA_DIR" https://huggingface.co/cozyga/test/resolve/main/s0fia_v2_000003700.safetensors
 [ ! -f "$LORA_DIR/s0fia_v2_000004300.safetensors" ] && wget -P "$LORA_DIR" https://huggingface.co/cozyga/test/resolve/main/s0fia_v2_000004300.safetensors
 [ ! -f "$LORA_DIR/dmd2_sdxl_4step_lora_fp16.safetensors" ] && wget -P "$LORA_DIR" https://huggingface.co/tianweiy/DMD2/resolve/main/dmd2_sdxl_4step_lora_fp16.safetensors
-# 4. === MODEL DOWNLOADS (Civitai) ===
-echo "Checking Civitai models..."
-
 [ ! -f /workspace/ComfyUI/models/loras/zittitslider.safetensors ] && \
     curl -L -H "$AUTH_HEADER" -o /workspace/ComfyUI/models/loras/zittitslider.safetensors "https://civitai.com/api/download/models/2478366"
 [ ! -f /workspace/ComfyUI/models/loras/QwenEditVersatilePoses.safetensors ] && \
@@ -71,13 +134,13 @@ echo "Checking Civitai models..."
 [ ! -f /workspace/ComfyUI/models/loras/nextscene.safetensors ] && \
     curl -L -H "$AUTH_HEADER" -o /workspace/ComfyUI/models/loras/nextscene.safetensors "https://civitai.com/api/download/models/2337214?type=Model&format=SafeTensor"
 
-
-# 5. === UPDATE AND START ===
+############################################
+# UPDATE & START
+############################################
 echo "Provisioning complete. Updating ComfyUI..."
 
 cd /workspace/ComfyUI || exit
 git pull
 
 echo "ComfyUI is updated. Starting now..."
-# Ensure the script ends by handing over to the ComfyUI process
-python main.py --listen
+python main.py --listen