From 5d9dfbd40d419d776f389be481d7f9c04a89e615 Mon Sep 17 00:00:00 2001
From: Idir Chikhoune <idir.chikhoune@lisn.fr>
Date: Tue, 31 Mar 2026 14:08:50 +0200
Subject: [PATCH 01/20] feature ok / needs to be tested

---
 src/apps/competitions/tasks.py                |  26 +-
 src/celery_config.py                          |   9 +
 .../riot/competitions/detail/detail.tag       | 835 ++++++++++++------
 src/utils/worker_utils.py                     | 109 +++
 4 files changed, 704 insertions(+), 275 deletions(-)

diff --git a/src/apps/competitions/tasks.py b/src/apps/competitions/tasks.py
index eeaa2ffae..27f8e4061 100644
--- a/src/apps/competitions/tasks.py
+++ b/src/apps/competitions/tasks.py
@@ -8,14 +8,10 @@
 from io import BytesIO
 from tempfile import TemporaryDirectory, NamedTemporaryFile
 
-# import json
-# import urllib
-
 import oyaml as yaml
 import requests
 from celery._state import app_or_default
 from django.conf import settings
-# from django_redis import get_redis_connection
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.files.base import ContentFile
 from django.db.models import Subquery, OuterRef, Count, Case, When, Value, F
@@ -24,10 +20,9 @@
 from django.utils.timezone import now
 from rest_framework.exceptions import ValidationError
 
-from celery_config import app  # , app_for_vhost
+from celery_config import app
 from competitions.models import Submission, CompetitionCreationTaskStatus, SubmissionDetails, Competition, \
     CompetitionDump, Phase
-# from queues.models import Queue
 from competitions.unpackers.utils import CompetitionUnpackingException
 from competitions.unpackers.v1 import V15Unpacker
 from competitions.unpackers.v2 import V2Unpacker
@@ -36,12 +31,9 @@
 from datasets.models import Data
 from utils.data import make_url_sassy
 from utils.email import codalab_send_markdown_email
-from channels.layers import get_channel_layer
-from asgiref.sync import async_to_sync
 
 import logging
 
-# from utils.worker_utils import WORKER_HEARTBEAT_TTL, WORKERS_REGISTRY_KEY, extract_queue_names, is_compute_worker, known_compute_queue_names
 logger = logging.getLogger(__name__)
 
 COMPETITION_FIELDS = [
@@ -798,24 +790,8 @@ def submission_status_cleanup():
     submissions = Submission.objects.filter(status=Submission.RUNNING, has_children=False).select_related('phase', 'parent')
 
     for sub in submissions:
-        # Check if the submission has been running for 24 hours longer than execution_time_limit
         if sub.started_when < now() - timedelta(milliseconds=(3600000 * 24) + sub.phase.execution_time_limit):
             if sub.parent is not None:
                 sub.parent.cancel(status=Submission.FAILED)
             else:
                 sub.cancel(status=Submission.FAILED)
-
-
-# -------------------------------------------------
-def _broadcast_worker_state(payload):
-    channel_layer = get_channel_layer()
-    if not channel_layer:
-        return
-
-    async_to_sync(channel_layer.group_send)(
-        "compute_workers",
-        {
-            "type": "worker.health",
-            "worker": payload,
-        },
-    )
diff --git a/src/celery_config.py b/src/celery_config.py
index e8ba5961e..614052be7 100644
--- a/src/celery_config.py
+++ b/src/celery_config.py
@@ -42,3 +42,12 @@ def app_for_vhost(vhost):
         vhost_app.conf.task_queues = app.conf.task_queues
         _vhost_apps[vhost] = vhost_app
     return _vhost_apps[vhost]
+
+
+
+app.conf.beat_schedule = {
+    "refresh-compute-worker-health": {
+        "task": "chemin.vers.refresh_compute_worker_health",
+        "schedule": 5.0,
+    },
+}
\ No newline at end of file
diff --git a/src/static/riot/competitions/detail/detail.tag b/src/static/riot/competitions/detail/detail.tag
index 7bed78b29..f1dce44fa 100644
--- a/src/static/riot/competitions/detail/detail.tag
+++ b/src/static/riot/competitions/detail/detail.tag
@@ -6,25 +6,13 @@
             <comp-tabs class="comp-detail-paragraph-text" competition="{ competition }"></comp-tabs>
         </div>
 
-        <button
-            if="{ canViewWorkersPanel }"
-            class="ui button primary workers-toggle-btn"
-            onclick="{ toggleWorkersPanel }">
-            <i class="server icon"></i>
-            { showWorkersPanel ? 'Hide workers' : 'Show workers' }
-        </button>
-
-        <aside if="{ canViewWorkersPanel && showWorkersPanel }"
-               class="workers-panel"
-               style="left: { panelLeft }px; top: { panelTop }px;">
+        <aside class="workers-panel" style="left: { panelLeft }px; top: { panelTop }px;">
             <div class="workers-card">
                 <div class="workers-header workers-drag-handle" onmousedown="{ startPanelDrag }">
                     <div class="workers-title">
                         <i class="server icon"></i>
                         <div class="workers-title-text">
                             Compute Workers
-                            </br>
-                            <small><small><small>displayed only for competition organizers</small></small></small>
                             <div class="workers-subtitle">
                                 <span class="workers-connection { wsState }">{ connectionLabel() }</span>
                                 <span class="workers-separator">•</span>
@@ -32,7 +20,10 @@
                             </div>
                         </div>
                     </div>
-                    <div class="workers-drag-hint">Drag to move</div>
+
+                    <div class="workers-drag-hint">
+                        Drag to move
+                    </div>
                 </div>
 
                 <div class="workers-stats">
@@ -64,18 +55,29 @@
                                 <th class="col-lastseen">Last seen</th>
                             </tr>
                         </thead>
+
                         <tbody>
-                            <tr each="{ worker in sortedWorkers() }">
-                                <td><strong>{ worker.hostname }</strong></td>
-                                <td>
+                            <tr each="{worker in sortedWorkers()}">
+                                <td class="worker-hostname">
+                                    <strong>{ worker.hostname }</strong>
+                                </td>
+
+                                <td class="worker-status-cell">
                                     <span class="ui tiny label worker-status { getStatusClass(worker) }">
                                         <i class="{ getStatusIcon(worker) } icon"></i>
                                         { getStatusText(worker) }
-                                    </span>
+                            return        </span>
+                                </td>
+
+                                <td class="worker-jobs">
+                                    <span class="ui circular label">{ worker.running_jobs || 0 }</span>
+                                </td>
+
+                                <td class="worker-lastseen">
+                                    { formatLastSeen(worker.timestamp) }
                                 </td>
-                                <td><span class="ui circular label">{ worker.running_jobs || 0 }</span></td>
-                                <td>{ formatLastSeen(worker.timestamp) }</td>
                             </tr>
+
                             <tr if="{ sortedWorkers().length === 0 }">
                                 <td colspan="4" class="center aligned">
                                     <div class="workers-empty">
@@ -98,95 +100,76 @@
     <script>
         var self = this;
 
-        self.competition = {};
-        self.workers = [];
-        self.ws = null;
-        self.wsReconnectTimer = null;
-        self.wsState = 'disconnected';
-        self.lastSyncAt = null;
-
-        self.canViewWorkersPanel = (self.opts.can_view_workers_panel === 'true');
-        self.showWorkersPanel = false
-
-        self.canViewWorkersPanel = String(self.opts.can_view_workers_panel || 'false') === 'true'
-        self.panelLeft = 24;
-        self.panelTop = 24;
-        self.panelWidth = 375;
-        self.draggingPanel = false;
-        self.dragOffsetX = 0;
-        self.dragOffsetY = 0;
-        self.panelStorageKey = 'codabench_workers_panel_position';
-        self.resizeListenerAttached = false;
-
-        self.toggleWorkersPanel = function () {
-            self.showWorkersPanel = !self.showWorkersPanel
-
-            if (self.showWorkersPanel) {
-                self.loadPanelPosition()
-                self.connect_workers_socket()
-            } else {
-                self.close_workers_socket()
-            }
-
-            self.update()
-        }
+        self.competition = {}
+        self.workers = []
+        self.ws = null
+        self.wsReconnectTimer = null
+        self.wsState = 'disconnected'
+        self.lastSyncAt = null
+
+        self.panelLeft = 24
+        self.panelTop = 24
+        self.panelWidth = 500
+        self.panelHeight = 120
+        self.draggingPanel = false
+        self.dragOffsetX = 0
+        self.dragOffsetY = 0
+        self.panelStorageKey = 'codabench_workers_panel_position'
 
         self.one('mount', function () {
-            $('.menu .item', self.root).tab();
-            self.update_competition_data();
-            if (self.canViewWorkersPanel) {
-                self.loadPanelPosition();
-                self.attachResizeListener();
-            }
-        });
+            $('.menu .item', self.root).tab()
+            self.loadPanelPosition()
+            self.update_competition_data()
+            self.connect_workers_socket()
+            window.addEventListener('resize', self.onWindowResize)
+        })
+
+        self.one('unmount', function () {
+            window.removeEventListener('resize', self.onWindowResize)
+            window.removeEventListener('mousemove', self.onPanelDragMove)
+            window.removeEventListener('mouseup', self.stopPanelDrag)
 
-        self.close_workers_socket = function () {
             if (self.wsReconnectTimer) {
                 clearTimeout(self.wsReconnectTimer)
                 self.wsReconnectTimer = null
             }
 
             if (self.ws) {
-                self.ws.onclose = null
-
                 try { self.ws.close() } catch (e) {}
                 self.ws = null
             }
 
-            self.wsState = 'disconnected'
-        }
-
-        self.one('unmount', function () {
-            self.detachResizeListener();
-            if (self.wsReconnectTimer) {
-                clearTimeout(self.wsReconnectTimer);
-                self.wsReconnectTimer = null;
-            }
-            if (self.ws) {
-                try { self.ws.close(); } catch(e) {}
-                self.ws = null;
-            }
-            document.body.classList.remove('workers-panel-dragging');
-        });
+            document.body.classList.remove('workers-panel-dragging')
+        })
 
         self.update_competition_data = function () {
             CODALAB.api.get_competition(self.opts.competition_pk, self.opts.secret_key)
                 .done(function (data) {
-                    self.competition = data;
-                    CODALAB.events.trigger('competition_loaded', self.competition);
-
-                    let currentPhase = _.find(self.competition.phases, { status: 'Current' });
-                    let selectedPhaseId = currentPhase ? currentPhase.id : null;
-                    if (selectedPhaseId === null) {
-                        let finalPhase = _.find(self.competition.phases, { is_final_phase: true });
-                        selectedPhaseId = finalPhase ? finalPhase.id : null;
+                    self.competition = data
+
+                    CODALAB.events.trigger('competition_loaded', self.competition)
+
+                    let selected_phase_index = _.get(
+                        _.find(self.competition.phases, { 'status': 'Current' }),
+                        'id'
+                    )
+
+                    if (selected_phase_index == null) {
+                        selected_phase_index = _.get(
+                            _.find(self.competition.phases, { is_final_phase: true }),
+                            'id'
+                        )
                     }
+
                     CODALAB.events.trigger(
                         'phase.selected',
-                        (_.find(self.competition.phases, { id: selectedPhaseId }))
-                    );
+                        (_.find(self.competition.phases, { id: selected_phase_index }))
+                    )
 
-                    self.update();
+                    self.update()
+                })
+                .fail(function () {
+                    toastr.error('Could not find benchmark')
                 })
                 .fail(function () {
                     toastr.error("Could not find competition");
@@ -456,193 +439,545 @@
             max-height: calc(100vh - 48px);
         }
 
-        .workers-card {
-            background: #fff;
-            border: 1px solid rgba(0,0,0,0.1);
-            border-radius: 16px;
-            box-shadow: 0 8px 24px rgba(0,0,0,0.08);
-            padding: 12px;
-        }
-        .workers-header { margin-bottom: 12px; }
-        .workers-title { display: flex; align-items: flex-start; gap: 10px; }
-        .workers-title .icon { margin-top: 2px; }
-        .workers-title-text { font-size: 18px; font-weight: 700; color: #1f2937; line-height: 1.2; }
-        .workers-subtitle {
-            margin-top: 4px;
-            font-size: 12px;
-            color: #6b7280;
-            display: flex;
-            align-items: center;
-            gap: 6px;
-        }
+        self.loadPanelPosition = function () {
+            try {
+                var raw = localStorage.getItem(self.panelStorageKey)
+                if (!raw) return
 
-        .workers-toggle-btn
-            z-index 10
-            position relative
-            top 10%
-            right 100vh
-            background #576671 !important
-            color white !important
-            
-        .workers-connection {
-            display: inline-flex;
-            align-items: center;
-            padding: 3px 8px;
-            border-radius: 999px;
-            font-weight: 700;
-            font-size: 11px;
-            text-transform: uppercase;
-            background: #f3f4f6;
-            color: #6b7280;
-        }
-        .workers-connection.connected {
-            background: rgba(33,186,69,.12);
-            color: #21ba45;
-        }
-        .workers-connection.connecting {
-            background: rgba(251,189,8,.14);
-            color: #b58105;
-        }
-        .workers-connection.error {
-            background: rgba(219,40,40,.12);
-            color: #db2828;
+                var pos = JSON.parse(raw)
+                if (typeof pos.left === 'number') self.panelLeft = pos.left
+                if (typeof pos.top === 'number') self.panelTop = pos.top
+
+                self.clampPanelPosition()
+            } catch (e) {
+                console.warn('Could not load panel position', e)
+            }
         }
-        .workers-connection.disconnected {
-            background: rgba(219,40,40,.12);
-            color: #db2828;
+
+        self.savePanelPosition = function () {
+            try {
+                localStorage.setItem(self.panelStorageKey, JSON.stringify({
+                    left: self.panelLeft,
+                    top: self.panelTop
+                }))
+            } catch (e) {
+                console.warn('Could not save panel position', e)
+            }
         }
-        .workers-separator { opacity: .6; }
-        .workers-drag-hint { margin-top: 4px; font-size: 11px; color: #9ca3af; white-space: nowrap; }
-
-        .workers-stats {
-            display: grid;
-            grid-template-columns: repeat(4, 1fr);
-            gap: 8px;
-            margin: 10px 0 15px 0 !important;
+
+        self.clampPanelPosition = function () {
+            var minLeft = 8
+            var minTop = 8
+            var maxLeft = Math.max(minLeft, window.innerWidth - self.panelWidth - 8)
+            var maxTop = Math.max(minTop, window.innerHeight - 80)
+
+            self.panelLeft = Math.min(Math.max(minLeft, self.panelLeft), maxLeft)
+            self.panelTop = Math.min(Math.max(minTop, self.panelTop), maxTop)
         }
-        .stat-card {
-            background: #f9fafb;
-            border: 1px solid rgba(0,0,0,0.06);
-            border-radius: 12px;
-            padding: 10px 8px;
-            text-align: center;
-            display: flex;
-            flex-direction: column;
-            align-items: center;
-            justify-content: center;
+
+        self.onWindowResize = function () {
+            self.clampPanelPosition()
+            self.update()
         }
-        .stat-value {
-            font-size: 18px;
-            font-weight: 800;
-            color: #111827;
-            margin-bottom: 4px;
-            min-width: 1ch;
+
+        self.startPanelDrag = function (e) {
+            if (e.button !== 0) return
+
+            var panel = self.root.querySelector('.workers-panel')
+            if (!panel) return
+
+            var rect = panel.getBoundingClientRect()
+
+            self.draggingPanel = true
+            self.dragOffsetX = e.clientX - rect.left
+            self.dragOffsetY = e.clientY - rect.top
+
+            document.body.classList.add('workers-panel-dragging')
+            window.addEventListener('mousemove', self.onPanelDragMove)
+            window.addEventListener('mouseup', self.stopPanelDrag)
+
+            e.preventDefault()
+            e.stopPropagation()
         }
-        .stat-green { color: #21ba45; }
-        .stat-yellow { color: #b58105; }
-        .stat-red { color: #db2828; }
-        .stat-label {
-            font-size: 11px;
-            font-weight: 700;
-            text-transform: uppercase;
-            color: #6b7280;
-            letter-spacing: .04em;
+
+        self.onPanelDragMove = function (e) {
+            if (!self.draggingPanel) return
+
+            var minLeft = 8
+            var minTop = 8
+            var maxLeft = Math.max(minLeft, window.innerWidth - self.panelWidth - 8)
+            var maxTop = Math.max(minTop, window.innerHeight - 80)
+
+            var newLeft = e.clientX - self.dragOffsetX
+            var newTop = e.clientY - self.dragOffsetY
+
+            self.panelLeft = Math.min(Math.max(minLeft, newLeft), maxLeft)
+            self.panelTop = Math.min(Math.max(minTop, newTop), maxTop)
+
+            self.update()
         }
 
-        .workers-table-wrap {
-            max-height: calc(100vh - 240px);
-            overflow: auto;
-            border-radius: 12px;
+        self.stopPanelDrag = function () {
+            if (!self.draggingPanel) return
+
+            self.draggingPanel = false
+            document.body.classList.remove('workers-panel-dragging')
+
+            window.removeEventListener('mousemove', self.onPanelDragMove)
+            window.removeEventListener('mouseup', self.stopPanelDrag)
+
+            self.savePanelPosition()
+            self.update()
         }
-        .workers-table {
-            margin: 0 !important;
-            width: 100%;
-            table-layout: auto;
-            font-size: 13px;
+
+        self.connect_workers_socket = function () {
+            if (self.ws) {
+                try { self.ws.close() } catch (e) {}
+                self.ws = null
+            }
+
+            var scheme = window.location.protocol === 'https:' ? 'wss' : 'ws'
+            var url = scheme + '://' + window.location.host + '/ws/workers/'
+
+            self.wsState = 'connecting'
+            self.update()
+
+            self.ws = new WebSocket(url)
+
+            self.ws.onopen = function () {
+                self.wsState = 'connected'
+                self.update()
+            }
+
+            self.ws.onmessage = function (event) {
+                var message = null
+
+                try {
+                    message = JSON.parse(event.data)
+                } catch (e) {
+                    console.error('Invalid websocket payload:', event.data)
+                    return
+                }
+
+                if (message.type === 'workers.snapshot') {
+                    self.workers = self.normalizeWorkers(message.workers || [])
+                    self.lastSyncAt = Date.now()
+                    self.update()
+                    return
+                }
+
+                if (message.type === 'worker.health' && message.worker) {
+                    self.upsertWorker(message.worker)
+                    self.lastSyncAt = Date.now()
+                    self.update()
+                }
+            }
+
+            self.ws.onerror = function () {
+                self.wsState = 'error'
+                self.update()
+            }
+
+            self.ws.onclose = function () {
+                self.wsState = 'disconnected'
+                self.update()
+
+                if (self.wsReconnectTimer) {
+                    clearTimeout(self.wsReconnectTimer)
+                }
+
+                self.wsReconnectTimer = setTimeout(function () {
+                    self.connect_workers_socket()
+                }, 2000)
+            }
         }
-        .workers-table thead th {
-            position: sticky;
-            top: 0;
-            background: #f8fafc !important;
-            color: #374151 !important;
-            font-weight: 700 !important;
-            font-size: 12px;
-            text-transform: uppercase;
+
+        self.normalizeWorker = function (worker) {
+            worker = worker || {}
+
+            return {
+                hostname: worker.hostname || 'unknown',
+                status: worker.status || 'unavailable',
+                running_jobs: typeof worker.running_jobs === 'number' ? worker.running_jobs : 0,
+                timestamp: worker.timestamp || null
+            }
         }
-        .workers-table td, .workers-table th {
-            vertical-align: middle !important;
+
+        self.normalizeWorkers = function (workers) {
+            return (workers || [])
+                .filter(function (worker) {
+                    return worker && worker.hostname
+                })
+                .map(function (worker) {
+                    return self.normalizeWorker(worker)
+                })
         }
-        .worker-hostname {
-            font-size: 13px;
-            font-weight: 700;
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
+
+        self.upsertWorker = function (worker) {
+            worker = self.normalizeWorker(worker)
+
+            if (!worker.hostname || worker.hostname === 'unknown') return
+
+            var idx = _.findIndex(self.workers, { hostname: worker.hostname })
+
+            if (idx === -1) {
+                self.workers.push(worker)
+            } else {
+                self.workers[idx] = worker
+            }
+
+            self.workers = self.workers.slice()
         }
-        .worker-jobs {
-            text-align: center;
+
+        self.sortedWorkers = function () {
+            var order = {
+                available: 0,
+                busy: 1,
+                unavailable: 2
+            }
+
+            return (self.workers || []).slice().sort(function (a, b) {
+                var sa = self.displayStatus(a)
+                var sb = self.displayStatus(b)
+
+                var oa = order.hasOwnProperty(sa) ? order[sa] : 99
+                var ob = order.hasOwnProperty(sb) ? order[sb] : 99
+
+                if (oa !== ob) return oa - ob
+                if ((b.running_jobs || 0) !== (a.running_jobs || 0)) {
+                    return (b.running_jobs || 0) - (a.running_jobs || 0)
+                }
+
+                return (a.hostname || '').localeCompare(b.hostname || '')
+            })
         }
-        .worker-lastseen {
-            color: #6b7280;
-            font-size: 12px;
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
+
+        self.displayStatus = function (worker) {
+            return worker && worker.status ? worker.status : 'unavailable'
         }
-        .worker-status {
-            border-radius: 999px !important;
-            font-weight: 700 !important;
-            display: inline-flex !important;
-            align-items: center;
-            gap: 6px;
-            white-space: nowrap;
+
+        self.getStatusClass = function (worker) {
+            var status = self.displayStatus(worker)
+            if (status === 'available') return 'green'
+            if (status === 'busy') return 'yellow'
+            return 'red'
         }
-        .workers-empty {
-            padding: 24px 12px;
-            text-align: center;
-            color: #6b7280;
+
+        self.getStatusIcon = function (worker) {
+            var status = self.displayStatus(worker)
+            if (status === 'available') return 'check circle'
+            if (status === 'busy') return 'clock'
+            return 'times circle'
         }
-        .workers-empty .header {
-            font-weight: 700;
-            color: #374151;
-            margin-bottom: 4px;
+
+        self.getStatusText = function (worker) {
+            var status = self.displayStatus(worker)
+            if (status === 'available') return 'Available'
+            if (status === 'busy') return 'Busy'
+            return 'Unavailable'
         }
-        .workers-footer {
-            margin-top: 12px;
-            font-size: 12px;
-            color: #6b7280;
+
+        self.formatLastSeen = function (timestamp) {
+            if (!timestamp) return '—'
+
+            var age = Math.max(0, Math.round((Date.now() / 1000) - timestamp))
+            if (age < 5) return 'just now'
+            if (age < 60) return age + 's ago'
+
+            var minutes = Math.floor(age / 60)
+            if (minutes < 60) return minutes + 'm ago'
+
+            var hours = Math.floor(minutes / 60)
+            return hours + 'h ago'
         }
-        .ui.label.green {
-            background-color: #21ba45 !important;
-            color: white !important;
+
+        self.lastSyncLabel = function () {
+            if (!self.lastSyncAt) return 'never'
+
+            var age = Math.max(0, Math.round((Date.now() - self.lastSyncAt) / 1000))
+            if (age < 5) return 'just now'
+            if (age < 60) return age + 's ago'
+
+            var minutes = Math.floor(age / 60)
+            return minutes + 'm ago'
         }
-        .ui.label.yellow {
-            background-color: #f2c037 !important;
-            color: black !important;
+
+        self.totalCount = function () {
+            return (self.workers || []).length
         }
-        .ui.label.red {
-            background-color: #db2828 !important;
-            color: white !important;
+
+        self.availableCount = function () {
+            return (self.workers || []).filter(function (worker) {
+                return self.displayStatus(worker) === 'available'
+            }).length
         }
-        body.workers-panel-dragging {
-            user-select: none;
+
+        self.busyCount = function () {
+            return (self.workers || []).filter(function (worker) {
+                return self.displayStatus(worker) === 'busy'
+            }).length
         }
 
-        @media (max-width: 1400px) {
-            .workers-panel {
-                position: static;
-                width: 100%;
-                max-height: none;
-                margin-top: 16px;
-            }
-            .workers-table-wrap {
-                max-height: none;
-            }
+        self.unavailableCount = function () {
+            return (self.workers || []).filter(function (worker) {
+                return self.displayStatus(worker) === 'unavailable'
+            }).length
         }
-        @media (max-width: 768px) {
-            .workers-stats {
-                grid-template-columns: repeat(2, 1fr);
-            }
+
+        self.connectionLabel = function () {
+            if (self.wsState === 'connected') return 'Connected'
+            if (self.wsState === 'connecting') return 'Connecting'
+            if (self.wsState === 'error') return 'Error'
+            return 'Disconnected'
         }
+
+        CODALAB.events.on('new_submission_created', function () {
+            self.update_competition_data()
+        })
+    </script>
+
+    <style type="text/stylus">
+        .comp-detail-paragraph-text
+            font-size 16px !important
+            line-height 20px !important
+
+        :scope
+            display block
+            width 100%
+            height 100%
+
+        .layout
+            display block
+            position relative
+
+        .comp-content
+            min-width 0
+            padding-right 0
+
+        .workers-panel
+            position fixed
+            top 24px
+            right 24px
+            width 375px
+            z-index 25
+            max-height calc(100vh - 48px)
+            overflow auto
+
+        .workers-card
+            background #fff
+            border 1px solid rgba(34, 36, 38, .12)
+            border-radius 16px
+            box-shadow 0 8px 24px rgba(16, 24, 40, .08)
+            padding 12px
+
+        .workers-drag-handle
+            cursor move
+            user-select none
+            touch-action none
+
+        .workers-header
+            margin-bottom 12px
+
+        .workers-title
+            display flex
+            align-items flex-start
+            gap 10px
+
+        .workers-title .icon
+            margin-top 2px
+
+        .workers-title-text
+            font-size 18px
+            font-weight 700
+            color #1f2937
+            line-height 1.2
+
+        .workers-subtitle
+            margin-top 4px
+            font-size 12px
+            color #6b7280
+            display flex
+            align-items center
+            flex-wrap wrap
+            gap 6px
+
+        .workers-connection
+            display inline-flex
+            align-items center
+            padding 3px 8px
+            border-radius 999px
+            font-weight 700
+            font-size 11px
+            text-transform uppercase
+            letter-spacing .04em
+            background #f3f4f6
+            color #6b7280
+
+        .workers-connection.connected
+            background rgba(33, 186, 69, .12)
+            color #21ba45
+
+        .workers-connection.connecting
+            background rgba(251, 189, 8, .14)
+            color #b58105
+
+        .workers-connection.error
+            background rgba(219, 40, 40, .12)
+            color #db2828
+
+        .workers-connection.disconnected
+            background rgba(219, 40, 40, .12)
+            color #db2828
+
+        .workers-separator
+            opacity .6
+
+        .workers-drag-hint
+            margin-top 4px
+            font-size 11px
+            color #9ca3af
+            white-space nowrap
+
+        .workers-stats
+            display grid
+            grid-template-columns repeat(4, minmax(0, 1fr))
+            gap 8px
+            margin 10px 0 15px 0 !important
+from channels.layers import get_channel_layer
+from asgiref.sync import async_to_sync
+        .stat-card
+            background #f9fafb
+            border 1px solid rgba(17, 24, 39, .06)
+            border-radius 12px
+            padding 10px 8px
+            text-align center
+            min-width 0
+            display flex
+            flex-direction column
+            align-items center
+            justify-content center
+
+        .stat-value
+            font-size 18px
+            font-weight 800
+            line-height 1
+            color #111827
+            margin-bottom 4px
+            min-width 1ch
+            text-align center
+
+        .stat-green
+            color #21ba45
+
+        .stat-yellow
+            color #b58105
+
+        .stat-red
+            color #db2828
+
+        .stat-label
+            font-size 11px
+            font-weight 700
+            text-transform uppercase
+            letter-spacing .04em
+            color #6b7280
+            line-height 1.1
+            text-align center
+            white-space nowrap
+
+        .workers-table-wrap
+            max-height calc(100vh - 240px)
+            overflow auto
+            border-radius 12px
+
+        .workers-table
+            margin 0 !important
+            width :autofill
+            table-layout auto
+            font-size 13px
+
+        .workers-table thead th
+            position sticky
+            top 0
+            z-index 2
+            background #f8fafc !important
+            color #374151 !important
+            font-weight 700 !important
+            font-size 12px
+            text-transform uppercase
+            letter-spacing .03em
+
+        .workers-table td,
+        .workers-table th
+            vertical-align middle !important
+
+        .worker-hostname
+            font-size 13px
+            font-weight 700
+            white-space nowrap
+            overflow hidden
+            text-overflow ellipsis
+
+        .worker-jobs
+            text-align center
+
+        .worker-lastseen
+            color #6b7280
+            font-size 12px
+            white-space nowrap
+            overflow hidden
+            text-overflow ellipsis
+
+        .worker-status
+            border-radius 999px !important
+            font-weight 700 !important
+            display inline-flex !important
+            align-items center
+            gap 6px
+            white-space nowrap
+
+        .workers-empty
+            padding 24px 12px
+            text-align center
+            color #6b7280
+
+        .workers-empty .header
+            font-weight 700
+            color #374151
+            margin-bottom 4px
+
+        .workers-footer
+            margin-top 12px
+            font-size 12px
+            color #6b7280
+
+        .ui.label.green
+            background-color #21ba45 !important
+            color white !important
+
+        .ui.label.yellow
+            background-color #f2c037 !important
+            color black !important
+
+        .ui.label.red
+            background-color #db2828 !important
+            color white !important
+
+        body.workers-panel-dragging
+            user-select none
+
+        @media (max-width: 1400px)
+            .workers-panel
+                position static
+                width 100%
+                max-height none
+                margin-top 16px
+
+            .workers-table-wrap
+                max-height none
+
+        @media (max-width: 768px)
+            .workers-stats
+                grid-template-columns repeat(2, minmax(0, 1fr))
     </style>
 </competition-detail>
\ No newline at end of file
diff --git a/src/utils/worker_utils.py b/src/utils/worker_utils.py
index f1b9a474b..a44101066 100644
--- a/src/utils/worker_utils.py
+++ b/src/utils/worker_utils.py
@@ -1,5 +1,15 @@
 from queues.models import Queue
 
+import logging
+import time
+import requests
+from django.conf import settings
+
+from queues.models import Queue as QueueModel
+
+logger = logging.getLogger(__name__)
+
+PIDBOX_SUFFIX = ".celery.pidbox"
 WORKERS_REGISTRY_KEY = "workers:registry"
 WORKER_HEARTBEAT_TTL = 180
 
@@ -26,3 +36,102 @@ def is_compute_worker(worker_name, queue_names, known_queue_names):
         or "compute-worker" in queue_names
         or worker_name.startswith("compute-worker")
     )
+
+def _get_rabbitmq_auth():
+    return (
+        settings.RABBITMQ_DEFAULT_USER,
+        settings.RABBITMQ_DEFAULT_PASS,
+    )
+
+
+def _get_rabbitmq_base_url():
+    return (
+        f"http://{settings.RABBITMQ_HOST}"
+        f":{settings.RABBITMQ_MANAGEMENT_PORT}/api"
+    )
+
+
+def _build_vhost_to_source_map():
+    mapping = {"/": "default"}
+    for q in QueueModel.objects.exclude(vhost__isnull=True).values("vhost", "name"):
+        mapping[str(q["vhost"])] = q["name"]
+    return mapping
+
+def _fetch_all_queues():
+    resp = requests.get(
+        f"{_get_rabbitmq_base_url()}/queues",
+        auth=_get_rabbitmq_auth(),
+        timeout=5,
+    )
+    resp.raise_for_status()
+    return resp.json()
+
+
+def fetch_compute_workers():
+    try:
+        all_queues = _fetch_all_queues()
+    except Exception:
+        logger.exception("Failed to fetch queues from RabbitMQ Management API")
+        return [], []
+
+    vhost_to_source = _build_vhost_to_source_map()
+
+    by_vhost: dict[str, list] = {}
+    for q in all_queues:
+        by_vhost.setdefault(q["vhost"], []).append(q)
+
+    workers = []
+    private_workers = []
+    now = time.time()
+
+    for vhost, queues in by_vhost.items():
+        source_name = vhost_to_source.get(vhost)
+        if not source_name:
+            continue
+
+        cw_queue = next((q for q in queues if q["name"] == "compute-worker"), None)
+        messages_unacked = cw_queue.get("messages_unacknowledged", 0) if cw_queue else 0
+        cw_consumers = cw_queue.get("consumers", 0) if cw_queue else 0
+
+        pidbox_queues = [
+            q for q in queues
+            if q["name"].endswith(PIDBOX_SUFFIX)
+            and q["name"].startswith("compute-worker@")
+        ]
+
+        for pidbox_q in pidbox_queues:
+            hostname = pidbox_q["name"][: -len(PIDBOX_SUFFIX)]
+
+            if not is_compute_worker(hostname, {"compute-worker"}, set()):
+                continue
+
+            pidbox_alive = pidbox_q.get("consumers", 0) > 0
+
+            if not pidbox_alive or cw_consumers == 0:
+                status = "unavailable"
+                running_jobs = 0
+            elif messages_unacked > 0:
+                status = "busy"
+                running_jobs = messages_unacked
+            else:
+                status = "available"
+                running_jobs = 0
+
+            worker = {
+                "hostname": hostname,
+                "status": status,
+                "running_jobs": running_jobs,
+                "last_seen": now,
+                "queue_source": source_name,
+                "queue_names": ["compute-worker"],
+            }
+
+            if source_name == "default":
+                workers.append(worker)
+            else:
+                private_workers.append(worker)
+
+    workers.sort(key=lambda x: x["hostname"])
+    private_workers.sort(key=lambda x: (x["queue_source"], x["hostname"]))
+
+    return workers, private_workers
\ No newline at end of file

From f000b915878218cf528184a528d0ba76dd6f4fe2 Mon Sep 17 00:00:00 2001
From: Idir Chikhoune <idir.chikhoune@lisn.fr>
Date: Thu, 2 Apr 2026 13:43:14 +0200
Subject: [PATCH 02/20] feature deactivated by default + hiden behind a button
 by default + visibile only by admin or comp organizer or collaborators

---
 .../riot/competitions/detail/detail.tag       | 833 ++++++------------
 1 file changed, 248 insertions(+), 585 deletions(-)

diff --git a/src/static/riot/competitions/detail/detail.tag b/src/static/riot/competitions/detail/detail.tag
index f1dce44fa..812327502 100644
--- a/src/static/riot/competitions/detail/detail.tag
+++ b/src/static/riot/competitions/detail/detail.tag
@@ -6,7 +6,17 @@
             <comp-tabs class="comp-detail-paragraph-text" competition="{ competition }"></comp-tabs>
         </div>
 
-        <aside class="workers-panel" style="left: { panelLeft }px; top: { panelTop }px;">
+        <button
+            if="{ canViewWorkersPanel }"
+            class="ui button primary workers-toggle-btn"
+            onclick="{ toggleWorkersPanel }">
+            <i class="server icon"></i>
+            { showWorkersPanel ? 'Hide workers' : 'Show workers' }
+        </button>
+
+        <aside if="{ canViewWorkersPanel && showWorkersPanel }"
+               class="workers-panel"
+               style="left: { panelLeft }px; top: { panelTop }px;">
             <div class="workers-card">
                 <div class="workers-header workers-drag-handle" onmousedown="{ startPanelDrag }">
                     <div class="workers-title">
@@ -20,10 +30,7 @@
                             </div>
                         </div>
                     </div>
-
-                    <div class="workers-drag-hint">
-                        Drag to move
-                    </div>
+                    <div class="workers-drag-hint">Drag to move</div>
                 </div>
 
                 <div class="workers-stats">
@@ -55,29 +62,18 @@
                                 <th class="col-lastseen">Last seen</th>
                             </tr>
                         </thead>
-
                         <tbody>
-                            <tr each="{worker in sortedWorkers()}">
-                                <td class="worker-hostname">
-                                    <strong>{ worker.hostname }</strong>
-                                </td>
-
-                                <td class="worker-status-cell">
+                            <tr each="{ worker in sortedWorkers() }">
+                                <td><strong>{ worker.hostname }</strong></td>
+                                <td>
                                     <span class="ui tiny label worker-status { getStatusClass(worker) }">
                                         <i class="{ getStatusIcon(worker) } icon"></i>
                                         { getStatusText(worker) }
                             return        </span>
                                 </td>
-
-                                <td class="worker-jobs">
-                                    <span class="ui circular label">{ worker.running_jobs || 0 }</span>
-                                </td>
-
-                                <td class="worker-lastseen">
-                                    { formatLastSeen(worker.timestamp) }
-                                </td>
+                                <td><span class="ui circular label">{ worker.running_jobs || 0 }</span></td>
+                                <td>{ formatLastSeen(worker.timestamp) }</td>
                             </tr>
-
                             <tr if="{ sortedWorkers().length === 0 }">
                                 <td colspan="4" class="center aligned">
                                     <div class="workers-empty">
@@ -100,76 +96,95 @@
     <script>
         var self = this;
 
-        self.competition = {}
-        self.workers = []
-        self.ws = null
-        self.wsReconnectTimer = null
-        self.wsState = 'disconnected'
-        self.lastSyncAt = null
-
-        self.panelLeft = 24
-        self.panelTop = 24
-        self.panelWidth = 500
-        self.panelHeight = 120
-        self.draggingPanel = false
-        self.dragOffsetX = 0
-        self.dragOffsetY = 0
-        self.panelStorageKey = 'codabench_workers_panel_position'
+        self.competition = {};
+        self.workers = [];
+        self.ws = null;
+        self.wsReconnectTimer = null;
+        self.wsState = 'disconnected';
+        self.lastSyncAt = null;
+
+        self.canViewWorkersPanel = (self.opts.can_view_workers_panel === 'true');
+        self.showWorkersPanel = false
+
+        self.canViewWorkersPanel = String(self.opts.can_view_workers_panel || 'false') === 'true'
+        self.panelLeft = 24;
+        self.panelTop = 24;
+        self.panelWidth = 375;
+        self.draggingPanel = false;
+        self.dragOffsetX = 0;
+        self.dragOffsetY = 0;
+        self.panelStorageKey = 'codabench_workers_panel_position';
+        self.resizeListenerAttached = false;
+
+        self.toggleWorkersPanel = function () {
+            self.showWorkersPanel = !self.showWorkersPanel
+
+            if (self.showWorkersPanel) {
+                self.loadPanelPosition()
+                self.connect_workers_socket()
+            } else {
+                self.close_workers_socket()
+            }
 
-        self.one('mount', function () {
-            $('.menu .item', self.root).tab()
-            self.loadPanelPosition()
-            self.update_competition_data()
-            self.connect_workers_socket()
-            window.addEventListener('resize', self.onWindowResize)
-        })
+            self.update()
+        }
 
-        self.one('unmount', function () {
-            window.removeEventListener('resize', self.onWindowResize)
-            window.removeEventListener('mousemove', self.onPanelDragMove)
-            window.removeEventListener('mouseup', self.stopPanelDrag)
+        self.one('mount', function () {
+            $('.menu .item', self.root).tab();
+            self.update_competition_data();
+            if (self.canViewWorkersPanel) {
+                self.loadPanelPosition();
+                self.attachResizeListener();
+            }
+        });
 
+        self.close_workers_socket = function () {
             if (self.wsReconnectTimer) {
                 clearTimeout(self.wsReconnectTimer)
                 self.wsReconnectTimer = null
             }
 
             if (self.ws) {
+                self.ws.onclose = null
+
                 try { self.ws.close() } catch (e) {}
                 self.ws = null
             }
 
-            document.body.classList.remove('workers-panel-dragging')
-        })
+            self.wsState = 'disconnected'
+        }
+
+        self.one('unmount', function () {
+            self.detachResizeListener();
+            if (self.wsReconnectTimer) {
+                clearTimeout(self.wsReconnectTimer);
+                self.wsReconnectTimer = null;
+            }
+            if (self.ws) {
+                try { self.ws.close(); } catch(e) {}
+                self.ws = null;
+            }
+            document.body.classList.remove('workers-panel-dragging');
+        });
 
         self.update_competition_data = function () {
             CODALAB.api.get_competition(self.opts.competition_pk, self.opts.secret_key)
                 .done(function (data) {
-                    self.competition = data
-
-                    CODALAB.events.trigger('competition_loaded', self.competition)
-
-                    let selected_phase_index = _.get(
-                        _.find(self.competition.phases, { 'status': 'Current' }),
-                        'id'
-                    )
-
-                    if (selected_phase_index == null) {
-                        selected_phase_index = _.get(
-                            _.find(self.competition.phases, { is_final_phase: true }),
-                            'id'
-                        )
+                    self.competition = data;
+                    CODALAB.events.trigger('competition_loaded', self.competition);
+
+                    let currentPhase = _.find(self.competition.phases, { status: 'Current' });
+                    let selectedPhaseId = currentPhase ? currentPhase.id : null;
+                    if (selectedPhaseId === null) {
+                        let finalPhase = _.find(self.competition.phases, { is_final_phase: true });
+                        selectedPhaseId = finalPhase ? finalPhase.id : null;
                     }
-
                     CODALAB.events.trigger(
                         'phase.selected',
-                        (_.find(self.competition.phases, { id: selected_phase_index }))
-                    )
+                        (_.find(self.competition.phases, { id: selectedPhaseId }))
+                    );
 
-                    self.update()
-                })
-                .fail(function () {
-                    toastr.error('Could not find benchmark')
+                    self.update();
                 })
                 .fail(function () {
                     toastr.error("Could not find competition");
@@ -439,545 +454,193 @@
             max-height: calc(100vh - 48px);
         }
 
-        self.loadPanelPosition = function () {
-            try {
-                var raw = localStorage.getItem(self.panelStorageKey)
-                if (!raw) return
-
-                var pos = JSON.parse(raw)
-                if (typeof pos.left === 'number') self.panelLeft = pos.left
-                if (typeof pos.top === 'number') self.panelTop = pos.top
-
-                self.clampPanelPosition()
-            } catch (e) {
-                console.warn('Could not load panel position', e)
-            }
+        .workers-card {
+            background: #fff;
+            border: 1px solid rgba(0,0,0,0.1);
+            border-radius: 16px;
+            box-shadow: 0 8px 24px rgba(0,0,0,0.08);
+            padding: 12px;
         }
-
-        self.savePanelPosition = function () {
-            try {
-                localStorage.setItem(self.panelStorageKey, JSON.stringify({
-                    left: self.panelLeft,
-                    top: self.panelTop
-                }))
-            } catch (e) {
-                console.warn('Could not save panel position', e)
-            }
+        .workers-header { margin-bottom: 12px; }
+        .workers-title { display: flex; align-items: flex-start; gap: 10px; }
+        .workers-title .icon { margin-top: 2px; }
+        .workers-title-text { font-size: 18px; font-weight: 700; color: #1f2937; line-height: 1.2; }
+        .workers-subtitle {
+            margin-top: 4px;
+            font-size: 12px;
+            color: #6b7280;
+            display: flex;
+            align-items: center;
+            gap: 6px;
         }
 
-        self.clampPanelPosition = function () {
-            var minLeft = 8
-            var minTop = 8
-            var maxLeft = Math.max(minLeft, window.innerWidth - self.panelWidth - 8)
-            var maxTop = Math.max(minTop, window.innerHeight - 80)
-
-            self.panelLeft = Math.min(Math.max(minLeft, self.panelLeft), maxLeft)
-            self.panelTop = Math.min(Math.max(minTop, self.panelTop), maxTop)
+        .workers-toggle-btn
+            position fixed
+            top 74px
+            right 24px
+            z-index 30
+            background #576671 !important
+            color white !important
+            
+        .workers-connection {
+            display: inline-flex;
+            align-items: center;
+            padding: 3px 8px;
+            border-radius: 999px;
+            font-weight: 700;
+            font-size: 11px;
+            text-transform: uppercase;
+            background: #f3f4f6;
+            color: #6b7280;
         }
-
-        self.onWindowResize = function () {
-            self.clampPanelPosition()
-            self.update()
+        .workers-connection.connected {
+            background: rgba(33,186,69,.12);
+            color: #21ba45;
         }
-
-        self.startPanelDrag = function (e) {
-            if (e.button !== 0) return
-
-            var panel = self.root.querySelector('.workers-panel')
-            if (!panel) return
-
-            var rect = panel.getBoundingClientRect()
-
-            self.draggingPanel = true
-            self.dragOffsetX = e.clientX - rect.left
-            self.dragOffsetY = e.clientY - rect.top
-
-            document.body.classList.add('workers-panel-dragging')
-            window.addEventListener('mousemove', self.onPanelDragMove)
-            window.addEventListener('mouseup', self.stopPanelDrag)
-
-            e.preventDefault()
-            e.stopPropagation()
+        .workers-connection.connecting {
+            background: rgba(251,189,8,.14);
+            color: #b58105;
         }
-
-        self.onPanelDragMove = function (e) {
-            if (!self.draggingPanel) return
-
-            var minLeft = 8
-            var minTop = 8
-            var maxLeft = Math.max(minLeft, window.innerWidth - self.panelWidth - 8)
-            var maxTop = Math.max(minTop, window.innerHeight - 80)
-
-            var newLeft = e.clientX - self.dragOffsetX
-            var newTop = e.clientY - self.dragOffsetY
-
-            self.panelLeft = Math.min(Math.max(minLeft, newLeft), maxLeft)
-            self.panelTop = Math.min(Math.max(minTop, newTop), maxTop)
-
-            self.update()
+        .workers-connection.error {
+            background: rgba(219,40,40,.12);
+            color: #db2828;
         }
-
-        self.stopPanelDrag = function () {
-            if (!self.draggingPanel) return
-
-            self.draggingPanel = false
-            document.body.classList.remove('workers-panel-dragging')
-
-            window.removeEventListener('mousemove', self.onPanelDragMove)
-            window.removeEventListener('mouseup', self.stopPanelDrag)
-
-            self.savePanelPosition()
-            self.update()
+        .workers-connection.disconnected {
+            background: rgba(219,40,40,.12);
+            color: #db2828;
         }
-
-        self.connect_workers_socket = function () {
-            if (self.ws) {
-                try { self.ws.close() } catch (e) {}
-                self.ws = null
-            }
-
-            var scheme = window.location.protocol === 'https:' ? 'wss' : 'ws'
-            var url = scheme + '://' + window.location.host + '/ws/workers/'
-
-            self.wsState = 'connecting'
-            self.update()
-
-            self.ws = new WebSocket(url)
-
-            self.ws.onopen = function () {
-                self.wsState = 'connected'
-                self.update()
-            }
-
-            self.ws.onmessage = function (event) {
-                var message = null
-
-                try {
-                    message = JSON.parse(event.data)
-                } catch (e) {
-                    console.error('Invalid websocket payload:', event.data)
-                    return
-                }
-
-                if (message.type === 'workers.snapshot') {
-                    self.workers = self.normalizeWorkers(message.workers || [])
-                    self.lastSyncAt = Date.now()
-                    self.update()
-                    return
-                }
-
-                if (message.type === 'worker.health' && message.worker) {
-                    self.upsertWorker(message.worker)
-                    self.lastSyncAt = Date.now()
-                    self.update()
-                }
-            }
-
-            self.ws.onerror = function () {
-                self.wsState = 'error'
-                self.update()
-            }
-
-            self.ws.onclose = function () {
-                self.wsState = 'disconnected'
-                self.update()
-
-                if (self.wsReconnectTimer) {
-                    clearTimeout(self.wsReconnectTimer)
-                }
-
-                self.wsReconnectTimer = setTimeout(function () {
-                    self.connect_workers_socket()
-                }, 2000)
-            }
+        .workers-separator { opacity: .6; }
+        .workers-drag-hint { margin-top: 4px; font-size: 11px; color: #9ca3af; white-space: nowrap; }
+
+        .workers-stats {
+            display: grid;
+            grid-template-columns: repeat(4, 1fr);
+            gap: 8px;
+            margin: 10px 0 15px 0 !important;
         }
-
-        self.normalizeWorker = function (worker) {
-            worker = worker || {}
-
-            return {
-                hostname: worker.hostname || 'unknown',
-                status: worker.status || 'unavailable',
-                running_jobs: typeof worker.running_jobs === 'number' ? worker.running_jobs : 0,
-                timestamp: worker.timestamp || null
-            }
+        .stat-card {
+            background: #f9fafb;
+            border: 1px solid rgba(0,0,0,0.06);
+            border-radius: 12px;
+            padding: 10px 8px;
+            text-align: center;
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            justify-content: center;
         }
-
-        self.normalizeWorkers = function (workers) {
-            return (workers || [])
-                .filter(function (worker) {
-                    return worker && worker.hostname
-                })
-                .map(function (worker) {
-                    return self.normalizeWorker(worker)
-                })
+        .stat-value {
+            font-size: 18px;
+            font-weight: 800;
+            color: #111827;
+            margin-bottom: 4px;
+            min-width: 1ch;
         }
-
-        self.upsertWorker = function (worker) {
-            worker = self.normalizeWorker(worker)
-
-            if (!worker.hostname || worker.hostname === 'unknown') return
-
-            var idx = _.findIndex(self.workers, { hostname: worker.hostname })
-
-            if (idx === -1) {
-                self.workers.push(worker)
-            } else {
-                self.workers[idx] = worker
-            }
-
-            self.workers = self.workers.slice()
+        .stat-green { color: #21ba45; }
+        .stat-yellow { color: #b58105; }
+        .stat-red { color: #db2828; }
+        .stat-label {
+            font-size: 11px;
+            font-weight: 700;
+            text-transform: uppercase;
+            color: #6b7280;
+            letter-spacing: .04em;
         }
 
-        self.sortedWorkers = function () {
-            var order = {
-                available: 0,
-                busy: 1,
-                unavailable: 2
-            }
-
-            return (self.workers || []).slice().sort(function (a, b) {
-                var sa = self.displayStatus(a)
-                var sb = self.displayStatus(b)
-
-                var oa = order.hasOwnProperty(sa) ? order[sa] : 99
-                var ob = order.hasOwnProperty(sb) ? order[sb] : 99
-
-                if (oa !== ob) return oa - ob
-                if ((b.running_jobs || 0) !== (a.running_jobs || 0)) {
-                    return (b.running_jobs || 0) - (a.running_jobs || 0)
-                }
-
-                return (a.hostname || '').localeCompare(b.hostname || '')
-            })
+        .workers-table-wrap {
+            max-height: calc(100vh - 240px);
+            overflow: auto;
+            border-radius: 12px;
         }
-
-        self.displayStatus = function (worker) {
-            return worker && worker.status ? worker.status : 'unavailable'
+        .workers-table {
+            margin: 0 !important;
+            width: 100%;
+            table-layout: auto;
+            font-size: 13px;
         }
-
-        self.getStatusClass = function (worker) {
-            var status = self.displayStatus(worker)
-            if (status === 'available') return 'green'
-            if (status === 'busy') return 'yellow'
-            return 'red'
+        .workers-table thead th {
+            position: sticky;
+            top: 0;
+            background: #f8fafc !important;
+            color: #374151 !important;
+            font-weight: 700 !important;
+            font-size: 12px;
+            text-transform: uppercase;
         }
-
-        self.getStatusIcon = function (worker) {
-            var status = self.displayStatus(worker)
-            if (status === 'available') return 'check circle'
-            if (status === 'busy') return 'clock'
-            return 'times circle'
+        .workers-table td, .workers-table th {
+            vertical-align: middle !important;
         }
-
-        self.getStatusText = function (worker) {
-            var status = self.displayStatus(worker)
-            if (status === 'available') return 'Available'
-            if (status === 'busy') return 'Busy'
-            return 'Unavailable'
+        .worker-hostname {
+            font-size: 13px;
+            font-weight: 700;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
         }
-
-        self.formatLastSeen = function (timestamp) {
-            if (!timestamp) return '—'
-
-            var age = Math.max(0, Math.round((Date.now() / 1000) - timestamp))
-            if (age < 5) return 'just now'
-            if (age < 60) return age + 's ago'
-
-            var minutes = Math.floor(age / 60)
-            if (minutes < 60) return minutes + 'm ago'
-
-            var hours = Math.floor(minutes / 60)
-            return hours + 'h ago'
+        .worker-jobs {
+            text-align: center;
         }
-
-        self.lastSyncLabel = function () {
-            if (!self.lastSyncAt) return 'never'
-
-            var age = Math.max(0, Math.round((Date.now() - self.lastSyncAt) / 1000))
-            if (age < 5) return 'just now'
-            if (age < 60) return age + 's ago'
-
-            var minutes = Math.floor(age / 60)
-            return minutes + 'm ago'
+        .worker-lastseen {
+            color: #6b7280;
+            font-size: 12px;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
         }
-
-        self.totalCount = function () {
-            return (self.workers || []).length
+        .worker-status {
+            border-radius: 999px !important;
+            font-weight: 700 !important;
+            display: inline-flex !important;
+            align-items: center;
+            gap: 6px;
+            white-space: nowrap;
         }
-
-        self.availableCount = function () {
-            return (self.workers || []).filter(function (worker) {
-                return self.displayStatus(worker) === 'available'
-            }).length
+        .workers-empty {
+            padding: 24px 12px;
+            text-align: center;
+            color: #6b7280;
         }
-
-        self.busyCount = function () {
-            return (self.workers || []).filter(function (worker) {
-                return self.displayStatus(worker) === 'busy'
-            }).length
+        .workers-empty .header {
+            font-weight: 700;
+            color: #374151;
+            margin-bottom: 4px;
         }
-
-        self.unavailableCount = function () {
-            return (self.workers || []).filter(function (worker) {
-                return self.displayStatus(worker) === 'unavailable'
-            }).length
+        .workers-footer {
+            margin-top: 12px;
+            font-size: 12px;
+            color: #6b7280;
         }
-
-        self.connectionLabel = function () {
-            if (self.wsState === 'connected') return 'Connected'
-            if (self.wsState === 'connecting') return 'Connecting'
-            if (self.wsState === 'error') return 'Error'
-            return 'Disconnected'
+        .ui.label.green {
+            background-color: #21ba45 !important;
+            color: white !important;
+        }
+        .ui.label.yellow {
+            background-color: #f2c037 !important;
+            color: black !important;
+        }
+        .ui.label.red {
+            background-color: #db2828 !important;
+            color: white !important;
+        }
+        body.workers-panel-dragging {
+            user-select: none;
         }
 
-        CODALAB.events.on('new_submission_created', function () {
-            self.update_competition_data()
-        })
-    </script>
-
-    <style type="text/stylus">
-        .comp-detail-paragraph-text
-            font-size 16px !important
-            line-height 20px !important
-
-        :scope
-            display block
-            width 100%
-            height 100%
-
-        .layout
-            display block
-            position relative
-
-        .comp-content
-            min-width 0
-            padding-right 0
-
-        .workers-panel
-            position fixed
-            top 24px
-            right 24px
-            width 375px
-            z-index 25
-            max-height calc(100vh - 48px)
-            overflow auto
-
-        .workers-card
-            background #fff
-            border 1px solid rgba(34, 36, 38, .12)
-            border-radius 16px
-            box-shadow 0 8px 24px rgba(16, 24, 40, .08)
-            padding 12px
-
-        .workers-drag-handle
-            cursor move
-            user-select none
-            touch-action none
-
-        .workers-header
-            margin-bottom 12px
-
-        .workers-title
-            display flex
-            align-items flex-start
-            gap 10px
-
-        .workers-title .icon
-            margin-top 2px
-
-        .workers-title-text
-            font-size 18px
-            font-weight 700
-            color #1f2937
-            line-height 1.2
-
-        .workers-subtitle
-            margin-top 4px
-            font-size 12px
-            color #6b7280
-            display flex
-            align-items center
-            flex-wrap wrap
-            gap 6px
-
-        .workers-connection
-            display inline-flex
-            align-items center
-            padding 3px 8px
-            border-radius 999px
-            font-weight 700
-            font-size 11px
-            text-transform uppercase
-            letter-spacing .04em
-            background #f3f4f6
-            color #6b7280
-
-        .workers-connection.connected
-            background rgba(33, 186, 69, .12)
-            color #21ba45
-
-        .workers-connection.connecting
-            background rgba(251, 189, 8, .14)
-            color #b58105
-
-        .workers-connection.error
-            background rgba(219, 40, 40, .12)
-            color #db2828
-
-        .workers-connection.disconnected
-            background rgba(219, 40, 40, .12)
-            color #db2828
-
-        .workers-separator
-            opacity .6
-
-        .workers-drag-hint
-            margin-top 4px
-            font-size 11px
-            color #9ca3af
-            white-space nowrap
-
-        .workers-stats
-            display grid
-            grid-template-columns repeat(4, minmax(0, 1fr))
-            gap 8px
-            margin 10px 0 15px 0 !important
-from channels.layers import get_channel_layer
-from asgiref.sync import async_to_sync
-        .stat-card
-            background #f9fafb
-            border 1px solid rgba(17, 24, 39, .06)
-            border-radius 12px
-            padding 10px 8px
-            text-align center
-            min-width 0
-            display flex
-            flex-direction column
-            align-items center
-            justify-content center
-
-        .stat-value
-            font-size 18px
-            font-weight 800
-            line-height 1
-            color #111827
-            margin-bottom 4px
-            min-width 1ch
-            text-align center
-
-        .stat-green
-            color #21ba45
-
-        .stat-yellow
-            color #b58105
-
-        .stat-red
-            color #db2828
-
-        .stat-label
-            font-size 11px
-            font-weight 700
-            text-transform uppercase
-            letter-spacing .04em
-            color #6b7280
-            line-height 1.1
-            text-align center
-            white-space nowrap
-
-        .workers-table-wrap
-            max-height calc(100vh - 240px)
-            overflow auto
-            border-radius 12px
-
-        .workers-table
-            margin 0 !important
-            width :autofill
-            table-layout auto
-            font-size 13px
-
-        .workers-table thead th
-            position sticky
-            top 0
-            z-index 2
-            background #f8fafc !important
-            color #374151 !important
-            font-weight 700 !important
-            font-size 12px
-            text-transform uppercase
-            letter-spacing .03em
-
-        .workers-table td,
-        .workers-table th
-            vertical-align middle !important
-
-        .worker-hostname
-            font-size 13px
-            font-weight 700
-            white-space nowrap
-            overflow hidden
-            text-overflow ellipsis
-
-        .worker-jobs
-            text-align center
-
-        .worker-lastseen
-            color #6b7280
-            font-size 12px
-            white-space nowrap
-            overflow hidden
-            text-overflow ellipsis
-
-        .worker-status
-            border-radius 999px !important
-            font-weight 700 !important
-            display inline-flex !important
-            align-items center
-            gap 6px
-            white-space nowrap
-
-        .workers-empty
-            padding 24px 12px
-            text-align center
-            color #6b7280
-
-        .workers-empty .header
-            font-weight 700
-            color #374151
-            margin-bottom 4px
-
-        .workers-footer
-            margin-top 12px
-            font-size 12px
-            color #6b7280
-
-        .ui.label.green
-            background-color #21ba45 !important
-            color white !important
-
-        .ui.label.yellow
-            background-color #f2c037 !important
-            color black !important
-
-        .ui.label.red
-            background-color #db2828 !important
-            color white !important
-
-        body.workers-panel-dragging
-            user-select none
-
-        @media (max-width: 1400px)
-            .workers-panel
-                position static
-                width 100%
-                max-height none
-                margin-top 16px
-
-            .workers-table-wrap
-                max-height none
-
-        @media (max-width: 768px)
-            .workers-stats
-                grid-template-columns repeat(2, minmax(0, 1fr))
+        @media (max-width: 1400px) {
+            .workers-panel {
+                position: static;
+                width: 100%;
+                max-height: none;
+                margin-top: 16px;
+            }
+            .workers-table-wrap {
+                max-height: none;
+            }
+        }
+        @media (max-width: 768px) {
+            .workers-stats {
+                grid-template-columns: repeat(2, 1fr);
+            }
+        }
     </style>
-</competition-detail>
\ No newline at end of file
+</competition-detail>

From 130ca59288f5455ea883be65a938ac0719f33b8a Mon Sep 17 00:00:00 2001
From: Idir Chikhoune <idir.chikhoune@lisn.fr>
Date: Thu, 2 Apr 2026 14:07:29 +0200
Subject: [PATCH 03/20] worker monitoring button behind user menu

---
 src/static/riot/competitions/detail/detail.tag | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/static/riot/competitions/detail/detail.tag b/src/static/riot/competitions/detail/detail.tag
index 812327502..abbf42743 100644
--- a/src/static/riot/competitions/detail/detail.tag
+++ b/src/static/riot/competitions/detail/detail.tag
@@ -475,10 +475,10 @@
         }
 
         .workers-toggle-btn
+            z-index 0
             position fixed
             top 74px
             right 24px
-            z-index 30
             background #576671 !important
             color white !important
             

From 33516ba0a9a31c7cfaa5ffb79fe7df80ed16ca60 Mon Sep 17 00:00:00 2001
From: Idir Chikhoune <idir.chikhoune@lisn.fr>
Date: Thu, 2 Apr 2026 15:54:14 +0200
Subject: [PATCH 04/20] files blacked for fixing the formatting issues

---
 src/apps/competitions/tasks.py | 534 +++++++++++++++++++--------------
 src/celery_config.py           |   3 +-
 2 files changed, 310 insertions(+), 227 deletions(-)

diff --git a/src/apps/competitions/tasks.py b/src/apps/competitions/tasks.py
index 27f8e4061..0e7b79759 100644
--- a/src/apps/competitions/tasks.py
+++ b/src/apps/competitions/tasks.py
@@ -21,8 +21,14 @@
 from rest_framework.exceptions import ValidationError
 
 from celery_config import app
-from competitions.models import Submission, CompetitionCreationTaskStatus, SubmissionDetails, Competition, \
-    CompetitionDump, Phase
+from competitions.models import (
+    Submission,
+    CompetitionCreationTaskStatus,
+    SubmissionDetails,
+    Competition,
+    CompetitionDump,
+    Phase,
+)
 from competitions.unpackers.utils import CompetitionUnpackingException
 from competitions.unpackers.v1 import V15Unpacker
 from competitions.unpackers.v2 import V2Unpacker
@@ -53,35 +59,35 @@
     "reward",
     "contact_email",
     "fact_sheet",
-    "forum_enabled"
+    "forum_enabled",
 ]
 
 TASK_FIELDS = [
-    'name',
-    'description',
-    'key',
-    'is_public',
+    "name",
+    "description",
+    "key",
+    "is_public",
 ]
 SOLUTION_FIELDS = [
-    'name',
-    'description',
-    'tasks',
-    'key',
+    "name",
+    "description",
+    "tasks",
+    "key",
 ]
 
 PHASE_FIELDS = [
-    'index',
-    'name',
-    'description',
-    'start',
-    'end',
-    'max_submissions_per_day',
-    'max_submissions_per_person',
-    'execution_time_limit',
-    'auto_migrate_to_this_phase',
-    'hide_output',
-    'hide_prediction_output',
-    'hide_score_output',
+    "index",
+    "name",
+    "description",
+    "start",
+    "end",
+    "max_submissions_per_day",
+    "max_submissions_per_person",
+    "execution_time_limit",
+    "auto_migrate_to_this_phase",
+    "hide_output",
+    "hide_prediction_output",
+    "hide_score_output",
 ]
 PHASE_FILES = [
     "input_data",
@@ -91,15 +97,12 @@
     "public_data",
     "starting_kit",
 ]
-PAGE_FIELDS = [
-    "title"
-]
+PAGE_FIELDS = ["title"]
 LEADERBOARD_FIELDS = [
-    'title',
-    'key',
-    'hidden',
-    'submission_rule',
-
+    "title",
+    "key",
+    "hidden",
+    "submission_rule",
     # For later
     # 'force_submission_to_leaderboard',
     # 'force_best_submission_to_leaderboard',
@@ -107,16 +110,18 @@
 ]
 
 COLUMN_FIELDS = [
-    'title',
-    'key',
-    'index',
-    'sorting',
-    'computation',
-    'computation_indexes',
-    'hidden',
-    'precision',
+    "title",
+    "key",
+    "index",
+    "sorting",
+    "computation",
+    "computation_indexes",
+    "hidden",
+    "precision",
 ]
-MAX_EXECUTION_TIME_LIMIT = int(os.environ.get('MAX_EXECUTION_TIME_LIMIT', 600))  # time limit of the default queue
+MAX_EXECUTION_TIME_LIMIT = int(
+    os.environ.get("MAX_EXECUTION_TIME_LIMIT", 600)
+)  # time limit of the default queue
 
 
 def _send_to_compute_worker(submission, is_scoring):
@@ -125,43 +130,51 @@ def _send_to_compute_worker(submission, is_scoring):
         "submissions_api_url": settings.SUBMISSIONS_API_URL,
         "secret": submission.secret,
         "docker_image": submission.phase.competition.docker_image,
-        "execution_time_limit": min(MAX_EXECUTION_TIME_LIMIT, submission.phase.execution_time_limit),
+        "execution_time_limit": min(
+            MAX_EXECUTION_TIME_LIMIT, submission.phase.execution_time_limit
+        ),
         "id": submission.pk,
         "is_scoring": is_scoring,
     }
 
-    if not submission.detailed_result.name and submission.phase.competition.enable_detailed_results:
-        submission.detailed_result.save('detailed_results.html', ContentFile(''.encode()))  # must encode here for GCS
-        submission.save(update_fields=['detailed_result'])
+    if (
+        not submission.detailed_result.name
+        and submission.phase.competition.enable_detailed_results
+    ):
+        submission.detailed_result.save(
+            "detailed_results.html", ContentFile("".encode())
+        )  # must encode here for GCS
+        submission.save(update_fields=["detailed_result"])
     if not submission.prediction_result.name:
-        submission.prediction_result.save('prediction_result.zip', ContentFile(''.encode()))  # must encode here for GCS
-        submission.save(update_fields=['prediction_result'])
+        submission.prediction_result.save(
+            "prediction_result.zip", ContentFile("".encode())
+        )  # must encode here for GCS
+        submission.save(update_fields=["prediction_result"])
     if not submission.scoring_result.name:
-        submission.scoring_result.save('scoring_result.zip', ContentFile(''.encode()))  # must encode here for GCS
-        submission.save(update_fields=['scoring_result'])
+        submission.scoring_result.save(
+            "scoring_result.zip", ContentFile("".encode())
+        )  # must encode here for GCS
+        submission.save(update_fields=["scoring_result"])
 
     submission = Submission.objects.get(id=submission.id)
     task = submission.task
 
     if not is_scoring:
-        run_args['prediction_result'] = make_url_sassy(
-            path=submission.prediction_result.name,
-            permission='w'
+        run_args["prediction_result"] = make_url_sassy(
+            path=submission.prediction_result.name, permission="w"
         )
     else:
         if submission.phase.competition.enable_detailed_results:
-            run_args['detailed_results_url'] = make_url_sassy(
+            run_args["detailed_results_url"] = make_url_sassy(
                 path=submission.detailed_result.name,
-                permission='w',
-                content_type='text/html'
+                permission="w",
+                content_type="text/html",
             )
-        run_args['prediction_result'] = make_url_sassy(
-            path=submission.prediction_result.name,
-            permission='r'
+        run_args["prediction_result"] = make_url_sassy(
+            path=submission.prediction_result.name, permission="r"
         )
-        run_args['scoring_result'] = make_url_sassy(
-            path=submission.scoring_result.name,
-            permission='w'
+        run_args["scoring_result"] = make_url_sassy(
+            path=submission.scoring_result.name, permission="w"
         )
 
     if task.ingestion_program:
@@ -169,12 +182,12 @@ def _send_to_compute_worker(submission, is_scoring):
             run_args['ingestion_program_data'] = make_url_sassy(task.ingestion_program.data_file.name)
 
     if task.input_data and (not is_scoring or task.ingestion_only_during_scoring):
-        run_args['input_data'] = make_url_sassy(task.input_data.data_file.name)
+        run_args["input_data"] = make_url_sassy(task.input_data.data_file.name)
 
     if is_scoring and task.reference_data:
-        run_args['reference_data'] = make_url_sassy(task.reference_data.data_file.name)
+        run_args["reference_data"] = make_url_sassy(task.reference_data.data_file.name)
 
-    run_args['ingestion_only_during_scoring'] = task.ingestion_only_during_scoring
+    run_args["ingestion_only_during_scoring"] = task.ingestion_only_during_scoring
 
     if is_scoring:
         run_args['scoring_program_data'] = make_url_sassy(path=task.scoring_program.data_file.name)
@@ -200,9 +213,13 @@ def _send_to_compute_worker(submission, is_scoring):
     time_padding = 60 * 20  # 20 minutes
     time_limit = submission.phase.execution_time_limit + time_padding
 
-    if submission.phase.competition.queue:  # if the competition is running on a custom queue, not the default queue
+    if (
+        submission.phase.competition.queue
+    ):  # if the competition is running on a custom queue, not the default queue
         submission.queue = submission.phase.competition.queue
-        run_args['execution_time_limit'] = submission.phase.execution_time_limit  # use the competition time limit
+        run_args["execution_time_limit"] = (
+            submission.phase.execution_time_limit
+        )  # use the competition time limit
         submission.save(update_fields=["queue"])
     if submission.status == Submission.SUBMITTING:
         # Don't want to mark an already-prepared submission as "submitted" again, so
@@ -217,20 +234,22 @@ def _enqueue_after_commit():
         if submission.phase.competition.queue:
             celery_app = app_or_default()
             with celery_app.connection() as new_connection:
-                new_connection.virtual_host = str(submission.phase.competition.queue.vhost)
+                new_connection.virtual_host = str(
+                    submission.phase.competition.queue.vhost
+                )
                 task = celery_app.send_task(
-                    'compute_worker_run',
+                    "compute_worker_run",
                     args=(run_args,),
-                    queue='compute-worker',
+                    queue="compute-worker",
                     soft_time_limit=time_limit,
                     connection=new_connection,
                     priority=priority,
                 )
         else:
             task = app.send_task(
-                'compute_worker_run',
+                "compute_worker_run",
                 args=(run_args,),
-                queue='compute-worker',
+                queue="compute-worker",
                 soft_time_limit=time_limit,
                 priority=priority,
             )
@@ -242,8 +261,12 @@ def _enqueue_after_commit():
 
 def create_detailed_output_file(detail_name, submission):
     # Detail logs like stdout/etc.
-    new_details = SubmissionDetails.objects.create(submission=submission, name=detail_name)
-    new_details.data_file.save(f'{detail_name}.txt', ContentFile(''.encode()))  # must encode here for GCS
+    new_details = SubmissionDetails.objects.create(
+        submission=submission, name=detail_name
+    )
+    new_details.data_file.save(
+        f"{detail_name}.txt", ContentFile("".encode())
+    )  # must encode here for GCS
     return make_url_sassy(new_details.data_file.name, permission="w")
 
 
@@ -254,47 +277,49 @@ def run_submission(submission_pk, tasks=None, is_scoring=False):
 
 def send_submission_message(submission, data):
     from channels.layers import get_channel_layer
+
     channel_layer = get_channel_layer()
     user = submission.owner
-    asyncio.get_event_loop().run_until_complete(channel_layer.group_send(f"submission_listening_{user.pk}", {
-        'type': 'submission.message',
-        'text': data,
-        'submission_id': submission.pk,
-    }))
+    asyncio.get_event_loop().run_until_complete(
+        channel_layer.group_send(
+            f"submission_listening_{user.pk}",
+            {
+                "type": "submission.message",
+                "text": data,
+                "submission_id": submission.pk,
+            },
+        )
+    )
 
 
 def send_parent_status(submission):
     """Helper function we can mock in tests, instead of having to do async mocks"""
-    send_submission_message(submission, {
-        "kind": "status_update",
-        "status": "Running"
-    })
+    send_submission_message(submission, {"kind": "status_update", "status": "Running"})
 
 
 def send_child_id(submission, child_id):
     """Helper function we can mock in tests, instead of having to do async mocks"""
-    send_submission_message(submission, {
-        "kind": "child_update",
-        "child_id": child_id
-    })
+    send_submission_message(submission, {"kind": "child_update", "child_id": child_id})
 
 
-@app.task(queue='site-worker', soft_time_limit=60)
+@app.task(queue="site-worker", soft_time_limit=60)
 def _run_submission(submission_pk, task_pks=None, is_scoring=False):
     """This function is wrapped so that when we run tests we can run this function not
     via celery"""
     select_models = (
-        'phase',
-        'phase__competition',
+        "phase",
+        "phase__competition",
     )
     prefetch_models = (
-        'details',
-        'phase__tasks__input_data',
-        'phase__tasks__reference_data',
-        'phase__tasks__scoring_program',
-        'phase__tasks__ingestion_program',
+        "details",
+        "phase__tasks__input_data",
+        "phase__tasks__reference_data",
+        "phase__tasks__scoring_program",
+        "phase__tasks__ingestion_program",
+    )
+    qs = Submission.objects.select_related(*select_models).prefetch_related(
+        *prefetch_models
     )
-    qs = Submission.objects.select_related(*select_models).prefetch_related(*prefetch_models)
     submission = qs.get(pk=submission_pk)
 
     if submission.is_specific_task_re_run:
@@ -305,7 +330,7 @@ def _run_submission(submission_pk, task_pks=None, is_scoring=False):
     else:
         tasks = submission.phase.tasks.filter(pk__in=task_pks)
 
-    tasks = tasks.order_by('pk')
+    tasks = tasks.order_by("pk")
 
     if len(tasks) > 1:
         # The initial submission object becomes the parent submission and we create children for each task
@@ -323,7 +348,7 @@ def _run_submission(submission_pk, task_pks=None, is_scoring=False):
                 participant=submission.participant,
                 parent=submission,
                 task=task,
-                fact_sheet_answers=submission.fact_sheet_answers
+                fact_sheet_answers=submission.fact_sheet_answers,
             )
             child_sub.save(ignore_submission_limit=True)
             _send_to_compute_worker(child_sub, is_scoring=False)
@@ -336,7 +361,7 @@ def _run_submission(submission_pk, task_pks=None, is_scoring=False):
         _send_to_compute_worker(submission, is_scoring)
 
 
-@app.task(queue='site-worker', soft_time_limit=60 * 60)  # 1 hour timeout
+@app.task(queue="site-worker", soft_time_limit=60 * 60)  # 1 hour timeout
 def unpack_competition(status_pk):
     logger.info(f"Starting unpack with status pk = {status_pk}")
     status = CompetitionCreationTaskStatus.objects.get(pk=status_pk)
@@ -357,8 +382,12 @@ def mark_status_as_failed_and_delete_dataset(competition_creation_status, detail
             # Extract bundle
             try:
                 with NamedTemporaryFile(mode="w+b") as temp_file:
-                    logger.info(f"Download competition bundle: {competition_dataset.data_file.name}")
-                    competition_bundle_url = make_url_sassy(competition_dataset.data_file.url)
+                    logger.info(
+                        f"Download competition bundle: {competition_dataset.data_file.name}"
+                    )
+                    competition_bundle_url = make_url_sassy(
+                        competition_dataset.data_file.url
+                    )
                     try:
                         with requests.get(competition_bundle_url, stream=True) as r:
                             r.raise_for_status()
@@ -366,12 +395,14 @@ def mark_status_as_failed_and_delete_dataset(competition_creation_status, detail
                                 temp_file.write(chunk)
                             r.close()
                     except requests.exceptions.RequestException as e:
-                        raise CompetitionUnpackingException(f"Failed to download bundle from storage: {e}")
+                        raise CompetitionUnpackingException(
+                            f"Failed to download bundle from storage: {e}"
+                        )
 
                     # seek back to the start of the tempfile after writing to it..
                     temp_file.seek(0)
 
-                    with zipfile.ZipFile(temp_file.name, 'r') as zip_pointer:
+                    with zipfile.ZipFile(temp_file.name, "r") as zip_pointer:
                         zip_pointer.extractall(temp_directory)
             except zipfile.BadZipFile:
                 raise CompetitionUnpackingException("Bad zip file uploaded.")
@@ -388,20 +419,24 @@ def mark_status_as_failed_and_delete_dataset(competition_creation_status, detail
                 with open(yaml_path) as f:
                     competition_yaml = yaml.safe_load(f.read())
             except yaml.YAMLError as e:
-                raise CompetitionUnpackingException(f"Error parsing competition.yaml: {e}")
+                raise CompetitionUnpackingException(
+                    f"Error parsing competition.yaml: {e}"
+                )
             except Exception as e:
-                raise CompetitionUnpackingException(f"Failed to read competition.yaml: {e}")
+                raise CompetitionUnpackingException(
+                    f"Failed to read competition.yaml: {e}"
+                )
 
-            yaml_version = str(competition_yaml.get('version', '1'))
+            yaml_version = str(competition_yaml.get("version", "1"))
 
             logger.info(f"The YAML version is: {yaml_version}")
-            if yaml_version in ['1', '1.5']:
+            if yaml_version in ["1", "1.5"]:
                 unpacker_class = V15Unpacker
-            elif yaml_version == '2':
+            elif yaml_version == "2":
                 unpacker_class = V2Unpacker
             else:
                 raise CompetitionUnpackingException(
-                    'A suitable version could not be found for this competition. Make sure one is supplied in the yaml.'
+                    "A suitable version could not be found for this competition. Make sure one is supplied in the yaml."
                 )
 
             unpacker = unpacker_class(
@@ -414,6 +449,7 @@ def mark_status_as_failed_and_delete_dataset(competition_creation_status, detail
             try:
                 competition = unpacker.save()
             except ValidationError as e:
+
                 def _get_error_string(error_dict):
                     """Helps us nicely print out a ValidationError"""
                     for key, errors in error_dict.items():
@@ -455,7 +491,7 @@ def _get_error_string(error_dict):
         mark_status_as_failed_and_delete_dataset(status, message)
 
 
-@app.task(queue='site-worker', soft_time_limit=60 * 10)
+@app.task(queue="site-worker", soft_time_limit=60 * 10)
 def create_competition_dump(competition_pk, keys_instead_of_files=False):
     yaml_data = {"version": "2"}
     try:
@@ -464,7 +500,7 @@ def create_competition_dump(competition_pk, keys_instead_of_files=False):
         logger.info(f"Finding competition {competition_pk}")
         comp = Competition.objects.get(pk=competition_pk)
         zip_buffer = BytesIO()
-        current_date_time = datetime.today().strftime('%Y-%m-%d %H:%M:%S')
+        current_date_time = datetime.today().strftime("%Y-%m-%d %H:%M:%S")
         zip_name = f"{comp.title}-{current_date_time}.zip"
         zip_file = zipfile.ZipFile(zip_buffer, "w")
 
@@ -472,14 +508,14 @@ def create_competition_dump(competition_pk, keys_instead_of_files=False):
         for field in COMPETITION_FIELDS:
             if hasattr(comp, field):
                 value = getattr(comp, field, "")
-                if field == 'queue' and value is not None:
+                if field == "queue" and value is not None:
                     value = str(value.vhost)
                 yaml_data[field] = value
         if comp.logo:
             logger.info("Checking logo")
             try:
-                yaml_data['image'] = re.sub(r'.*/', '', comp.logo.name)
-                zip_file.writestr(yaml_data['image'], comp.logo.read())
+                yaml_data["image"] = re.sub(r".*/", "", comp.logo.name)
+                zip_file.writestr(yaml_data["image"], comp.logo.read())
                 logger.info(f"Logo found for competition {comp.pk}")
             except OSError:
                 logger.warning(
@@ -488,25 +524,25 @@ def create_competition_dump(competition_pk, keys_instead_of_files=False):
 
         # -------- Competition Terms -------
         if comp.terms:
-            yaml_data['terms'] = 'terms.md'
-            zip_file.writestr('terms.md', comp.terms)
+            yaml_data["terms"] = "terms.md"
+            zip_file.writestr("terms.md", comp.terms)
 
         # -------- Competition Pages -------
-        yaml_data['pages'] = []
+        yaml_data["pages"] = []
         for page in comp.pages.all():
             temp_page_data = {}
             for field in PAGE_FIELDS:
                 if hasattr(page, field):
                     temp_page_data[field] = getattr(page, field, "")
             page_file_name = f"{slugify(page.title)}-{page.pk}.md"
-            temp_page_data['file'] = page_file_name
-            yaml_data['pages'].append(temp_page_data)
-            zip_file.writestr(temp_page_data['file'], page.content)
+            temp_page_data["file"] = page_file_name
+            yaml_data["pages"].append(temp_page_data)
+            zip_file.writestr(temp_page_data["file"], page.content)
 
         # -------- Competition Tasks/Solutions -------
 
-        yaml_data['tasks'] = []
-        yaml_data['solutions'] = []
+        yaml_data["tasks"] = []
+        yaml_data["solutions"] = []
 
         task_solution_pairs = {}
         tasks = [task for phase in comp.phases.all() for task in phase.tasks.all()]
@@ -517,23 +553,18 @@ def create_competition_dump(competition_pk, keys_instead_of_files=False):
         for index, task in enumerate(tasks):
 
             task_solution_pairs[task.id] = {
-                'index': index,
-                'solutions': {
-                    'ids': [],
-                    'indexes': []
-                }
+                "index": index,
+                "solutions": {"ids": [], "indexes": []},
             }
 
-            temp_task_data = {
-                'index': index
-            }
+            temp_task_data = {"index": index}
 
             for field in TASK_FIELDS:
                 data = getattr(task, field, "")
                 # If keys_instead of files is not true and field is key, then skip this filed
-                if not keys_instead_of_files and field == 'key':
+                if not keys_instead_of_files and field == "key":
                     continue
-                if field == 'key':
+                if field == "key":
                     data = str(data)
                 temp_task_data[field] = data
 
@@ -546,116 +577,136 @@ def create_competition_dump(competition_pk, keys_instead_of_files=False):
                                 temp_task_data[file_type] = str(temp_dataset.key)
                             else:
                                 try:
-                                    temp_task_data[file_type] = f"{file_type}-{task.pk}.zip"
-                                    zip_file.writestr(temp_task_data[file_type], temp_dataset.data_file.read())
+                                    temp_task_data[file_type] = (
+                                        f"{file_type}-{task.pk}.zip"
+                                    )
+                                    zip_file.writestr(
+                                        temp_task_data[file_type],
+                                        temp_dataset.data_file.read(),
+                                    )
                                 except OSError:
                                     logger.error(
                                         f"The file field is set, but no actual"
                                         f" file was found for dataset: {temp_dataset.pk} with name {temp_dataset.name}"
                                     )
                         else:
-                            logger.warning(f"Could not find data file for dataset object: {temp_dataset.pk}")
+                            logger.warning(
+                                f"Could not find data file for dataset object: {temp_dataset.pk}"
+                            )
             # Now for all of our solutions for the tasks, write those too
             for solution in task.solutions.all():
                 # for index_two, solution in enumerate(task.solutions.all()):
                 #     temp_index = index_two
                 # IF OUR SOLUTION WAS ALREADY ADDED
-                if solution.id in task_solution_pairs[task.id]['solutions']['ids']:
-                    for solution_data in yaml_data['solutions']:
-                        if solution_data['key'] == solution.key:
-                            solution_data['tasks'].append(task.id)
+                if solution.id in task_solution_pairs[task.id]["solutions"]["ids"]:
+                    for solution_data in yaml_data["solutions"]:
+                        if solution_data["key"] == solution.key:
+                            solution_data["tasks"].append(task.id)
                             break
                     break
                 # Else if our index is already taken
-                elif index_two in task_solution_pairs[task.id]['solutions']['indexes']:
+                elif index_two in task_solution_pairs[task.id]["solutions"]["indexes"]:
                     index_two += 1
-                task_solution_pairs[task.id]['solutions']['indexes'].append(index_two)
-                task_solution_pairs[task.id]['solutions']['ids'].append(solution.id)
+                task_solution_pairs[task.id]["solutions"]["indexes"].append(index_two)
+                task_solution_pairs[task.id]["solutions"]["ids"].append(solution.id)
 
-                temp_solution_data = {
-                    'index': index_two
-                }
+                temp_solution_data = {"index": index_two}
                 for field in SOLUTION_FIELDS:
                     if hasattr(solution, field):
                         data = getattr(solution, field, "")
-                        if field == 'key':
+                        if field == "key":
                             data = str(data)
                         temp_solution_data[field] = data
                 if solution.data:
-                    temp_dataset = getattr(solution, 'data')
+                    temp_dataset = getattr(solution, "data")
                     if temp_dataset:
                         if temp_dataset.data_file:
                             try:
-                                temp_solution_data['path'] = f"solution-{solution.pk}.zip"
-                                zip_file.writestr(temp_solution_data['path'], temp_dataset.data_file.read())
+                                temp_solution_data["path"] = (
+                                    f"solution-{solution.pk}.zip"
+                                )
+                                zip_file.writestr(
+                                    temp_solution_data["path"],
+                                    temp_dataset.data_file.read(),
+                                )
                             except OSError:
                                 logger.error(
                                     f"The file field is set, but no actual"
                                     f" file was found for dataset: {temp_dataset.pk} with name {temp_dataset.name}"
                                 )
                         else:
-                            logger.warning(f"Could not find data file for dataset object: {temp_dataset.pk}")
+                            logger.warning(
+                                f"Could not find data file for dataset object: {temp_dataset.pk}"
+                            )
                 # TODO: Make sure logic here is right. Needs to be outputted as a list, but what others can we tie to?
-                temp_solution_data['tasks'] = [index]
-                yaml_data['solutions'].append(temp_solution_data)
+                temp_solution_data["tasks"] = [index]
+                yaml_data["solutions"].append(temp_solution_data)
                 index_two += 1
             # End for loop for solutions; Append tasks data
-            yaml_data['tasks'].append(temp_task_data)
+            yaml_data["tasks"].append(temp_task_data)
 
         # -------- Competition Phases -------
 
-        yaml_data['phases'] = []
+        yaml_data["phases"] = []
         for phase in comp.phases.all():
             temp_phase_data = {}
             for field in PHASE_FIELDS:
                 if hasattr(phase, field):
-                    if field == 'start' or field == 'end':
+                    if field == "start" or field == "end":
                         temp_date = getattr(phase, field)
                         if not temp_date:
                             continue
                         temp_date = temp_date.strftime("%Y-%m-%d")
                         temp_phase_data[field] = temp_date
-                    elif field == 'max_submissions_per_person':
-                        temp_phase_data['max_submissions'] = getattr(phase, field)
+                    elif field == "max_submissions_per_person":
+                        temp_phase_data["max_submissions"] = getattr(phase, field)
                     else:
                         temp_phase_data[field] = getattr(phase, field, "")
-            task_indexes = [task_solution_pairs[task.id]['index'] for task in phase.tasks.all()]
-            temp_phase_data['tasks'] = task_indexes
+            task_indexes = [
+                task_solution_pairs[task.id]["index"] for task in phase.tasks.all()
+            ]
+            temp_phase_data["tasks"] = task_indexes
             temp_phase_solutions = []
             for task in phase.tasks.all():
-                temp_phase_solutions += task_solution_pairs[task.id]['solutions']['indexes']
-            temp_phase_data['solutions'] = temp_phase_solutions
-            yaml_data['phases'].append(temp_phase_data)
-        yaml_data['phases'] = sorted(yaml_data['phases'], key=lambda phase: phase['index'])
+                temp_phase_solutions += task_solution_pairs[task.id]["solutions"][
+                    "indexes"
+                ]
+            temp_phase_data["solutions"] = temp_phase_solutions
+            yaml_data["phases"].append(temp_phase_data)
+        yaml_data["phases"] = sorted(
+            yaml_data["phases"], key=lambda phase: phase["index"]
+        )
 
         # -------- Leaderboards -------
 
-        yaml_data['leaderboards'] = []
+        yaml_data["leaderboards"] = []
         # Have to grab leaderboards from phases
-        leaderboards = Leaderboard.objects.filter(id__in=comp.phases.all().values_list('leaderboard', flat=True))
+        leaderboards = Leaderboard.objects.filter(
+            id__in=comp.phases.all().values_list("leaderboard", flat=True)
+        )
         for index, leaderboard in enumerate(leaderboards):
-            ldb_data = {
-                'index': index
-            }
+            ldb_data = {"index": index}
             for field in LEADERBOARD_FIELDS:
                 if hasattr(leaderboard, field):
                     ldb_data[field] = getattr(leaderboard, field, "")
-            ldb_data['columns'] = []
+            ldb_data["columns"] = []
             for column in leaderboard.columns.all():
                 col_data = {}
                 for field in COLUMN_FIELDS:
                     if hasattr(column, field):
                         value = getattr(column, field, "")
-                        if field == 'computation_indexes' and value is not None:
-                            value = value.split(',')
+                        if field == "computation_indexes" and value is not None:
+                            value = value.split(",")
                         if value is not None:
                             col_data[field] = value
-                ldb_data['columns'].append(col_data)
-            yaml_data['leaderboards'].append(ldb_data)
+                ldb_data["columns"].append(col_data)
+            yaml_data["leaderboards"].append(ldb_data)
 
         # ------- Finalize --------
         logger.info(f"YAML data to be written is: {yaml_data}")
-        comp_yaml = yaml.safe_dump(yaml_data, default_flow_style=False, allow_unicode=True, encoding="utf-8")
+        comp_yaml = yaml.safe_dump(
+            yaml_data, default_flow_style=False, allow_unicode=True, encoding="utf-8"
+        )
         logger.info(f"YAML output: {comp_yaml}")
         zip_file.writestr("competition.yaml", comp_yaml)
         zip_file.close()
@@ -666,8 +717,8 @@ def create_competition_dump(competition_pk, keys_instead_of_files=False):
         temp_dataset_bundle = Data.objects.create(
             created_by=comp.created_by,
             name=f"{comp.title} Dump #{bundle_count} Created {current_date_time}",
-            type='competition_bundle',
-            description='Automatically created competition dump',
+            type="competition_bundle",
+            description="Automatically created competition dump",
             # 'data_file'=,
         )
         logger.info("Saving zip to Competition Bundle")
@@ -676,61 +727,74 @@ def create_competition_dump(competition_pk, keys_instead_of_files=False):
         temp_comp_dump = CompetitionDump.objects.create(
             dataset=temp_dataset_bundle,
             status="Finished",
-            details="Competition Bundle {0} for Competition {1}".format(temp_dataset_bundle.pk, comp.pk),
-            competition=comp
+            details="Competition Bundle {0} for Competition {1}".format(
+                temp_dataset_bundle.pk, comp.pk
+            ),
+            competition=comp,
+        )
+        logger.info(
+            f"Finished creating competition dump: {temp_comp_dump.pk} for competition: {comp.pk}"
         )
-        logger.info(f"Finished creating competition dump: {temp_comp_dump.pk} for competition: {comp.pk}")
     except ObjectDoesNotExist:
-        logger.error("Could not find competition with pk {} to create a competition dump".format(competition_pk))
+        logger.error(
+            "Could not find competition with pk {} to create a competition dump".format(
+                competition_pk
+            )
+        )
 
 
-@app.task(queue='site-worker', soft_time_limit=60 * 5)
+@app.task(queue="site-worker", soft_time_limit=60 * 5)
 def do_phase_migrations():
     # Update phase statuses
-    previous_subquery = Phase.objects.filter(
-        competition=OuterRef('competition'),
-        end__lte=now()
-    ).order_by('-index').values('index')[:1]
+    previous_subquery = (
+        Phase.objects.filter(competition=OuterRef("competition"), end__lte=now())
+        .order_by("-index")
+        .values("index")[:1]
+    )
 
     current_subquery = Phase.objects.filter(
-        competition=OuterRef('competition'),
+        competition=OuterRef("competition"),
         start__lte=now(),
         end__gt=now(),
-    ).values('index')[:1]
+    ).values("index")[:1]
 
-    next_subquery = Phase.objects.filter(
-        competition=OuterRef('competition'),
-        start__gt=now()
-    ).order_by('index').values('index')[:1]
+    next_subquery = (
+        Phase.objects.filter(competition=OuterRef("competition"), start__gt=now())
+        .order_by("index")
+        .values("index")[:1]
+    )
 
     Phase.objects.annotate(
         previous_index=Subquery(previous_subquery),
         current_index=Subquery(current_subquery),
         next_index=Subquery(next_subquery),
-    ).update(status=Case(
-        When(index=F('previous_index'), then=Value(Phase.PREVIOUS)),
-        When(index=F('current_index'), then=Value(Phase.CURRENT)),
-        When(index=F('next_index'), then=Value(Phase.NEXT)),
-        default=None
-    ))
+    ).update(
+        status=Case(
+            When(index=F("previous_index"), then=Value(Phase.PREVIOUS)),
+            When(index=F("current_index"), then=Value(Phase.CURRENT)),
+            When(index=F("next_index"), then=Value(Phase.NEXT)),
+            default=None,
+        )
+    )
 
     # Updating Competitions whose phases have finished migrating to `is_migrating=False`
-    completed_statuses = [Submission.FINISHED, Submission.FAILED, Submission.CANCELLED, Submission.NONE]
-
-    running_subs_query = Submission.objects.filter(
-        created_by_migration=OuterRef('pk')
-    ).exclude(
-        status__in=completed_statuses
-    ).values_list('pk')[:1]
+    completed_statuses = [
+        Submission.FINISHED,
+        Submission.FAILED,
+        Submission.CANCELLED,
+        Submission.NONE,
+    ]
+
+    running_subs_query = (
+        Submission.objects.filter(created_by_migration=OuterRef("pk"))
+        .exclude(status__in=completed_statuses)
+        .values_list("pk")[:1]
+    )
 
     Competition.objects.filter(
-        pk__in=Phase.objects.annotate(
-            running_subs=Count(Subquery(running_subs_query))
-        ).filter(
-            running_subs=0,
-            competition__is_migrating=True,
-            status=Phase.PREVIOUS
-        ).values_list('competition__pk', flat=True)
+        pk__in=Phase.objects.annotate(running_subs=Count(Subquery(running_subs_query)))
+        .filter(running_subs=0, competition__is_migrating=True, status=Phase.PREVIOUS)
+        .values_list("competition__pk", flat=True)
     ).update(is_migrating=False)
 
     # Checking for new phases to start migrating
@@ -738,7 +802,7 @@ def do_phase_migrations():
         auto_migrate_to_this_phase=True,
         start__lte=now(),
         competition__is_migrating=False,
-        has_been_migrated=False
+        has_been_migrated=False,
     )
 
     logger.info(f"Checking {len(new_phases)} phases for phase migrations.")
@@ -747,50 +811,70 @@ def do_phase_migrations():
         p.check_future_phase_submissions()
 
 
-@app.task(queue='site-worker', soft_time_limit=60 * 5)
+@app.task(queue="site-worker", soft_time_limit=60 * 5)
 def manual_migration(phase_id):
     try:
         source_phase = Phase.objects.get(id=phase_id)
     except Phase.DoesNotExist:
-        logger.error(f'Could not manually migrate phase with id: {phase_id}. Phase could not be found.')
+        logger.error(
+            f"Could not manually migrate phase with id: {phase_id}. Phase could not be found."
+        )
         return
 
     try:
-        destination_phase = source_phase.competition.phases.get(index=source_phase.index + 1)
+        destination_phase = source_phase.competition.phases.get(
+            index=source_phase.index + 1
+        )
     except Phase.DoesNotExist:
-        logger.error(f'Could not manually migrate phase with id: {phase_id}. The next phase could not be found.')
+        logger.error(
+            f"Could not manually migrate phase with id: {phase_id}. The next phase could not be found."
+        )
         return
-    destination_phase.competition.apply_phase_migration(source_phase, destination_phase, force_migration=True)
+    destination_phase.competition.apply_phase_migration(
+        source_phase, destination_phase, force_migration=True
+    )
 
 
-@app.task(queue='site-worker', soft_time_limit=60 * 5)
+@app.task(queue="site-worker", soft_time_limit=60 * 5)
 def batch_send_email(comp_id, content):
     try:
-        competition = Competition.objects.prefetch_related('participants__user').get(id=comp_id)
+        competition = Competition.objects.prefetch_related("participants__user").get(
+            id=comp_id
+        )
     except Competition.DoesNotExist:
-        logger.error(f'Not sending emails because competition with id {comp_id} could not be found')
+        logger.error(
+            f"Not sending emails because competition with id {comp_id} could not be found"
+        )
         return
 
     codalab_send_markdown_email(
-        subject=f'A message from the admins of {competition.title}',
+        subject=f"A message from the admins of {competition.title}",
         markdown_content=content,
-        recipient_list=[participant.user.email for participant in competition.participants.all()]
+        recipient_list=[
+            participant.user.email for participant in competition.participants.all()
+        ],
     )
 
 
-@app.task(queue='site-worker', soft_time_limit=60 * 5)
+@app.task(queue="site-worker", soft_time_limit=60 * 5)
 def update_phase_statuses():
-    competitions = Competition.objects.exclude(phases__in=Phase.objects.filter(is_final_phase=True, end__lt=now()))
+    competitions = Competition.objects.exclude(
+        phases__in=Phase.objects.filter(is_final_phase=True, end__lt=now())
+    )
     for comp in competitions:
         comp.update_phase_statuses()
 
 
-@app.task(queue='site-worker')
+@app.task(queue="site-worker")
 def submission_status_cleanup():
-    submissions = Submission.objects.filter(status=Submission.RUNNING, has_children=False).select_related('phase', 'parent')
+    submissions = Submission.objects.filter(
+        status=Submission.RUNNING, has_children=False
+    ).select_related("phase", "parent")
 
     for sub in submissions:
-        if sub.started_when < now() - timedelta(milliseconds=(3600000 * 24) + sub.phase.execution_time_limit):
+        if sub.started_when < now() - timedelta(
+            milliseconds=(3600000 * 24) + sub.phase.execution_time_limit
+        ):
             if sub.parent is not None:
                 sub.parent.cancel(status=Submission.FAILED)
             else:
diff --git a/src/celery_config.py b/src/celery_config.py
index 614052be7..30fda9b1c 100644
--- a/src/celery_config.py
+++ b/src/celery_config.py
@@ -44,10 +44,9 @@ def app_for_vhost(vhost):
     return _vhost_apps[vhost]
 
 
-
 app.conf.beat_schedule = {
     "refresh-compute-worker-health": {
         "task": "chemin.vers.refresh_compute_worker_health",
         "schedule": 5.0,
     },
-}
\ No newline at end of file
+}

From dff0a95b1a365bf37e2025cf2ef9a9c0f5c18949 Mon Sep 17 00:00:00 2001
From: Idir Chikhoune <idir.chikhoune@lisn.fr>
Date: Thu, 2 Apr 2026 17:06:04 +0200
Subject: [PATCH 05/20] fixing synthax and format

---
 src/apps/competitions/tasks.py | 10 ++--
 src/celery_config.py           |  7 ++-
 src/utils/consumers.py         | 87 ++++++++++++++++++----------------
 3 files changed, 57 insertions(+), 47 deletions(-)

diff --git a/src/apps/competitions/tasks.py b/src/apps/competitions/tasks.py
index 0e7b79759..9d9f9251a 100644
--- a/src/apps/competitions/tasks.py
+++ b/src/apps/competitions/tasks.py
@@ -3,15 +3,16 @@
 import re
 import traceback
 import zipfile
+import json
 from datetime import timedelta, datetime
-
+from django.conf import settings
 from io import BytesIO
 from tempfile import TemporaryDirectory, NamedTemporaryFile
 
 import oyaml as yaml
 import requests
 from celery._state import app_or_default
-from django.conf import settings
+from django_redis import get_redis_connection
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.files.base import ContentFile
 from django.db.models import Subquery, OuterRef, Count, Case, When, Value, F
@@ -39,9 +40,12 @@
 from utils.email import codalab_send_markdown_email
 
 import logging
-
 logger = logging.getLogger(__name__)
 
+r = get_redis_connection("default")
+WORKERS_REGISTRY_KEY = "compute_workers_registry"
+WORKER_HEARTBEAT_TTL = 35
+
 COMPETITION_FIELDS = [
     "title",
     "description",
diff --git a/src/celery_config.py b/src/celery_config.py
index 30fda9b1c..f15e7ee12 100644
--- a/src/celery_config.py
+++ b/src/celery_config.py
@@ -43,10 +43,9 @@ def app_for_vhost(vhost):
         _vhost_apps[vhost] = vhost_app
     return _vhost_apps[vhost]
 
-
 app.conf.beat_schedule = {
     "refresh-compute-worker-health": {
-        "task": "chemin.vers.refresh_compute_worker_health",
-        "schedule": 5.0,
+        "task": "apps.competitions.tasks.refresh_compute_worker_health",
+        "schedule": 3.0,
     },
-}
+}
\ No newline at end of file
diff --git a/src/utils/consumers.py b/src/utils/consumers.py
index 6d076bac9..7259e0a45 100644
--- a/src/utils/consumers.py
+++ b/src/utils/consumers.py
@@ -17,12 +17,6 @@
 
 
 def _load_snapshot(competition_queue_name=None):
-    """
-    Charge les workers depuis Redis.
-    - workers par défaut : toujours inclus (queue_source == 'default')
-    - workers privés : inclus uniquement si leur queue_source correspond
-      à la queue de la compétition courante
-    """
     raw = r.hgetall(WORKERS_REGISTRY_KEY)
     workers = []
     private_workers = []
@@ -50,7 +44,6 @@ def _load_snapshot(competition_queue_name=None):
 
 
 def _get_competition_queue_name(competition_id):
-    """Retourne le nom de la queue de la compétition, ou None."""
     if not competition_id:
         return None
     try:
@@ -61,14 +54,21 @@ def _get_competition_queue_name(competition_id):
         logger.warning("Competition %s not found or has no queue", competition_id)
     return None
 
+import logging
+
+logger = logging.getLogger(__name__)
+
 
 class ComputeWorkersConsumer(AsyncJsonWebsocketConsumer):
+    async def connect(self):
+        user = self.scope.get("user")
 
     async def connect(self):
         user = self.scope.get("user")
         if user is None or user.is_anonymous:
             await self.close()
             return
+
         await self.accept()
         await self.channel_layer.group_add("compute_workers", self.channel_name)
         self._competition_queue_name = None
@@ -78,29 +78,23 @@ async def connect(self):
 
     async def disconnect(self, close_code):
         self._running = False
-        await self.channel_layer.group_discard("compute_workers", self.channel_name)
         task = getattr(self, "_task", None)
         if task:
             task.cancel()
             try:
                 await task
-            except (asyncio.CancelledError, RuntimeError):
+            except asyncio.CancelledError:
                 pass
 
-    async def receive_json(self, content):
-        logger.debug("WebSocket received: %s", content)
-        if content.get("type") == "subscribe":
-            competition_id = content.get("competition_id")
-            self._competition_queue_name = await sync_to_async(_get_competition_queue_name)(
-                competition_id)
-            self._subscribed.set()
-
     async def _push_workers_loop(self):
         try:
-            try:
-                await asyncio.wait_for(self._subscribed.wait(), timeout=5.0)
-            except asyncio.TimeoutError:
-                logger.warning("WebSocket subscribe timeout, proceeding without competition filter")
+            stats = inspector.stats() or {}
+            active = inspector.active() or {}
+            reserved = inspector.reserved() or {}
+            active_queues = inspector.active_queues() or {}
+        except Exception:
+            logger.exception("Unable to inspect Celery workers")
+            return []
 
             while self._running:
                 workers, private_workers = await sync_to_async(_load_snapshot)(
@@ -120,23 +114,36 @@ async def _push_workers_loop(self):
         except asyncio.CancelledError:
             pass
 
-    async def worker_health(self, event):
-        worker = event["worker"]
-        is_default = worker.get("queue_source") == "default"
-        is_mine = (
-            self._competition_queue_name is not None
-            and worker.get("queue_source") == self._competition_queue_name
-        )
-        if not is_default and not is_mine:
-            return
-        try:
-            workers, private_workers = await sync_to_async(_load_snapshot)(
-                self._competition_queue_name
+        for worker_name in stats.keys():
+            queues = active_queues.get(worker_name, []) or []
+            queue_names = []
+
+            for q in queues:
+                if isinstance(q, dict) and q.get("name"):
+                    queue_names.append(q["name"])
+
+            is_compute_worker = (
+                "compute-worker" in queue_names
+                or worker_name.startswith("compute-worker")
+                or worker_name.startswith("CW")
             )
-            await self.send_json({
-                "type": "workers.snapshot",
-                "workers": workers,
-                "private_workers": private_workers,
-            })
-        except RuntimeError:
-            pass
+
+            if not is_compute_worker:
+                continue
+
+            running_jobs = (
+                len(active.get(worker_name, []))
+                + len(reserved.get(worker_name, []))
+            )
+            status = "busy" if running_jobs > 0 else "available"
+
+            workers.append(
+                {
+                    "hostname": worker_name,
+                    "status": status,
+                    "running_jobs": running_jobs,
+                    "timestamp": time.time(),
+                }
+            )
+
+        return workers

From cc7b8af967c944599c3342644c1b77bc4f3e1032 Mon Sep 17 00:00:00 2001
From: Idir Chikhoune <idir.chikhoune@lisn.fr>
Date: Wed, 27 May 2026 14:09:29 +0200
Subject: [PATCH 06/20] rebase on dev

---
 src/apps/competitions/tasks.py | 1 +
 src/celery_config.py           | 3 ++-
 src/utils/consumers.py         | 5 ++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/apps/competitions/tasks.py b/src/apps/competitions/tasks.py
index 9d9f9251a..bade6dc8f 100644
--- a/src/apps/competitions/tasks.py
+++ b/src/apps/competitions/tasks.py
@@ -40,6 +40,7 @@
 from utils.email import codalab_send_markdown_email
 
 import logging
+
 logger = logging.getLogger(__name__)
 
 r = get_redis_connection("default")
diff --git a/src/celery_config.py b/src/celery_config.py
index f15e7ee12..a4e3299f7 100644
--- a/src/celery_config.py
+++ b/src/celery_config.py
@@ -43,9 +43,10 @@ def app_for_vhost(vhost):
         _vhost_apps[vhost] = vhost_app
     return _vhost_apps[vhost]
 
+
 app.conf.beat_schedule = {
     "refresh-compute-worker-health": {
         "task": "apps.competitions.tasks.refresh_compute_worker_health",
         "schedule": 3.0,
     },
-}
\ No newline at end of file
+}
diff --git a/src/utils/consumers.py b/src/utils/consumers.py
index 7259e0a45..9b1726659 100644
--- a/src/utils/consumers.py
+++ b/src/utils/consumers.py
@@ -131,9 +131,8 @@ async def _push_workers_loop(self):
             if not is_compute_worker:
                 continue
 
-            running_jobs = (
-                len(active.get(worker_name, []))
-                + len(reserved.get(worker_name, []))
+            running_jobs = len(active.get(worker_name, [])) + len(
+                reserved.get(worker_name, [])
             )
             status = "busy" if running_jobs > 0 else "available"
 

From 824f8aebb3b791ef938afc24c08507e1c82ff1ce Mon Sep 17 00:00:00 2001
From: Idir Chikhoune <idir.chikhoune@lisn.fr>
Date: Wed, 27 May 2026 14:13:26 +0200
Subject: [PATCH 07/20] clean feature

---
 src/apps/competitions/tasks.py |   6 --
 src/utils/consumers.py         | 111 +++++++++------------------------
 2 files changed, 29 insertions(+), 88 deletions(-)

diff --git a/src/apps/competitions/tasks.py b/src/apps/competitions/tasks.py
index bade6dc8f..bf2a93496 100644
--- a/src/apps/competitions/tasks.py
+++ b/src/apps/competitions/tasks.py
@@ -3,7 +3,6 @@
 import re
 import traceback
 import zipfile
-import json
 from datetime import timedelta, datetime
 from django.conf import settings
 from io import BytesIO
@@ -12,7 +11,6 @@
 import oyaml as yaml
 import requests
 from celery._state import app_or_default
-from django_redis import get_redis_connection
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.files.base import ContentFile
 from django.db.models import Subquery, OuterRef, Count, Case, When, Value, F
@@ -43,10 +41,6 @@
 
 logger = logging.getLogger(__name__)
 
-r = get_redis_connection("default")
-WORKERS_REGISTRY_KEY = "compute_workers_registry"
-WORKER_HEARTBEAT_TTL = 35
-
 COMPETITION_FIELDS = [
     "title",
     "description",
diff --git a/src/utils/consumers.py b/src/utils/consumers.py
index 9b1726659..b3a4edbc6 100644
--- a/src/utils/consumers.py
+++ b/src/utils/consumers.py
@@ -1,52 +1,19 @@
 import asyncio
-import json
 import logging
-import time
-
-from competitions.models import Competition
 
 from asgiref.sync import sync_to_async
 from channels.generic.websocket import AsyncJsonWebsocketConsumer
-from django_redis import get_redis_connection
 
-from utils.worker_utils import WORKER_HEARTBEAT_TTL, WORKERS_REGISTRY_KEY
+from utils.worker_utils import fetch_compute_workers
 
 logger = logging.getLogger(__name__)
 
-r = get_redis_connection("default")
-
-
-def _load_snapshot(competition_queue_name=None):
-    raw = r.hgetall(WORKERS_REGISTRY_KEY)
-    workers = []
-    private_workers = []
-    now = time.time()
-
-    for _, value in raw.items():
-        try:
-            worker = json.loads(value)
-        except Exception:
-            continue
-
-        if now - worker.get("last_seen", 0) > WORKER_HEARTBEAT_TTL:
-            continue
-
-        if worker.get("queue_source") == "default":
-            workers.append(worker)
-        else:
-            # Worker privé : n'afficher que si la queue correspond à la compétition
-            if competition_queue_name and worker.get("queue_source") == competition_queue_name:
-                private_workers.append(worker)
-
-    workers.sort(key=lambda x: x.get("hostname", ""))
-    private_workers.sort(key=lambda x: (x.get("queue_source", ""), x.get("hostname", "")))
-    return workers, private_workers
-
 
 def _get_competition_queue_name(competition_id):
     if not competition_id:
         return None
     try:
+        from competitions.models import Competition
         competition = Competition.objects.select_related("queue").get(pk=competition_id)
         if competition.queue and competition.queue.name:
             return competition.queue.name
@@ -54,21 +21,28 @@ def _get_competition_queue_name(competition_id):
         logger.warning("Competition %s not found or has no queue", competition_id)
     return None
 
-import logging
 
-logger = logging.getLogger(__name__)
+def _load_snapshot(competition_queue_name=None):
+    workers, private_workers = fetch_compute_workers()
+
+    if competition_queue_name is not None:
+        private_workers = [
+            w for w in private_workers
+            if w.get("queue_source") == competition_queue_name
+        ]
+    else:
+        private_workers = []
+
+    return workers, private_workers
 
 
 class ComputeWorkersConsumer(AsyncJsonWebsocketConsumer):
-    async def connect(self):
-        user = self.scope.get("user")
 
     async def connect(self):
         user = self.scope.get("user")
         if user is None or user.is_anonymous:
             await self.close()
             return
-
         await self.accept()
         await self.channel_layer.group_add("compute_workers", self.channel_name)
         self._competition_queue_name = None
@@ -78,23 +52,29 @@ async def connect(self):
 
     async def disconnect(self, close_code):
         self._running = False
+        await self.channel_layer.group_discard("compute_workers", self.channel_name)
         task = getattr(self, "_task", None)
         if task:
             task.cancel()
             try:
                 await task
-            except asyncio.CancelledError:
+            except (asyncio.CancelledError, RuntimeError):
                 pass
 
+    async def receive_json(self, content):
+        if content.get("type") == "subscribe":
+            competition_id = content.get("competition_id")
+            self._competition_queue_name = await sync_to_async(
+                _get_competition_queue_name
+            )(competition_id)
+            self._subscribed.set()
+
     async def _push_workers_loop(self):
         try:
-            stats = inspector.stats() or {}
-            active = inspector.active() or {}
-            reserved = inspector.reserved() or {}
-            active_queues = inspector.active_queues() or {}
-        except Exception:
-            logger.exception("Unable to inspect Celery workers")
-            return []
+            try:
+                await asyncio.wait_for(self._subscribed.wait(), timeout=5.0)
+            except asyncio.TimeoutError:
+                logger.warning("WebSocket subscribe timeout, no competition filter applied")
 
             while self._running:
                 workers, private_workers = await sync_to_async(_load_snapshot)(
@@ -112,37 +92,4 @@ async def _push_workers_loop(self):
                     break
                 await asyncio.sleep(3)
         except asyncio.CancelledError:
-            pass
-
-        for worker_name in stats.keys():
-            queues = active_queues.get(worker_name, []) or []
-            queue_names = []
-
-            for q in queues:
-                if isinstance(q, dict) and q.get("name"):
-                    queue_names.append(q["name"])
-
-            is_compute_worker = (
-                "compute-worker" in queue_names
-                or worker_name.startswith("compute-worker")
-                or worker_name.startswith("CW")
-            )
-
-            if not is_compute_worker:
-                continue
-
-            running_jobs = len(active.get(worker_name, [])) + len(
-                reserved.get(worker_name, [])
-            )
-            status = "busy" if running_jobs > 0 else "available"
-
-            workers.append(
-                {
-                    "hostname": worker_name,
-                    "status": status,
-                    "running_jobs": running_jobs,
-                    "timestamp": time.time(),
-                }
-            )
-
-        return workers
+            pass
\ No newline at end of file

From 11d944bd8cb87c579a989bc51f3a0f2da9921438 Mon Sep 17 00:00:00 2001
From: Idir Chikhoune <idir.chikhoune@lisn.fr>
Date: Wed, 27 May 2026 14:15:53 +0200
Subject: [PATCH 08/20] git rebase continue

---
 src/apps/competitions/tasks.py | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/apps/competitions/tasks.py b/src/apps/competitions/tasks.py
index bf2a93496..65cbd9772 100644
--- a/src/apps/competitions/tasks.py
+++ b/src/apps/competitions/tasks.py
@@ -1,4 +1,5 @@
 import asyncio
+import logging
 import os
 import re
 import traceback
@@ -6,34 +7,35 @@
 from datetime import timedelta, datetime
 from django.conf import settings
 from io import BytesIO
-from tempfile import TemporaryDirectory, NamedTemporaryFile
+from tempfile import NamedTemporaryFile, TemporaryDirectory
 
 import oyaml as yaml
 import requests
 from celery._state import app_or_default
-from django.core.exceptions import ObjectDoesNotExist
-from django.core.files.base import ContentFile
-from django.db.models import Subquery, OuterRef, Count, Case, When, Value, F
-from django.db import transaction
-from django.utils.text import slugify
-from django.utils.timezone import now
-from rest_framework.exceptions import ValidationError
-
-from celery_config import app
 from competitions.models import (
-    Submission,
-    CompetitionCreationTaskStatus,
-    SubmissionDetails,
     Competition,
+    CompetitionCreationTaskStatus,
     CompetitionDump,
     Phase,
+    Submission,
+    SubmissionDetails,
 )
 from competitions.unpackers.utils import CompetitionUnpackingException
 from competitions.unpackers.v1 import V15Unpacker
 from competitions.unpackers.v2 import V2Unpacker
+from datasets.models import Data
+from django.conf import settings
+from django.core.exceptions import ObjectDoesNotExist
+from django.core.files.base import ContentFile
+from django.db import transaction
+from django.db.models import Case, Count, F, OuterRef, Subquery, Value, When
+from django.utils.text import slugify
+from django.utils.timezone import now
 from leaderboards.models import Leaderboard
+from rest_framework.exceptions import ValidationError
 from tasks.models import Task
-from datasets.models import Data
+
+from celery_config import app
 from utils.data import make_url_sassy
 from utils.email import codalab_send_markdown_email
 

From 8fdacf366b39d201294747be68c143e65076d1ef Mon Sep 17 00:00:00 2001
From: Idir Chikhoune <idir.chikhoune@lisn.fr>
Date: Tue, 7 Apr 2026 15:58:47 +0200
Subject: [PATCH 09/20] feature in progress

---
 src/static/riot/competitions/detail/detail.tag | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/static/riot/competitions/detail/detail.tag b/src/static/riot/competitions/detail/detail.tag
index abbf42743..9753ee753 100644
--- a/src/static/riot/competitions/detail/detail.tag
+++ b/src/static/riot/competitions/detail/detail.tag
@@ -23,6 +23,8 @@
                         <i class="server icon"></i>
                         <div class="workers-title-text">
                             Compute Workers
+                            </br>
+                            <small><small><small>displayed only for competition organizers</small></small></small>
                             <div class="workers-subtitle">
                                 <span class="workers-connection { wsState }">{ connectionLabel() }</span>
                                 <span class="workers-separator">•</span>
@@ -475,10 +477,10 @@
         }
 
         .workers-toggle-btn
-            z-index 0
-            position fixed
-            top 74px
-            right 24px
+            z-index 10
+            position relative
+            top 150%
+            right 1%
             background #576671 !important
             color white !important
             

From e1004d61ad9acd1675dc821859bbf02de1db9057 Mon Sep 17 00:00:00 2001
From: Idir Chikhoune <idir.chikhoune@lisn.fr>
Date: Wed, 27 May 2026 14:17:13 +0200
Subject: [PATCH 10/20] git rebase continue

---
 .../riot/competitions/detail/_header.tag      |  5 +--
 .../riot/competitions/detail/detail.tag       |  8 ++---
 .../detail/worker-monitor-toggle.tag          | 31 ++++++++++++++++++-
 3 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/src/static/riot/competitions/detail/_header.tag b/src/static/riot/competitions/detail/_header.tag
index f572fa959..6b26edb24 100644
--- a/src/static/riot/competitions/detail/_header.tag
+++ b/src/static/riot/competitions/detail/_header.tag
@@ -36,13 +36,10 @@
                             Migrate
                         </button>
 
-                        <!--
                         <worker-monitor-toggle
                             if="{competition.admin}"
-                            can_view_workers_panel="true"
-                            competition_id="{ competition.id }">
+                            can_view_workers_panel="true">
                         </worker-monitor-toggle>
-                        -->
 
                     </div>
                     <div class="row">
diff --git a/src/static/riot/competitions/detail/detail.tag b/src/static/riot/competitions/detail/detail.tag
index 9753ee753..7bed78b29 100644
--- a/src/static/riot/competitions/detail/detail.tag
+++ b/src/static/riot/competitions/detail/detail.tag
@@ -71,7 +71,7 @@
                                     <span class="ui tiny label worker-status { getStatusClass(worker) }">
                                         <i class="{ getStatusIcon(worker) } icon"></i>
                                         { getStatusText(worker) }
-                            return        </span>
+                                    </span>
                                 </td>
                                 <td><span class="ui circular label">{ worker.running_jobs || 0 }</span></td>
                                 <td>{ formatLastSeen(worker.timestamp) }</td>
@@ -479,8 +479,8 @@
         .workers-toggle-btn
             z-index 10
             position relative
-            top 150%
-            right 1%
+            top 10%
+            right 100vh
             background #576671 !important
             color white !important
             
@@ -645,4 +645,4 @@
             }
         }
     </style>
-</competition-detail>
+</competition-detail>
\ No newline at end of file
diff --git a/src/static/riot/competitions/detail/worker-monitor-toggle.tag b/src/static/riot/competitions/detail/worker-monitor-toggle.tag
index d31b64e2e..9f5af52de 100644
--- a/src/static/riot/competitions/detail/worker-monitor-toggle.tag
+++ b/src/static/riot/competitions/detail/worker-monitor-toggle.tag
@@ -46,12 +46,18 @@
             </div>
 
             <div class="workers-section">
+<<<<<<< HEAD
                 <div class="workers-section-title workers-section-header" onclick="{ toggleDefaultWorkers }">
                     <span>Default compute workers</span>
 
                     <i class="dropdown icon workers-collapse-icon { showDefaultWorkers ? 'open' : '' }"></i>
                 </div>
                 <div class="workers-table-wrap" if="{ showDefaultWorkers }">
+=======
+                <div class="workers-section-title">Default compute workers</div>
+
+                <div class="workers-table-wrap">
+>>>>>>> a2f07695 (new file for monitoring implentation imported into frontend)
                     <table class="ui very compact selectable striped table workers-table">
                         <thead>
                             <tr>
@@ -95,7 +101,12 @@
                     <table class="ui very compact selectable striped table workers-table">
                         <thead>
                             <tr>
+<<<<<<< HEAD
                                 <th>Worker</th>
+=======
+                                <th>Competition</th>
+                                <th>Queue</th>
+>>>>>>> a2f07695 (new file for monitoring implentation imported into frontend)
                                 <th>Status</th>
                                 <th>Jobs</th>
                                 <th>Last seen</th>
@@ -136,13 +147,19 @@
         self.wsReconnectTimer = null
         self.wsState = 'disconnected'
         self.lastSyncAt = null
+<<<<<<< HEAD
         self.showDefaultWorkers = true
+=======
+>>>>>>> a2f07695 (new file for monitoring implentation imported into frontend)
 
         self.canViewWorkersPanel =
             String(self.opts.can_view_workers_panel || 'false') === 'true'
 
+<<<<<<< HEAD
         self.competitionId = parseInt(self.opts.competition_id) || null
 
+=======
+>>>>>>> a2f07695 (new file for monitoring implentation imported into frontend)
         self.showWorkersPanel = false
         self.panelLeft = 24
         self.panelTop = 24
@@ -154,7 +171,6 @@
 
         self.toggleWorkersPanel = function () {
             self.showWorkersPanel = !self.showWorkersPanel
-            //   here, we make sure the network is not used when the pannel is closed
             if (self.showWorkersPanel) {
                 self.loadPanelPosition()
                 self.connect_workers_socket()
@@ -188,7 +204,11 @@
                 } catch (e) {}
                 self.ws = null
             }
+<<<<<<< HEAD
             var competitionId = parseInt(self.opts.competition_id) || null
+=======
+
+>>>>>>> a2f07695 (new file for monitoring implentation imported into frontend)
             var scheme = window.location.protocol === 'https:' ? 'wss' : 'ws'
             var url = scheme + '://' + window.location.host + '/ws/workers/'
 
@@ -199,12 +219,18 @@
 
             self.ws.onopen = function () {
                 self.wsState = 'connected'
+<<<<<<< HEAD
                 if (self.competitionId) {
                     var msg = JSON.stringify({ type: 'subscribe', competition_id: self.competitionId })
                     self.ws.send(msg)
                 }
                 self.update()
             }
+=======
+                self.update()
+            }
+
+>>>>>>> a2f07695 (new file for monitoring implentation imported into frontend)
             self.ws.onmessage = function (event) {
                 var message = null
 
@@ -375,11 +401,14 @@
             return 'red'
         }
 
+<<<<<<< HEAD
         self.toggleDefaultWorkers = function () {
             self.showDefaultWorkers = !self.showDefaultWorkers
             self.update()
         }
 
+=======
+>>>>>>> a2f07695 (new file for monitoring implentation imported into frontend)
         self.getStatusIcon = function (worker) {
             if (self.displayStatus(worker) === 'available') return 'check circle'
             if (self.displayStatus(worker) === 'busy') return 'clock'

From 597c8aab2a9960d21e8a9205751198013d55e8ac Mon Sep 17 00:00:00 2001
From: Idir Chikhoune <idir.chikhoune@lisn.fr>
Date: Wed, 27 May 2026 14:18:42 +0200
Subject: [PATCH 11/20] git rebase continue

---
 src/apps/competitions/tasks.py | 1 +
 src/utils/consumers.py         | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/apps/competitions/tasks.py b/src/apps/competitions/tasks.py
index 65cbd9772..0aeb38d8a 100644
--- a/src/apps/competitions/tasks.py
+++ b/src/apps/competitions/tasks.py
@@ -36,6 +36,7 @@
 from tasks.models import Task
 
 from celery_config import app
+from utils.consumers import _extract_queue_names, _is_compute_worker, _known_compute_queue_names
 from utils.data import make_url_sassy
 from utils.email import codalab_send_markdown_email
 
diff --git a/src/utils/consumers.py b/src/utils/consumers.py
index b3a4edbc6..c3515c0a7 100644
--- a/src/utils/consumers.py
+++ b/src/utils/consumers.py
@@ -3,6 +3,7 @@
 
 from asgiref.sync import sync_to_async
 from channels.generic.websocket import AsyncJsonWebsocketConsumer
+from queues.models import Queue
 
 from utils.worker_utils import fetch_compute_workers
 
@@ -92,4 +93,4 @@ async def _push_workers_loop(self):
                     break
                 await asyncio.sleep(3)
         except asyncio.CancelledError:
-            pass
\ No newline at end of file
+            pass

From d7978a66ea7bac8f7e42ca3f6875b2f7797352db Mon Sep 17 00:00:00 2001
From: Idir Chikhoune <idir.chikhoune@lisn.fr>
Date: Thu, 7 May 2026 14:56:27 +0200
Subject: [PATCH 12/20] compute worker monitoring on private queues (amazing
 stuff)

---
 src/apps/competitions/tasks.py |  7 +++++++
 src/utils/consumers.py         | 27 +++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/src/apps/competitions/tasks.py b/src/apps/competitions/tasks.py
index 0aeb38d8a..1ec015b31 100644
--- a/src/apps/competitions/tasks.py
+++ b/src/apps/competitions/tasks.py
@@ -1,6 +1,7 @@
 import asyncio
 import logging
 import os
+from queue import Queue
 import re
 import traceback
 import zipfile
@@ -42,7 +43,13 @@
 
 import logging
 
+<<<<<<< HEAD
 logger = logging.getLogger(__name__)
+=======
+r = get_redis_connection("default")
+WORKERS_REGISTRY_KEY = "workers:registry"
+WORKER_HEARTBEAT_TTL = 35
+>>>>>>> b7de9241 (compute worker monitoring on private queues (amazing stuff))
 
 COMPETITION_FIELDS = [
     "title",
diff --git a/src/utils/consumers.py b/src/utils/consumers.py
index c3515c0a7..70ed53b42 100644
--- a/src/utils/consumers.py
+++ b/src/utils/consumers.py
@@ -37,6 +37,31 @@ def _load_snapshot(competition_queue_name=None):
     return workers, private_workers
 
 
+def _get_broker_host(broker_url):
+    if not broker_url or "@" not in broker_url:
+        return None
+    try:
+        return broker_url.split("@", 1)[1].split("/", 1)[0].split(":", 1)[0]
+    except Exception:
+        return None
+
+
+def _resolve_broker_url(celery_app, broker_url):
+    if not broker_url:
+        return broker_url
+
+    if "@localhost:" not in broker_url:
+        return broker_url
+
+    default_broker = getattr(celery_app.conf, "broker_url", None)
+    default_host = _get_broker_host(default_broker)
+
+    if not default_host or default_host == "localhost":
+        return broker_url
+
+    return broker_url.replace("@localhost:", f"@{default_host}:")
+
+
 class ComputeWorkersConsumer(AsyncJsonWebsocketConsumer):
 
     async def connect(self):
@@ -61,6 +86,8 @@ async def disconnect(self, close_code):
                 await task
             except (asyncio.CancelledError, RuntimeError):
                 pass
+            except RuntimeError:
+                pass
 
     async def receive_json(self, content):
         if content.get("type") == "subscribe":

From db3da1312a6b2920d7404fa8665cf7713dc8cec6 Mon Sep 17 00:00:00 2001
From: Idir Chikhoune <idir.chikhoune@lisn.fr>
Date: Thu, 7 May 2026 15:57:00 +0200
Subject: [PATCH 13/20] test number 245

---
 src/utils/consumers.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/utils/consumers.py b/src/utils/consumers.py
index 70ed53b42..c20bf14fd 100644
--- a/src/utils/consumers.py
+++ b/src/utils/consumers.py
@@ -3,6 +3,7 @@
 
 from asgiref.sync import sync_to_async
 from channels.generic.websocket import AsyncJsonWebsocketConsumer
+from kombu import Connection
 from queues.models import Queue
 
 from utils.worker_utils import fetch_compute_workers

From 56907d1ce6df937cc0c118a890650a1679f52538 Mon Sep 17 00:00:00 2001
From: Idir Chikhoune <idir.chikhoune@lisn.fr>
Date: Wed, 27 May 2026 14:22:00 +0200
Subject: [PATCH 14/20] git rebase continue

---
 src/utils/consumers.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/utils/consumers.py b/src/utils/consumers.py
index c20bf14fd..00883a407 100644
--- a/src/utils/consumers.py
+++ b/src/utils/consumers.py
@@ -1,10 +1,12 @@
 import asyncio
 import logging
 
+import urllib
+
 from asgiref.sync import sync_to_async
 from channels.generic.websocket import AsyncJsonWebsocketConsumer
-from kombu import Connection
 from queues.models import Queue
+from celery_config import app as celery_app, app_for_vhost
 
 from utils.worker_utils import fetch_compute_workers
 

From 2607beabd60fea8d1897cc8b2623cec115b8048f Mon Sep 17 00:00:00 2001
From: Idir Chikhoune <idir.chikhoune@lisn.fr>
Date: Wed, 27 May 2026 16:27:45 +0200
Subject: [PATCH 15/20] rebase and fix incoming

---
 src/apps/competitions/tasks.py |   7 ---
 src/utils/consumers.py         | 111 ++++++++++++++++++---------------
 2 files changed, 60 insertions(+), 58 deletions(-)

diff --git a/src/apps/competitions/tasks.py b/src/apps/competitions/tasks.py
index 1ec015b31..5c88b1163 100644
--- a/src/apps/competitions/tasks.py
+++ b/src/apps/competitions/tasks.py
@@ -37,19 +37,12 @@
 from tasks.models import Task
 
 from celery_config import app
-from utils.consumers import _extract_queue_names, _is_compute_worker, _known_compute_queue_names
 from utils.data import make_url_sassy
 from utils.email import codalab_send_markdown_email
 
 import logging
 
-<<<<<<< HEAD
 logger = logging.getLogger(__name__)
-=======
-r = get_redis_connection("default")
-WORKERS_REGISTRY_KEY = "workers:registry"
-WORKER_HEARTBEAT_TTL = 35
->>>>>>> b7de9241 (compute worker monitoring on private queues (amazing stuff))
 
 COMPETITION_FIELDS = [
     "title",
diff --git a/src/utils/consumers.py b/src/utils/consumers.py
index 00883a407..4c298494a 100644
--- a/src/utils/consumers.py
+++ b/src/utils/consumers.py
@@ -1,68 +1,58 @@
 import asyncio
+import json
 import logging
+import time
 
-import urllib
+from competitions.models import Competition
 
 from asgiref.sync import sync_to_async
 from channels.generic.websocket import AsyncJsonWebsocketConsumer
-from queues.models import Queue
-from celery_config import app as celery_app, app_for_vhost
+from django_redis import get_redis_connection
 
-from utils.worker_utils import fetch_compute_workers
+from utils.worker_utils import WORKER_HEARTBEAT_TTL, WORKERS_REGISTRY_KEY
 
 logger = logging.getLogger(__name__)
 
-
-def _get_competition_queue_name(competition_id):
-    if not competition_id:
-        return None
-    try:
-        from competitions.models import Competition
-        competition = Competition.objects.select_related("queue").get(pk=competition_id)
-        if competition.queue and competition.queue.name:
-            return competition.queue.name
-    except Exception:
-        logger.warning("Competition %s not found or has no queue", competition_id)
-    return None
+r = get_redis_connection("default")
 
 
 def _load_snapshot(competition_queue_name=None):
-    workers, private_workers = fetch_compute_workers()
-
-    if competition_queue_name is not None:
-        private_workers = [
-            w for w in private_workers
-            if w.get("queue_source") == competition_queue_name
-        ]
-    else:
-        private_workers = []
+    raw = r.hgetall(WORKERS_REGISTRY_KEY)
+    workers = []
+    private_workers = []
+    now = time.time()
 
+    for _, value in raw.items():
+        try:
+            worker = json.loads(value)
+        except Exception:
+            continue
+
+        if now - worker.get("last_seen", 0) > WORKER_HEARTBEAT_TTL:
+            continue
+
+        if worker.get("queue_source") == "default":
+            workers.append(worker)
+        else:
+            # Worker privé : n'afficher que si la queue correspond à la compétition
+            if competition_queue_name and worker.get("queue_source") == competition_queue_name:
+                private_workers.append(worker)
+
+    workers.sort(key=lambda x: x.get("hostname", ""))
+    private_workers.sort(key=lambda x: (x.get("queue_source", ""), x.get("hostname", "")))
     return workers, private_workers
 
 
-def _get_broker_host(broker_url):
-    if not broker_url or "@" not in broker_url:
+def _get_competition_queue_name(competition_id):
+    if not competition_id:
         return None
     try:
-        return broker_url.split("@", 1)[1].split("/", 1)[0].split(":", 1)[0]
+        competition = Competition.objects.select_related("queue").get(pk=competition_id)
+        if competition.queue and competition.queue.name:    
+            return competition.queue.name
     except Exception:
-        return None
-
-
-def _resolve_broker_url(celery_app, broker_url):
-    if not broker_url:
-        return broker_url
-
-    if "@localhost:" not in broker_url:
-        return broker_url
-
-    default_broker = getattr(celery_app.conf, "broker_url", None)
-    default_host = _get_broker_host(default_broker)
-
-    if not default_host or default_host == "localhost":
-        return broker_url
-
-    return broker_url.replace("@localhost:", f"@{default_host}:")
+        logger.warning("Competition %s not found or has no queue", competition_id)
+    return None
 
 
 class ComputeWorkersConsumer(AsyncJsonWebsocketConsumer):
@@ -89,15 +79,13 @@ async def disconnect(self, close_code):
                 await task
             except (asyncio.CancelledError, RuntimeError):
                 pass
-            except RuntimeError:
-                pass
 
     async def receive_json(self, content):
+        logger.debug("WebSocket received: %s", content)
         if content.get("type") == "subscribe":
             competition_id = content.get("competition_id")
-            self._competition_queue_name = await sync_to_async(
-                _get_competition_queue_name
-            )(competition_id)
+            self._competition_queue_name = await sync_to_async(_get_competition_queue_name)(
+                competition_id)
             self._subscribed.set()
 
     async def _push_workers_loop(self):
@@ -105,7 +93,7 @@ async def _push_workers_loop(self):
             try:
                 await asyncio.wait_for(self._subscribed.wait(), timeout=5.0)
             except asyncio.TimeoutError:
-                logger.warning("WebSocket subscribe timeout, no competition filter applied")
+                logger.warning("WebSocket subscribe timeout, proceeding without competition filter")
 
             while self._running:
                 workers, private_workers = await sync_to_async(_load_snapshot)(
@@ -124,3 +112,24 @@ async def _push_workers_loop(self):
                 await asyncio.sleep(3)
         except asyncio.CancelledError:
             pass
+
+    async def worker_health(self, event):
+        worker = event["worker"]
+        is_default = worker.get("queue_source") == "default"
+        is_mine = (
+            self._competition_queue_name is not None
+            and worker.get("queue_source") == self._competition_queue_name
+        )
+        if not is_default and not is_mine:
+            return
+        try:
+            workers, private_workers = await sync_to_async(_load_snapshot)(
+                self._competition_queue_name
+            )
+            await self.send_json({
+                "type": "workers.snapshot",
+                "workers": workers,
+                "private_workers": private_workers,
+            })
+        except RuntimeError:
+            pass

From 17117bc0d66958c787f4ee5a06b30ad7a2d2a503 Mon Sep 17 00:00:00 2001
From: Idir Chikhoune <idir.chikhoune@lisn.fr>
Date: Wed, 27 May 2026 16:30:17 +0200
Subject: [PATCH 16/20] rebase and fix incoming

---
 src/celery_config.py | 7 -------
 src/settings/base.py | 4 ----
 2 files changed, 11 deletions(-)

diff --git a/src/celery_config.py b/src/celery_config.py
index a4e3299f7..5a9c055bb 100644
--- a/src/celery_config.py
+++ b/src/celery_config.py
@@ -43,10 +43,3 @@ def app_for_vhost(vhost):
         _vhost_apps[vhost] = vhost_app
     return _vhost_apps[vhost]
 
-
-app.conf.beat_schedule = {
-    "refresh-compute-worker-health": {
-        "task": "apps.competitions.tasks.refresh_compute_worker_health",
-        "schedule": 3.0,
-    },
-}
diff --git a/src/settings/base.py b/src/settings/base.py
index 47c76ad6b..d2698bb2a 100644
--- a/src/settings/base.py
+++ b/src/settings/base.py
@@ -276,10 +276,6 @@
         'task': 'profiles.tasks.clean_non_activated_users',
         'schedule': timedelta(days=1),  # Run every 24 hours
     },
-    "refresh_compute_worker_health": {
-        "task": "competitions.tasks.refresh_compute_worker_health",
-        "schedule": 60,
-    },
 }
 CELERY_TIMEZONE = 'UTC'
 CELERY_WORKER_PREFETCH_MULTIPLIER = 1

From 4f1913e1e24b7d49335f9fc1ea3db3b338ede41c Mon Sep 17 00:00:00 2001
From: Idir Chikhoune <idir.chikhoune@lisn.fr>
Date: Wed, 27 May 2026 16:44:55 +0200
Subject: [PATCH 17/20] feature clean

---
 src/utils/consumers.py    | 90 ++++++++++++---------------------------
 src/utils/worker_utils.py | 90 ++++++++++++++-------------------------
 2 files changed, 60 insertions(+), 120 deletions(-)

diff --git a/src/utils/consumers.py b/src/utils/consumers.py
index 4c298494a..978cd2c31 100644
--- a/src/utils/consumers.py
+++ b/src/utils/consumers.py
@@ -1,60 +1,43 @@
+# utils/consumers.py
+
 import asyncio
-import json
 import logging
-import time
-
-from competitions.models import Competition
 
 from asgiref.sync import sync_to_async
 from channels.generic.websocket import AsyncJsonWebsocketConsumer
-from django_redis import get_redis_connection
-
-from utils.worker_utils import WORKER_HEARTBEAT_TTL, WORKERS_REGISTRY_KEY
-
-logger = logging.getLogger(__name__)
 
-r = get_redis_connection("default")
+from utils.worker_utils import fetch_compute_workers
 
 
-def _load_snapshot(competition_queue_name=None):
-    raw = r.hgetall(WORKERS_REGISTRY_KEY)
-    workers = []
-    private_workers = []
-    now = time.time()
-
-    for _, value in raw.items():
-        try:
-            worker = json.loads(value)
-        except Exception:
-            continue
-
-        if now - worker.get("last_seen", 0) > WORKER_HEARTBEAT_TTL:
-            continue
-
-        if worker.get("queue_source") == "default":
-            workers.append(worker)
-        else:
-            # Worker privé : n'afficher que si la queue correspond à la compétition
-            if competition_queue_name and worker.get("queue_source") == competition_queue_name:
-                private_workers.append(worker)
-
-    workers.sort(key=lambda x: x.get("hostname", ""))
-    private_workers.sort(key=lambda x: (x.get("queue_source", ""), x.get("hostname", "")))
-    return workers, private_workers
+logger = logging.getLogger(__name__)
 
 
 def _get_competition_queue_name(competition_id):
     if not competition_id:
         return None
     try:
+        from competitions.models import Competition
         competition = Competition.objects.select_related("queue").get(pk=competition_id)
-        if competition.queue and competition.queue.name:    
+        if competition.queue and competition.queue.name:
             return competition.queue.name
     except Exception:
         logger.warning("Competition %s not found or has no queue", competition_id)
     return None
 
 
+def _load_snapshot(competition_queue_name=None):
+    workers, private_workers = fetch_compute_workers()
+
+    if competition_queue_name:
+        private_workers = [
+            w for w in private_workers
+            if w.get("queue_source") == competition_queue_name
+        ]
+    else:
+        private_workers = []
+
+    return workers, private_workers
+
 class ComputeWorkersConsumer(AsyncJsonWebsocketConsumer):
 
     async def connect(self):
@@ -81,19 +64,22 @@ async def disconnect(self, close_code):
                 pass
 
     async def receive_json(self, content):
-        logger.debug("WebSocket received: %s", content)
         if content.get("type") == "subscribe":
             competition_id = content.get("competition_id")
-            self._competition_queue_name = await sync_to_async(_get_competition_queue_name)(
-                competition_id)
+            self._competition_queue_name = await sync_to_async(
+                _get_competition_queue_name
+            )(competition_id)
             self._subscribed.set()
 
     async def _push_workers_loop(self):
         try:
+            # Attendre le subscribe avant le premier envoi (max 5s)
             try:
                 await asyncio.wait_for(self._subscribed.wait(), timeout=5.0)
             except asyncio.TimeoutError:
-                logger.warning("WebSocket subscribe timeout, proceeding without competition filter")
+                logger.warning(
+                    "WebSocket subscribe timeout, proceeding without competition filter"
+                )
 
             while self._running:
                 workers, private_workers = await sync_to_async(_load_snapshot)(
@@ -110,26 +96,6 @@ async def _push_workers_loop(self):
                 except RuntimeError:
                     break
                 await asyncio.sleep(3)
+
         except asyncio.CancelledError:
-            pass
-
-    async def worker_health(self, event):
-        worker = event["worker"]
-        is_default = worker.get("queue_source") == "default"
-        is_mine = (
-            self._competition_queue_name is not None
-            and worker.get("queue_source") == self._competition_queue_name
-        )
-        if not is_default and not is_mine:
-            return
-        try:
-            workers, private_workers = await sync_to_async(_load_snapshot)(
-                self._competition_queue_name
-            )
-            await self.send_json({
-                "type": "workers.snapshot",
-                "workers": workers,
-                "private_workers": private_workers,
-            })
-        except RuntimeError:
-            pass
+            pass
\ No newline at end of file
diff --git a/src/utils/worker_utils.py b/src/utils/worker_utils.py
index a44101066..ef48b0e55 100644
--- a/src/utils/worker_utils.py
+++ b/src/utils/worker_utils.py
@@ -1,72 +1,47 @@
-from queues.models import Queue
+# utils/worker_utils.py
 
 import logging
 import time
+
 import requests
 from django.conf import settings
-
-from queues.models import Queue as QueueModel
+from queues.models import Queue
 
 logger = logging.getLogger(__name__)
 
 PIDBOX_SUFFIX = ".celery.pidbox"
-WORKERS_REGISTRY_KEY = "workers:registry"
-WORKER_HEARTBEAT_TTL = 180
-
-
-def extract_queue_names(active_queues):
-    names = set()
-    for q in active_queues or []:
-        if isinstance(q, dict) and q.get("name"):
-            names.add(q["name"])
-    return names
 
 
-def known_compute_queue_names():
-    return set(
-        Queue.objects.exclude(name__isnull=True)
-        .exclude(name="")
-        .values_list("name", flat=True)
-    )
-
-
-def is_compute_worker(worker_name, queue_names, known_queue_names):
-    return (
-        bool(queue_names & known_queue_names)
-        or "compute-worker" in queue_names
-        or worker_name.startswith("compute-worker")
-    )
-
-def _get_rabbitmq_auth():
-    return (
-        settings.RABBITMQ_DEFAULT_USER,
-        settings.RABBITMQ_DEFAULT_PASS,
-    )
+def _rabbitmq_auth():
+    return (settings.RABBITMQ_DEFAULT_USER, settings.RABBITMQ_DEFAULT_PASS)
 
 
-def _get_rabbitmq_base_url():
-    return (
-        f"http://{settings.RABBITMQ_HOST}"
-        f":{settings.RABBITMQ_MANAGEMENT_PORT}/api"
-    )
+def _rabbitmq_base_url():
+    return f"http://{settings.RABBITMQ_HOST}:{settings.RABBITMQ_MANAGEMENT_PORT}/api"
 
 
 def _build_vhost_to_source_map():
+    """{ vhost_string: queue_source_name }. Default vhost '/' → 'default'."""
     mapping = {"/": "default"}
-    for q in QueueModel.objects.exclude(vhost__isnull=True).values("vhost", "name"):
+    for q in Queue.objects.exclude(vhost__isnull=True).values("vhost", "name"):
         mapping[str(q["vhost"])] = q["name"]
     return mapping
 
+
 def _fetch_all_queues():
     resp = requests.get(
-        f"{_get_rabbitmq_base_url()}/queues",
-        auth=_get_rabbitmq_auth(),
+        f"{_rabbitmq_base_url()}/queues",
+        auth=_rabbitmq_auth(),
         timeout=5,
     )
     resp.raise_for_status()
     return resp.json()
 
 
+def is_compute_worker(worker_name):
+    return worker_name.startswith("compute-worker")
+
+
 def fetch_compute_workers():
     try:
         all_queues = _fetch_all_queues()
@@ -74,8 +49,13 @@ def fetch_compute_workers():
         logger.exception("Failed to fetch queues from RabbitMQ Management API")
         return [], []
 
-    vhost_to_source = _build_vhost_to_source_map()
+    try:
+        vhost_to_source = _build_vhost_to_source_map()
+    except Exception:
+        logger.exception("Failed to build vhost→source map")
+        return [], []
 
+    # Grouper par vhost
     by_vhost: dict[str, list] = {}
     for q in all_queues:
         by_vhost.setdefault(q["vhost"], []).append(q)
@@ -93,29 +73,24 @@ def fetch_compute_workers():
         messages_unacked = cw_queue.get("messages_unacknowledged", 0) if cw_queue else 0
         cw_consumers = cw_queue.get("consumers", 0) if cw_queue else 0
 
-        pidbox_queues = [
-            q for q in queues
-            if q["name"].endswith(PIDBOX_SUFFIX)
-            and q["name"].startswith("compute-worker@")
-        ]
-
-        for pidbox_q in pidbox_queues:
-            hostname = pidbox_q["name"][: -len(PIDBOX_SUFFIX)]
+        # Pidbox queues 1 worker / queue
+        for pidbox_q in queues:
+            name = pidbox_q["name"]
+            if not (name.endswith(PIDBOX_SUFFIX) and name.startswith("compute-worker@")):
+                continue
 
-            if not is_compute_worker(hostname, {"compute-worker"}, set()):
+            hostname = name[: -len(PIDBOX_SUFFIX)]
+            if not is_compute_worker(hostname):
                 continue
 
             pidbox_alive = pidbox_q.get("consumers", 0) > 0
 
             if not pidbox_alive or cw_consumers == 0:
-                status = "unavailable"
-                running_jobs = 0
+                status, running_jobs = "unavailable", 0
             elif messages_unacked > 0:
-                status = "busy"
-                running_jobs = messages_unacked
+                status, running_jobs = "busy", messages_unacked
             else:
-                status = "available"
-                running_jobs = 0
+                status, running_jobs = "available", 0
 
             worker = {
                 "hostname": hostname,
@@ -133,5 +108,4 @@ def fetch_compute_workers():
 
     workers.sort(key=lambda x: x["hostname"])
     private_workers.sort(key=lambda x: (x["queue_source"], x["hostname"]))
-
     return workers, private_workers
\ No newline at end of file

From 8d46cf212213108f63d1e480f6f7d4c910704dc3 Mon Sep 17 00:00:00 2001
From: Idir Chikhoune <idir.chikhoune@lisn.fr>
Date: Thu, 28 May 2026 13:29:36 +0200
Subject: [PATCH 18/20] conflicts solved

---
 .../detail/worker-monitor-toggle.tag          | 38 -------------------
 1 file changed, 38 deletions(-)

diff --git a/src/static/riot/competitions/detail/worker-monitor-toggle.tag b/src/static/riot/competitions/detail/worker-monitor-toggle.tag
index 9f5af52de..0dc540246 100644
--- a/src/static/riot/competitions/detail/worker-monitor-toggle.tag
+++ b/src/static/riot/competitions/detail/worker-monitor-toggle.tag
@@ -46,18 +46,12 @@
             </div>
 
             <div class="workers-section">
-<<<<<<< HEAD
                 <div class="workers-section-title workers-section-header" onclick="{ toggleDefaultWorkers }">
                     <span>Default compute workers</span>
 
                     <i class="dropdown icon workers-collapse-icon { showDefaultWorkers ? 'open' : '' }"></i>
                 </div>
                 <div class="workers-table-wrap" if="{ showDefaultWorkers }">
-=======
-                <div class="workers-section-title">Default compute workers</div>
-
-                <div class="workers-table-wrap">
->>>>>>> a2f07695 (new file for monitoring implentation imported into frontend)
                     <table class="ui very compact selectable striped table workers-table">
                         <thead>
                             <tr>
@@ -101,12 +95,8 @@
                     <table class="ui very compact selectable striped table workers-table">
                         <thead>
                             <tr>
-<<<<<<< HEAD
-                                <th>Worker</th>
-=======
                                 <th>Competition</th>
                                 <th>Queue</th>
->>>>>>> a2f07695 (new file for monitoring implentation imported into frontend)
                                 <th>Status</th>
                                 <th>Jobs</th>
                                 <th>Last seen</th>
@@ -147,19 +137,10 @@
         self.wsReconnectTimer = null
         self.wsState = 'disconnected'
         self.lastSyncAt = null
-<<<<<<< HEAD
-        self.showDefaultWorkers = true
-=======
->>>>>>> a2f07695 (new file for monitoring implentation imported into frontend)
 
         self.canViewWorkersPanel =
             String(self.opts.can_view_workers_panel || 'false') === 'true'
 
-<<<<<<< HEAD
-        self.competitionId = parseInt(self.opts.competition_id) || null
-
-=======
->>>>>>> a2f07695 (new file for monitoring implentation imported into frontend)
         self.showWorkersPanel = false
         self.panelLeft = 24
         self.panelTop = 24
@@ -204,11 +185,6 @@
                 } catch (e) {}
                 self.ws = null
             }
-<<<<<<< HEAD
-            var competitionId = parseInt(self.opts.competition_id) || null
-=======
-
->>>>>>> a2f07695 (new file for monitoring implentation imported into frontend)
             var scheme = window.location.protocol === 'https:' ? 'wss' : 'ws'
             var url = scheme + '://' + window.location.host + '/ws/workers/'
 
@@ -219,18 +195,12 @@
 
             self.ws.onopen = function () {
                 self.wsState = 'connected'
-<<<<<<< HEAD
                 if (self.competitionId) {
                     var msg = JSON.stringify({ type: 'subscribe', competition_id: self.competitionId })
                     self.ws.send(msg)
                 }
                 self.update()
             }
-=======
-                self.update()
-            }
-
->>>>>>> a2f07695 (new file for monitoring implentation imported into frontend)
             self.ws.onmessage = function (event) {
                 var message = null
 
@@ -401,14 +371,6 @@
             return 'red'
         }
 
-<<<<<<< HEAD
-        self.toggleDefaultWorkers = function () {
-            self.showDefaultWorkers = !self.showDefaultWorkers
-            self.update()
-        }
-
-=======
->>>>>>> a2f07695 (new file for monitoring implentation imported into frontend)
         self.getStatusIcon = function (worker) {
             if (self.displayStatus(worker) === 'available') return 'check circle'
             if (self.displayStatus(worker) === 'busy') return 'clock'

From ad232a4370af8fb6deeecc5436561164775f668d Mon Sep 17 00:00:00 2001
From: Idir Chikhoune <idir.chikhoune@lisn.fr>
Date: Thu, 28 May 2026 13:32:18 +0200
Subject: [PATCH 19/20] conflicts solved

---
 .../competitions/detail/worker-monitor-toggle.tag    | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/static/riot/competitions/detail/worker-monitor-toggle.tag b/src/static/riot/competitions/detail/worker-monitor-toggle.tag
index 0dc540246..774c398ee 100644
--- a/src/static/riot/competitions/detail/worker-monitor-toggle.tag
+++ b/src/static/riot/competitions/detail/worker-monitor-toggle.tag
@@ -46,12 +46,9 @@
             </div>
 
             <div class="workers-section">
-                <div class="workers-section-title workers-section-header" onclick="{ toggleDefaultWorkers }">
-                    <span>Default compute workers</span>
+                <div class="workers-section-title">Default compute workers</div>
 
-                    <i class="dropdown icon workers-collapse-icon { showDefaultWorkers ? 'open' : '' }"></i>
-                </div>
-                <div class="workers-table-wrap" if="{ showDefaultWorkers }">
+                <div class="workers-table-wrap">
                     <table class="ui very compact selectable striped table workers-table">
                         <thead>
                             <tr>
@@ -195,12 +192,9 @@
 
             self.ws.onopen = function () {
                 self.wsState = 'connected'
-                if (self.competitionId) {
-                    var msg = JSON.stringify({ type: 'subscribe', competition_id: self.competitionId })
-                    self.ws.send(msg)
-                }
                 self.update()
             }
+
             self.ws.onmessage = function (event) {
                 var message = null
 

From eac01ff43f1eb2549977a650a65aac6aa9e94fbc Mon Sep 17 00:00:00 2001
From: Idir Chikhoune <idir.chikhoune@lisn.fr>
Date: Thu, 28 May 2026 13:59:58 +0200
Subject: [PATCH 20/20] private CW pb solved

---
 src/static/riot/competitions/detail/_header.tag            | 3 ++-
 .../riot/competitions/detail/worker-monitor-toggle.tag     | 7 +++++++
 src/utils/consumers.py                                     | 2 --
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/static/riot/competitions/detail/_header.tag b/src/static/riot/competitions/detail/_header.tag
index 6b26edb24..b8234bb1d 100644
--- a/src/static/riot/competitions/detail/_header.tag
+++ b/src/static/riot/competitions/detail/_header.tag
@@ -38,7 +38,8 @@
 
                         <worker-monitor-toggle
                             if="{competition.admin}"
-                            can_view_workers_panel="true">
+                            can_view_workers_panel="true"
+                            competition_id="{ competition.id }">
                         </worker-monitor-toggle>
 
                     </div>
diff --git a/src/static/riot/competitions/detail/worker-monitor-toggle.tag b/src/static/riot/competitions/detail/worker-monitor-toggle.tag
index 774c398ee..2b3be9eaf 100644
--- a/src/static/riot/competitions/detail/worker-monitor-toggle.tag
+++ b/src/static/riot/competitions/detail/worker-monitor-toggle.tag
@@ -192,6 +192,13 @@
 
             self.ws.onopen = function () {
                 self.wsState = 'connected'
+                var competitionId = parseInt(self.opts.competition_id) || null
+                if (competitionId) {
+                    self.ws.send(JSON.stringify({
+                        type: 'subscribe',
+                        competition_id: competitionId
+                    }))
+                }
                 self.update()
             }
 
diff --git a/src/utils/consumers.py b/src/utils/consumers.py
index 978cd2c31..003787870 100644
--- a/src/utils/consumers.py
+++ b/src/utils/consumers.py
@@ -73,7 +73,6 @@ async def receive_json(self, content):
 
     async def _push_workers_loop(self):
         try:
-            # Attendre le subscribe avant le premier envoi (max 5s)
             try:
                 await asyncio.wait_for(self._subscribed.wait(), timeout=5.0)
             except asyncio.TimeoutError:
@@ -96,6 +95,5 @@ async def _push_workers_loop(self):
                 except RuntimeError:
                     break
                 await asyncio.sleep(3)
-
         except asyncio.CancelledError:
             pass
\ No newline at end of file