Update app.py

app.py

@@ -109,6 +109,8 @@ warmup_state: Dict[str, Any] = {
     # NOUVEAUX CHAMPS POUR RÉCAP
     "asked": [],           # liste demandée au lancement
     "ok_repos": [],        # liste des repos téléchargés OK
+    "cache_repos": [],     # liste des repos ignorés car déjà en cache
+    "downloaded_repos": [],# liste des repos réellement téléchargés pendant ce run
     "failed_repos": [],    # liste des repos en échec
     "started_at": 0.0,     # timestamp début
     "finished_at": 0.0,    # timestamp fin
@@ -174,26 +176,31 @@ def _dir_size_bytes(path: str) -> int:
     except Exception:
         return 0
 
-def _download_one(repo_id: str, tries: int = 3) -> bool:
+def _download_one(repo_id: str, tries: int = 3) -> str:
     """
-    Télécharge un repo HF en réessayant si besoin, avec logs précis.
+    Renvoie un statut précis :
+      - "cache"   : déjà présent localement, rien à faire
+      - "ok"      : téléchargé avec succès
+      - "fail"    : échec après toutes les tentatives
+      - "stopped" : arrêt demandé pendant le run
     """
     cache_home = os.path.expanduser(os.getenv("HF_HOME", "/home/user/.cache/huggingface"))
     local_dir = os.path.join(cache_home, "models", repo_id.replace("/", "__"))
 
-    # Cache déjà présent ?
+    # 1) Déjà en cache ?
     try:
         if _is_repo_cached(repo_id):
             sz = _dir_size_bytes(local_dir)
             _log_warmup(f"[CACHE] {repo_id} • {local_dir} • {sz/1e6:.1f} MB (skip)")
-            return True
+            return "cache"
     except Exception:
         pass
 
+    # 2) Tentatives de téléchargement
     for attempt in range(1, tries + 1):
         if warmup_stop.is_set():
             _log_warmup(f"[STOP] Abandon demandé avant téléchargement de {repo_id}")
-            return False
+            return "stopped"
 
         t0 = time.time()
         _log_warmup(f"[START] {repo_id} • tentative {attempt}/{tries} • {local_dir}")
@@ -207,12 +214,13 @@ def _download_one(repo_id: str, tries: int = 3) -> bool:
             dt = time.time() - t0
             sz = _dir_size_bytes(local_dir)
             _log_warmup(f"[DONE]  {repo_id} • {dt:.1f}s • {sz/1e6:.1f} MB")
-            return True
+            return "ok"
         except Exception as e:
             dt = time.time() - t0
             _log_warmup(f"[FAIL]  {repo_id} • {dt:.1f}s • {type(e).__name__}: {e}")
             time.sleep(min(10, 2 * attempt))
-    return False
+    return "fail"
+
 
 def _warmup_thread(models: List[str]):
     ok_count = 0
@@ -229,17 +237,23 @@ def _warmup_thread(models: List[str]):
             warmup_state["current"] = repo
             warmup_state["percent"] = int((i / max(1, len(models))) * 100)
 
-        ok = _download_one(repo)
+                res = _download_one(repo)
         with warmup_lock:
-            if ok:
+            if res == "ok":
                 ok_count += 1
                 warmup_state["ok_count"] = ok_count
-                warmup_state["ok_repos"].append(repo)
-            else:
+                warmup_state.setdefault("downloaded_repos", []).append(repo)
+            elif res == "cache":
+                warmup_state.setdefault("cache_repos", []).append(repo)
+            elif res == "fail":
                 warmup_state["failed_repos"].append(repo)
+            elif res == "stopped":
+                _log_warmup("[STOP] Fin anticipée — demande reçue pendant le run")
+                break
 
             warmup_state["percent"] = int(((i + 1) / max(1, len(models))) * 100)
 
+
         if warmup_stop.is_set():
             _log_warmup("[STOP] Fin anticipée — demande reçue pendant le run")
             break
@@ -568,6 +582,8 @@ async def warmup_start(payload: Optional[Dict[str, Any]] = Body(None)):
             "job_id": job_id,
             "asked": models[:],
             "ok_repos": [],
+            "cache_repos": [],
+            "downloaded_repos": [],
             "failed_repos": [],
             "ok_count": 0,
             "logs": [],
@@ -1041,55 +1057,31 @@ const warmupCloseBtn     = document.getElementById('warmupCloseBtn');
 function buildFinalSummary(s){
   const asked  = Array.isArray(s.asked) ? s.asked : [];
   const okL    = Array.isArray(s.ok_repos) ? s.ok_repos : [];
-  const failL  = Array.isArray(s.failed_repos) ? s.failed_repos : [];
-  const cached = Array.isArray(s.audit_cached) ? s.audit_cached : [];
-  const tot    = s.total ?? asked.length ?? 0;
-  // >>> RÉSUMÉ LISIBLE (ajout) <<<
-  const ignored = asked.filter(m => cached.includes(m) && !okL.includes(m) && !failL.includes(m));
-  const out = [];
-  out.push("RÉCAP FINAL");
-  out.push(`Demandés : ${asked.length}`);
-  if (asked.length) out.push(asked.map(m => ' • ' + m).join('\n'));
-
-  out.push("");
-  out.push(`⬛ Ignorés (déjà en cache) : ${ignored.length}`);
-  if (ignored.length) out.push(ignored.map(m => ' • ' + m).join('\n'));
-
-  out.push("");
-  out.push(`✅ Téléchargés : ${okL.length}`);
-  if (okL.length) out.push(okL.map(m => ' • ' + m).join('\n'));
-
-  out.push("");
-  out.push(`❌ ��checs : ${failL.length}`);
-  if (failL.length) out.push(failL.map(m => ' • ' + m).join('\n'));
-
-  out.push("");
-  out.push(`📦 En cache maintenant : ${cached.length}`);
-  if (cached.length) out.push(cached.map(m => ' • ' + m).join('\n'));
-
-  return out.join('\n');
-  // >>> FIN AJOUT <<<
+    const failL  = Array.isArray(s.failed_repos) ? s.failed_repos : [];
+  const cacheL = Array.isArray(s.cache_repos) ? s.cache_repos : [];
+  const dlL    = Array.isArray(s.downloaded_repos) ? s.downloaded_repos : [];
+  const tot    = asked.length;
 
   const lines = [];
-  lines.push("RÉCAP FINAL");
-  lines.push(`Demandés : ${asked.length}`);
+  lines.push(`Terminé — demandés: ${tot} • ⬛ cache: ${cacheL.length} • ✅ téléchargés: ${dlL.length} • ❌ échecs: ${failL.length}`);
+  lines.push("");
+
+  lines.push("Demandés : " + asked.length);
   if (asked.length) lines.push(asked.map(m=>' • '+m).join('\n'));
 
   lines.push("");
-  lines.push(`✅ Téléchargés : ${okL.length}/${tot}`);
-  if (okL.length) lines.push(okL.map(m=>' • '+m).join('\n'));
+  lines.push(`⬛ Ignorés (déjà en cache) : ${cacheL.length}`);
+  if (cacheL.length) lines.push(cacheL.map(m=>' • '+m).join('\n'));
 
   lines.push("");
-  lines.push(`❌ Échecs : ${failL.length}`);
-  if (failL.length) lines.push(failL.map(m=>' • '+m).join('\n'));
+  lines.push(`✅ Téléchargés : ${dlL.length}`);
+  if (dlL.length) lines.push(dlL.map(m=>' • '+m).join('\n'));
 
   lines.push("");
-  lines.push(`📦 En cache maintenant : ${cached.length}`);
-  if (cached.length) lines.push(cached.map(m=>' • '+m).join('\n'));
+  lines.push(`❌ Échecs : ${failL.length}`);
+  if (failL.length) lines.push(failL.map(m=>' • '+m).join('\n'));
 
   return lines.join('\n');
-}
-
 
 // >>> C2_BEGIN warmup_preface
 let warmupPreface = '';
@@ -1147,6 +1139,10 @@ async function refreshWarmupUI(){
           const ok  = Number.isFinite(s.ok_count) ? s.ok_count : 0;
           const fail = Array.isArray(s.failed_repos) ? s.failed_repos.length : Math.max(0, tot - ok);
           warmupStatusEl.textContent = `✅ Terminé — ${ok}/${tot} téléchargés, ${fail} échec(s) [inst:${instanceId}]`;
+          const cacheN = Array.isArray(s.cache_repos) ? s.cache_repos.length : 0;
+          const dlN    = Array.isArray(s.downloaded_repos) ? s.downloaded_repos.length : 0;
+          const failN  = Array.isArray(s.failed_repos) ? s.failed_repos.length : 0;
+          warmupStatusEl.textContent = `✅ Terminé — ⬛ ${cacheN} • ✅ ${dlN} • ❌ ${failN} / ${tot} [inst:${instanceId}]`;
           if (warmupPopupStatus) warmupPopupStatus.textContent = 'Terminé';
           if (warmupLogs) warmupLogs.textContent = buildFinalSummary(s);
         } else {