deploy: labeling server

labeling/static/app.js

@@ -3,6 +3,9 @@
 const AXES = ["art_style", "color", "art_medium", "lighting"];
 const TOKEN_STORAGE_KEY = "aamcq_token";
 const THEME_STORAGE_KEY = "aamcq_theme";
+const ROUNDS_KEY = "aamcq_rounds_done";
+const FIRST_SESSION_CAP = 20;
+const REPEAT_SESSION_CAP = 10;
 
 function setTheme(theme) {
   document.documentElement.setAttribute("data-theme", theme);
@@ -37,6 +40,11 @@ async function fetchJSON(path, init) {
 //   2. localStorage (returning visitor)
 //   3. POST /api/register (fresh anonymous session; only works when the
 //      server was launched with --anonymous-register)
+function nextSessionCap() {
+  const rounds = parseInt(localStorage.getItem(ROUNDS_KEY) || "0", 10);
+  return rounds === 0 ? FIRST_SESSION_CAP : REPEAT_SESSION_CAP;
+}
+
 async function ensureToken() {
   const urlToken = new URL(window.location.href).searchParams.get("token");
   if (urlToken) {
@@ -45,7 +53,8 @@ async function ensureToken() {
   }
   const stored = localStorage.getItem(TOKEN_STORAGE_KEY);
   if (stored) return stored;
-  const resp = await fetch("/api/register", { method: "POST" });
+  const cap = nextSessionCap();
+  const resp = await fetch(`/api/register?cap=${cap}`, { method: "POST" });
   if (!resp.ok) {
     throw new Error(
       "No ?token= in URL and anonymous registration is disabled on this server."
@@ -102,6 +111,18 @@ async function loadNext(token) {
         ? `All done — you labeled ${labeled} items. Thank you!`
         : `All items are fully labeled (you contributed ${labeled}). Thank you!`;
     card.innerHTML = `<p class='done'>${msg}</p>`;
+    if (data.reason === "cap_reached") {
+      const btn = document.createElement("button");
+      btn.id = "new-session";
+      btn.textContent = `Start a new session (+${REPEAT_SESSION_CAP} more)`;
+      btn.addEventListener("click", () => {
+        const rounds = parseInt(localStorage.getItem(ROUNDS_KEY) || "0", 10);
+        localStorage.setItem(ROUNDS_KEY, String(rounds + 1));
+        localStorage.removeItem(TOKEN_STORAGE_KEY);
+        location.reload();
+      });
+      card.appendChild(btn);
+    }
     submit.disabled = true;
     updateProgress(data.labeled, data.cap);
     return;

labeling/static/index.html

@@ -4,7 +4,7 @@
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <title>AestheticMCQ — Annotation</title>
-  <link rel="stylesheet" href="/style.css?v=7" />
+  <link rel="stylesheet" href="/style.css?v=8" />
   <script>
     // Apply saved theme before CSS paints to avoid a flash.
     (function () {
@@ -41,6 +41,6 @@
       <span id="error"></span>
     </footer>
   </main>
-  <script src="/app.js?v=7"></script>
+  <script src="/app.js?v=9"></script>
 </body>
 </html>

labeling/static/style.css

@@ -179,4 +179,17 @@ button#submit:disabled {
 }
 
 #error { color: #e66; font-size: 0.9rem; }
-.done { text-align: center; font-size: 1.2rem; color: var(--muted); }
+.done { text-align: center; font-size: 1.2rem; color: var(--muted); margin: 24px 0 12px; }
+
+button#new-session {
+  display: block;
+  margin: 12px auto 0;
+  background: transparent;
+  color: var(--accent);
+  border: 1px solid var(--accent);
+  padding: 8px 16px;
+  border-radius: 6px;
+  font-size: 0.95rem;
+  cursor: pointer;
+}
+button#new-session:hover { background: var(--card); }

src/aamcq/annotation/api.py

@@ -85,8 +85,12 @@ def create_app(
             raise HTTPException(status_code=401, detail="invalid token")
         return annotator_id
 
+    def _effective_cap(conn: sqlite3.Connection, annotator_id: str) -> int | None:
+        per = dbmod.get_annotator_cap(conn, annotator_id)
+        return per if per is not None else app.state.max_labels_per_annotator
+
     def _next_task_payload(annotator_id: str, conn: sqlite3.Connection, n_done: int) -> dict:
-        cap = app.state.max_labels_per_annotator
+        cap = _effective_cap(conn, annotator_id)
         if cap is not None and n_done >= cap:
             return {"done": True, "reason": "cap_reached", "labeled": n_done, "cap": cap}
         if app.state.pool_mode:
@@ -105,8 +109,16 @@ def create_app(
         }
 
     @app.post("/api/register")
-    def api_register(conn: sqlite3.Connection = Depends(get_conn)):
-        """Mint a fresh anonymous annotator. Only enabled when anonymous_register."""
+    def api_register(
+        cap: int | None = Query(default=None, ge=1, le=10000),
+        conn: sqlite3.Connection = Depends(get_conn),
+    ):
+        """Mint a fresh anonymous annotator. Only enabled when anonymous_register.
+
+        Optional `?cap=N` sets a per-annotator label cap that overrides the
+        server default (used by the frontend to give the first session a
+        larger quota than subsequent ones).
+        """
         if not app.state.anonymous_register:
             raise HTTPException(status_code=404, detail="anonymous register disabled")
         existing = {row["annotator_id"] for row in conn.execute(
@@ -120,8 +132,8 @@ def create_app(
             n += 1
             if n > 8:
                 raise HTTPException(status_code=500, detail="could not mint unique id")
-        tokens = bootstrap_annotators(conn, [candidate])
-        return {"annotator_id": candidate, "token": tokens[candidate]}
+        tokens = bootstrap_annotators(conn, [candidate], cap=cap)
+        return {"annotator_id": candidate, "token": tokens[candidate], "cap": cap}
 
     @app.get("/api/task")
     def api_task(

src/aamcq/annotation/assignment.py

@@ -61,12 +61,17 @@ def assign_items_round_robin(
 
 
 def bootstrap_annotators(
-    conn, annotator_ids: Iterable[str]
+    conn, annotator_ids: Iterable[str], cap: int | None = None,
 ) -> dict[str, str]:
-    """Create annotator rows with freshly minted tokens. Returns {annotator_id: token}."""
+    """Create annotator rows with freshly minted tokens. Returns {annotator_id: token}.
+
+    `cap` sets a per-annotator label cap that overrides the server default for
+    just these annotators (used for anonymous registration to customise the
+    cap per session).
+    """
     tokens: dict[str, str] = {}
     for aid in annotator_ids:
         token = dbmod.mint_token()
-        dbmod.insert_annotator(conn, aid, token)
+        dbmod.insert_annotator(conn, aid, token, cap=cap)
         tokens[aid] = token
     return tokens

src/aamcq/annotation/db.py

@@ -25,7 +25,8 @@ CREATE TABLE IF NOT EXISTS items (
 CREATE TABLE IF NOT EXISTS annotators (
     annotator_id TEXT PRIMARY KEY,
     token TEXT NOT NULL UNIQUE,
-    created_at REAL NOT NULL
+    created_at REAL NOT NULL,
+    cap INTEGER
 );
 CREATE TABLE IF NOT EXISTS assignments (
     item_id TEXT NOT NULL,
@@ -82,6 +83,11 @@ def connect(db_path: str | Path) -> sqlite3.Connection:
 
 def init_schema(conn: sqlite3.Connection) -> None:
     conn.executescript(SCHEMA)
+    # Migrate older DBs that predate the `cap` column on annotators.
+    try:
+        conn.execute("ALTER TABLE annotators ADD COLUMN cap INTEGER")
+    except sqlite3.OperationalError:
+        pass  # column already exists
 
 
 def mint_token() -> str:
@@ -95,13 +101,26 @@ def insert_item(conn: sqlite3.Connection, item_id: str, payload: dict, is_gold:
     )
 
 
-def insert_annotator(conn: sqlite3.Connection, annotator_id: str, token: str) -> None:
+def insert_annotator(
+    conn: sqlite3.Connection,
+    annotator_id: str,
+    token: str,
+    cap: int | None = None,
+) -> None:
     conn.execute(
-        "INSERT OR REPLACE INTO annotators(annotator_id, token, created_at) VALUES (?, ?, ?)",
-        (annotator_id, token, time.time()),
+        "INSERT OR REPLACE INTO annotators(annotator_id, token, created_at, cap) "
+        "VALUES (?, ?, ?, ?)",
+        (annotator_id, token, time.time(), cap),
     )
 
 
+def get_annotator_cap(conn: sqlite3.Connection, annotator_id: str) -> int | None:
+    row = conn.execute(
+        "SELECT cap FROM annotators WHERE annotator_id = ?", (annotator_id,)
+    ).fetchone()
+    return None if row is None or row["cap"] is None else int(row["cap"])
+
+
 def insert_assignment(conn: sqlite3.Connection, item_id: str, annotator_id: str) -> None:
     conn.execute(
         "INSERT OR IGNORE INTO assignments(item_id, annotator_id, assigned_at) "