Show search queue position and activity

application_neo4j/app.py

@@ -287,6 +287,11 @@ def inject_i18n():
         "search.progress_stage_completed", "search.progress_stage_failed",
         "search.progress_stage_cancelled",
         "search.progress_elapsed", "search.progress_items",
+        "search.progress_queue_title", "search.progress_queue_wait",
+        "search.progress_queue_position", "search.progress_queue_ahead_one",
+        "search.progress_queue_ahead_many", "search.progress_queue_next",
+        "search.progress_queue_running_one", "search.progress_queue_running_many",
+        "search.progress_queue_note",
         "search.progress_server_percent",
         "search.progress_remaining_step", "search.progress_server_note",
         "search.progress_connection_error",
@@ -711,6 +716,25 @@ def search_job_status(job_id):
     with search_jobs_lock:
         stored_job = search_jobs.get(job_id)
         job = dict(stored_job) if stored_job else None
+        queued_jobs = sorted(
+            (
+                (queued_job.get("created_at", 0), queued_job_id)
+                for queued_job_id, queued_job in search_jobs.items()
+                if queued_job.get("status") == "queued"
+            )
+        )
+        queued_job_ids = [
+            queued_job_id for _, queued_job_id in queued_jobs
+        ]
+        queue_position = (
+            queued_job_ids.index(job_id) + 1
+            if job_id in queued_job_ids
+            else None
+        )
+        running_jobs = sum(
+            queued_job.get("status") == "running"
+            for queued_job in search_jobs.values()
+        )
     if not job:
         return jsonify({"error": "Search job not found"}), 404
 
@@ -722,6 +746,14 @@ def search_job_status(job_id):
         "elapsed_seconds": max(0, math.floor(now - started_at)) if started_at else 0,
         "progress_percent": None,
         "remaining_seconds": None,
+        "queue_position": queue_position,
+        "queued_jobs": len(queued_job_ids),
+        "running_jobs": running_jobs,
+        "queue_wait_seconds": (
+            max(0, math.floor(now - job.get("created_at", now)))
+            if job["status"] == "queued"
+            else None
+        ),
         "completed_items": job.get("completed_items"),
         "total_items": job.get("total_items"),
         "result_url": (

application_neo4j/static/js/search_progress.js

@@ -95,6 +95,7 @@
   }
 
   function renderStatus(progress, job) {
+    const title = progress.querySelector(".search-progress-title");
     const stage = progress.querySelector(".search-progress-stage");
     const status = progress.querySelector(".search-progress-status");
     const note = progress.querySelector(".search-progress-note");
@@ -102,6 +103,92 @@
 
     stage.textContent = stageLabel(job.stage);
 
+    if (job.status === "queued" || job.stage === "queued") {
+      title.textContent = translate(
+        "search.progress_queue_title",
+        "Recherche en file d’attente"
+      );
+      progress.classList.remove("alert-info", "alert-danger", "alert-secondary");
+      progress.classList.add("alert-warning");
+
+      const queueDetails = [
+        format(
+          translate(
+            "search.progress_queue_wait",
+            "Temps d’attente : {seconds} s"
+          ),
+          { seconds: job.queue_wait_seconds ?? 0 }
+        ),
+      ];
+      if (job.queue_position && job.queued_jobs) {
+        queueDetails.push(
+          format(
+            translate(
+              "search.progress_queue_position",
+              "Position dans la file : {position}/{total}"
+            ),
+            {
+              position: job.queue_position,
+              total: job.queued_jobs,
+            }
+          )
+        );
+        const jobsAhead = job.queue_position - 1;
+        if (jobsAhead === 0) {
+          queueDetails.push(
+            translate(
+              "search.progress_queue_next",
+              "Votre recherche est la prochaine."
+            )
+          );
+        } else {
+          queueDetails.push(
+            format(
+              translate(
+                jobsAhead === 1
+                  ? "search.progress_queue_ahead_one"
+                  : "search.progress_queue_ahead_many",
+                jobsAhead === 1
+                  ? "1 recherche devant la vôtre"
+                  : "{count} recherches devant la vôtre"
+              ),
+              { count: jobsAhead }
+            )
+          );
+        }
+      }
+      if (job.running_jobs) {
+        queueDetails.push(
+          format(
+            translate(
+              job.running_jobs === 1
+                ? "search.progress_queue_running_one"
+                : "search.progress_queue_running_many",
+              job.running_jobs === 1
+                ? "1 recherche en cours"
+                : "{count} recherches en cours"
+            ),
+            { count: job.running_jobs }
+          )
+        );
+      }
+      status.textContent = queueDetails.join(" · ");
+      note.textContent = translate(
+        "search.progress_queue_note",
+        "La recherche démarrera automatiquement dès qu’une capacité sera disponible."
+      );
+      bar.style.width = "0%";
+      bar.removeAttribute("aria-valuenow");
+      return;
+    }
+
+    title.textContent = translate(
+      "search.progress_title",
+      "Recherche en cours…"
+    );
+    progress.classList.remove("alert-warning", "alert-danger", "alert-secondary");
+    progress.classList.add("alert-info");
+
     const details = [
       format(
         translate("search.progress_elapsed", "Temps écoulé : {seconds} s"),
@@ -208,6 +295,10 @@
       elapsed_seconds: 0,
       progress_percent: null,
       remaining_seconds: null,
+      queue_position: null,
+      queued_jobs: null,
+      running_jobs: null,
+      queue_wait_seconds: 0,
       completed_items: null,
       total_items: null,
     });

application_neo4j/translations.py

@@ -108,7 +108,7 @@ TRANSLATIONS = {
         "search.btn_search": "Rechercher",
         "search.btn_search_simple": "Rechercher",
         "search.progress_title": "Recherche en cours…",
-        "search.progress_stage_queued": "En attente du serveur…",
+        "search.progress_stage_queued": "En attente d’une capacité de recherche…",
         "search.progress_stage_preparing": "Préparation du graphe…",
         "search.progress_stage_descendants": "Recherche des descendants…",
         "search.progress_stage_ancestors": "Recherche des ascendants…",
@@ -122,6 +122,15 @@ TRANSLATIONS = {
         "search.progress_stage_cancelled": "Recherche annulée.",
         "search.progress_elapsed": "Temps écoulé : {seconds} s",
         "search.progress_items": "Éléments traités par le serveur : {completed}/{total}",
+        "search.progress_queue_title": "Recherche en file d’attente",
+        "search.progress_queue_wait": "Temps d’attente : {seconds} s",
+        "search.progress_queue_position": "Position dans la file : {position}/{total}",
+        "search.progress_queue_ahead_one": "1 recherche devant la vôtre",
+        "search.progress_queue_ahead_many": "{count} recherches devant la vôtre",
+        "search.progress_queue_next": "Votre recherche est la prochaine.",
+        "search.progress_queue_running_one": "1 recherche en cours",
+        "search.progress_queue_running_many": "{count} recherches en cours",
+        "search.progress_queue_note": "La recherche démarrera automatiquement dès qu’une capacité sera disponible.",
         "search.progress_server_percent": "Progression indiquée par le serveur : {percent} %",
         "search.progress_remaining_step": "Temps restant estimé pour cette étape : {seconds} s",
         "search.progress_server_note": "La progression repose sur les opérations réellement terminées par le serveur.",
@@ -337,7 +346,7 @@ TRANSLATIONS = {
         "search.btn_search": "Search",
         "search.btn_search_simple": "Search",
         "search.progress_title": "Search in progress…",
-        "search.progress_stage_queued": "Waiting for the server…",
+        "search.progress_stage_queued": "Waiting for search capacity…",
         "search.progress_stage_preparing": "Preparing the graph…",
         "search.progress_stage_descendants": "Searching descendants…",
         "search.progress_stage_ancestors": "Searching ancestors…",
@@ -351,6 +360,15 @@ TRANSLATIONS = {
         "search.progress_stage_cancelled": "Search cancelled.",
         "search.progress_elapsed": "Elapsed time: {seconds} s",
         "search.progress_items": "Items processed by the server: {completed}/{total}",
+        "search.progress_queue_title": "Search queued",
+        "search.progress_queue_wait": "Waiting time: {seconds} s",
+        "search.progress_queue_position": "Queue position: {position}/{total}",
+        "search.progress_queue_ahead_one": "1 search ahead of yours",
+        "search.progress_queue_ahead_many": "{count} searches ahead of yours",
+        "search.progress_queue_next": "Your search is next.",
+        "search.progress_queue_running_one": "1 search currently running",
+        "search.progress_queue_running_many": "{count} searches currently running",
+        "search.progress_queue_note": "Your search will start automatically as soon as capacity becomes available.",
         "search.progress_server_percent": "Progress reported by the server: {percent}%",
         "search.progress_remaining_step": "Estimated time remaining for this step: {seconds} s",
         "search.progress_server_note": "Progress is based on operations actually completed by the server.",