Update script.sh

script.sh

@@ -45,7 +45,6 @@ WORKFLOWS=(
     "https://huggingface.co/JCscrew/RisuAI_asset_generator/resolve/main/Single_Posture.json"
 )
 
-# ===== 新增：已知內建套件列表（vastai/comfy image已包含） =====
 PREINSTALLED_PACKAGES=(
     "torch"
     "torchvision"
@@ -65,12 +64,10 @@ log_error() { echo "    ❌ $1"; }
 log_success() { echo "    ✅ $1"; }
 log_step() { echo ""; echo "=== [Step $1] $2 ==="; }
 
-# ===== 新增：檢查套件是否已安裝 =====
 package_installed() {
     $PYTHON_BIN -c "import $1" 2>/dev/null && return 0 || return 1
 }
 
-# ===== 新增：過濾requirements.txt中已安裝的套件 =====
 filter_requirements() {
     local req_file="$1"
     local tmp_file="${req_file}.filtered"
@@ -78,10 +75,8 @@ filter_requirements() {
     > "$tmp_file"
     
     while IFS= read -r line; do
-        # 跳過空行和註解
         [[ -z "$line" || "$line" =~ ^# ]] && continue
         
-        # 提取套件名（處理版本指定符如==, >=等）
         local pkg_name
         pkg_name=$(echo "$line" | sed 's/[<>=!].*//' | xargs)
         
@@ -89,7 +84,6 @@ filter_requirements() {
             continue
         fi
         
-        # 轉換為module名稱（- 轉 _）
         local module_name="${pkg_name//-/_}"
         
         if package_installed "$module_name"; then
@@ -175,10 +169,8 @@ install_node() {
     if [ -f "$install_path/requirements.txt" ]; then
         log_info "處理 $repo_name 的依賴..."
         
-        # 移除torch相關套件（避免重複安裝）
         sed -i -e '/^torch/d' -e '/^sam2/d' "$install_path/requirements.txt" 2>/dev/null || true
         
-        # 過濾已安裝的套件
         if filter_requirements "$install_path/requirements.txt"; then
             log_info "安裝 $repo_name 的新依賴..."
             $PIP_BIN install -q --no-cache-dir -r "$install_path/requirements.txt" 2>&1 | grep -v "Requirement already satisfied" || log_warn "部分依賴安裝失敗"
@@ -199,12 +191,7 @@ download_file() {
     
     mkdir -p "$(dirname "$dest_path")"
 
-    if [ -f "$dest_path" ]; then
-        log_info "檔案 '$filename' 已存在，跳過下載"
-        return 0
-    fi
-
-    log_info "下載: $filename"
+    log_info "開始下載: $filename"
     
     local max_retries=3
     local attempt=0
@@ -256,7 +243,7 @@ download_file() {
     done
 
     if [ -f "$dest_path" ]; then
-        log_success "下載完成: $filename"
+        # Verification will be handled by sync_and_verify, just log success here.
         return 0
     else
         log_error "下載失敗: $filename"
@@ -264,57 +251,62 @@ download_file() {
     fi
 }
 
-download_to_directory() {
+sync_and_verify() {
     local dest_dir="$1"
     shift
     local urls=("$@")
     
-    if [ ${#urls[@]} -eq 0 ]; then
-        return 0
-    fi
-    
+    if [ ${#urls[@]} -eq 0 ]; then return 0; fi
+
+    local urls_to_download=()
     mkdir -p "$dest_dir"
-    log_info "下載 ${#urls[@]} 個文件到 $dest_dir"
-    
-    local MAX_PARALLEL=3
-    for url in "${urls[@]}"; do
-        while [ $(jobs -r | wc -l) -ge $MAX_PARALLEL ]; do
-            sleep 1
-        done
-        local filename
-        filename=$(basename "$url" | sed 's/?.*//')
-        download_file "${dest_dir}/${filename}" "$url" &
-    done
-    wait
-}
 
-verify_and_retry_downloads() {
-    local dest_dir="$1"
-    shift
-    local urls=("$@")
-    
-    if [ ${#urls[@]} -eq 0 ]; then
-        return 0
-    fi
-    
-    log_info "檢查 $dest_dir 中的文件..."
-    
-    local missing_files=()
+    log_info "開始驗證 $dest_dir 中的文件..."
+
     for url in "${urls[@]}"; do
         local filename
         filename=$(basename "$url" | sed 's/?.*//')
         local dest_path="${dest_dir}/${filename}"
         
-        if [ ! -f "$dest_path" ]; then
-            log_warn "檔案缺失: $filename"
-            missing_files+=("$url")
+        local expected_sha256=""
+        if [[ "$url" =~ huggingface\.co ]]; then
+            expected_sha256=$(curl -sI "$url?lfs=true" | grep -i 'x-linked-sha256' | awk -F': ' '{print $2}' | tr -d '\r')
+        fi
+
+        if [ -z "$expected_sha256" ]; then
+            log_warn "無法獲取 '$filename' 的校驗和，將僅檢查文件是否存在。"
+            if [ ! -f "$dest_path" ]; then
+                log_info "文件不存在，加入下載列表: $filename"
+                urls_to_download+=("$url")
+            else
+                log_success "文件已存在 (跳過校驗): $filename"
+            fi
+            continue
+        fi
+
+        if [ -f "$dest_path" ]; then
+            local local_sha256
+            local_sha256=$(sha256sum "$dest_path" | awk '{print $1}')
+            if [ "$local_sha256" == "$expected_sha256" ]; then
+                log_success "文件校驗通過: $filename"
+            else
+                log_warn "文件校驗和不匹配: $filename"
+                log_warn "  --> 預期: $expected_sha256"
+                log_warn "  --> 得到: $local_sha256"
+                rm -f "$dest_path"
+                log_info "已刪除損壞文件，將重新下載。"
+                urls_to_download+=("$url")
+            fi
+        else
+            log_info "文件不存在，加入下載列表: $filename"
+            urls_to_download+=("$url")
         fi
     done
     
-    if [ ${#missing_files[@]} -gt 0 ]; then
-        log_warn "發現 ${#missing_files[@]} 個缺失文件，重新下載..."
+    if [ ${#urls_to_download[@]} -gt 0 ]; then
+        log_info "準備下載 ${#urls_to_download[@]} 個新文件或無效文件到 $dest_dir"
         local MAX_PARALLEL=3
-        for url in "${missing_files[@]}"; do
+        for url in "${urls_to_download[@]}"; do
             while [ $(jobs -r | wc -l) -ge $MAX_PARALLEL ]; do
                 sleep 1
             done
@@ -323,11 +315,40 @@ verify_and_retry_downloads() {
             download_file "${dest_dir}/${filename}" "$url" &
         done
         wait
+        
+        log_info "重新驗證下載的文件..."
+        for url in "${urls_to_download[@]}"; do
+            local filename
+            filename=$(basename "$url" | sed 's/?.*//')
+            local dest_path="${dest_dir}/${filename}"
+            
+            if [ ! -f "$dest_path" ]; then
+                log_error "重試下載後文件依然缺失: $filename"
+                continue
+            fi
+
+            local expected_sha256=""
+            if [[ "$url" =~ huggingface\.co ]]; then
+                expected_sha256=$(curl -sI "$url?lfs=true" | grep -i 'x-linked-sha256' | awk -F': ' '{print $2}' | tr -d '\r')
+            fi
+
+            if [ -n "$expected_sha256" ]; then
+                local local_sha256
+                local_sha256=$(sha256sum "$dest_path" | awk '{print $1}')
+                if [ "$local_sha256" == "$expected_sha256" ]; then
+                    log_success "重新下載的文件校驗通過: $filename"
+                else
+                    log_error "重新下載的文件校驗失敗: $filename"
+                fi
+            fi
+        done
+
     else
-        log_success "所有文件已確認存在"
+        log_success "$dest_dir 中的所有文件均已驗證且為最新。"
     fi
 }
 
+
 provisioning_print_header() {
     echo ""
     echo "##############################################"
@@ -393,29 +414,18 @@ provisioning_step2_nodes() {
     fi
 }
 
-provisioning_step3_downloads() {
-    log_step "3" "下載模型與工作流文件"
+provisioning_step3_models_and_workflows() {
+    log_step "3" "下載並驗證模型與工作流"
+    
+    sync_and_verify "${COMFYUI_DIR}/models/checkpoints" "${CHECKPOINT_MODELS[@]}"
+    sync_and_verify "${COMFYUI_DIR}/models/clip_vision" "${CLIP_VISION_MODELS[@]}"
+    sync_and_verify "${COMFYUI_DIR}/models/ipadapter" "${IPADAPTER_MODELS[@]}"
+    sync_and_verify "${COMFYUI_DIR}/models/sams" "${SAM_MODELS[@]}"
+    sync_and_verify "${COMFYUI_DIR}/models/ultralytics/bbox" "${ULTRALYTICS_BBOX_MODELS[@]}"
+    sync_and_verify "${COMFYUI_DIR}/models/upscale_models" "${ESRGAN_MODELS[@]}"
     
-    download_to_directory "${COMFYUI_DIR}/models/checkpoints" "${CHECKPOINT_MODELS[@]}"
-    download_to_directory "${COMFYUI_DIR}/models/clip_vision" "${CLIP_VISION_MODELS[@]}"
-    download_to_directory "${COMFYUI_DIR}/models/ipadapter" "${IPADAPTER_MODELS[@]}"
-    download_to_directory "${COMFYUI_DIR}/models/sams" "${SAM_MODELS[@]}"
-    download_to_directory "${COMFYUI_DIR}/models/ultralytics/bbox" "${ULTRALYTICS_BBOX_MODELS[@]}"
-    download_to_directory "${COMFYUI_DIR}/models/upscale_models" "${ESRGAN_MODELS[@]}"
-
     if [ ${#WORKFLOWS[@]} -gt 0 ]; then
-        log_info "下載工作流文件..."
-        mkdir -p "${COMFYUI_DIR}/user/default/workflows"
-        local MAX_PARALLEL=3
-        for workflow_url in "${WORKFLOWS[@]}"; do
-            while [ $(jobs -r | wc -l) -ge $MAX_PARALLEL ]; do
-                sleep 1
-            done
-            local workflow_name
-            workflow_name=$(basename "$workflow_url" | sed 's/?.*//')
-            download_file "${COMFYUI_DIR}/user/default/workflows/${workflow_name}" "$workflow_url" &
-        done
-        wait
+        sync_and_verify "${COMFYUI_DIR}/user/default/workflows" "${WORKFLOWS[@]}"
     fi
 }
 
@@ -425,37 +435,34 @@ provisioning_print_header
 
 cd "${COMFYUI_DIR}" || exit 1
 
-log_step "1" "安裝系統套件 (aria2)"
+log_step "1" "安裝系統套件"
+
+COMMANDS_TO_CHECK=("aria2c" "curl" "sha256sum")
+MISSING_COMMANDS=()
+for cmd in "${COMMANDS_TO_CHECK[@]}"; do
+    if ! command -v $cmd >/dev/null 2>&1; then
+        MISSING_COMMANDS+=($cmd)
+    fi
+done
 
-if ! command -v aria2c >/dev/null 2>&1; then
-    log_info "aria2 未安裝，開始安裝..."
+if [ ${#MISSING_COMMANDS[@]} -gt 0 ]; then
+    log_info "缺少必要套件: ${MISSING_COMMANDS[*]}. 開始安裝..."
     if command -v sudo &>/dev/null && sudo -n true 2>/dev/null; then
         sudo apt-get update -qq
-        sudo apt-get install -y -qq aria2
-        log_success "aria2 安裝完成"
+        sudo apt-get install -y -qq aria2 curl coreutils
+        log_success "套件安裝完成"
     else
-        log_warn "無 sudo 權限，無法安裝 aria2 (下載將使用 wget 備用)"
+        log_error "無 sudo 權限，無法安裝缺失套件。請手動安裝: ${MISSING_COMMANDS[*]}"
+        exit 1
     fi
 else
-    log_success "aria2 已安裝，跳過"
+    log_success "所有必要套件 (aria2, curl, sha256sum) 均已安裝。"
 fi
 
-# 步驟 2 (安裝節點) 與 步驟 3 (下載模型) 並行執行
-provisioning_step2_nodes &
-NODE_PID=$!
-
-provisioning_step3_downloads
-
-log_step "4" "驗證下載完整性"
-
-verify_and_retry_downloads "${COMFYUI_DIR}/models/checkpoints" "${CHECKPOINT_MODELS[@]}"
-verify_and_retry_downloads "${COMFYUI_DIR}/models/clip_vision" "${CLIP_VISION_MODELS[@]}"
-verify_and_retry_downloads "${COMFYUI_DIR}/models/ipadapter" "${IPADAPTER_MODELS[@]}"
-verify_and_retry_downloads "${COMFYUI_DIR}/models/sams" "${SAM_MODELS[@]}"
-verify_and_retry_downloads "${COMFYUI_DIR}/models/ultralytics/bbox" "${ULTRALYTICS_BBOX_MODELS[@]}"
-verify_and_retry_downloads "${COMFYUI_DIR}/models/upscale_models" "${ESRGAN_MODELS[@]}"
+provisioning_step2_nodes
+provisioning_step3_models_and_workflows
 
-log_step "5" "完成配置"
+log_step "4" "完成配置"
 
 touch "/workspace/.provision_complete"
 log_success "配置標記文件已創建"