Spaces:

lanczos
/

graphtestbed

Running

Zhu Jiajun (jz28583) Claude Opus 4.7 (1M context) commited on Apr 21

Commit

bf48fd7

1 Parent(s): f819f00

Landing table: fix per-column sort + drop tasks col + move avg to last

Sort bug: the per-task columns (figraph, arxiv-citation, …) had
data-sort attrs but the JS sortKey switch only handled rank/agent/
primary/n_submissions/first_seen, so any other key fell through to
`default: return 0` and rows kept their original order despite the
arrow appearing.

Replaced the switch with a header-position lookup that resolves the
column index from the th element itself, so any future column added
to the header row sorts automatically.

Also:
- Agent column no longer has data-sort (per request); cursor: default.
- Removed the "tasks" (n_tasks/N) column from the Overall table.
- Moved the Average column to the last position so per-task scores
read left-to-right before the aggregate.
- Empty-row colspan adjusted from 4+n to 3+n accordingly.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Files changed (1) hide show

server/api.py +26 -23

server/api.py CHANGED Viewed

@@ -941,12 +941,11 @@ _LANDING_TMPL = r"""<!doctype html>
           <thead>
             <tr>
               <th class="rank" data-sort="rank">#</th>
-              <th data-sort="agent">Agent</th>
-              <th class="num sorted" data-sort="primary">average <span class="arrow">&#9662;</span></th>
-              <th class="num" data-sort="n_submissions">tasks</th>
               {% for t in tasks %}
               <th class="num" data-sort="{{ t.name }}">{{ t.name }}</th>
               {% endfor %}
             </tr>
           </thead>
           <tbody>
@@ -955,18 +954,17 @@ _LANDING_TMPL = r"""<!doctype html>
               <tr data-agent="{{ r.agent }}">
                 <td class="rank{% if loop.index == 1 %} r1{% elif loop.index == 2 %} r2{% elif loop.index == 3 %} r3{% endif %}">{{ loop.index }}</td>
                 <td class="agent">{{ r.agent }}</td>
-                <td class="score">{{ "%.3f"|format(r.average) }}</td>
-                <td class="num">{{ r.n_tasks }} / {{ n_tasks }}</td>
                 {% for t in tasks %}
                 <td class="num">
                   {% set v = r.per_task[t.name] %}
                   {% if v is not none %}{{ "%.3f"|format(v) }}{% else %}<span class="muted">—</span>{% endif %}
                 </td>
                 {% endfor %}
               </tr>
               {% endfor %}
             {% else %}
-              <tr class="empty-row"><td colspan="{{ 4 + n_tasks }}">No submissions yet — be the first to submit.</td></tr>
             {% endif %}
           </tbody>
         </table>
@@ -1004,7 +1002,7 @@ _LANDING_TMPL = r"""<!doctype html>
           <thead>
             <tr>
               <th class="rank" data-sort="rank">#</th>
-              <th data-sort="agent">Agent</th>
               <th class="num sorted" data-sort="primary">{{ t.metric }} <span class="arrow">&#9662;</span></th>
               <th class="num" data-sort="n_submissions">Submissions</th>
               <th class="date" data-sort="first_seen">First seen</th>
@@ -1176,21 +1174,26 @@ gtb leaderboard &lt;task&gt;</code></pre>
   });
   // ---- sortable columns ----
-  function sortTable(table, key, dir) {
     var tbody = table.tBodies[0];
     var rows = Array.from(tbody.querySelectorAll('tr')).filter(function (r) {
       return !r.classList.contains('empty-row');
     });
     if (!rows.length) return;
     var sortKey = function (r) {
-      switch (key) {
-        case 'rank':           return parseInt(r.cells[0].textContent, 10) || 0;
-        case 'agent':          return (r.dataset.agent || '').toLowerCase();
-        case 'primary':        return parseFloat(r.cells[2].textContent) || 0;
-        case 'n_submissions':  return parseInt(r.cells[3].textContent, 10) || 0;
-        case 'first_seen':     return r.cells[4].textContent;
-        default:               return 0;
-      }
     };
     rows.sort(function (a, b) {
       var av = sortKey(a), bv = sortKey(b);
@@ -1200,22 +1203,22 @@ gtb leaderboard &lt;task&gt;</code></pre>
     });
     rows.forEach(function (r, i) {
       tbody.appendChild(r);
-      // recompute rank cell only when sorted by primary desc (i.e. canonical order)
-      var rk = r.cells[0];
       if (key === 'primary' && dir === 'desc') {
         rk.textContent = (i + 1);
         rk.className = 'rank' + (i === 0 ? ' r1' : i === 1 ? ' r2' : i === 2 ? ' r3' : '');
-      } else {
-        // preserve raw rank (1-indexed in original order); fall back to recompute
-        if (!rk.dataset.origRank) rk.dataset.origRank = rk.textContent.trim();
       }
     });
   }
   document.querySelectorAll('table.lb thead th').forEach(function (th) {
     th.addEventListener('click', function () {
       var table = th.closest('table');
-      var key = th.dataset.sort;
       var current = th.classList.contains('sorted')
         ? (th.dataset.dir === 'asc' ? 'asc' : 'desc')
         : null;
@@ -1231,7 +1234,7 @@ gtb leaderboard &lt;task&gt;</code></pre>
       arrow.className = 'arrow';
       arrow.textContent = (dir === 'asc') ? '\u25B4' : '\u25BE';
       th.appendChild(arrow);
-      sortTable(table, key, dir);
     });
   });

           <thead>
             <tr>
               <th class="rank" data-sort="rank">#</th>
+              <th>Agent</th>
               {% for t in tasks %}
               <th class="num" data-sort="{{ t.name }}">{{ t.name }}</th>
               {% endfor %}
+              <th class="num sorted" data-sort="primary">average <span class="arrow">&#9662;</span></th>
             </tr>
           </thead>
           <tbody>
               <tr data-agent="{{ r.agent }}">
                 <td class="rank{% if loop.index == 1 %} r1{% elif loop.index == 2 %} r2{% elif loop.index == 3 %} r3{% endif %}">{{ loop.index }}</td>
                 <td class="agent">{{ r.agent }}</td>
                 {% for t in tasks %}
                 <td class="num">
                   {% set v = r.per_task[t.name] %}
                   {% if v is not none %}{{ "%.3f"|format(v) }}{% else %}<span class="muted">—</span>{% endif %}
                 </td>
                 {% endfor %}
+                <td class="score">{{ "%.3f"|format(r.average) }}</td>
               </tr>
               {% endfor %}
             {% else %}
+              <tr class="empty-row"><td colspan="{{ 3 + n_tasks }}">No submissions yet — be the first to submit.</td></tr>
             {% endif %}
           </tbody>
         </table>
           <thead>
             <tr>
               <th class="rank" data-sort="rank">#</th>
+              <th>Agent</th>
               <th class="num sorted" data-sort="primary">{{ t.metric }} <span class="arrow">&#9662;</span></th>
               <th class="num" data-sort="n_submissions">Submissions</th>
               <th class="date" data-sort="first_seen">First seen</th>
   });
   // ---- sortable columns ----
+  function sortTable(table, th, dir) {
     var tbody = table.tBodies[0];
     var rows = Array.from(tbody.querySelectorAll('tr')).filter(function (r) {
       return !r.classList.contains('empty-row');
     });
     if (!rows.length) return;
+    // Resolve column index from the header's position — works for any layout
+    // (per-task columns are dynamic; previous switch-on-key broke for them).
+    var headers = Array.from(table.tHead.rows[0].cells);
+    var colIndex = headers.indexOf(th);
+    var key = th.dataset.sort;
     var sortKey = function (r) {
+      if (key === 'agent') return (r.dataset.agent || '').toLowerCase();
+      if (key === 'first_seen') return r.cells[colIndex].textContent;
+      var txt = (r.cells[colIndex].textContent || '').trim();
+      // Treat "—" / empty as -Infinity so missing scores sink to the bottom
+      // when sorting desc, top when sorting asc.
+      if (txt === '' || txt === '—') return -Infinity;
+      var n = parseFloat(txt);
+      return isNaN(n) ? txt : n;
     };
     rows.sort(function (a, b) {
       var av = sortKey(a), bv = sortKey(b);
     });
     rows.forEach(function (r, i) {
       tbody.appendChild(r);
+      // Renumber rank only when sorted by the canonical "primary" column desc.
       if (key === 'primary' && dir === 'desc') {
+        var rk = r.cells[0];
         rk.textContent = (i + 1);
         rk.className = 'rank' + (i === 0 ? ' r1' : i === 1 ? ' r2' : i === 2 ? ' r3' : '');
       }
     });
   }
   document.querySelectorAll('table.lb thead th').forEach(function (th) {
+    if (!th.dataset.sort) {
+      th.style.cursor = 'default';
+      return;  // unsortable column (e.g. Agent) — no click handler
+    }
     th.addEventListener('click', function () {
       var table = th.closest('table');
       var current = th.classList.contains('sorted')
         ? (th.dataset.dir === 'asc' ? 'asc' : 'desc')
         : null;
       arrow.className = 'arrow';
       arrow.textContent = (dir === 'asc') ? '\u25B4' : '\u25BE';
       th.appendChild(arrow);
+      sortTable(table, th, dir);
     });
   });