Update app.py

app.py

@@ -410,72 +410,6 @@ async def upload(request: Request, file: UploadFile = File(...), redirect: Optio
 def progress(vid_stem: str):
     return progress_data.get(vid_stem, {'percent': 0, 'logs': [], 'done': False})
 
-# >>> B1_BEGIN warmup_routes
-@app.post("/warmup/start", tags=["warmup"])
-async def warmup_start(request: Request, payload: Optional[Dict[str, Any]] = Body(None)):
-    """
-    Démarre un warm-up séquentiel.
-    Sources de la liste des modèles (dans cet ordre) :
-    1) payload JSON: {"models": ["repo/a", "repo/b", ...]}
-    2) query string: ?models=repo/a,repo/b
-    3) env WARMUP_MODELS (JSON array)
-    """
-    with warmup_lock:
-        if warmup_state.get("running"):
-            return {
-                "ok": False,
-                "running": True,
-                "msg": "Warm-up déjà en cours",
-                "percent": warmup_state.get("percent", 0),
-                "current": warmup_state.get("current"),
-                "idx": warmup_state.get("idx", 0),
-                "total": warmup_state.get("total", 0),
-            }
-
-    # 1) payload JSON
-    models_list: List[str] = []
-    if isinstance(payload, dict):
-        ml = payload.get("models")
-        if isinstance(ml, list):
-            models_list = [str(x).strip() for x in ml if str(x).strip()]
-
-    # 2) query string
-    if not models_list:
-        qs_models = request.query_params.get("models") or ""
-        if qs_models:
-            models_list = [s.strip() for s in qs_models.split(",") if s.strip()]
-
-    # 3) env
-    if not models_list:
-        models_list = _default_model_list()
-
-    if not models_list:
-        raise HTTPException(400, "Aucun modèle fourni (body.models ou ?models=) et WARMUP_MODELS vide.")
-
-    t = threading.Thread(target=_warmup_thread, args=(models_list,), daemon=True)
-    t.start()
-    return {"ok": True, "started": True, "total": len(models_list)}
-
-@app.get("/warmup/status", tags=["warmup"])
-def warmup_status():
-    """
-    État courant du warm-up + 200 dernières lignes de logs.
-    """
-    with warmup_lock:
-        state = dict(warmup_state)
-        state["logs"] = warmup_state.get("logs", [])[-200:]
-    return state
-
-@app.post("/warmup/stop", tags=["warmup"])
-def warmup_stop_route():
-    """
-    Demande d'arrêt gracieux. Le modèle en cours se termine puis la boucle stoppe.
-    """
-    if not warmup_state.get("running"):
-        return {"ok": True, "was_running": False}
-    warmup_stop.set()
-    return {"ok": True, "was_running": True}
-# >>> B1_END warmup_routes
 
 
 @app.delete("/delete/{vid}", tags=["io"])
@@ -743,7 +677,24 @@ HTML_TEMPLATE = r"""
  <button class="btn" type="submit">Uploader</button>
  </form>
  <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>
+
+<!-- >>> A2B2_BEGIN warmup_topbar -->
+<div style="display:flex;gap:8px;align-items:center">
+  <button id="warmupStartBtn" class="btn" title="Télécharger les modèles (séquentiel)">🔥 Préparer modèles</button>
+  <button id="warmupStopBtn" class="btn" title="Arrêter le warm-up en cours" style="display:none">⏹️ Stop warm-up</button>
+  <button id="warmupLogsBtn" class="btn" title="Voir les logs du warm-up">📜 Logs warm-up</button>
+  <span id="warmupStatus" class="muted"></span>
+</div>
+<!-- >>> A2B2_END warmup_topbar -->
+
+
 </div>
 <div class="layout">
  <div>
@@ -816,6 +767,22 @@ HTML_TEMPLATE = r"""
  <div id="popup-progress-bar"><div id="popup-progress-fill"></div></div>
  <div id="popup-logs"></div>
 </div>
+
+<!-- >>> A2B2_BEGIN warmup_popup -->
+<div id="warmupPopup" style="display:none; position:fixed; top:22%; left:50%; transform:translate(-50%,-50%); background:#fff; padding:20px; border-radius:8px; box-shadow:0 0 10px rgba(0,0,0,0.2); z-index:1001; min-width:360px">
+  <h3>Préparation des modèles (warm-up)</h3>
+  <div class="muted" id="warmupPopupStatus">—</div>
+  <div style="background:#f3f4f6;border-radius:4px;height:8px;margin:10px 0">
+    <div id="warmup-progress-fill" style="background:#2563eb;height:100%;width:0;border-radius:4px"></div>
+  </div>
+  <div id="warmup-logs" style="max-height:220px; overflow:auto; font-size:12px; color:#6b7280; white-space:pre-wrap"></div>
+  <div style="margin-top:10px; display:flex; gap:8px; justify-content:flex-end">
+    <button id="warmupCloseBtn" class="btn">Fermer</button>
+  </div>
+</div>
+<!-- >>> A2B2_END warmup_popup -->
+
+
 <div id="toast"></div>
 <script>
 const serverVid = "__VID__";
@@ -855,6 +822,98 @@ const maskedCount = document.getElementById('maskedCount');
 const hud = document.getElementById('hud');
 const toastWrap = document.getElementById('toast');
 const gotoInput = document.getElementById('gotoInput');
+
+
+
+// >>> A2B2_BEGIN warmup_dom
+// Références DOM (topbar + popup)
+const warmupStartBtn   = document.getElementById('warmupStartBtn');
+const warmupStopBtn    = document.getElementById('warmupStopBtn');
+const warmupLogsBtn    = document.getElementById('warmupLogsBtn');
+const warmupStatusEl   = document.getElementById('warmupStatus');
+
+const warmupPopup        = document.getElementById('warmupPopup');
+const warmupPopupStatus  = document.getElementById('warmupPopupStatus');
+const warmupProgressFill = document.getElementById('warmup-progress-fill');
+const warmupLogs         = document.getElementById('warmup-logs');
+const warmupCloseBtn     = document.getElementById('warmupCloseBtn');
+
+// Helpers popup
+function openWarmupPopup(){ if(warmupPopup) warmupPopup.style.display = 'block'; }
+function closeWarmupPopup(){ if(warmupPopup) warmupPopup.style.display = 'none'; }
+if (warmupCloseBtn) warmupCloseBtn.addEventListener('click', closeWarmupPopup);
+
+// Rafraîchissement d’état
+let warmupTimer = null;
+async function refreshWarmupUI(){
+  try{
+    const r = await fetch('/warmup/status');
+    if(!r.ok) return;
+    const s = await r.json();
+    const pct = Math.max(0, Math.min(100, parseInt(s.percent||0,10)));
+    const running = !!s.running;
+
+    if (warmupStatusEl) {
+      if (running) {
+        const idx = (s.idx ?? 0) + 1;
+        const tot = (s.total ?? 0);
+        warmupStatusEl.textContent = `⏳ ${pct}% — ${s.current||''} (${idx}/${tot})`;
+      } else {
+        warmupStatusEl.textContent = `✅ Terminé (${s.total||0} modèles)`;
+      }
+    }
+    if (warmupProgressFill) warmupProgressFill.style.width = pct + '%';
+    if (warmupPopupStatus)  warmupPopupStatus.textContent = running ? 'Téléchargement en cours…' : 'Terminé';
+    if (warmupLogs && Array.isArray(s.logs)) warmupLogs.textContent = s.logs.join('\n');
+    if (warmupStopBtn) warmupStopBtn.style.display = running ? 'inline-block' : 'none';
+
+    if (running) {
+      openWarmupPopup();
+      if (!warmupTimer) warmupTimer = setInterval(refreshWarmupUI, 1000);
+    } else {
+      if (warmupTimer) { clearInterval(warmupTimer); warmupTimer = null; }
+    }
+  }catch(e){ /* no-op */ }
+}
+
+// Boutons
+if (warmupStartBtn){
+  warmupStartBtn.addEventListener('click', async ()=>{
+    // Optionnel : l’utilisateur peut saisir une liste (CSV). Vide => configuration serveur (WARMUP_MODELS)
+    const txt = prompt('Modèles (optionnel, séparés par des virgules). Laisse vide pour utiliser la config du serveur :','');
+    let body = {};
+    if (txt && txt.trim()){
+      body = { models: txt.split(',').map(s=>s.trim()).filter(Boolean) };
+    }
+    try{
+      const r = await fetch('/warmup/start',{ method:'POST', headers:{'Content-Type':'application/json'}, body: JSON.stringify(body) });
+      if(!r.ok){ const t = await r.text(); alert('Échec démarrage: ' + r.status + ' ' + t); return; }
+      openWarmupPopup();
+      await refreshWarmupUI();
+      if (!warmupTimer) warmupTimer = setInterval(refreshWarmupUI, 1000);
+    }catch(e){ alert('Erreur réseau'); }
+  });
+}
+if (warmupLogsBtn){
+  warmupLogsBtn.addEventListener('click', async ()=>{
+    openWarmupPopup();
+    await refreshWarmupUI();
+    if (!warmupTimer) warmupTimer = setInterval(refreshWarmupUI, 1000);
+  });
+}
+if (warmupStopBtn){
+  warmupStopBtn.addEventListener('click', async ()=>{
+    try{ await fetch('/warmup/stop',{method:'POST'}); await refreshWarmupUI(); }catch(e){}
+  });
+}
+
+// 1er affichage (badge de statut en topbar)
+refreshWarmupUI();
+// >>> A2B2_END warmup_dom
+
+
+
+
 const gotoBtn = document.getElementById('gotoBtn');
 
 // State