From ea002233e96ba985e2ae214e762e4eca23379ce4 Mon Sep 17 00:00:00 2001
From: Andrew Zhu <me@andrew-zhu.com>
Date: Mon, 19 Feb 2024 13:24:28 -0500
Subject: [PATCH] refactor: implement table for fanout

---
 leaderboard/src/Table.vue                   | 181 +++++++++-----------
 leaderboard/src/data/web-closedbook.json    |   1 +
 leaderboard/src/data/web-openbook.json      |   1 +
 leaderboard/src/data/web-wiki-provided.json |   1 +
 leaderboard/src/filters.ts                  |  88 ++--------
 leaderboard/src/scores.ts                   |   3 +
 leaderboard/src/sorters.ts                  |  67 +++-----
 7 files changed, 121 insertions(+), 221 deletions(-)
 create mode 100644 leaderboard/src/data/web-closedbook.json
 create mode 100644 leaderboard/src/data/web-openbook.json
 create mode 100644 leaderboard/src/data/web-wiki-provided.json

diff --git a/leaderboard/src/Table.vue b/leaderboard/src/Table.vue
index 3a3d1f5..7b5c638 100644
--- a/leaderboard/src/Table.vue
+++ b/leaderboard/src/Table.vue
@@ -1,35 +1,39 @@
 <script setup lang="ts">
 import FilterIcon from '@/FilterIcon.vue'
-import { filters } from '@/filters'
-import { sorters, SortOrder } from '@/sorters'
+import {filters} from '@/filters'
+import {defaultSorter, sorters, SortOrder} from '@/sorters'
 import SortIcon from '@/SortIcon.vue'
-import { isArray } from 'lodash'
-import { computed, onMounted, reactive } from 'vue'
-import { useRoute, useRouter } from 'vue-router'
+import {isArray} from 'lodash'
+import {computed, onMounted, reactive} from 'vue'
+import {useRoute, useRouter} from 'vue-router'
+import type {Datum} from "@/scores";
 
 // setup
 const router = useRouter()
 const route = useRoute()
+const props = defineProps<{
+  data: Datum[];
+}>();
 
 // state
 const pagination = reactive({
   currentPage: 0,
   numPerPage: 50
 })
-const filterSelections = reactive(new Map<string, Set<number>>())
+const filterSelections = reactive(new Map<string, Set<any>>())
 const sortOrders = reactive(new Map<string, SortOrder>())
 
 // computed
 const filteredSortedData = computed(() => {
-  let data = [...worldPlots.value]
+  let tempData = [...props.data]
   // filter
   for (const [filterKey, selected] of filterSelections) {
     const filterImpl = filters[filterKey]
     if (!filterImpl) continue
-    data = data.filter(filterImpl.strategy(Array.from(selected)))
+    tempData = tempData.filter(filterImpl.strategy(Array.from(selected)))
   }
   // sort: return first non-zero sort
-  return data.sort((a, b) => {
+  return tempData.sort((a, b) => {
     for (const [sorterKey, direction] of sortOrders) {
       const sorterImpl = sorters[sorterKey]
       if (!sorterImpl) continue
@@ -46,8 +50,8 @@ const filteredSortedData = computed(() => {
 })
 const currentPageData = computed(() => {
   return filteredSortedData.value.slice(
-    pagination.currentPage * pagination.numPerPage,
-    (pagination.currentPage + 1) * pagination.numPerPage
+      pagination.currentPage * pagination.numPerPage,
+      (pagination.currentPage + 1) * pagination.numPerPage
   )
 })
 const numPages = computed(() => {
@@ -68,7 +72,7 @@ function onFilterSelectionChange(filterKey: string, selected: number[]) {
   if (!selected.length) {
     filterSelections.delete(filterKey)
   } else {
-    filterSelections.set(filterKey, new Set<number>(selected))
+    filterSelections.set(filterKey, new Set(selected))
   }
   updateQueryParams()
 }
@@ -106,7 +110,7 @@ function updateQueryParams() {
       queryParams[filterKey] = undefined
     }
   }
-  router.replace({ query: queryParams })
+  router.replace({query: queryParams})
 }
 
 function loadFilterQueryParams() {
@@ -128,7 +132,7 @@ function loadFilterQueryParams() {
     }
     // and init the filter
     if (validOptions.length) {
-      filterSelections.set(filterKey, new Set<number>(validOptions))
+      filterSelections.set(filterKey, new Set(validOptions))
     }
   }
 }
@@ -201,121 +205,100 @@ onMounted(() => {
       <tr>
         <th>
             <span class="icon-text">
-              <span>District</span>
+              <span>Model</span>
               <FilterIcon
-                class="ml-1"
-                :options="filters.districts.options"
-                :selected="getSelectedFilterOptions('districts')"
-                @selectionChanged="onFilterSelectionChange('districts', $event)"
+                  class="ml-1"
+                  :options="filters.modelType.options"
+                  :selected="getSelectedFilterOptions('modelType')"
+                  @selectionChanged="onFilterSelectionChange('modelType', $event)"
               />
             </span>
         </th>
         <th>
             <span class="icon-text">
-              <span>Ward</span>
-              <FilterIconGrid
-                class="ml-1"
-                :options="filters.wards.options"
-                :selected="getSelectedFilterOptions('wards')"
-                @selectionChanged="onFilterSelectionChange('wards', $event)"
-              />
-            </span>
-        </th>
-        <th>
-            <span class="icon-text">
-              <span>Plot</span>
-              <FilterIconGrid
-                class="ml-1"
-                :options="filters.plots.options"
-                :selected="getSelectedFilterOptions('plots')"
-                @selectionChanged="onFilterSelectionChange('plots', $event)"
+              <span>Context Size</span>
+              <SortIcon
+                  class="ml-1"
+                  :index="getSortIndex('context')"
+                  :direction="getSortDirection('context')"
+                  @directionChanged="onSortDirectionChange('context', $event)"
               />
             </span>
         </th>
         <th>
             <span class="icon-text">
-              <span>Size</span>
+              <span>Loose</span>
               <SortIcon
-                class="ml-1"
-                :index="getSortIndex('size')"
-                :direction="getSortDirection('size')"
-                @directionChanged="onSortDirectionChange('size', $event)"
-              />
-              <FilterIcon
-                :options="filters.sizes.options"
-                :selected="getSelectedFilterOptions('sizes')"
-                @selectionChanged="onFilterSelectionChange('sizes', $event)"
+                  class="ml-1"
+                  :index="getSortIndex('loose')"
+                  :direction="getSortDirection('loose')"
+                  @directionChanged="onSortDirectionChange('loose', $event)"
               />
             </span>
         </th>
         <th>
             <span class="icon-text">
-              <span>Price</span>
+              <span>Strict</span>
               <SortIcon
-                class="ml-1"
-                :index="getSortIndex('price')"
-                :direction="getSortDirection('price')"
-                @directionChanged="onSortDirectionChange('price', $event)"
+                  class="ml-1"
+                  :index="getSortIndex('strict')"
+                  :direction="getSortDirection('strict')"
+                  @directionChanged="onSortDirectionChange('strict', $event)"
               />
             </span>
         </th>
         <th>
             <span class="icon-text">
-              <span>Entries</span>
+              <span>ROUGE-1</span>
               <SortIcon
-                class="ml-1"
-                :index="getSortIndex('entries')"
-                :direction="getSortDirection('entries')"
-                @directionChanged="onSortDirectionChange('entries', $event)"
+                  class="ml-1"
+                  :index="getSortIndex('rouge1')"
+                  :direction="getSortDirection('rouge1')"
+                  @directionChanged="onSortDirectionChange('rouge1', $event)"
               />
             </span>
         </th>
         <th>
             <span class="icon-text">
-              <span>Lottery Phase</span>
+              <span>ROUGE-2</span>
               <SortIcon
-                class="ml-1"
-                :index="getSortIndex('phase')"
-                :direction="getSortDirection('phase')"
-                @directionChanged="onSortDirectionChange('phase', $event)"
-              />
-              <FilterIcon
-                :options="filters.phases.options"
-                :selected="getSelectedFilterOptions('phases')"
-                @selectionChanged="onFilterSelectionChange('phases', $event)"
+                  class="ml-1"
+                  :index="getSortIndex('rouge2')"
+                  :direction="getSortDirection('rouge2')"
+                  @directionChanged="onSortDirectionChange('rouge2', $event)"
               />
             </span>
         </th>
         <th>
             <span class="icon-text">
-              <span>Allowed Tenants</span>
-              <FilterIcon
-                class="ml-1"
-                :options="filters.tenants.options"
-                :selected="getSelectedFilterOptions('tenants')"
-                @selectionChanged="onFilterSelectionChange('tenants', $event)"
+              <span>ROUGE-L</span>
+              <SortIcon
+                  class="ml-1"
+                  :index="getSortIndex('rougeL')"
+                  :direction="getSortDirection('rougeL')"
+                  @directionChanged="onSortDirectionChange('rougeL', $event)"
               />
             </span>
         </th>
         <th>
             <span class="icon-text">
-              <span>Last Updated</span>
+              <span>BLEURT</span>
               <SortIcon
-                class="ml-1"
-                :index="getSortIndex('updateTime')"
-                :direction="getSortDirection('updateTime')"
-                @directionChanged="onSortDirectionChange('updateTime', $event)"
+                  class="ml-1"
+                  :index="getSortIndex('bleurt')"
+                  :direction="getSortDirection('bleurt')"
+                  @directionChanged="onSortDirectionChange('bleurt', $event)"
               />
             </span>
         </th>
         <th>
             <span class="icon-text">
-              <span>First Seen</span>
+              <span>GPT Judge</span>
               <SortIcon
-                class="ml-1"
-                :index="getSortIndex('firstSeen')"
-                :direction="getSortDirection('firstSeen')"
-                @directionChanged="onSortDirectionChange('firstSeen', $event)"
+                  class="ml-1"
+                  :index="getSortIndex('gptscore')"
+                  :direction="getSortDirection('gptscore')"
+                  @directionChanged="onSortDirectionChange('gptscore', $event)"
               />
             </span>
         </th>
@@ -323,26 +306,16 @@ onMounted(() => {
       </thead>
 
       <tbody>
-      <tr
-        v-for="plot in currentPageData"
-        :key="[plot.world_id, plot.district_id, plot.ward_number, plot.plot_number].toString()"
-      >
-        <td>{{ client.districtName(plot.district_id) }}</td>
-        <td>Ward {{ plot.ward_number + 1 }}</td>
-        <td>Plot {{ plot.plot_number + 1 }}</td>
-        <td>{{ utils.sizeStr(plot.size) }}</td>
-        <td>{{ plot.price.toLocaleString() }}</td>
-        <td>
-          <FlashOnChange :value="utils.lotteryEntryCountStr(plot)" :class="{'is-italic': utils.shouldEm(plot)}" />
-        </td>
-        <td>
-          <FlashOnChange :value="utils.lotteryPhaseStr(plot)" :class="{'is-italic': utils.shouldEm(plot)}" />
-        </td>
-        <td>{{ utils.tenantStr(plot.purchase_system) }}</td>
-        <td>
-          <FlashOnChange :value="utils.updatedStr(plot.last_updated_time)" />
-        </td>
-        <td>{{ utils.updatedStr(plot.first_seen_time) }}</td>
+      <tr v-for="datum in currentPageData">
+        <td>{{ datum.name }} ({{ datum.citation }})</td>
+        <td>{{ datum.context }}</td>
+        <td>{{ datum.acc.loose }}</td>
+        <td>{{ datum.acc.strict }}</td>
+        <td>{{ datum.rouge.rouge1.fscore }}</td>
+        <td>{{ datum.rouge.rouge2.fscore }}</td>
+        <td>{{ datum.rouge.rougeL.fscore }}</td>
+        <td>{{ datum.bleurt }}</td>
+        <td>{{ datum.gpt }}</td>
       </tr>
       </tbody>
     </table>
@@ -351,13 +324,13 @@ onMounted(() => {
       <p class="level-item">
         <button class="button mr-2" v-if="pagination.currentPage > 0" @click="pagination.currentPage--">
           <span class="icon is-small">
-            <font-awesome-icon :icon="['fas', 'angle-left']" />
+            <font-awesome-icon :icon="['fas', 'angle-left']"/>
           </span>
         </button>
         <span>Page {{ pagination.currentPage + 1 }} / {{ numPages }}</span>
         <button class="button ml-2" v-if="pagination.currentPage < numPages - 1" @click="pagination.currentPage++">
           <span class="icon is-small">
-            <font-awesome-icon :icon="['fas', 'angle-right']" />
+            <font-awesome-icon :icon="['fas', 'angle-right']"/>
           </span>
         </button>
       </p>
diff --git a/leaderboard/src/data/web-closedbook.json b/leaderboard/src/data/web-closedbook.json
new file mode 100644
index 0000000..42f21ad
--- /dev/null
+++ b/leaderboard/src/data/web-closedbook.json
@@ -0,0 +1 @@
+[{"acc": {"acc": 0.3549958003169331, "perfect": 0.06629834254143646}, "rouge": {"rouge1": {"precision": 0.3081323409240976, "recall": 0.4026625098759217, "fscore": 0.313123968945042}, "rouge2": {"precision": 0.1696203592964782, "recall": 0.22556614456096988, "fscore": 0.1769179306107922}, "rougeL": {"precision": 0.2618982426700318, "recall": 0.3437078118709097, "fscore": 0.26676820286543684}}, "bleurt": 0.4191427961588729, "gpt": 0.14917127071823205, "name": "GPT-4", "authors": "OpenAI", "url": "https://platform.openai.com/docs/models/gpt-4-and-gpt-4-turbo", "citation": "OpenAI, 2023", "type": "FOUNDATION", "context": 8192}, {"acc": {"acc": 0.4597296177579326, "perfect": 0.10082872928176796}, "rouge": {"rouge1": {"precision": 0.5061057938990791, "recall": 0.5171893148007345, "fscore": 0.48194841967428786}, "rouge2": {"precision": 0.29559659009870354, "recall": 0.30901380162874503, "fscore": 0.290250346638784}, "rougeL": {"precision": 0.43012909178526687, "recall": 0.440115792132854, "fscore": 0.4091321043635482}}, "bleurt": 0.49333308180228125, "gpt": 0.19889502762430938, "name": "GPT-4-turbo", "authors": "OpenAI", "url": "https://platform.openai.com/docs/models/gpt-4-and-gpt-4-turbo", "citation": "OpenAI, 2023", "type": "FOUNDATION", "context": 128000}, {"acc": {"acc": 0.3979994873440785, "perfect": 0.058011049723756904}, "rouge": {"rouge1": {"precision": 0.40734904473273553, "recall": 0.45162239056919035, "fscore": 0.4012819044350075}, "rouge2": {"precision": 0.22803347570177684, "recall": 0.2518584000616542, "fscore": 0.2271839790263482}, "rougeL": {"precision": 0.34711466296455995, "recall": 0.38661536042587596, "fscore": 0.34195490807715956}}, "bleurt": 0.4551408462926169, "gpt": 0.14502762430939226, "name": "GPT-3.5-turbo", "authors": "OpenAI", "url": "https://platform.openai.com/docs/models/gpt-3-5-turbo", "citation": "OpenAI, 2023", "type": "FOUNDATION", "context": 16384}, {"acc": {"acc": 0.4403229470249054, "perfect": 0.058011049723756904}, "rouge": {"rouge1": {"precision": 0.21079994013879805, "recall": 0.5309704790876308, "fscore": 0.2847323680812482}, "rouge2": {"precision": 0.11206570754887477, "recall": 0.26618658655979804, "fscore": 0.14873440544450633}, "rougeL": {"precision": 0.17624114336611502, "recall": 0.44614569152308986, "fscore": 0.23787236888912539}}, "bleurt": 0.44125290332331185, "gpt": 0.12016574585635359, "name": "LLaMA 2 70B", "authors": "Meta", "url": "https://ai.meta.com/research/publications/llama-2-open-foundation-and-fine-tuned-chat-models/", "citation": "Touvron et al., 2023", "type": "FOUNDATION", "context": 4096}, {"acc": {"acc": 0.4271172854502475, "perfect": 0.055248618784530384}, "rouge": {"rouge1": {"precision": 0.19504405031464528, "recall": 0.5205896670595586, "fscore": 0.2603643670617223}, "rouge2": {"precision": 0.09285001789519015, "recall": 0.23254410979936643, "fscore": 0.12283050286793348}, "rougeL": {"precision": 0.15867921904916787, "recall": 0.42898549246034995, "fscore": 0.21227960835014928}}, "bleurt": 0.4494648841801434, "gpt": 0.10220994475138122, "name": "Mistral-7B", "authors": "Mistral AI", "url": "https://mistral.ai/news/announcing-mistral-7b/", "citation": "Jiang et al., 2023", "type": "FOUNDATION", "context": 32000}, {"acc": {"acc": 0.4695900993561285, "perfect": 0.08149171270718232}, "rouge": {"rouge1": {"precision": 0.2402434133434171, "recall": 0.5465023664516744, "fscore": 0.3023042602650845}, "rouge2": {"precision": 0.1278099874524417, "recall": 0.26409680478109976, "fscore": 0.15751696515253602}, "rougeL": {"precision": 0.20205125579019406, "recall": 0.46086662623646035, "fscore": 0.2538329572357096}}, "bleurt": 0.46641780631565255, "gpt": 0.18646408839779005, "name": "Mixtral-8x7B", "authors": "Mistral AI", "url": "https://mistral.ai/news/mixtral-of-experts/", "citation": "Jiang et al., 2024", "type": "FOUNDATION", "context": 32000}, {"acc": {"acc": 0.34087118650894077, "perfect": 0.04143646408839779}, "rouge": {"rouge1": {"precision": 0.5180287739482223, "recall": 0.3878211545435264, "fscore": 0.41162891337334295}, "rouge2": {"precision": 0.25046659737457144, "recall": 0.19938401442157735, "fscore": 0.20843439451844803}, "rougeL": {"precision": 0.4368122438044132, "recall": 0.3228172228944878, "fscore": 0.34362967985991916}}, "bleurt": 0.42636404607383255, "gpt": 0.11049723756906077, "name": "Claude 2.1", "authors": "Anthropic", "url": "https://www.anthropic.com/news/claude-2-1", "citation": "Anthropic, 2023", "type": "FOUNDATION", "context": 200000}]
\ No newline at end of file
diff --git a/leaderboard/src/data/web-openbook.json b/leaderboard/src/data/web-openbook.json
new file mode 100644
index 0000000..9748eca
--- /dev/null
+++ b/leaderboard/src/data/web-openbook.json
@@ -0,0 +1 @@
+[{"acc": {"acc": 0.3152160636708284, "perfect": 0.05662983425414365}, "rouge": {"rouge1": {"precision": 0.17356455306164578, "recall": 0.39150580236680255, "fscore": 0.20783575754357375}, "rouge2": {"precision": 0.09085032002525105, "recall": 0.17549598793784338, "fscore": 0.10625950758793883}, "rougeL": {"precision": 0.1532112048714597, "recall": 0.34618346407417766, "fscore": 0.18344705502411385}}, "bleurt": 0.4267584370109587, "gpt": 0.1643646408839779, "name": "GPT-4", "authors": "OpenAI", "url": "https://platform.openai.com/docs/models/gpt-4-and-gpt-4-turbo", "citation": "OpenAI, 2023", "type": "FOUNDATION", "context": 8192}, {"acc": {"acc": 0.4703468836864732, "perfect": 0.10911602209944751}, "rouge": {"rouge1": {"precision": 0.32591691806739764, "recall": 0.5274025346455309, "fscore": 0.35589614186761614}, "rouge2": {"precision": 0.18949097802681353, "recall": 0.28817587063251693, "fscore": 0.20743984742825158}, "rougeL": {"precision": 0.28537777495423555, "recall": 0.46967882341300493, "fscore": 0.31379331104952}}, "bleurt": 0.4865400605212424, "gpt": 0.26243093922651933, "name": "GPT-4-turbo", "authors": "OpenAI", "url": "https://platform.openai.com/docs/models/gpt-4-and-gpt-4-turbo", "citation": "OpenAI, 2023", "type": "FOUNDATION", "context": 128000}, {"acc": {"acc": 0.15469947220693514, "perfect": 0.031767955801104975}, "rouge": {"rouge1": {"precision": 0.09699008021536212, "recall": 0.19469418167728442, "fscore": 0.11418755334242695}, "rouge2": {"precision": 0.040413694872158276, "recall": 0.08488911320642317, "fscore": 0.05075429578237907}, "rougeL": {"precision": 0.0835343704701655, "recall": 0.1699066826399081, "fscore": 0.09861238283404707}}, "bleurt": 0.33750931579022775, "gpt": 0.07596685082872928, "name": "GPT-3.5-turbo", "authors": "OpenAI", "url": "https://platform.openai.com/docs/models/gpt-3-5-turbo", "citation": "OpenAI, 2023", "type": "FOUNDATION", "context": 16384}, {"acc": {"acc": 0.38953698927856806, "perfect": 0.06353591160220995}, "rouge": {"rouge1": {"precision": 0.09966641622516868, "recall": 0.47799987641310493, "fscore": 0.15662035695680138}, "rouge2": {"precision": 0.04823947632622272, "recall": 0.21575914217888367, "fscore": 0.07543987012466698}, "rougeL": {"precision": 0.08324811278648249, "recall": 0.40852712042925454, "fscore": 0.13141945954530423}}, "bleurt": 0.4429991969951938, "gpt": 0.10773480662983426, "name": "LLaMA 2 70B", "authors": "Meta", "url": "https://ai.meta.com/research/publications/llama-2-open-foundation-and-fine-tuned-chat-models/", "citation": "Touvron et al., 2023", "type": "FOUNDATION", "context": 4096}, {"acc": {"acc": 0.024145046175432918, "perfect": 0.0013812154696132596}, "rouge": {"rouge1": {"precision": 0.007230514490414043, "recall": 0.029838755315060313, "fscore": 0.010116056959318522}, "rouge2": {"precision": 0.0030492661970760036, "recall": 0.01235636714726415, "fscore": 0.004309447012284605}, "rougeL": {"precision": 0.006576325561071797, "recall": 0.02700577469421076, "fscore": 0.009108932193761509}}, "bleurt": 0.1700935731461858, "gpt": 0.011049723756906077, "name": "Mistral-7B", "authors": "Mistral AI", "url": "https://mistral.ai/news/announcing-mistral-7b/", "citation": "Jiang et al., 2023", "type": "FOUNDATION", "context": 32000}, {"acc": {"acc": 0.3961719668514913, "perfect": 0.055248618784530384}, "rouge": {"rouge1": {"precision": 0.11787584988437909, "recall": 0.47223446046975565, "fscore": 0.17315178004485718}, "rouge2": {"precision": 0.053319584239651184, "recall": 0.20480681092188244, "fscore": 0.07820162065687233}, "rougeL": {"precision": 0.10000718238197719, "recall": 0.4077342141256453, "fscore": 0.147182462986372}}, "bleurt": 0.4493722631107213, "gpt": 0.1477900552486188, "name": "Mixtral-8x7B", "authors": "Mistral AI", "url": "https://mistral.ai/news/mixtral-of-experts/", "citation": "Jiang et al., 2024", "type": "FOUNDATION", "context": 32000}, {"acc": {"acc": 0.47120748528585843, "perfect": 0.0856353591160221}, "rouge": {"rouge1": {"precision": 0.2330077534090562, "recall": 0.5457109366018758, "fscore": 0.29497641803677077}, "rouge2": {"precision": 0.12616194413675985, "recall": 0.2804704207979029, "fscore": 0.15747334844988234}, "rougeL": {"precision": 0.19843856217260156, "recall": 0.4759886498517577, "fscore": 0.2527928960282501}}, "bleurt": 0.48486519522594484, "gpt": 0.21823204419889503, "name": "Claude 2.1", "authors": "Anthropic", "url": "https://www.anthropic.com/news/claude-2-1", "citation": "Anthropic, 2023", "type": "FOUNDATION", "context": 200000}]
\ No newline at end of file
diff --git a/leaderboard/src/data/web-wiki-provided.json b/leaderboard/src/data/web-wiki-provided.json
new file mode 100644
index 0000000..d19761f
--- /dev/null
+++ b/leaderboard/src/data/web-wiki-provided.json
@@ -0,0 +1 @@
+[{"acc": {"acc": 0.5456098545791228, "perfect": 0.143646408839779}, "rouge": {"rouge1": {"precision": 0.4725312298278398, "recall": 0.6085356260042157, "fscore": 0.49998452049151393}, "rouge2": {"precision": 0.2815675162719931, "recall": 0.35623992580949976, "fscore": 0.3005037957568856}, "rougeL": {"precision": 0.38835972782295014, "recall": 0.5045559933909823, "fscore": 0.41272370572817085}}, "bleurt": 0.5298143146528723, "gpt": 0.30386740331491713, "name": "GPT-4", "authors": "OpenAI", "url": "https://platform.openai.com/docs/models/gpt-4-and-gpt-4-turbo", "citation": "OpenAI, 2023", "type": "FOUNDATION", "context": 8192}, {"acc": {"acc": 0.6281475667110468, "perfect": 0.1919889502762431}, "rouge": {"rouge1": {"precision": 0.6321127734126731, "recall": 0.6764341478682872, "fscore": 0.6144612886380147}, "rouge2": {"precision": 0.3984152059157445, "recall": 0.4292697483707228, "fscore": 0.39470073987610177}, "rougeL": {"precision": 0.536314082392947, "recall": 0.5794550216005496, "fscore": 0.5226280415927149}}, "bleurt": 0.5809288421923614, "gpt": 0.4129834254143646, "name": "GPT-4-turbo", "authors": "OpenAI", "url": "https://platform.openai.com/docs/models/gpt-4-and-gpt-4-turbo", "citation": "OpenAI, 2023", "type": "FOUNDATION", "context": 128000}, {"acc": {"acc": 0.5165072478945334, "perfect": 0.10220994475138122}, "rouge": {"rouge1": {"precision": 0.463516335636312, "recall": 0.5689152894435296, "fscore": 0.45546862566608826}, "rouge2": {"precision": 0.24946325633429448, "recall": 0.31371309343477694, "fscore": 0.25221468710915207}, "rougeL": {"precision": 0.3653434458264324, "recall": 0.45283802498465286, "fscore": 0.3581738799002991}}, "bleurt": 0.49659434195546154, "gpt": 0.2430939226519337, "name": "GPT-3.5-turbo", "authors": "OpenAI", "url": "https://platform.openai.com/docs/models/gpt-3-5-turbo", "citation": "OpenAI, 2023", "type": "FOUNDATION", "context": 16384}, {"acc": {"acc": 0.5143679183027113, "perfect": 0.07734806629834254}, "rouge": {"rouge1": {"precision": 0.3407245588154435, "recall": 0.5902473705256917, "fscore": 0.3762628122180759}, "rouge2": {"precision": 0.1832699274716267, "recall": 0.31368060953904164, "fscore": 0.20593914103223815}, "rougeL": {"precision": 0.27518702361418795, "recall": 0.4795536695039635, "fscore": 0.30410024296144206}}, "bleurt": 0.47221096980678773, "gpt": 0.16160220994475138, "name": "LLaMA 2 70B", "authors": "Meta", "url": "https://ai.meta.com/research/publications/llama-2-open-foundation-and-fine-tuned-chat-models/", "citation": "Touvron et al., 2023", "type": "FOUNDATION", "context": 4096}, {"acc": {"acc": 0.539846654625103, "perfect": 0.08839779005524862}, "rouge": {"rouge1": {"precision": 0.25362992874397977, "recall": 0.6206499844406299, "fscore": 0.3300987746835614}, "rouge2": {"precision": 0.13136173541137755, "recall": 0.31550366270027114, "fscore": 0.17182351464162274}, "rougeL": {"precision": 0.20309078966310257, "recall": 0.5001600255631405, "fscore": 0.2639495371227864}}, "bleurt": 0.4745529419974069, "gpt": 0.20165745856353592, "name": "Mistral-7B", "authors": "Mistral AI", "url": "https://mistral.ai/news/announcing-mistral-7b/", "citation": "Jiang et al., 2023", "type": "FOUNDATION", "context": 32000}, {"acc": {"acc": 0.5760681994469418, "perfect": 0.13535911602209943}, "rouge": {"rouge1": {"precision": 0.337280859260002, "recall": 0.6511326541771959, "fscore": 0.40933745120007703}, "rouge2": {"precision": 0.1943735281050035, "recall": 0.3485360713472991, "fscore": 0.23141031987255675}, "rougeL": {"precision": 0.282396718505277, "recall": 0.5503517413117182, "fscore": 0.34298526601178303}}, "bleurt": 0.508856576296259, "gpt": 0.28314917127071826, "name": "Mixtral-8x7B", "authors": "Mistral AI", "url": "https://mistral.ai/news/mixtral-of-experts/", "citation": "Jiang et al., 2024", "type": "FOUNDATION", "context": 32000}, {"acc": {"acc": 0.6531674930336602, "perfect": 0.2154696132596685}, "rouge": {"rouge1": {"precision": 0.32045520128134836, "recall": 0.7180304376195379, "fscore": 0.42300161074719367}, "rouge2": {"precision": 0.1979935998869878, "recall": 0.4389654131557785, "fscore": 0.26233077626475276}, "rougeL": {"precision": 0.2663865768311303, "recall": 0.6115257311712957, "fscore": 0.3538037743008641}}, "bleurt": 0.5081962022251187, "gpt": 0.4696132596685083, "name": "Claude 2.1", "authors": "Anthropic", "url": "https://www.anthropic.com/news/claude-2-1", "citation": "Anthropic, 2023", "type": "FOUNDATION", "context": 200000}]
\ No newline at end of file
diff --git a/leaderboard/src/filters.ts b/leaderboard/src/filters.ts
index 20150c9..a048590 100644
--- a/leaderboard/src/filters.ts
+++ b/leaderboard/src/filters.ts
@@ -1,80 +1,28 @@
-const maxWardNumber = 30
-const maxPlotNumber = 60
+import type {Datum} from "@/scores";
+import {ModelType} from "@/scores";
 
 export interface FilterOption<T> {
-  label: string;
-  value: T;
+    label: string;
+    value: T;
 }
 
-export type Filter = (plot: PlotState) => boolean;
+export type Filter = (datum: Datum) => boolean;
 
 export interface FilterParams<T> {
-  options: FilterOption<T>[];
-  strategy: (values: T[]) => Filter;
+    options: FilterOption<T>[];
+    strategy: (values: T[]) => Filter;
 }
 
-export const filters: { [id: string]: FilterParams<number> } = {
-  districts: {
-    options: [
-      { label: 'Mist', value: 339 },
-      { label: 'The Lavender Beds', value: 340 },
-      { label: 'The Goblet', value: 341 },
-      { label: 'Shirogane', value: 641 },
-      { label: 'Empyreum', value: 979 }
-    ],
-    strategy(values: number[]): (plot: PlotState) => boolean {
-      return (plot: PlotState) => values.includes(plot.district_id)
-    }
-  },
-  wards: {
-    options: generateOptionSequence(maxWardNumber),
-    strategy(values: number[]): (plot: PlotState) => boolean {
-      return (plot: PlotState) => values.includes(plot.ward_number)
-    }
-  },
-  plots: {
-    options: generateOptionSequence(maxPlotNumber),
-    strategy(values: number[]): (plot: PlotState) => boolean {
-      return (plot: PlotState) => values.includes(plot.plot_number)
-    }
-  },
-  sizes: {
-    options: [
-      { label: 'Small', value: HouseSize.SMALL },
-      { label: 'Medium', value: HouseSize.MEDIUM },
-      { label: 'Large', value: HouseSize.LARGE }
-    ],
-    strategy(values: number[]): (plot: PlotState) => boolean {
-      return (plot: PlotState) => values.includes(plot.size)
-    }
-  },
-  phases: {
-    options: [
-      { label: 'Accepting Entries', value: LottoPhase.ENTRY },
-      { label: 'Results', value: LottoPhase.RESULTS },
-      { label: 'Unavailable', value: LottoPhase.UNAVAILABLE },
-      { label: 'FCFS', value: -2 },
-      { label: 'Missing/Outdated', value: -1 }
-    ],
-    strategy(values: number[]): (plot: PlotState) => boolean {
-      return (plot: PlotState) => {
-        if (!isLottery(plot)) {
-          return values.includes(-2)
-        } else if (isUnknownOrOutdatedPhase(plot)) {
-          return values.includes(-1)
+export const filters: { [id: string]: FilterParams<any> } = {
+    modelType: {
+        options: [
+            {label: 'Foundation Model', value: ModelType.foundation},
+            {label: 'Fine-Tune', value: ModelType.finetune},
+            {label: 'Specialized Prompting', value: ModelType.prompt},
+            {label: 'Other', value: ModelType.other},
+        ],
+        strategy(values: any[]): (datum: Datum) => boolean {
+            return (datum: Datum) => values.includes(datum.type)
         }
-        return values.includes(plot.lotto_phase!)
-      }
-    }
-  },
-  tenants: {
-    options: [
-      { label: 'Free Company', value: PurchaseSystem.FREE_COMPANY },
-      { label: 'Individual', value: PurchaseSystem.INDIVIDUAL }
-    ],
-    strategy(values: number[]): (plot: PlotState) => boolean {
-      const tenantBitField = values.reduce((acc, x) => acc | x)
-      return (plot: PlotState) => (plot.purchase_system & tenantBitField) !== 0
-    }
-  }
+    },
 }
diff --git a/leaderboard/src/scores.ts b/leaderboard/src/scores.ts
index 0276b49..9e17833 100644
--- a/leaderboard/src/scores.ts
+++ b/leaderboard/src/scores.ts
@@ -18,9 +18,12 @@ export interface Score {
   url: string;
   citation: string;
   type: ModelType;
+  context: number;
   // score
   acc: { loose: number, strict: number };
   rouge: { rouge1: RougeScore, rouge2: RougeScore, rougeL: RougeScore };
   bleurt: number;
   gpt: number;
 }
+
+export type Datum = Score;
diff --git a/leaderboard/src/sorters.ts b/leaderboard/src/sorters.ts
index e0d8ecf..11f359d 100644
--- a/leaderboard/src/sorters.ts
+++ b/leaderboard/src/sorters.ts
@@ -1,56 +1,29 @@
+import type {Datum} from "@/scores";
+
 // helpers
-export type Sorter = (a: PlotState, b: PlotState) => number;
+export type Sorter = (a: Datum, b: Datum) => number;
 
-const inverse = (f: Sorter) => (a: PlotState, b: PlotState) => -f(a, b)
+const inverse = (f: Sorter) => (a: Datum, b: Datum) => -f(a, b)
 
 export const enum SortOrder {
-  NONE = 0,
-  ASC = 1,
-  DESC = 2,
-}
-
-export const addressSorter: Sorter = (a, b) =>
-  a.district_id - b.district_id || a.ward_number - b.ward_number || a.plot_number - b.plot_number
-
-// sorter impls
-const size = (a: PlotState, b: PlotState) => a.size - b.size
-const sizeDesc = inverse(size)
-
-const price = (a: PlotState, b: PlotState) => a.price - b.price
-const priceDesc = inverse(price)
-
-const entries = (a: PlotState, b: PlotState) => {
-  const aVal = isOutdatedPhase(a) || a.lotto_phase === null ? Number.MAX_VALUE : a.lotto_entries ?? 0
-  const bVal = isOutdatedPhase(b) || b.lotto_phase === null ? Number.MAX_VALUE : b.lotto_entries ?? 0
-  return aVal - bVal
-}
-const entriesDesc = (a: PlotState, b: PlotState) => {
-  // Number.MIN_VALUE is actually an epsilon and not the minimum value representable in a float
-  // because *that's* not a foot-gun at all. Thanks Javascript.
-  const aVal = isOutdatedPhase(a) || a.lotto_phase === null ? Number.MIN_SAFE_INTEGER : a.lotto_entries ?? 0
-  const bVal = isOutdatedPhase(b) || b.lotto_phase === null ? Number.MIN_SAFE_INTEGER : b.lotto_entries ?? 0
-  return bVal - aVal
+    NONE = 0,
+    ASC = 1,
+    DESC = 2,
 }
 
-const phase = (a: PlotState, b: PlotState) => {
-  const aVal = isUnknownOrOutdatedPhase(a) ? Number.MAX_VALUE : a.lotto_phase!
-  const bVal = isUnknownOrOutdatedPhase(b) ? Number.MAX_VALUE : b.lotto_phase!
-  return aVal - bVal
-}
-const phaseDesc = inverse(phase)
-
-const updateTime = (a: PlotState, b: PlotState) => b.last_updated_time - a.last_updated_time
-const updateTimeDesc = inverse(updateTime)
-
-const firstSeen = (a: PlotState, b: PlotState) => b.first_seen_time - a.first_seen_time
-const firstSeenDesc = inverse(firstSeen)
+// ==== sorter impls ====
+const numeric: (getter: (datum: Datum) => number) => Sorter = (getter) => (a, b) => getter(a) - getter(b)
+const numericDesc: (getter: (datum: Datum) => number) => Sorter = (key) => inverse(numeric(key))
 
-// full mapping
+// ==== export mapping ====
 export const sorters: { [id: string]: { asc: Sorter; desc?: Sorter } } = {
-  size: { asc: size, desc: sizeDesc },
-  price: { asc: price, desc: priceDesc },
-  entries: { asc: entries, desc: entriesDesc },
-  phase: { asc: phase, desc: phaseDesc },
-  updateTime: { asc: updateTime, desc: updateTimeDesc },
-  firstSeen: { asc: firstSeen, desc: firstSeenDesc }
+    context: {asc: numeric(datum => datum.context), desc: numericDesc(datum => datum.context)},
+    loose: {asc: numeric(datum => datum.acc.loose), desc: numericDesc(datum => datum.acc.loose)},
+    strict: {asc: numeric(datum => datum.acc.strict), desc: numericDesc(datum => datum.acc.strict)},
+    rouge1: {asc: numeric(datum => datum.rouge.rouge1.fscore), desc: numericDesc(datum => datum.rouge.rouge1.fscore)},
+    rouge2: {asc: numeric(datum => datum.rouge.rouge2.fscore), desc: numericDesc(datum => datum.rouge.rouge2.fscore)},
+    rougeL: {asc: numeric(datum => datum.rouge.rougeL.fscore), desc: numericDesc(datum => datum.rouge.rougeL.fscore)},
+    bleurt: {asc: numeric(datum => datum.bleurt), desc: numericDesc(datum => datum.bleurt)},
+    gptscore: {asc: numeric(datum => datum.gpt), desc: numericDesc(datum => datum.gpt)},
 }
+export const defaultSorter: Sorter = sorters.context.asc;