Update image_Studio.sh

image_Studio.sh

@@ -1,23 +1,26 @@
 #!/usr/bin/env bash
-# setup_comfyui_custom_v2.sh (FIX DL HANG + BLACKWELL)
-# Otimizado: timeouts/retries, Civitai headers, estado robusto, Blackwell nightly
+# setup_comfyui_custom_v2.sh
+# FIX: instalar SEM pré-criar $COMFY_DIR (evita falso positivo do comfy-cli)
+# + timeouts/retries em downloads, headers p/ Civitai, estado robusto
+# + Blackwell (5090/5080) com torch/vision nightly via --pre --upgrade --no-cache-dir
+# + comfy-cli mantido para instalar/rodar/instalar nodes
 
 set -euo pipefail
 
 # --------------------------------
-# Modo interativo?
+# Interatividade
 # --------------------------------
 if [ ! -t 0 ] || [ ! -t 1 ]; then INTERACTIVE=false; else INTERACTIVE=true; fi
 
 # --------------------------------
-# Cores
+# Cores/logs
 # --------------------------------
 RED='\033[0;31m'; GREEN='\033[0;32m'; YELLOW='\033[1;33m'; BLUE='\033[0;34m'; CYAN='\033[0;36m'; NC='\033[0m'
-log_info() { echo -e "${BLUE}[INFO]${NC} $1"; }
+log_info()    { echo -e "${BLUE}[INFO]${NC} $1"; }
 log_success() { echo -e "${GREEN}[✓]${NC} $1"; }
-log_warn() { echo -e "${YELLOW}[!]${NC} $1"; }
-log_error() { echo -e "${RED}[✗]${NC} $1"; }
-log_progress() { echo -e "${CYAN}[→]${NC} $1"; }
+log_warn()    { echo -e "${YELLOW}[!]${NC} $1"; }
+log_error()   { echo -e "${RED}[✗]${NC} $1"; }
+log_progress(){ echo -e "${CYAN}[→]${NC} $1"; }
 
 # --------------------------------
 # Config
@@ -27,7 +30,7 @@ MODELS_DIR="$COMFY_DIR/models"
 COMFY_HOST="${COMFY_HOST:-0.0.0.0}"
 COMFY_PORT="${COMFY_PORT:-8818}"
 
-# Mantemos as keys hardcoded como pedido
+# Mantemos as keys hardcoded (pedido do usuário)
 CIVITAI_TOKEN="${CIVITAI_TOKEN:-4fcb2834969399006a736ee402b061e5}"
 HF_TOKEN="${HF_TOKEN:-}"
 
@@ -46,9 +49,9 @@ export HF_TRANSFER_CONCURRENCY=16
 export EXT_PARALLEL=4
 export PIP_DEFAULT_TIMEOUT=60
 
-# Rede (timeouts e headers)
-DOWNLOAD_TIMEOUT="${DOWNLOAD_TIMEOUT:-900}"          # 15min hard cap por artefato
-CONNECT_TIMEOUT="${CONNECT_TIMEOUT:-20}"             # conexão
+# Rede
+DOWNLOAD_TIMEOUT="${DOWNLOAD_TIMEOUT:-900}"   # 15 min por artefato
+CONNECT_TIMEOUT="${CONNECT_TIMEOUT:-20}"
 RETRY_COUNT="${RETRY_COUNT:-3}"
 RETRY_WAIT="${RETRY_WAIT:-3}"
 UA="${UA:-Mozilla/5.0 (X11; Linux x86_64) curl/8}"
@@ -57,19 +60,18 @@ CIVITAI_REF="https://civitai.com/"
 # --------------------------------
 # Estado
 # --------------------------------
-init_state(){ mkdir -p "$STATE_DIR"; :> "$STATE_FILE"; touch "$COMPLETED_DOWNLOADS" "$COMPLETED_NODES"; }
+init_state(){ mkdir -p "$STATE_DIR"; touch "$STATE_FILE" "$COMPLETED_DOWNLOADS" "$COMPLETED_NODES"; }
 save_state(){ echo "$1" > "$STATE_FILE"; log_info "Estado salvo: $1"; }
 get_state(){ [[ -f "$STATE_FILE" && "$(cat "$STATE_FILE" || echo 0)" =~ ^[0-9]+$ ]] && cat "$STATE_FILE" || echo 0; }
 reset_state(){ log_warn "Resetando estado da instalação..."; rm -rf "$STATE_DIR"; init_state; }
 
-# normaliza "url|type|filename" (trim e remove espaços fantasma)
-normalize_entry(){
-  local url="$1"; local type="$2"; local filename="$3"
-  url="$(echo -n "$url" | xargs)"; type="$(echo -n "$type" | xargs)"; filename="$(echo -n "${filename:-}" | xargs)"
+normalize_entry(){ # "url|type|filename"
+  local url="$1" type="$2" filename="${3:-}"
+  url="$(echo -n "$url" | xargs)"; type="$(echo -n "$type" | xargs)"; filename="$(echo -n "$filename" | xargs)"
   echo "${url}|${type}|${filename}"
 }
-mark_download_complete(){ local key="$1"; echo "$key" >> "$COMPLETED_DOWNLOADS"; }
-is_download_complete(){ local key="$1"; [[ -f "$COMPLETED_DOWNLOADS" ]] && grep -Fxq "$key" "$COMPLETED_DOWNLOADS"; }
+mark_download_complete(){ echo "$1" >> "$COMPLETED_DOWNLOADS"; }
+is_download_complete(){ [[ -f "$COMPLETED_DOWNLOADS" ]] && grep -Fxq "$1" "$COMPLETED_DOWNLOADS"; }
 mark_node_complete(){ echo "$1" >> "$COMPLETED_NODES"; }
 is_node_complete(){ [[ -f "$COMPLETED_NODES" ]] && grep -Fxq "$1" "$COMPLETED_NODES"; }
 
@@ -152,53 +154,46 @@ install_megatools(){
   if ! command_exists megadl; then
     log_info "Instalando megatools..."
     apt-get update -qq && apt-get install -y -qq megatools >/dev/null 2>&1 || true
-    command_exists megadl && log_success "Megatools OK" || log_warn "Megatools falhou (downloads do Mega podem não funcionar)"
+    command_exists megadl && log_success "Megatools OK" || log_warn "Megatools falhou (MEGA pode não funcionar)"
   fi
 }
 
 add_civitai_token(){
   local url="$1"
-  if [[ "$url" == *"civitai.com/api/download"* ]] && [[ "$url" != *"token="* ]]; then
+  if [[ "$url" == *"civitai.com/api/download"* && "$url" != *"token="* ]]; then
     echo "${url}&token=${CIVITAI_TOKEN}"
   else
     echo "$url"
   fi
 }
 
-# HuggingFace (CLI) com timeout
-download_hf(){
+download_hf(){ # via hf/huggingface-cli com timeout
   local repo="$1" file_path="$2" target_dir="$3" filename="$4"
   [[ -z "$filename" ]] && filename="$(basename "$file_path")"
-  local target_file="$target_dir/$filename"
-  if [[ -s "$target_file" && $(stat -c%s "$target_file" 2>/dev/null || echo 0) -gt 1000000 ]]; then
-    log_success "Arquivo já existe: $filename"; return 0
-  fi
+  local out="$target_dir/$filename"
+  if [[ -s "$out" && $(stat -c%s "$out" 2>/dev/null || echo 0) -gt 1000000 ]]; then log_success "Arquivo já existe: $filename"; return 0; fi
 
-  log_info "Baixando de HF: $repo/$file_path -> $filename"
-  local temp_dir; temp_dir="$(mktemp -d)"
-  local ok=false
+  log_info "HF: $repo/$file_path -> $filename"
+  local tmp; tmp="$(mktemp -d)"; local ok=false
 
   if command_exists hf; then
     if timeout "$DOWNLOAD_TIMEOUT" env HF_HUB_ENABLE_HF_TRANSFER=1 hf download "$repo" "$file_path" \
-      --local-dir "$temp_dir" --local-dir-use-symlinks False >/dev/null 2>&1; then ok=true; fi
+      --local-dir "$tmp" --local-dir-use-symlinks False >/dev/null 2>&1; then ok=true; fi
   fi
-
-  if [[ "$ok" = false && $(command_exists huggingface-cli; echo $?) -eq 0 ]]; then
+  if ! $ok && command_exists huggingface-cli; then
     log_warn "Tentando com huggingface-cli..."
     if timeout "$DOWNLOAD_TIMEOUT" env HF_HUB_ENABLE_HF_TRANSFER=1 huggingface-cli download "$repo" "$file_path" \
-      --local-dir "$temp_dir" --local-dir-use-symlinks False >/dev/null 2>&1; then ok=true; fi
+      --local-dir "$tmp" --local-dir-use-symlinks False >/dev/null 2>&1; then ok=true; fi
   fi
 
-  if "$ok"; then
-    local f; f="$(find "$temp_dir" -type f \( -name "*.safetensors" -o -name "*.pth" -o -name "*.pt" -o -name "*.bin" -o -name "*.onnx" \) | head -1)"
-    if [[ -n "$f" ]]; then mv "$f" "$target_file"; rm -rf "$temp_dir"; log_success "HF OK: $filename"; return 0; fi
+  if $ok; then
+    local f; f="$(find "$tmp" -type f \( -name "*.safetensors" -o -name "*.pth" -o -name "*.pt" -o -name "*.bin" -o -name "*.onnx" \) | head -1)"
+    if [[ -n "$f" ]]; then mv "$f" "$out"; rm -rf "$tmp"; log_success "HF OK: $filename"; return 0; fi
   fi
-
-  rm -rf "$temp_dir"; log_error "HF falhou: $filename"; return 1
+  rm -rf "$tmp"; log_error "HF falhou: $filename"; return 1
 }
 
-# MEGA com timeout
-download_mega(){
+download_mega(){ # com timeout
   local url="$1" target_dir="$2"
   command_exists megadl || { log_error "megatools não instalado"; return 1; }
   url="${url#mega://}"
@@ -207,52 +202,45 @@ download_mega(){
   log_error "MEGA falhou/timeout"; return 1
 }
 
-# Detecta nome via cabeçalho
-detect_remote_name(){
-  local url="$1"
-  local name
+detect_remote_name(){ # pega filename do cabeçalho
+  local url="$1" name
   name="$(timeout 60 curl -I -sSL -4 -A "$UA" -e "$CIVITAI_REF" "$url" \
-          | awk -F'filename=' 'BEGIN{IGNORECASE=1}/content-disposition/{gsub(/\"|;|\r/,"",$2); print $2}' | tail -1)"
+        | awk -F'filename=' 'BEGIN{IGNORECASE=1}/content-disposition/{gsub(/\"|;|\r/,"",$2); print $2}' | tail -1)"
   [[ -z "$name" ]] && name="$(basename "$(echo "$url" | cut -d'?' -f1)")"
   echo "$name"
 }
 
-# Baixador genérico (CURL -> WGET -> ARIA2C), todos com timeout & retries
-download_file(){
-  local url="$1" target_dir="$2" filename="$3"
+download_file(){ # CURL -> WGET -> ARIA2C (todos com timeout & retries)
+  local url="$1" target_dir="$2" filename="${3:-}"
   url="$(add_civitai_token "$url")"
-
-  if [[ -z "$filename" ]]; then filename="$(detect_remote_name "$url")"; fi
+  [[ -z "$filename" ]] && filename="$(detect_remote_name "$url")"
   local out="$target_dir/$filename"
 
   if [[ -s "$out" && $(stat -c%s "$out" 2>/dev/null || echo 0) -gt 1000000 ]]; then
     log_success "Arquivo já existe: $filename"; return 0
   fi
 
-  log_info "HTTP: ${filename} (-> $target_dir)"
+  log_info "HTTP: ${filename} -> $target_dir"
 
-  # 1) CURL
   if command_exists curl; then
     if timeout "$DOWNLOAD_TIMEOUT" curl -fL -4 -A "$UA" -e "$CIVITAI_REF" \
-      --connect-timeout "$CONNECT_TIMEOUT" --retry "$RETRY_COUNT" --retry-delay "$RETRY_WAIT" \
-      -C - -o "$out" "$url"; then
+        --connect-timeout "$CONNECT_TIMEOUT" --retry "$RETRY_COUNT" --retry-delay "$RETRY_WAIT" \
+        -C - -o "$out" "$url"; then
       log_success "CURL OK: $filename"; return 0
     else
       log_warn "CURL falhou para $filename"
     fi
   fi
 
-  # 2) WGET
   if command_exists wget; then
     if timeout "$DOWNLOAD_TIMEOUT" wget -q --show-progress -4 --referer="$CIVITAI_REF" --user-agent="$UA" \
-      --timeout="$CONNECT_TIMEOUT" --tries="$RETRY_COUNT" -c -O "$out" "$url"; then
+        --timeout="$CONNECT_TIMEOUT" --tries="$RETRY_COUNT" -c -O "$out" "$url"; then
       log_success "WGET OK: $filename"; return 0
     else
       log_warn "WGET falhou para $filename"
     fi
   fi
 
-  # 3) ARIA2C
   if command_exists aria2c; then
     local aria_opts="-c -s 16 -x 16 -k 1M --file-allocation=none --allow-overwrite=true --auto-file-renaming=false \
       --summary-interval=10 --console-log-level=warn --timeout=$CONNECT_TIMEOUT --retry-wait=$RETRY_WAIT --max-tries=$RETRY_COUNT --referer=$CIVITAI_REF --user-agent=$UA"
@@ -267,9 +255,8 @@ download_file(){
   return 1
 }
 
-# Processa a lista de downloads com chave normalizada + logs
 process_downloads(){
-  local total="${#DOWNLOAD_FILES[@]}"; local current=0; local failed=0
+  local total="${#DOWNLOAD_FILES[@]}" current=0 failed=0
   log_info "Total de downloads: $total"
   log_info "Iniciando loop de downloads..."
 
@@ -299,12 +286,11 @@ process_downloads(){
     if [[ "$url" == mega://* ]]; then
       download_mega "$url" "$target_dir" && ok=0
     elif [[ "$url" == hf://* ]]; then
-      url="${url#hf://}"; local repo="${url%%/*/*}"; repo="${url%/*/*}"; # não usado aqui, mantido por compat
-      local repo2="$(echo "$url" | cut -d'/' -f1-2)"
+      url="${url#hf://}"
+      local repo="$(echo "$url" | cut -d'/' -f1-2)"
       local file_path="$(echo "$url" | cut -d'/' -f3-)"
-      download_hf "$repo2" "$file_path" "$target_dir" "$filename" && ok=0
+      download_hf "$repo" "$file_path" "$target_dir" "$filename" && ok=0
     elif [[ "$url" == https://huggingface.co/*/resolve/* ]]; then
-      # resolve/ direto por HTTP (mais rápido se público)
       download_file "$url" "$target_dir" "$filename" && ok=0
     else
       download_file "$url" "$target_dir" "$filename" && ok=0
@@ -325,18 +311,24 @@ process_downloads(){
   return 0
 }
 
-# Git clone/update com pip reqs e timeouts
 clone_or_update(){
   local url="$1" dest="$2" node_name="$(basename "$dest")"
-
   if is_node_complete "$url"; then log_success "Node já instalado: $node_name"; return 0; fi
 
+  if [[ -d "$dest/.git" ]]; then
+    # sanity: garante que é o repo esperado
+    if ! git -C "$dest" remote -v | grep -qiE 'comfy|comfyui|github\.com'; then
+      log_warn "$node_name tem git estranho; removendo..."
+      rm -rf "$dest"
+    fi
+  fi
+
   if [[ -d "$dest/.git" ]]; then
     log_info "Atualizando $node_name..."
-    timeout 120 git -C "$dest" pull --ff-only >/dev/null 2>&1 || log_warn "Timeout/erro ao atualizar $node_name"
+    timeout 180 git -C "$dest" pull --ff-only >/dev/null 2>&1 || log_warn "Timeout/erro ao atualizar $node_name"
   else
     log_info "Clonando $node_name..."
-    timeout 180 git clone --recursive --depth 1 "$url" "$dest" >/dev/null 2>&1 || { log_warn "Falha ao clonar $node_name"; return 0; }
+    timeout 300 git clone --recursive --depth 1 "$url" "$dest" >/dev/null 2>&1 || { log_warn "Falha ao clonar $node_name"; return 0; }
   fi
 
   if [[ -f "$dest/requirements.txt" ]]; then
@@ -379,9 +371,8 @@ show_menu(){
 # Main
 # --------------------------------
 main(){
-  mkdir -p "$COMFY_DIR" "$MODELS_DIR"; init_state
+  init_state
   show_menu
-
   local s; s="$(get_state)"
 
   # STEP 1: deps
@@ -402,20 +393,43 @@ main(){
     log_success "Ferramentas OK"; save_state "2"
   fi
 
-  # STEP 3: ComfyUI
+  # STEP 3: ComfyUI via comfy-cli (sem pré-criar $COMFY_DIR)
   if [[ "$s" -lt "3" ]]; then
-    log_info "[3/6] Instalando ComfyUI..."
-    if [[ -f "$COMFY_DIR/main.py" ]]; then log_warn "ComfyUI já existe"; else comfy --skip-prompt install --fast-deps --nvidia || { log_error "ComfyUI não instalou"; exit 1; }; fi
-    log_success "ComfyUI instalado"; save_state "3"
+    log_info "[3/6] Instalando ComfyUI (comfy-cli)..."
+
+    if [[ -d "$COMFY_DIR" ]]; then
+      if [[ -d "$COMFY_DIR/.git" || -f "$COMFY_DIR/main.py" ]]; then
+        log_warn "ComfyUI já parece instalado em $COMFY_DIR"
+      else
+        log_warn "Diretório $COMFY_DIR existe porém não é ComfyUI válido. Removendo..."
+        rm -rf "$COMFY_DIR"
+      fi
+    fi
+
+    # git sanity: se existir git mas não for o repo esperado, remove
+    if [[ -d "$COMFY_DIR/.git" ]]; then
+      if ! git -C "$COMFY_DIR" remote -v 2>/dev/null | grep -qi 'comfyanonymous/ComfyUI'; then
+        log_warn "Git em $COMFY_DIR não aponta para comfyanonymous/ComfyUI. Removendo..."
+        rm -rf "$COMFY_DIR"
+      fi
+    fi
+
+    if [[ ! -f "$COMFY_DIR/main.py" ]]; then
+      comfy --skip-prompt install --nvidia --fast-deps --path "$COMFY_DIR" || {
+        log_error "ComfyUI não instalou (comfy-cli erro)"; exit 1; }
+    fi
+
+    [[ -f "$COMFY_DIR/main.py" ]] || { log_error "ComfyUI não encontrado após instalar"; exit 1; }
+    log_success "ComfyUI instalado em: $COMFY_DIR"
+    save_state "3"
   fi
 
-  # STEP 4: Blackwell nightly (se 5090/5080)
+  # STEP 4: Blackwell nightly (5090/5080)
   if [[ "$s" -lt "4" ]]; then
     log_info "[4/6] Verificando GPU..."
     local gpu_info; gpu_info="$(nvidia-smi --query-gpu=name --format=csv,noheader 2>/dev/null || echo "")"
     if [[ "$gpu_info" == *"5090"* || "$gpu_info" == *"5080"* ]]; then
-      log_warn "RTX ${gpu_info:-Blackwell} detectada - aplicando PyTorch nightly (como você pediu)"
-      # alinhado ao pedido: --pre --upgrade --no-cache-dir + extra-index nightly
+      log_warn "RTX ${gpu_info:-Blackwell} detectada - aplicando PyTorch nightly (pedido do usuário)"
       python3 -m pip install --pre --upgrade --no-cache-dir torch --extra-index-url https://download.pytorch.org/whl/nightly/cu128
       python3 -m pip install --pre --upgrade --no-cache-dir torchvision --extra-index-url https://download.pytorch.org/whl/nightly/cu128
       log_success "PyTorch nightly (cu128) pronto"
@@ -425,7 +439,7 @@ main(){
     save_state "4"
   fi
 
-  # STEP 5: modelos
+  # STEP 5: modelos (só agora criamos $MODELS_DIR)
   if [[ "$s" -lt "5" ]]; then
     log_info "[5/6] Baixando modelos..."
     mkdir -p "$MODELS_DIR"/{loras,upscale_models,checkpoints,ultralytics/bbox}
@@ -449,7 +463,7 @@ main(){
 
   # Verificação final
   log_info "Verificando instalação..."
-  if [[ -f "$COMFY_DIR/main.py" ]]; then log_success "✓ ComfyUI instalado"; else log_error "✗ ComfyUI não encontrado"; fi
+  [[ -f "$COMFY_DIR/main.py" ]] && log_success "✓ ComfyUI instalado" || log_error "✗ ComfyUI não encontrado"
 
   echo ""; log_info "Modelos instalados:"
   for dir in checkpoints loras vae vae_approx text_encoders clip_vision upscale_models ultralytics; do
@@ -480,7 +494,7 @@ main(){
   read -t 10 -p "Escolha [1-3] (padrão 1): " final_choice || final_choice="1"
   case "$final_choice" in
     1|"") log_info "Iniciando ComfyUI..."; cd "$COMFY_DIR"; exec comfy launch -- --listen "$COMFY_HOST" --port "$COMFY_PORT" ;;
-    2) reset_state; log_success "Estado resetado. Rode de novo para reinstalar." ;;
+    2) reset_state; log_success "Estado resetado. Rode o script novamente para reinstalar." ;;
     3) log_info "Saindo..." ;;
     *) cd "$COMFY_DIR"; exec comfy launch -- --listen "$COMFY_HOST" --port "$COMFY_PORT" ;;
   esac