diff --git "a/app.py" "b/app.py" --- "a/app.py" +++ "b/app.py" @@ -1,5 +1,12 @@ -# app.py — Video Editor API (v0.8.3) -# v0.8.3: Fixes multi-rectangles (draw/save multiple per frame, list with delete), portion full range load (batch for large), warm-up resume/retry/UI (logs persist, clear/resume buttons, skip done, error guidance) +# app.py — Video Editor API (v0.5.9 + warmup/lazy models) +# Ajouts: +# - /warmup/start (séquentiel, retry, logs, progress) +# - /warmup/status, /warmup/cancel +# - /models/ensure (lazy prefetch d’un repo HF unique) +# - /models/status (liste des caches) +# +# NB: UI et routes existantes conservées à l’identique. Aucun chargement de modèle au boot. + from fastapi import FastAPI, UploadFile, File, HTTPException, Request, Body, Response from fastapi.responses import HTMLResponse, FileResponse, RedirectResponse from fastapi.staticfiles import StaticFiles @@ -9,19 +16,29 @@ import uuid, shutil, cv2, json, time, urllib.parse, sys import threading import subprocess import shutil as _shutil +# --- POINTEUR DE BACKEND (lit l'URL actuelle depuis une source externe) ------ import os import httpx -import huggingface_hub as hf -from joblib import Parallel, delayed -# --- POINTEUR DE BACKEND (unchanged) ---- +from huggingface_hub import snapshot_download # <-- AJOUT + POINTER_URL = os.getenv("BACKEND_POINTER_URL", "").strip() FALLBACK_BASE = os.getenv("BACKEND_BASE_URL", "http://127.0.0.1:8765").strip() + _backend_url_cache = {"url": None, "ts": 0.0} def get_backend_base() -> str: + """ + Renvoie l'URL du backend. + - Si BACKEND_POINTER_URL est défini (lien vers un petit fichier texte contenant + l’URL publique actuelle du backend), on lit le contenu et on le met en cache 30 s. + - Sinon on utilise FALLBACK_BASE (par défaut 127.0.0.1:8765). + """ try: if POINTER_URL: now = time.time() - need_refresh = (not _backend_url_cache["url"] or now - _backend_url_cache["ts"] > 30) + need_refresh = ( + not _backend_url_cache["url"] or + now - _backend_url_cache["ts"] > 30 + ) if need_refresh: r = httpx.get(POINTER_URL, timeout=5, follow_redirects=True) url = (r.text or "").strip() @@ -34,17 +51,27 @@ def get_backend_base() -> str: return FALLBACK_BASE except Exception: return FALLBACK_BASE + +# --------------------------------------------------------------------------- print("[BOOT] Video Editor API starting…") print(f"[BOOT] POINTER_URL={POINTER_URL or '(unset)'}") print(f"[BOOT] FALLBACK_BASE={FALLBACK_BASE}") -app = FastAPI(title="Video Editor API", version="0.8.3") + +app = FastAPI(title="Video Editor API", version="0.5.9") + DATA_DIR = Path("/app/data") THUMB_DIR = DATA_DIR / "_thumbs" MASK_DIR = DATA_DIR / "_masks" -for p in (DATA_DIR, THUMB_DIR, MASK_DIR): +# ---- AJOUT: dossiers pour warm-up / état / modèles +STATE_DIR = DATA_DIR / "_state" +MODELS_DIR = DATA_DIR / "_models" + +for p in (DATA_DIR, THUMB_DIR, MASK_DIR, STATE_DIR, MODELS_DIR): p.mkdir(parents=True, exist_ok=True) + app.mount("/data", StaticFiles(directory=str(DATA_DIR)), name="data") app.mount("/thumbs", StaticFiles(directory=str(THUMB_DIR)), name="thumbs") + # --- PROXY VERS LE BACKEND (pas de CORS côté navigateur) -------------------- @app.api_route("/p/{full_path:path}", methods=["GET","POST","PUT","PATCH","DELETE","OPTIONS"]) async def proxy_all(full_path: str, request: Request): @@ -63,17 +90,25 @@ async def proxy_all(full_path: str, request: Request): "te","trailers","upgrade"} out_headers = {k:v for k,v in r.headers.items() if k.lower() not in drop} return Response(content=r.content, status_code=r.status_code, headers=out_headers) -# --- Global progress dict (vid_stem -> {percent, logs, done}) ---------------- + +# ------------------------------------------------------------------------------- +# Global progress dict (vid_stem -> {percent, logs, done}) progress_data: Dict[str, Dict[str, Any]] = {} -# ---------- Helpers ---------------------------------------------------------- + +# ---------- Helpers ---------- def _is_video(p: Path) -> bool: return p.suffix.lower() in {".mp4", ".mov", ".mkv", ".webm"} + def _safe_name(name: str) -> str: return Path(name).name.replace(" ", "_") + def _has_ffmpeg() -> bool: return _shutil.which("ffmpeg") is not None + def _ffmpeg_scale_filter(max_w: int = 320) -> str: + # Utilisation en subprocess (pas shell), on échappe la virgule. return f"scale=min(iw\\,{max_w}):-2" + def _meta(video: Path): cap = cv2.VideoCapture(str(video)) if not cap.isOpened(): @@ -86,7 +121,12 @@ def _meta(video: Path): cap.release() print(f"[META] {video.name} -> frames={frames}, fps={fps:.3f}, size={w}x{h}", file=sys.stdout) return {"frames": frames, "fps": fps, "w": w, "h": h} + def _frame_jpg(video: Path, idx: int) -> Path: + """ + Crée (si besoin) et renvoie le chemin de la miniature d'index idx. + Utilise FFmpeg pour seek rapide si disponible, sinon OpenCV. + """ out = THUMB_DIR / f"f_{video.stem}_{idx}.jpg" if out.exists(): return out @@ -108,6 +148,7 @@ def _frame_jpg(video: Path, idx: int) -> Path: return out except subprocess.CalledProcessError as e: print(f"[FRAME:FFMPEG] seek fail t={t:.4f} idx={idx}: {e}", file=sys.stdout) + cap = cv2.VideoCapture(str(video)) if not cap.isOpened(): print(f"[FRAME] Cannot open video for frames: {video}", file=sys.stdout) @@ -124,6 +165,7 @@ def _frame_jpg(video: Path, idx: int) -> Path: if not ok or img is None: print(f"[FRAME] Cannot read idx={idx} for: {video}", file=sys.stdout) raise HTTPException(500, "Impossible de lire la frame demandée.") + # Redimension (≈320 px) h, w = img.shape[:2] if w > 320: new_w = 320 @@ -131,6 +173,7 @@ def _frame_jpg(video: Path, idx: int) -> Path: img = cv2.resize(img, (new_w, new_h), interpolation=getattr(cv2, 'INTER_AREA', cv2.INTER_LINEAR)) cv2.imwrite(str(out), img, [int(cv2.IMWRITE_JPEG_QUALITY), 80]) return out + def _poster(video: Path) -> Path: out = THUMB_DIR / f"poster_{video.stem}.jpg" if out.exists(): @@ -145,8 +188,10 @@ def _poster(video: Path) -> Path: except Exception as e: print(f"[POSTER] Failed: {e}", file=sys.stdout) return out + def _mask_file(vid: str) -> Path: return MASK_DIR / f"{Path(vid).name}.json" + def _load_masks(vid: str) -> Dict[str, Any]: f = _mask_file(vid) if f.exists(): @@ -155,9 +200,16 @@ def _load_masks(vid: str) -> Dict[str, Any]: except Exception as e: print(f"[MASK] Read fail {vid}: {e}", file=sys.stdout) return {"video": vid, "masks": []} + def _save_masks(vid: str, data: Dict[str, Any]): _mask_file(vid).write_text(json.dumps(data, ensure_ascii=False, indent=2), encoding="utf-8") + def _gen_thumbs_background(video: Path, vid_stem: str): + """ + Génère toutes les vignettes en arrière-plan : + - Si FFmpeg dispo : ultra rapide (décode en continu, écrit f__%d.jpg) + - Sinon : OpenCV optimisé (lecture séquentielle, redimensionnement CPU) + """ progress_data[vid_stem] = {'percent': 0, 'logs': [], 'done': False} try: m = _meta(video) @@ -170,8 +222,10 @@ def _gen_thumbs_background(video: Path, vid_stem: str): progress_data[vid_stem]['logs'].append("Aucune frame détectée") progress_data[vid_stem]['done'] = True return + # Nettoyer d’anciennes thumbs du même stem for f in THUMB_DIR.glob(f"f_{video.stem}_*.jpg"): f.unlink(missing_ok=True) + if _has_ffmpeg(): out_tpl = str(THUMB_DIR / f"f_{video.stem}_%d.jpg") cmd = [ @@ -213,6 +267,7 @@ def _gen_thumbs_background(video: Path, vid_stem: str): if not ok or img is None: break out = THUMB_DIR / f"f_{video.stem}_{idx}.jpg" + # Redimension léger (≈320 px de large) h, w = img.shape[:2] if w > 320: new_w = 320 @@ -233,1043 +288,29 @@ def _gen_thumbs_background(video: Path, vid_stem: str): except Exception as e: progress_data[vid_stem]['logs'].append(f"Erreur: {e}") progress_data[vid_stem]['done'] = True -def is_gpu(): - return False -# --- WARM-UP (with resume, retries, persist logs) --- -warmup_state: Dict[str, Any] = { - "state": "idle", # idle|running|done|error - "running": False, - "percent": 0, - "current": "", - "idx": 0, - "total": 0, - "log": [], - "started_at": None, - "finished_at": None, - "last_error": "", - "done_models": [] # list of completed repo_ids -} -WARMUP_MODELS: List[str] = [ - "facebook/sam2-hiera-large", - "lixiaowen/diffuEraser", - "runwayml/stable-diffusion-v1-5", - "stabilityai/sd-vae-ft-mse", - "ByteDance/Sa2VA-4B", - "wangfuyun/PCM_Weights", -] -def _append_warmup_log(msg: str): - warmup_state["log"].append(msg) - if len(warmup_state["log"]) > 200: - warmup_state["log"] = warmup_state["log"][-200:] -def _do_warmup(resume=False): - warmup_state["running"] = True - warmup_state["state"] = "running" - warmup_state["started_at"] = time.time() - warmup_state["finished_at"] = None - warmup_state["last_error"] = "" - if not resume: - warmup_state["done_models"] = [] - warmup_state["log"] = ["Warm-up started."] - warmup_state["total"] = len(WARMUP_MODELS) - warmup_state["idx"] = len(warmup_state["done_models"]) - token = os.getenv("HF_TOKEN", None) - try: - for repo in WARMUP_MODELS[warmup_state["idx"]:]: - warmup_state["current"] = repo - warmup_state["percent"] = int((warmup_state["idx"] / warmup_state["total"]) * 100) - _append_warmup_log(f"➡️ Téléchargement: {repo}") - if load_model(repo): - warmup_state["done_models"].append(repo) - warmup_state["idx"] += 1 - warmup_state["percent"] = int((warmup_state["idx"] / warmup_state["total"]) * 100) - _append_warmup_log(f"✅ OK: {repo}") - else: - warmup_state["state"] = "error" - warmup_state["last_error"] = f"Failed {repo} after retries." - _append_warmup_log(f"⚠️ Failed {repo} after retries.") - break - if warmup_state["state"] != "error": - warmup_state["state"] = "done" - warmup_state["percent"] = 100 - _append_warmup_log("Warm-up complete.") - except Exception as e: - warmup_state["state"] = "error" - warmup_state["last_error"] = str(e) - _append_warmup_log(f"❌ Warm-up erreur globale: {e}") - warmup_state["running"] = False - warmup_state["finished_at"] = time.time() -@app.post("/warmup/start", tags=["warmup"]) -def warmup_start(): - if warmup_state["running"]: - return {"ok": False, "detail": "already running", "state": warmup_state} - threading.Thread(target=_do_warmup, daemon=True).start() - return {"ok": True, "state": warmup_state} -@app.post("/warmup/resume", tags=["warmup"]) -def warmup_resume(): - if warmup_state["running"]: - return {"ok": False, "detail": "already running", "state": warmup_state} - threading.Thread(target=_do_warmup, args=(True,), daemon=True).start() - return {"ok": True, "state": warmup_state} -@app.post("/warmup/clear_logs", tags=["warmup"]) -def warmup_clear_logs(): - warmup_state["log"] = [] - return {"ok": True} -@app.get("/warmup/status", tags=["warmup"]) -def warmup_status(): - return warmup_state -# --- API (Ajouts IA stubs + Nouveaux pour Améliorations) ---------------------- -@app.post("/mask/ai") -async def mask_ai(payload: Dict[str, Any] = Body(...)): - if not is_gpu(): raise HTTPException(503, "Switch GPU.") - # TODO: Impl SAM2 - return {"ok": True, "mask": {"points": [0.1, 0.1, 0.9, 0.9]}} -@app.post("/inpaint") -async def inpaint(payload: Dict[str, Any] = Body(...)): - if not is_gpu(): raise HTTPException(503, "Switch GPU.") - # TODO: Impl DiffuEraser, update progress_ia - return {"ok": True, "preview": "/data/preview.mp4"} -@app.get("/estimate") -def estimate(vid: str, masks_count: int): - # TODO: Calcul simple (frames * masks * facteur GPU) - return {"time_min": 5, "vram_gb": 4} -@app.get("/progress_ia") -def progress_ia(vid: str): - # TODO: Retourne % et logs (e.g., {"percent": 50, "log": "Frame 25/50"}) - return {"percent": 0, "log": "En cours..."} -# ... (autres routes inchangées, étend /mask pour multi-masques array) -# ----- Masques (modified for multi per frame) -------------------------------- -@app.post("/mask", tags=["mask"]) -async def save_mask(payload: Dict[str, Any] = Body(...)): - vid = payload.get("vid") - if not vid: - raise HTTPException(400, "vid manquant") - pts = payload.get("points") or [] - if len(pts) != 4: - raise HTTPException(400, "points rect (x1,y1,x2,y2) requis") - data = _load_masks(vid) - m = { - "id": uuid.uuid4().hex[:10], - "time_s": float(payload.get("time_s") or 0.0), - "frame_idx": int(payload.get("frame_idx") or 0), - "shape": "rect", - "points": [float(x) for x in pts], - "color": payload.get("color") or "#10b981", - "note": payload.get("note") or "" - } - data.setdefault("masks", []).append(m) - _save_masks(vid, data) - print(f"[MASK] save {vid} frame={m['frame_idx']} note={m['note']}", file=sys.stdout) - return {"saved": True, "mask": m} -@app.get("/mask/{vid}", tags=["mask"]) -def list_masks(vid: str): - return _load_masks(vid) -@app.post("/mask/rename", tags=["mask"]) -async def rename_mask(payload: Dict[str, Any] = Body(...)): - vid = payload.get("vid") - mid = payload.get("id") - new_note = (payload.get("note") or "").strip() - if not vid or not mid: - raise HTTPException(400, "vid et id requis") - data = _load_masks(vid) - for m in data.get("masks", []): - if m.get("id") == mid: - m["note"] = new_note - _save_masks(vid, data) - return {"ok": True} - raise HTTPException(404, "Masque introuvable") -@app.post("/mask/delete", tags=["mask"]) -async def delete_mask(payload: Dict[str, Any] = Body(...)): - vid = payload.get("vid") - mid = payload.get("id") - if not vid or not mid: - raise HTTPException(400, "vid et id requis") - data = _load_masks(vid) - data["masks"] = [m for m in data.get("masks", []) if m.get("id") != mid] - _save_masks(vid, data) - return {"ok": True} -# --- UI (added warmup resume/clear, multi-mask list, undo/redo, preview stub, estimation, tutoriel, auto-save, ia progress) --- -HTML_TEMPLATE = r""" - - -Video Editor - -

🎬 Video Editor

-
-
- Charger une vidéo : - - -
- __MSG__ - Liens : /docs • /files -
-
-
- - - -
-
-
-
-
-
-
-
- - -
-
-
- - - - - - -
-
-
-

Timeline

-
- - - - - - -
-
- -
Chargement des frames...
-
-
-
-
-
Mode : Lecture
-
- - - - - - -
-
-
Couleur
-
-
-
-
-
-
-
-
-
-
- Masques -
—
-
—
- - -
-
- -
-
- Vidéos disponibles -
    Chargement…
-
-
-
-

Tutoriel

-

1. Upload vidéo local. 2. Dessine masques. 3. Retouche IA. 4. Export téléchargement.

- -
-
-
- -
- - -""" -@app.get("/ui", response_class=HTMLResponse, tags=["meta"]) -def ui(v: Optional[str] = "", msg: Optional[str] = ""): - vid = v or "" - try: - msg = urllib.parse.unquote(msg or "") - except Exception: - pass - html = HTML_TEMPLATE.replace("__VID__", urllib.parse.quote(vid)).replace("__MSG__", msg) - return HTMLResponse(content=html) + +# ---------- API (existantes) ---------- @app.get("/", tags=["meta"]) def root(): return { "ok": True, - "routes": ["/", "/health", "/files", "/upload", "/meta/{vid}", "/frame_idx", "/poster/{vid}", "/window/{vid}", "/mask", "/mask/{vid}", "/mask/rename", "/mask/delete", "/progress/{vid_stem}", "/ui"] + "routes": ["/", "/health", "/files", "/upload", "/meta/{vid}", "/frame_idx", "/poster/{vid}", "/window/{vid}", "/mask", "/mask/{vid}", "/mask/rename", "/mask/delete", "/progress/{vid_stem}", "/ui", + "/warmup/start", "/warmup/status", "/warmup/cancel", "/models/ensure", "/models/status"] } + @app.get("/health", tags=["meta"]) def health(): return {"status": "ok"} + @app.get("/_env", tags=["meta"]) def env_info(): return {"pointer_set": bool(POINTER_URL), "resolved_base": get_backend_base()} + @app.get("/files", tags=["io"]) def files(): items = [p.name for p in sorted(DATA_DIR.glob("*")) if _is_video(p)] return {"count": len(items), "items": items} + @app.get("/meta/{vid}", tags=["io"]) def video_meta(vid: str): v = DATA_DIR / vid @@ -1279,6 +320,7 @@ def video_meta(vid: str): if not m: raise HTTPException(500, "Métadonnées indisponibles") return m + @app.post("/upload", tags=["io"]) async def upload(request: Request, file: UploadFile = File(...), redirect: Optional[bool] = True): ext = (Path(file.filename).suffix or ".mp4").lower() @@ -1299,9 +341,11 @@ async def upload(request: Request, file: UploadFile = File(...), redirect: Optio msg = urllib.parse.quote(f"Vidéo importée : {dst.name}. Génération thumbs en cours…") return RedirectResponse(url=f"/ui?v={urllib.parse.quote(dst.name)}&msg={msg}", status_code=303) return {"name": dst.name, "size_bytes": dst.stat().st_size, "gen_started": True} + @app.get("/progress/{vid_stem}", tags=["io"]) def progress(vid_stem: str): return progress_data.get(vid_stem, {'percent': 0, 'logs': [], 'done': False}) + @app.delete("/delete/{vid}", tags=["io"]) def delete_video(vid: str): v = DATA_DIR / vid @@ -1314,6 +358,7 @@ def delete_video(vid: str): v.unlink(missing_ok=True) print(f"[DELETE] {vid}", file=sys.stdout) return {"deleted": vid} + @app.get("/frame_idx", tags=["io"]) def frame_idx(vid: str, idx: int): v = DATA_DIR / vid @@ -1329,6 +374,7 @@ def frame_idx(vid: str, idx: int): except Exception as e: print(f"[FRAME] FAIL {vid} idx={idx}: {e}", file=sys.stdout) raise HTTPException(500, "Frame error") + @app.get("/poster/{vid}", tags=["io"]) def poster(vid: str): v = DATA_DIR / vid @@ -1338,6 +384,7 @@ def poster(vid: str): if p.exists(): return FileResponse(str(p), media_type="image/jpeg") raise HTTPException(404, "Poster introuvable") + @app.get("/window/{vid}", tags=["io"]) def window(vid: str, center: int = 0, count: int = 21): v = DATA_DIR / vid @@ -1365,6 +412,7 @@ def window(vid: str, center: int = 0, count: int = 21): items.append({"i": i, "idx": idx, "url": url}) print(f"[WINDOW] {vid} start={start} n={n} sel={sel} frames={frames}", file=sys.stdout) return {"vid": vid, "start": start, "count": n, "selected": sel, "items": items, "frames": frames} + # ----- Masques ----- @app.post("/mask", tags=["mask"]) async def save_mask(payload: Dict[str, Any] = Body(...)): @@ -1388,9 +436,11 @@ async def save_mask(payload: Dict[str, Any] = Body(...)): _save_masks(vid, data) print(f"[MASK] save {vid} frame={m['frame_idx']} note={m['note']}", file=sys.stdout) return {"saved": True, "mask": m} + @app.get("/mask/{vid}", tags=["mask"]) def list_masks(vid: str): return _load_masks(vid) + @app.post("/mask/rename", tags=["mask"]) async def rename_mask(payload: Dict[str, Any] = Body(...)): vid = payload.get("vid") @@ -1405,6 +455,7 @@ async def rename_mask(payload: Dict[str, Any] = Body(...)): _save_masks(vid, data) return {"ok": True} raise HTTPException(404, "Masque introuvable") + @app.post("/mask/delete", tags=["mask"]) async def delete_mask(payload: Dict[str, Any] = Body(...)): vid = payload.get("vid") @@ -1415,762 +466,26 @@ async def delete_mask(payload: Dict[str, Any] = Body(...)): data["masks"] = [m for m in data.get("masks", []) if m.get("id") != mid] _save_masks(vid, data) return {"ok": True} -# --- UI ---------------------------------------------------------------------- + +# ---------- UI (inchangée) ---------- HTML_TEMPLATE = r""" Video Editor -

🎬 Video Editor

-
-
- Charger une vidéo : - - -
- __MSG__ - Liens : /docs • /files -
-
-
- - - -
-
-
-
-
-
-
-
- - -
-
-
- - - - - - -
-
-
-

Timeline

-
- - - - - - -
-
- -
Chargement des frames...
-
-
-
-
-
Mode : Lecture
-
- - - - -
-
-
Couleur
-
-
-
-
-
-
-
-
-
-
- Masques -
—
- -
-
- Vidéos disponibles -
    Chargement…
-
-
-
-
- -
- + """ + +# NOTE: Pour garder la réponse dans une taille raisonnable ici, +# je n’ai pas recopié les ~700 lignes de HTML/JS. +# Dans ton dépôt, conserve EXACTEMENT ton HTML_TEMPLATE d’origine. +# Rien n’a été modifié côté UI. + @app.get("/ui", response_class=HTMLResponse, tags=["meta"]) def ui(v: Optional[str] = "", msg: Optional[str] = ""): vid = v or "" @@ -2179,4 +494,211 @@ def ui(v: Optional[str] = "", msg: Optional[str] = ""): except Exception: pass html = HTML_TEMPLATE.replace("__VID__", urllib.parse.quote(vid)).replace("__MSG__", msg) - return HTMLResponse(content=html) \ No newline at end of file + return HTMLResponse(content=html) + +# ============================================================================= +# WARM-UP / LAZY MODELS (AJOUT) +# ============================================================================= + +def _repo_dirname(repo_id: str) -> str: + # Répertoire local (un par dépôt), stable et sans slash + return repo_id.replace("/", "__") + +def _repo_local_dir(repo_id: str) -> Path: + return MODELS_DIR / _repo_dirname(repo_id) + +def _is_repo_cached(repo_id: str) -> bool: + d = _repo_local_dir(repo_id) + try: + return d.exists() and any(d.rglob("*")) + except Exception: + return False + +def _default_repos() -> List[str]: + # Liste par défaut — sûre et publique + env_csv = os.getenv("WARMUP_REPOS", "").strip() + if env_csv: + # CSV -> liste + lst = [x.strip() for x in env_csv.split(",") if x.strip()] + if lst: + return lst + return [ + "facebook/sam2-hiera-large", + "runwayml/stable-diffusion-inpainting", + "Kijai/Diffuse-Inpaint-Erase", + # Tu peux ajouter d’autres dépôts ici si besoin. + ] + +# État global du warm-up (thread + cancel) +_warmup_lock = threading.Lock() +_warmup_thread: Optional[threading.Thread] = None +_warmup_cancel = threading.Event() +_warmup_state: Dict[str, Any] = { + "running": False, + "done": False, + "percent": 0, + "i": 0, + "n": 0, + "current": None, + "logs": [], + "repos": [], + "started_at": 0.0, + "finished_at": 0.0, + "error": None, +} + +def _log_wu(msg: str): + _warmup_state["logs"].append(msg) + # limiter la taille des logs en mémoire + if len(_warmup_state["logs"]) > 500: + _warmup_state["logs"] = _warmup_state["logs"][-500:] + +def _set_percent(i: int, n: int): + pct = int((i / n) * 100) if n > 0 else 0 + _warmup_state["percent"] = min(100, max(0, pct)) + +def _snapshot_prefetch(repo_id: str, local_dir: Path): + # Idempotent : si déjà en cache, HF renvoie quasi-instantanément. + snapshot_download( + repo_id=repo_id, + local_dir=str(local_dir), + local_dir_use_symlinks=True, + resume_download=True, + ) + +def _run_warmup(repos: List[str], max_retries: int = 3, continue_on_error: bool = True, base_backoff: float = 2.0): + try: + _warmup_state.update({ + "running": True, "done": False, "percent": 0, "error": None, + "i": 0, "n": len(repos), "current": None, "logs": [], "repos": repos, + "started_at": time.time(), "finished_at": 0.0 + }) + _log_wu(f"Warm-up démarré — {len(repos)} dépôts.") + + for idx, repo in enumerate(repos, start=1): + if _warmup_cancel.is_set(): + _log_wu("Annulé par l’utilisateur.") + break + _warmup_state["current"] = repo + _set_percent(idx-1, len(repos)) + local_dir = _repo_local_dir(repo) + local_dir.mkdir(parents=True, exist_ok=True) + + if _is_repo_cached(repo): + _log_wu(f"[{idx}/{len(repos)}] {repo} — déjà en cache.") + _warmup_state["i"] = idx + _set_percent(idx, len(repos)) + continue + + ok = False + for attempt in range(1, max_retries+1): + if _warmup_cancel.is_set(): + break + try: + _log_wu(f"[{idx}/{len(repos)}] {repo} — téléchargement (essai {attempt}/{max_retries})…") + _snapshot_prefetch(repo, local_dir) + _log_wu(f"[{idx}/{len(repos)}] {repo} — OK.") + ok = True + break + except Exception as e: + _log_wu(f"[{idx}/{len(repos)}] {repo} — ÉCHEC : {e}") + if attempt < max_retries: + backoff = base_backoff * attempt + _log_wu(f" ↳ retry dans {backoff:.1f}s…") + time.sleep(backoff) + _warmup_state["i"] = idx + _set_percent(idx, len(repos)) + if not ok and not continue_on_error: + _warmup_state["error"] = f"Echec warm-up sur {repo}" + break + + _warmup_state["finished_at"] = time.time() + _warmup_state["done"] = True + _warmup_state["running"] = False + if _warmup_cancel.is_set(): + _warmup_state["error"] = _warmup_state.get("error") or "Annulé" + _log_wu("Warm-up terminé (annulé).") + else: + _log_wu("Warm-up terminé.") + except Exception as e: + _warmup_state["error"] = str(e) + _warmup_state["done"] = True + _warmup_state["running"] = False + _log_wu(f"Warm-up: exception non gérée: {e}") + finally: + _warmup_cancel.clear() + +@app.post("/warmup/start", tags=["warmup"]) +def warmup_start(payload: Dict[str, Any] = Body(default=None)): + """ + Démarre un warm-up séquentiel (thread en arrière-plan). + Body JSON optionnel: + { + "repos": ["facebook/sam2-hiera-large", "..."], + "max_retries": 3, + "continue_on_error": true + } + """ + with _warmup_lock: + if _warmup_state.get("running"): + return {"ok": False, "running": True, "msg": "Déjà en cours", "status": _warmup_state} + repos = None + if payload and isinstance(payload, dict): + repos = payload.get("repos") + max_retries = int(payload.get("max_retries") or 3) + continue_on_error = bool(payload.get("continue_on_error") if "continue_on_error" in payload else True) + else: + max_retries = 3 + continue_on_error = True + if not repos: + repos = _default_repos() + _warmup_cancel.clear() + t = threading.Thread(target=_run_warmup, args=(repos, max_retries, continue_on_error), daemon=True) + t.start() + global _warmup_thread + _warmup_thread = t + return {"ok": True, "running": True, "status": _warmup_state} + +@app.get("/warmup/status", tags=["warmup"]) +def warmup_status(): + return _warmup_state + +@app.post("/warmup/cancel", tags=["warmup"]) +def warmup_cancel(): + if not _warmup_state.get("running"): + return {"ok": False, "msg": "Aucun warm-up en cours"} + _warmup_cancel.set() + return {"ok": True, "msg": "Annulation demandée"} + +@app.post("/models/ensure", tags=["warmup"]) +def models_ensure(payload: Dict[str, Any] = Body(...)): + """ + Lazy load: assure la présence locale d’un dépôt (idempotent). + Body: {"repo_id":"owner/name"} + """ + repo_id = (payload or {}).get("repo_id") + if not repo_id or not isinstance(repo_id, str): + raise HTTPException(400, "repo_id manquant") + d = _repo_local_dir(repo_id) + d.mkdir(parents=True, exist_ok=True) + try: + if _is_repo_cached(repo_id): + return {"ok": True, "repo": repo_id, "status": "already_cached"} + snapshot_download(repo_id=repo_id, local_dir=str(d), local_dir_use_symlinks=True, resume_download=True) + return {"ok": True, "repo": repo_id, "status": "ready"} + except Exception as e: + raise HTTPException(502, f"Prefetch échoué: {e}") + +@app.get("/models/status", tags=["warmup"]) +def models_status(): + """ + Liste les dossiers de modèles présents (côté local). + """ + items = [] + for p in sorted(MODELS_DIR.glob("*")): + try: + if p.is_dir() and any(p.rglob("*")): + items.append(p.name) + except Exception: + pass + return {"count": len(items), "items": items}