Update start.sh

start.sh

@@ -3,81 +3,96 @@ set -euo pipefail
 
 : "${APP_DIR:=/app}"
 
-export PYTORCH_CUDA_ALLOC_CONF="expandable_segments:True,max_split_size_mb:128"
-export CUDA_MODULE_LOADING="LAZY"
-
 echo "======================================================="
 echo " VINCIE - Start (VINCIE-3B, 8x L40S)"
 echo "======================================================="
 
-# 1) Builder (garante Apex/Flash e deps CUDA)
-echo "🛠️  Iniciando o builder.sh para compilar/instalar dependências CUDA..."
+# 1) Builder (Apex/Flash/dep. CUDA)
+echo "🛠️  Iniciando o builder.sh..."
 if [ -f "/app/builder.sh" ]; then
   /bin/bash /app/builder.sh
   echo "✅ Builder finalizado."
 else
-  echo "⚠️  Aviso: builder.sh não encontrado. Pulando etapa de compilação de dependências."
-fi
+  echo "⚠️  Aviso: builder.sh não encontrado. Pulando compilação."
+fi  # [file:24]
 
 # 2) Env da UI
 export GRADIO_SERVER_NAME="0.0.0.0"
 export GRADIO_SERVER_PORT="${PORT:-7860}"
-export GRADIO_ENABLE_QUEUE="True"
+export GRADIO_ENABLE_QUEUE="True"  # [file:24]
 
-# 3) Preflight: repo + snapshot + symlinks idempotentes
+# 3) CKPT_ROOT externo ao repo (use volumes)
+if [ -d "/data" ]; then
+  export CKPT_ROOT="/data/ckpt/VINCIE-3B"
+  export HF_HUB_CACHE="${HF_HUB_CACHE:-/data/.cache/huggingface/hub}"
+else
+  export CKPT_ROOT="/app/ckpt/VINCIE-3B"
+  export HF_HUB_CACHE="${HF_HUB_CACHE:-/app/.cache/huggingface/hub}"
+fi
+
+# 4) Preflight: baixar snapshot COMPLETO para CKPT_ROOT
 python3 - <<'PY'
-import os, sys, subprocess
+import os, sys, shutil
 from pathlib import Path
-from services.vincie import VincieService
-
-repo_dir = Path("/app/VINCIE")
-ckpt_repo = repo_dir / "ckpt" / "VINCIE-3B"
-ckpt_app  = Path("/app/ckpt") / "VINCIE-3B"
-
-def ensure_symlink(link: Path, target: Path):
-    if link.is_symlink():
-        # relinka se o alvo mudou
-        if link.resolve() != target:
-            link.unlink()
-            link.symlink_to(target, target_is_directory=True)
-    elif link.exists():
-        # se for pasta/arquivo, remove para padronizar como symlink
-        subprocess.run(["rm","-rf",str(link)], check=True)
-        link.symlink_to(target, target_is_directory=True)
+from huggingface_hub import snapshot_download
+
+CKPT_ROOT = Path(os.environ["CKPT_ROOT"])
+MODEL_REPO = os.environ.get("MODEL_REPO", "ByteDance-Seed/VINCIE-3B")
+repo_dir  = Path("/app/VINCIE")
+gy = repo_dir / "configs" / "generate.yaml"
+mp = repo_dir / "main.py"
+
+def download_snapshot():
+    CKPT_ROOT.parent.mkdir(parents=True, exist_ok=True)
+    tmp = CKPT_ROOT.with_name(CKPT_ROOT.name + ".tmp")
+    if tmp.exists():
+        shutil.rmtree(tmp, ignore_errors=True)
+    snapshot_download(
+        repo_id=MODEL_REPO,
+        local_dir=str(tmp),
+        local_dir_use_symlinks=False,
+        resume_download=True,
+    )
+    if CKPT_ROOT.exists():
+        shutil.rmtree(CKPT_ROOT, ignore_errors=True)
+    tmp.rename(CKPT_ROOT)
+
+def validate():
+    need = [CKPT_ROOT/"dit.pth", CKPT_ROOT/"vae.pth", CKPT_ROOT/"llm14b"]
+    missing = [str(p) for p in need if not p.exists()]
+    if missing:
+        raise RuntimeError(f"Snapshot incompleto: {missing}")
+    if not gy.exists() or not mp.exists():
+        raise RuntimeError("VINCIE repo inválido (faltando generate.yaml/main.py)")
+
+# valida repo
+if not gy.exists() or not mp.exists():
+    raise SystemExit("[preflight] Repo ausente/incompleto; clone esperado antes do start.")
+
+try:
+    if CKPT_ROOT.exists():
+        try:
+            validate(); print(f"[preflight] CKPT_ROOT OK: {CKPT_ROOT}")
+        except Exception as e:
+            print("[preflight] validação falhou; refazendo snapshot:", e)
+            shutil.rmtree(CKPT_ROOT, ignore_errors=True)
+            download_snapshot(); validate()
     else:
-        link.parent.mkdir(parents=True, exist_ok=True)
-        link.symlink_to(target, target_is_directory=True)
-
-# 3.1 baixa repo + snapshot
-svc = VincieService()
-svc.ensure_repo()
-svc.ensure_model()
-snapshot = Path(str(svc.ckpt_dir))
-
-# 3.2 cria symlink dentro do repo e também em /app/ckpt
-ensure_symlink(ckpt_repo, snapshot)
-ensure_symlink(ckpt_app,  snapshot)
-
-# 3.3 valida itens essenciais
-need = [snapshot/"dit.pth", snapshot/"vae.pth", snapshot/"llm14b"]
-missing = [str(p) for p in need if not p.exists()]
-if missing:
-    raise SystemExit(f"[preflight] faltam itens no snapshot: {missing}")
-
-# 3.4 symlink opcional de models (heranças YAML)
-models_link = Path("/app/models")
-models_src  = repo_dir / "models"
-if models_src.exists() and (not models_link.exists()):
+        download_snapshot(); validate()
+except Exception as e:
+    print("[preflight] falha definitiva:", e)
     try:
-        models_link.symlink_to(models_src, target_is_directory=True)
-        print(f"[preflight] linked {models_link} -> {models_src}")
-    except Exception as e:
-        print("[preflight] warn: link models failed:", e)
-
-print(f"[preflight] OK: repo={repo_dir}, ckpt(link)={ckpt_repo} -> {snapshot}")
-PY
-
-# 4) PYTHONPATH (imports upstream)
+        for p in (CKPT_ROOT.parent, ):
+            print(f">>> {p}")
+            if p.exists():
+                for x in sorted(p.iterdir(), key=lambda z: z.name.lower()):
+                    print("  -", x.name + ("/" if x.is_dir() else ""))
+    except Exception:
+        pass
+    sys.exit(1)
+PY  # [file:24][file:25]
+
+# 5) PYTHONPATH e includes relativos
 export VINCIE_DIR="${VINCIE_DIR:-/app/VINCIE}"
 : "${PYTHONPATH:=}"
 if [ -n "${PYTHONPATH}" ]; then
@@ -85,16 +100,17 @@ if [ -n "${PYTHONPATH}" ]; then
 else
   export PYTHONPATH="${VINCIE_DIR}"
 fi
+[ -d "/app/VINCIE/models" ] && [ ! -e "/app/models" ] && ln -s /app/VINCIE/models /app/models || true
+
+# 6) Alocador CUDA (mitigar fragmentação no cold-start)
+export PYTORCH_CUDA_ALLOC_CONF="${PYTORCH_CUDA_ALLOC_CONF:-expandable_segments:True,max_split_size_mb:128}"
+export CUDA_MODULE_LOADING="${CUDA_MODULE_LOADING:-LAZY}"
 
-# 5) Diagnóstico mínimo
-echo "🔎 ckpt (repo):"
-ls -la /app/VINCIE/ckpt || true
-ls -la /app/VINCIE/ckpt/VINCIE-3B | head -n 20 || true
-echo "🔎 ckpt (/app):"
-ls -la /app/ckpt || true
-ls -la /app/ckpt/VINCIE-3B | head -n 20 || true
+# 7) Diagnóstico leve
+echo "🔎 Conteúdo de CKPT_ROOT:"
+ls -la "${CKPT_ROOT}" | head -n 50 || true
 
-# 6) Sobe a UI
+# 8) Launch da UI
 echo "🚀 Iniciando a interface web VINCIE (app_vince.py)..."
 cd "$APP_DIR"
-python3 /app/app_vince.py
+python3 /app/app_vince.py  # [file:23]