Update lipsync.sh

lipsync.sh

@@ -12,9 +12,15 @@ CUSTOM_NODES_DIR="${COMFYUI_DIR}/custom_nodes"
 MODELS_DIR="${COMFYUI_DIR}/models"
 WORKFLOWS_DIR="${COMFYUI_DIR}/user/default/workflows"
 INPUT_DIR="${COMFYUI_DIR}/input"
+OUTPUT_DIR="${COMFYUI_DIR}/output"
+TEMP_DIR="${COMFYUI_DIR}/temp"
 
 HF_REPO_BASE="${HF_REPO_BASE:-https://huggingface.co/realgen4/OFMHUB-assets/resolve/main}"
-WORKFLOW_JSON_URL="${WORKFLOW_JSON_URL:-${HF_REPO_BASE}/OFM_hubv2_animatorlipsync.json}"
+WORKFLOW_JSON_URL="${WORKFLOW_JSON_URL:-}"
+WORKFLOW_JSON_NAME="${WORKFLOW_JSON_NAME:-ЛипсинкФикшенный.json}"
+
+# Optional: preseed RIFE model. If this download fails, ComfyUI-VFI can still auto-download it on first use.
+RIFE_FLOWNET_URL="${RIFE_FLOWNET_URL:-https://huggingface.co/jbilcke-hf/varnish/resolve/main/rife/flownet.pkl}"
 
 log "Starting animatorlipsync provisioning"
 
@@ -31,8 +37,12 @@ if [ ! -d "${COMFYUI_DIR}" ]; then
   exit 1
 fi
 
-mkdir -p "${CUSTOM_NODES_DIR}" "${WORKFLOWS_DIR}" "${INPUT_DIR}"
 mkdir -p \
+  "${CUSTOM_NODES_DIR}" \
+  "${WORKFLOWS_DIR}" \
+  "${INPUT_DIR}" \
+  "${OUTPUT_DIR}" \
+  "${TEMP_DIR}" \
   "${MODELS_DIR}/diffusion_models" \
   "${MODELS_DIR}/vae" \
   "${MODELS_DIR}/text_encoders" \
@@ -40,7 +50,8 @@ mkdir -p \
   "${MODELS_DIR}/controlnet" \
   "${MODELS_DIR}/loras" \
   "${MODELS_DIR}/detection" \
-  "${MODELS_DIR}/sam2"
+  "${MODELS_DIR}/sam2" \
+  "${MODELS_DIR}/rife"
 
 apt-get update -y || true
 apt-get install -y \
@@ -95,13 +106,32 @@ download_if_missing() {
 
   mkdir -p "$(dirname "${out}")"
   log "Downloading $(basename "${out}")"
-  wget -O "${out}" --tries=5 --timeout=60 "${url}" || {
+  wget -O "${out}" --tries=5 --timeout=120 "${url}" || {
     warn "Failed download: ${url}"
     rm -f "${out}"
     return 1
   }
 }
 
+copy_if_missing() {
+  local src="$1"
+  local dst="$2"
+
+  if [ ! -f "${src}" ]; then
+    warn "copy_if_missing source missing: ${src}"
+    return 1
+  fi
+
+  if [ -f "${dst}" ]; then
+    log "Exists: ${dst}"
+    return 0
+  fi
+
+  mkdir -p "$(dirname "${dst}")"
+  cp -f "${src}" "${dst}"
+  log "Copied alias $(basename "${src}") -> ${dst}"
+}
+
 install_ts_node_from_hf() {
   local target_dir="${CUSTOM_NODES_DIR}/NEW-UTILS"
 
@@ -137,24 +167,103 @@ install_repo_node "https://github.com/Kosinkadink/ComfyUI-VideoHelperSuite" "Com
 install_repo_node "https://github.com/rgthree/rgthree-comfy" "rgthree-comfy"
 install_repo_node "https://github.com/PGCRT/CRT-Nodes" "CRT-Nodes"
 install_repo_node "https://github.com/evanspearman/ComfyMath" "ComfyMath"
+install_repo_node "https://github.com/GACLove/ComfyUI-VFI" "ComfyUI-VFI"
+install_repo_node "https://github.com/Fannovel16/comfyui_controlnet_aux" "comfyui_controlnet_aux"
 install_ts_node_from_hf
 
-log "Downloading workflow"
-download_if_missing "${WORKFLOW_JSON_URL}" "${WORKFLOWS_DIR}/OFM_hubv2_animatorlipsync.json" || warn "Workflow download failed"
-
-log "Downloading models"
-download_if_missing "https://huggingface.co/Kijai/WanVideo_comfy_fp8_scaled/resolve/main/Wan22Animate/Wan2_2-Animate-14B_fp8_scaled_e4m3fn_KJ_v2.safetensors" "${MODELS_DIR}/diffusion_models/Wan2_2-Animate-14B_fp8_scaled_e4m3fn_KJ_v2.safetensors" || true
-download_if_missing "https://huggingface.co/Kijai/WanVideo_comfy/resolve/main/Wan2_1_VAE_bf16.safetensors" "${MODELS_DIR}/vae/wan_2.1_vae.safetensors" || true
-download_if_missing "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/text_encoders/umt5_xxl_fp8_e4m3fn_scaled.safetensors" "${MODELS_DIR}/text_encoders/umt5_xxl_fp8_e4m3fn_scaled.safetensors" || true
-download_if_missing "https://huggingface.co/calcuis/wan-gguf/resolve/f52f5a1f0ba441d50277fb7cdd7c1b36611837f9/clip_vision_h.safetensors" "${MODELS_DIR}/clip_vision/clip_vision_h.safetensors" || true
-download_if_missing "https://huggingface.co/Kijai/WanVideo_comfy/resolve/main/Wan21_Uni3C_controlnet_fp16.safetensors" "${MODELS_DIR}/controlnet/Wan21_Uni3C_controlnet_fp16.safetensors" || true
-download_if_missing "https://huggingface.co/Kijai/WanVideo_comfy/resolve/main/Lightx2v/lightx2v_I2V_14B_480p_cfg_step_distill_rank256_bf16.safetensors" "${MODELS_DIR}/loras/lightx2v_I2V_14B_480p_cfg_step_distill_rank256_bf16.safetensors" || true
-download_if_missing "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/loras/wan2.2_i2v_lightx2v_4steps_lora_v1_high_noise.safetensors" "${MODELS_DIR}/loras/wan2.2_i2v_lightx2v_4steps_lora_v1_high_noise.safetensors" || true
-download_if_missing "https://huggingface.co/Kijai/WanVideo_comfy/resolve/main/Pusa/Wan21_PusaV1_LORA_14B_rank512_bf16.safetensors" "${MODELS_DIR}/loras/Wan21_PusaV1_LORA_14B_rank512_bf16.safetensors" || true
-download_if_missing "https://huggingface.co/rahul7star/wan2.2Lora/resolve/main/Wan2.2-Fun-A14B-InP-low-noise-HPS2.1.safetensors" "${MODELS_DIR}/loras/Wan2.2-Fun-A14B-InP-low-noise-HPS2.1.safetensors" || true
-download_if_missing "https://huggingface.co/JunkyByte/easy_ViTPose/resolve/main/onnx/wholebody/vitpose-l-wholebody.onnx" "${MODELS_DIR}/detection/vitpose-l-wholebody.onnx" || true
-download_if_missing "https://huggingface.co/onnx-community/yolov10m/resolve/main/onnx/model.onnx" "${MODELS_DIR}/detection/yolov10m.onnx" || true
-download_if_missing "https://huggingface.co/Kijai/sam2-safetensors/resolve/main/sam2.1_hiera_base_plus.safetensors" "${MODELS_DIR}/sam2/sam2.1_hiera_base_plus.safetensors" || true
+if [ -n "${WORKFLOW_JSON_URL}" ]; then
+  log "Downloading workflow"
+  download_if_missing "${WORKFLOW_JSON_URL}" "${WORKFLOWS_DIR}/${WORKFLOW_JSON_NAME}" || warn "Workflow download failed"
+else
+  warn "WORKFLOW_JSON_URL is empty, skipping workflow download. Put your JSON manually into ${WORKFLOWS_DIR}"
+fi
+
+log "Downloading models used by the workflow"
+# Wan model stack
+
+download_if_missing \
+  "https://huggingface.co/Kijai/WanVideo_comfy_fp8_scaled/resolve/main/Wan22Animate/Wan2_2-Animate-14B_fp8_scaled_e4m3fn_KJ_v2.safetensors" \
+  "${MODELS_DIR}/diffusion_models/Wan2_2-Animate-14B_fp8_scaled_e4m3fn_KJ_v2.safetensors" || true
+
+download_if_missing \
+  "https://huggingface.co/Kijai/WanVideo_comfy/resolve/main/Wan2_1_VAE_bf16.safetensors" \
+  "${MODELS_DIR}/vae/wan_2.1_vae.safetensors" || true
+
+download_if_missing \
+  "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/text_encoders/umt5_xxl_fp8_e4m3fn_scaled.safetensors" \
+  "${MODELS_DIR}/text_encoders/umt5_xxl_fp8_e4m3fn_scaled.safetensors" || true
+
+download_if_missing \
+  "https://huggingface.co/calcuis/wan-gguf/resolve/f52f5a1f0ba441d50277fb7cdd7c1b36611837f9/clip_vision_h.safetensors" \
+  "${MODELS_DIR}/clip_vision/clip_vision_h.safetensors" || true
+
+download_if_missing \
+  "https://huggingface.co/Kijai/WanVideo_comfy/resolve/main/Wan21_Uni3C_controlnet_fp16.safetensors" \
+  "${MODELS_DIR}/controlnet/Wan21_Uni3C_controlnet_fp16.safetensors" || true
+
+download_if_missing \
+  "https://huggingface.co/Kijai/WanVideo_comfy/resolve/main/Lightx2v/lightx2v_I2V_14B_480p_cfg_step_distill_rank256_bf16.safetensors" \
+  "${MODELS_DIR}/loras/lightx2v_I2V_14B_480p_cfg_step_distill_rank256_bf16.safetensors" || true
+
+download_if_missing \
+  "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/loras/wan2.2_i2v_lightx2v_4steps_lora_v1_high_noise.safetensors" \
+  "${MODELS_DIR}/loras/wan2.2_i2v_lightx2v_4steps_lora_v1_high_noise.safetensors" || true
+
+download_if_missing \
+  "https://huggingface.co/Kijai/WanVideo_comfy/resolve/main/Pusa/Wan21_PusaV1_LORA_14B_rank512_bf16.safetensors" \
+  "${MODELS_DIR}/loras/Wan21_PusaV1_LORA_14B_rank512_bf16.safetensors" || true
+# Exact filename alias for your JSON (LoRA vs LORA case difference)
+copy_if_missing \
+  "${MODELS_DIR}/loras/Wan21_PusaV1_LORA_14B_rank512_bf16.safetensors" \
+  "${MODELS_DIR}/loras/Wan21_PusaV1_LoRA_14B_rank512_bf16.safetensors" || true
+
+download_if_missing \
+  "https://huggingface.co/rahul7star/wan2.2Lora/resolve/main/Wan2.2-Fun-A14B-InP-low-noise-HPS2.1.safetensors" \
+  "${MODELS_DIR}/loras/Wan2.2-Fun-A14B-InP-low-noise-HPS2.1.safetensors" || true
+
+# WanAnimatePreprocess models -> ComfyUI/models/detection
+
+download_if_missing \
+  "https://huggingface.co/JunkyByte/easy_ViTPose/resolve/main/onnx/wholebody/vitpose-l-wholebody.onnx" \
+  "${MODELS_DIR}/detection/vitpose-l-wholebody.onnx" || true
+
+download_if_missing \
+  "https://huggingface.co/onnx-community/yolov10m/resolve/main/onnx/model.onnx" \
+  "${MODELS_DIR}/detection/yolov10m.onnx" || true
+
+# SAM2
+
+download_if_missing \
+  "https://huggingface.co/Kijai/sam2-safetensors/resolve/main/sam2.1_hiera_base_plus.safetensors" \
+  "${MODELS_DIR}/sam2/sam2.1_hiera_base_plus.safetensors" || true
+
+# DWPose models for DWPreprocessor -> comfyui_controlnet_aux expected cache paths
+DWPOSE_DIR_YZD="${CUSTOM_NODES_DIR}/comfyui_controlnet_aux/ckpts/yzd-v/DWPose"
+DWPOSE_DIR_HR16="${CUSTOM_NODES_DIR}/comfyui_controlnet_aux/ckpts/hr16/UnJIT-DWPose"
+mkdir -p "${DWPOSE_DIR_YZD}" "${DWPOSE_DIR_HR16}"
+
+download_if_missing \
+  "https://huggingface.co/yzd-v/DWPose/resolve/main/yolox_l.onnx" \
+  "${DWPOSE_DIR_YZD}/yolox_l.onnx" || true
+
+download_if_missing \
+  "https://huggingface.co/yzd-v/DWPose/resolve/main/dw-ll_ucoco_384.onnx" \
+  "${DWPOSE_DIR_YZD}/dw-ll_ucoco_384.onnx" || true
+
+# Exact filename alias for your JSON widget value: dw-ll_ucoco.onnx
+copy_if_missing \
+  "${DWPOSE_DIR_YZD}/dw-ll_ucoco_384.onnx" \
+  "${DWPOSE_DIR_YZD}/dw-ll_ucoco.onnx" || true
+# Extra compatibility alias for wrappers that look in hr16/UnJIT-DWPose
+copy_if_missing \
+  "${DWPOSE_DIR_YZD}/dw-ll_ucoco_384.onnx" \
+  "${DWPOSE_DIR_HR16}/dw-ll_ucoco.onnx" || true
+
+# RIFE model for RIFEInterpolation -> ComfyUI/models/rife/flownet.pkl
+# If this fails, ComfyUI-VFI can auto-download it on first use.
+download_if_missing \
+  "${RIFE_FLOWNET_URL}" \
+  "${MODELS_DIR}/rife/flownet.pkl" || true
 
 log "Validation"
 missing=0
@@ -167,6 +276,8 @@ for path in \
   "${CUSTOM_NODES_DIR}/rgthree-comfy" \
   "${CUSTOM_NODES_DIR}/CRT-Nodes" \
   "${CUSTOM_NODES_DIR}/ComfyMath" \
+  "${CUSTOM_NODES_DIR}/ComfyUI-VFI" \
+  "${CUSTOM_NODES_DIR}/comfyui_controlnet_aux" \
   "${CUSTOM_NODES_DIR}/NEW-UTILS/__init__.py" \
   "${CUSTOM_NODES_DIR}/NEW-UTILS/nodes/color_match.py" \
   "${CUSTOM_NODES_DIR}/NEW-UTILS/nodes/openpose_smoother.py" \
@@ -180,11 +291,15 @@ for path in \
   "${MODELS_DIR}/loras/lightx2v_I2V_14B_480p_cfg_step_distill_rank256_bf16.safetensors" \
   "${MODELS_DIR}/loras/wan2.2_i2v_lightx2v_4steps_lora_v1_high_noise.safetensors" \
   "${MODELS_DIR}/loras/Wan21_PusaV1_LORA_14B_rank512_bf16.safetensors" \
+  "${MODELS_DIR}/loras/Wan21_PusaV1_LoRA_14B_rank512_bf16.safetensors" \
   "${MODELS_DIR}/loras/Wan2.2-Fun-A14B-InP-low-noise-HPS2.1.safetensors" \
   "${MODELS_DIR}/detection/vitpose-l-wholebody.onnx" \
   "${MODELS_DIR}/detection/yolov10m.onnx" \
   "${MODELS_DIR}/sam2/sam2.1_hiera_base_plus.safetensors" \
-  "${WORKFLOWS_DIR}/OFM_hubv2_animatorlipsync.json"
+  "${DWPOSE_DIR_YZD}/yolox_l.onnx" \
+  "${DWPOSE_DIR_YZD}/dw-ll_ucoco_384.onnx" \
+  "${DWPOSE_DIR_YZD}/dw-ll_ucoco.onnx" \
+  "${DWPOSE_DIR_HR16}/dw-ll_ucoco.onnx"
 do
   if [ -e "${path}" ]; then
     log "OK: ${path}"
@@ -194,6 +309,23 @@ do
   fi
 done
 
+if [ -n "${WORKFLOW_JSON_URL}" ]; then
+  if [ -e "${WORKFLOWS_DIR}/${WORKFLOW_JSON_NAME}" ]; then
+    log "OK: ${WORKFLOWS_DIR}/${WORKFLOW_JSON_NAME}"
+  else
+    warn "MISSING: ${WORKFLOWS_DIR}/${WORKFLOW_JSON_NAME}"
+    missing=1
+  fi
+else
+  warn "Workflow file was not validated because WORKFLOW_JSON_URL is empty"
+fi
+
+if [ -e "${MODELS_DIR}/rife/flownet.pkl" ]; then
+  log "OK: ${MODELS_DIR}/rife/flownet.pkl"
+else
+  warn "RIFE flownet.pkl not preloaded. ComfyUI-VFI should auto-download it on first use."
+fi
+
 if [ "${missing}" -eq 1 ]; then
   warn "Provisioning completed with missing files"
 else