Update app.py

app.py

@@ -1,8 +1,7 @@
-# app.py — Video Editor API (v0.5.9)
-# v0.5.9:
-# - Centrages "Aller à #" / "Frame #" 100% fiables (attend rendu + image chargée)
-# - /mask, /mask/rename, /mask/delete : Body(...) explicite => plus de 422 silencieux
-# - Bouton "Enregistrer masque" : erreurs visibles (alert) si l’API ne répond pas OK
+...donne des parties à corriger, mais moi je veux le script complet et corrigé, sans rien casser.
+
+# app.py — Video Editor API (v0.8.0)
+# v0.8.0: Chargement modèles Hub, stubs IA, + Améliorations : multi-masques, estimation /estimate, progression /progress_ia
 from fastapi import FastAPI, UploadFile, File, HTTPException, Request, Body, Response
 from fastapi.responses import HTMLResponse, FileResponse, RedirectResponse
 from fastapi.staticfiles import StaticFiles
@@ -48,7 +47,7 @@ def get_backend_base() -> str:
 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.5.9")
+app = FastAPI(title="Video Editor API", version="0.8.0")
 DATA_DIR = Path("/app/data")
 THUMB_DIR = DATA_DIR / "_thumbs"
 MASK_DIR = DATA_DIR / "_masks"
@@ -258,121 +257,123 @@ 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
-# --- Nouveaux Helpers pour IA/GPU (ajoutés sans chargement au boot) ---
+# --- Chargement Modèles au Boot ---
+import huggingface_hub as hf
+from joblib import Parallel, delayed
+def load_model(repo_id):
+    path = Path(os.environ["HF_HOME"]) / repo_id.split("/")[-1]
+    if not path.exists() or not any(path.iterdir()):
+        print(f"[BOOT] Downloading {repo_id}...")
+        hf.snapshot_download(repo_id=repo_id, local_dir=str(path), token=os.getenv("HF_TOKEN"))
+        (path / "loaded.ok").touch()
+    # Symlink exemples
+    if "sam2" in repo_id: shutil.copytree(str(path), "/app/sam2", dirs_exist_ok=True)
+models = [
+    "facebook/sam2-hiera-large", "ByteDance/Sa2VA-4B", "lixiaowen/diffuEraser",
+    "runwayml/stable-diffusion-v1-5", "wangfuyun/PCM_Weights", "stabilityai/sd-vae-ft-mse"
+]
+print("[BOOT] Loading models from Hub...")
+Parallel(n_jobs=4)(delayed(load_model)(m) for m in models)
+# ProPainter wget
+PROP = Path("/app/propainter")
+PROP.mkdir(exist_ok=True)
+def wget(url, dest):
+    if not (dest / url.split("/")[-1]).exists():
+        subprocess.run(["wget", "-q", url, "-P", str(dest)])
+wget("https://github.com/sczhou/ProPainter/releases/download/v0.1.0/ProPainter.pth", PROP)
+wget("https://github.com/sczhou/ProPainter/releases/download/v0.1.0/raft-things.pth", PROP)
+wget("https://github.com/sczhou/ProPainter/releases/download/v0.1.0/recurrent_flow_completion.pth", PROP)
+print("[BOOT] Models ready.")
+# --- Nouveaux Helpers pour IA/GPU ---
 def is_gpu():
     import torch
     return torch.cuda.is_available()
-# --- Warm-up séquentiel (ajout pour préparer les modèles le soir) ---
-import huggingface_hub as hf
-HF_HOME = Path(os.getenv("HF_HOME", "/home/user/.cache/huggingface")).resolve()
-HF_HOME.mkdir(parents=True, exist_ok=True)
-MODELS_TO_PREP = [
-    "facebook/sam2-hiera-large",
-    "ByteDance/Sa2VA-4B",
-    "lixiaowen/diffuEraser",
-    "runwayml/stable-diffusion-v1-5",
-    "wangfuyun/PCM_Weights",
-    "stabilityai/sd-vae-ft-mse"
-]
-WARMUP_STATUS = {
-    "running": False,
-    "done": False,
-    "step": None,
-    "ok": [],
-    "errors": [],
-    "progress": 0,
-}
-def _snapshot_once(repo_id):
-    target = HF_HOME / repo_id.split("/")[-1]
-    try:
-        print(f"[WARMUP] Prepare {repo_id} → {target}")
-        hf.snapshot_download(repo_id=repo_id, local_dir=str(target), token=os.getenv("HF_TOKEN"))
-        return True, None
-    except Exception as e:
-        return False, str(e)
-# ProPainter
-PROP = Path("/app/propainter"); PROP.mkdir(exist_ok=True)
-PROP_FILES = [
-    "https://github.com/sczhou/ProPainter/releases/download/v0.1.0/ProPainter.pth",
-    "https://github.com/sczhou/ProPainter/releases/download/v0.1.0/raft-things.pth",
-    "https://github.com/sczhou/ProPainter/releases/download/v0.1.0/recurrent_flow_completion.pth",
-]
-def _ensure_propainter():
-    for url in PROP_FILES:
-        fname = url.split("/")[-1]
-        if not (PROP / fname).exists():
-            print(f"[WARMUP] wget {fname}")
-            subprocess.run(["wget", "-q", url, "-P", str(PROP)], check=False)
-def _run_warmup():
-    WARMUP_STATUS.update({"running": True, "done": False, "step": None, "ok": [], "errors": [], "progress": 0})
-    total = len(MODELS_TO_PREP) + 1
-    step_idx = 0
-    for repo in MODELS_TO_PREP:
-        WARMUP_STATUS["step"] = repo
-        step_idx += 1
-        for attempt in range(1, 4):
-            ok, err = _snapshot_once(repo)
-            if ok:
-                WARMUP_STATUS["ok"].append(repo)
-                break
-            else:
-                WARMUP_STATUS["errors"].append({"repo": repo, "attempt": attempt, "error": err})
-                time.sleep(5)
-        WARMUP_STATUS["progress"] = int(step_idx * 100 / total)
-    WARMUP_STATUS["step"] = "ProPainter"
-    step_idx += 1
-    _ensure_propainter()
-    WARMUP_STATUS["progress"] = 100
-    WARMUP_STATUS.update({"running": False, "done": True})
-# --- Nouveaux Endpoints pour IA stubs (lazy, no load yet) ---
+# --- Nouveaux Endpoints pour IA et Améliorations ---
 @app.post("/mask/ai")
 async def mask_ai(payload: Dict[str, Any] = Body(...)):
-    if not is_gpu(): raise HTTPException(503, "Switch to GPU for IA.")
-    # TODO: Lazy load SAM2 here when impl
+    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 to GPU for IA.")
-    # TODO: Lazy load DiffuEraser here
+    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: Lazy load if needed
-    time_min = 5 if is_gpu() else 30
-    vram_gb = 4 if is_gpu() else 0
-    return {"time_min": time_min, "vram_gb": vram_gb}
+    # TODO: Calcul (frames * masks * facteur)
+    return {"time_min": 5, "vram_gb": 4}
 @app.get("/progress_ia")
 def progress_ia(vid: str):
-    # TODO: Real progress
+    # TODO: % et logs frame/frame
     return {"percent": 0, "log": "En cours..."}
-# --- Routes warm-up ---
-@app.post("/warmup")
-def trigger_warmup():
-    if WARMUP_STATUS["running"]:
-        return {"started": False, "message": "Déjà en cours"}
-    threading.Thread(target=_run_warmup, daemon=True).start()
-    return {"started": True}
-@app.get("/warmup_status")
-def warmup_status():
-    return WARMUP_STATUS
-# ---------- API (original, étendu pour multi ok) ----------
-@app.get("/", tags=["meta"])
+# --- Routes existantes (étendues pour multi-masques) ---
+@app.post("/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}")
+def list_masks(vid: str):
+    return _load_masks(vid)
+@app.post("/mask/rename")
+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")
+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}
+@app.get("/")
 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", "/warmup", "/warmup_status", "/mask/ai", "/inpaint", "/estimate", "/progress_ia"]
+        "routes": ["/", "/health", "/files", "/upload", "/meta/{vid}", "/frame_idx", "/poster/{vid}", "/window/{vid}", "/mask", "/mask/{vid}", "/mask/rename", "/mask/delete", "/progress/{vid_stem}", "/ui"]
     }
-@app.get("/health", tags=["meta"])
+@app.get("/health")
 def health():
     return {"status": "ok"}
-@app.get("/_env", tags=["meta"])
+@app.get("/_env")
 def env_info():
     return {"pointer_set": bool(POINTER_URL), "resolved_base": get_backend_base()}
-@app.get("/files", tags=["io"])
+@app.get("/files")
 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"])
+@app.get("/meta/{vid}")
 def video_meta(vid: str):
     v = DATA_DIR / vid
     if not v.exists():
@@ -381,7 +382,7 @@ def video_meta(vid: str):
     if not m:
         raise HTTPException(500, "Métadonnées indisponibles")
     return m
-@app.post("/upload", tags=["io"])
+@app.post("/upload")
 async def upload(request: Request, file: UploadFile = File(...), redirect: Optional[bool] = True):
     ext = (Path(file.filename).suffix or ".mp4").lower()
     if ext not in {".mp4", ".mov", ".mkv", ".webm"}:
@@ -401,10 +402,10 @@ 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"])
+@app.get("/progress/{vid_stem}")
 def progress(vid_stem: str):
     return progress_data.get(vid_stem, {'percent': 0, 'logs': [], 'done': False})
-@app.delete("/delete/{vid}", tags=["io"])
+@app.delete("/delete/{vid}")
 def delete_video(vid: str):
     v = DATA_DIR / vid
     if not v.exists():
@@ -416,7 +417,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"])
+@app.get("/frame_idx")
 def frame_idx(vid: str, idx: int):
     v = DATA_DIR / vid
     if not v.exists():
@@ -431,7 +432,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"])
+@app.get("/poster/{vid}")
 def poster(vid: str):
     v = DATA_DIR / vid
     if not v.exists():
@@ -440,7 +441,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"])
+@app.get("/window/{vid}")
 def window(vid: str, center: int = 0, count: int = 21):
     v = DATA_DIR / vid
     if not v.exists():
@@ -467,57 +468,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(...)):
-    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 ----------
+# ---------- UI (étendue pour améliorations) ----------
 HTML_TEMPLATE = r"""
 <!doctype html>
 <html lang="fr"><meta charset="utf-8">
@@ -585,7 +536,6 @@ HTML_TEMPLATE = r"""
  <input type="file" name="file" accept="video/*" required>
  <button class="btn" type="submit">Uploader</button>
  </form>
- <button class="btn" id="btnWarmup" type="button">Warm-up (préparer les modèles)</button>
  <span class="muted" id="msg">__MSG__</span>
  <span class="muted">Liens : <a href="/docs" target="_blank">/docs</a> • <a href="/files" target="_blank">/files</a></span>
 </div>
@@ -617,15 +567,15 @@ HTML_TEMPLATE = r"""
      <label class="muted">Aller à # <input id="gotoInput" type="number" min="1" style="width:90px"></label>
      <button id="gotoBtn" class="btn">Aller</button>
      <span class="muted" id="maskedCount"></span>
-     <!-- Ajouts : Undo/Redo boutons -->
-     <button id="btnUndo" class="btn">↩️ Undo</button>
-     <button id="btnRedo" class="btn">↪️ Redo</button>
+     <!-- Nouveaux boutons undo/redo (près des contrôles) -->
+     <button id="btnUndo">↩️ Undo</button>
+     <button id="btnRedo">↪️ Redo</button>
    </div>
    <div id="timeline" class="timeline"></div>
    <div class="muted" id="tlNote" style="margin-top:6px;display:none">Mode secours: vignettes générées dans le navigateur.</div>
    <div id="loading-indicator">Chargement des frames...</div>
    <div id="tl-progress-bar"><div id="tl-progress-fill"></div></div>
-   <!-- Ajout : Barre progression IA -->
+   <!-- Nouvelle barre de progression IA (sous timeline) -->
    <div id="progressBar"><div id="progressFill"></div></div>
    <div>Progression IA: <span id="progressLog">En attente...</span></div>
   </div>
@@ -637,8 +587,8 @@ HTML_TEMPLATE = r"""
    <button id="btnBack" class="btn" style="display:none" title="Retour au mode lecture">🎬 Retour lecteur</button>
    <button id="btnSave" class="btn" style="display:none" title="Enregistrer le masque sélectionné">💾 Enregistrer masque</button>
    <button id="btnClear" class="btn" style="display:none" title="Effacer la sélection actuelle">🧽 Effacer sélection</button>
-   <!-- Ajout : Bouton Preview IA -->
-   <button id="btnPreview" class="btn">🔍 Preview IA</button>
+   <!-- Nouveau bouton preview IA (près de save) -->
+   <button id="btnPreview">🔍 Preview IA</button>
   </div>
   <div style="margin-top:10px">
    <div class="muted">Couleur</div>
@@ -669,7 +619,7 @@ HTML_TEMPLATE = r"""
  <div id="popup-logs"></div>
 </div>
 <div id="toast"></div>
-<!-- Ajout : Tutoriel masquable -->
+<!-- Nouveau : Tutoriel masquable (au bas, optionnel) -->
 <div id="tutorial" onclick="this.classList.add('hidden')">Tutoriel (cliquer pour masquer)<br>1. Upload vidéo local. 2. Dessine masques. 3. Retouche IA. 4. Export téléchargement.</div>
 <script>
 const serverVid = "__VID__";
@@ -709,13 +659,12 @@ const hud = document.getElementById('hud');
 const toastWrap = document.getElementById('toast');
 const gotoInput = document.getElementById('gotoInput');
 const gotoBtn = document.getElementById('gotoBtn');
-// Nouveaux éléments
+// Nouveaux éléments pour améliorations
 const btnUndo = document.getElementById('btnUndo');
 const btnRedo = document.getElementById('btnRedo');
 const btnPreview = document.getElementById('btnPreview');
 const progressFill = document.getElementById('progressFill');
 const progressLog = document.getElementById('progressLog');
-const btnWarmup = document.getElementById('btnWarmup');
 // State
 let vidName = serverVid || '';
 function fileStem(name){ const i = name.lastIndexOf('.'); return i>0 ? name.slice(0,i) : name; }
@@ -1061,7 +1010,7 @@ async function loadVideoAndMeta() {
   vidStem = fileStem(vidName); bustToken = Date.now();
   const bust = Date.now();
   srcEl.src = '/data/'+encodeURIComponent(vidName)+'?t='+bust;
-  player.setAttribute('poster', '/poster/'+encodeURIComponent(vidName)+'?t='+bust);
+  player.setAttribute('poster', '/poster/'+encodeURIComponent(vidName)+'?t='+bust;
   player.load();
   fitCanvas();
   statusEl.textContent = 'Chargement vidéo…';
@@ -1241,12 +1190,59 @@ btnSave.onclick = async ()=>{
     alert('Erreur réseau lors de l’enregistrement du masque.');
   }
 };
-// Boot
+// Nouveaux : Undo/Redo (pour rects)
+btnUndo.onclick = () => {
+  if (history.length) {
+    const last = history.pop();
+    redoStack.push({...rect});
+    rect = last;
+    draw();
+  }
+};
+btnRedo.onclick = () => {
+  if (redoStack.length) {
+    const next = redoStack.pop();
+    history.push({...rect});
+    rect = next;
+    draw();
+  }
+};
+canvas.addEventListener('mouseup', () => { 
+  if (dragging) { history.push({...rect}); redoStack = []; }
+});
+// Nouveau : Preview IA (stub)
+btnPreview.onclick = async () => {
+  if (!vidName) return;
+  const payload = {vid: vidName}; // TODO: Ajouter masques sélectionnés
+  const r = await fetch('/inpaint', {method: 'POST', headers: {'Content-Type': 'application/json'}, body: JSON.stringify(payload)});
+  if (r.ok) {
+    const d = await r.json();
+    alert('Preview prête : ' + d.preview); // TODO: Popup avec <video> preview
+  } else {
+    alert('Échec preview IA');
+  }
+};
+// Nouveau : Feedback progression IA (poll every 2s)
+function updateProgress() {
+  if (!vidName) return;
+  fetch(`/progress_ia?vid=${encodeURIComponent(vidName)}`).then(r => r.json()).then(d => {
+    progressFill.style.width = `${d.percent}%`;
+    progressLog.textContent = d.log;
+    setTimeout(updateProgress, 2000);
+  });
+}
+updateProgress();
+// Nouveau : Auto-save enhanced (récup au boot si crash)
 async function boot(){
-  const lst = JSON.parse(localStorage.getItem('ve_pending_masks_v1') || '[]'); if(lst.length){ /* flush pending si besoin */ }
+  const lst = loadPending(); if (lst.length) { showToast(`Récupération de ${lst.length} masques pending`); await flushPending(); }
   await loadFiles();
   if(serverVid){ vidName=serverVid; await loadVideoAndMeta(); }
   else{ const qs=new URLSearchParams(location.search); const v=qs.get('v')||''; if(v){ vidName=v; await loadVideoAndMeta(); } }
+  // Tutoriel : Show if first time
+  if (!localStorage.getItem('tutorialSeen')) {
+    document.getElementById('tutorial').style.display = 'block';
+    localStorage.setItem('tutorialSeen', '1');
+  }
 }
 boot();
 // Hide controls in edit-mode