deploy: labeling server

labeling/static/app.js

@@ -161,6 +161,7 @@ async function renderDonePage(token, taskData) {
   if (taskData.reason !== "cap_reached") {
     // Pool is drained entirely. Thank and stop.
     card.innerHTML = `<p class='done'>All items are fully labeled (you contributed ${labeled}). Thank you!</p>`;
+    appendAnnouncement(card);
     return;
   }
 
@@ -188,9 +189,8 @@ async function renderDonePage(token, taskData) {
     const btn = document.createElement("button");
     btn.id = "retry-session";
     if (status.round_number === 1) {
-      btn.textContent = "Try again (careful labeling)";
+      btn.textContent = "Try again";
       btn.addEventListener("click", () => {
-        // Round-1 fail: wipe everything — no email on file yet.
         localStorage.removeItem(TOKEN_STORAGE_KEY);
         localStorage.removeItem(EMAIL_STORAGE_KEY);
         location.reload();
@@ -198,7 +198,6 @@ async function renderDonePage(token, taskData) {
     } else {
       btn.textContent = `Redo round ${status.round_number}`;
       btn.addEventListener("click", async () => {
-        // Round 2+ fail: clear token but keep email, re-register same round.
         localStorage.removeItem(TOKEN_STORAGE_KEY);
         const email = status.email || localStorage.getItem(EMAIL_STORAGE_KEY);
         if (!email) { location.reload(); return; }
@@ -215,15 +214,15 @@ async function renderDonePage(token, taskData) {
       });
     }
     card.appendChild(btn);
+    appendAnnouncement(card);
     return;
   }
 
   // Pass state
   if (status.round_number === 1 && !status.email) {
-    // Needs email submission
     msg.innerHTML =
-      `<strong>Great job!</strong> Your round-1 session passed the quality check. ` +
-      `Submit your email to be entered in the lottery.`;
+      `<strong>Great job!</strong> Your session passed the quality check. ` +
+      `Submit your email to enter the lottery.`;
     const form = document.createElement("form");
     form.id = "email-form";
     form.innerHTML =
@@ -235,41 +234,37 @@ async function renderDonePage(token, taskData) {
       const email = document.getElementById("email-input").value.trim();
       if (!email) return;
       try {
-        const resp = await fetchJSON("/api/submit_email", {
+        await fetchJSON("/api/submit_email", {
           method: "POST",
           headers: { "content-type": "application/json" },
           body: JSON.stringify({ token, email }),
         });
         localStorage.setItem(EMAIL_STORAGE_KEY, email);
-        // Re-render with updated status
         await renderDonePage(token, taskData);
       } catch (e) {
         document.getElementById("error").textContent = `Submit failed: ${e.message}`;
       }
     });
+    appendAnnouncement(card);
     return;
   }
 
-  // Already on email chain (round 1 email submitted OR round 2+)
-  const multiplier = status.multiplier || 1.0;
+  // Already on email chain: thank + offer "Label more" if not maxed
+  const entries = status.labels_in_lottery ?? 0;
   msg.innerHTML =
-    `<strong>Thanks, ${status.email}!</strong><br>` +
-    `Your lottery multiplier is now <strong>${multiplier.toFixed(2)}×</strong> ` +
-    `(${labeled}-item round ${status.round_number} passed).`;
+    `<strong>Thanks, ${status.email}!</strong> You're entered in the lottery ` +
+    `with <strong>${entries}</strong> labels counted so far.`;
 
   if (status.can_extend) {
-    const extraLeft = 3 - status.round_number;
-    const nextMultiplier = Math.min(multiplier + 0.25, 1.5);
-    const info = document.createElement("p");
-    info.style.color = "var(--muted)";
-    info.textContent =
-      `Label ${EXTRA_ROUND_CAP} more to reach ${nextMultiplier.toFixed(2)}× ` +
-      `(${extraLeft} bonus round${extraLeft > 1 ? "s" : ""} remaining).`;
-    card.appendChild(info);
+    const hint = document.createElement("p");
+    hint.className = "muted-info";
+    hint.textContent =
+      `Want better odds? Label ${EXTRA_ROUND_CAP} more to add to your entry count.`;
+    card.appendChild(hint);
 
     const btn = document.createElement("button");
     btn.id = "extend-session";
-    btn.textContent = `Label ${EXTRA_ROUND_CAP} more (+0.25×)`;
+    btn.textContent = `Label ${EXTRA_ROUND_CAP} more`;
     btn.addEventListener("click", async () => {
       try {
         await registerWithParams({
@@ -284,11 +279,23 @@ async function renderDonePage(token, taskData) {
     });
     card.appendChild(btn);
   } else {
-    const info = document.createElement("p");
-    info.style.color = "var(--muted)";
-    info.textContent = "Maximum lottery multiplier reached. Thanks for labeling!";
-    card.appendChild(info);
+    const hint = document.createElement("p");
+    hint.className = "muted-info";
+    hint.textContent = "Thanks for participating!";
+    card.appendChild(hint);
   }
+
+  appendAnnouncement(card);
+}
+
+function appendAnnouncement(card) {
+  const div = document.createElement("div");
+  div.className = "announcement";
+  div.innerHTML =
+    `Winning probability is proportional to labels that pass the quality check. ` +
+    `Prize pool: <strong>10 × $20 Amazon gift cards</strong>, drawn after ` +
+    `we reach 2,000 labels total.`;
+  card.appendChild(div);
 }
 
 function updateProgress(labeled, cap) {

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=9" />
+  <link rel="stylesheet" href="/style.css?v=10" />
   <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=13"></script>
+  <script src="/app.js?v=14"></script>
 </body>
 </html>

labeling/static/style.css

@@ -219,3 +219,21 @@ button#submit:disabled {
   padding: 8px 16px;
   margin: 0;
 }
+
+.announcement {
+  margin: 28px auto 0;
+  padding: 12px 16px;
+  max-width: 520px;
+  font-size: 0.85rem;
+  color: var(--muted);
+  text-align: center;
+  border-top: 1px dashed var(--border);
+  line-height: 1.5;
+}
+
+.muted-info {
+  text-align: center;
+  color: var(--muted);
+  font-size: 0.9rem;
+  margin: 8px auto;
+}

src/aamcq/annotation/api.py

@@ -19,22 +19,16 @@ from aamcq.annotation import db as dbmod
 from aamcq.annotation.assignment import bootstrap_annotators
 
 DEFAULT_ACC_THRESHOLD = 0.40
-MAX_LOTTERY_ROUND = 3  # round 1 base, +2 bonus rounds cap multiplier at 1.5x
+# Round 1 (cap=20) + up to 3 bonus rounds (cap=10 each) = 50 labels max per
+# annotator. Each label that lives in a passing session counts as one
+# lottery entry; more labels = better odds.
+MAX_LOTTERY_ROUND = 4
 _EMAIL_RE = re.compile(r"^[^@\s]+@[^@\s]+\.[^@\s]+$")
 
 
 def _is_valid_email(email: str) -> bool:
     return bool(email) and len(email) <= 254 and bool(_EMAIL_RE.match(email))
 
-
-def _multiplier(passed_rounds: set[int]) -> float:
-    """Lottery multiplier = 1.0 + 0.25 * (extra passed rounds beyond round 1),
-    capped at 1.5 (i.e. rounds 1+2+3 all passed)."""
-    if 1 not in passed_rounds:
-        return 0.0
-    extras = len([r for r in passed_rounds if r > 1])
-    return min(1.0 + 0.25 * extras, 1.5)
-
 REPO_ROOT = Path(__file__).resolve().parents[3]
 DEFAULT_DB = REPO_ROOT / "data" / "annotations.sqlite"
 DEFAULT_IMAGE_DIR = REPO_ROOT / "data" / "images"
@@ -326,19 +320,24 @@ def create_app(
         # to compute the current multiplier + whether more rounds are
         # available.
         email = row["email"]
-        multiplier = 0.0
-        passed_rounds: set[int] = set()
+        labels_in_lottery = 0
         if email:
-            passed_rounds = dbmod.email_passed_rounds(
+            # Count labels across ALL this email's passing annotators;
+            # each label is one lottery entry.
+            labels_in_lottery = dbmod.email_passed_label_count(
                 conn, email, app.state.acc_threshold
             )
-            # Include THIS session's pass optimistically so the UI shows
-            # the correct multiplier immediately after a passing round
-            # (row's cap may differ from the session_accuracy lookup if
-            # server cap default applied; use effective cap instead).
+            # Include THIS session optimistically if it just passed — the
+            # helper's scan excludes uncommitted state, and we want the
+            # UI to reflect the new total immediately.
             if acc_pass:
-                passed_rounds = passed_rounds | {int(row["round_number"])}
-            multiplier = _multiplier(passed_rounds)
+                # Avoid double-counting if this annotator's already
+                # persisted labels would have been counted.
+                passed_rounds = dbmod.email_passed_rounds(
+                    conn, email, app.state.acc_threshold
+                )
+                if int(row["round_number"]) not in passed_rounds:
+                    labels_in_lottery += int(n)
 
         can_extend = (
             acc_pass
@@ -353,9 +352,9 @@ def create_app(
             "acc_pass": bool(acc_pass),
             "round_number": int(row["round_number"]),
             "email": email,
-            "multiplier": multiplier,
+            "labels_in_lottery": int(labels_in_lottery),
             "can_extend": bool(can_extend),
-            "next_round_cap": 10,  # hardcoded for now; frontend uses this
+            "next_round_cap": 10,
         }
 
     @app.post("/api/submit_email")
@@ -411,14 +410,11 @@ def create_app(
             )
 
         dbmod.set_annotator_email(conn, annotator_id, payload.email)
-        passed_rounds = dbmod.email_passed_rounds(
-            conn, payload.email, app.state.acc_threshold
-        )
         return {
             "ok": True,
             "email": payload.email,
             "round_number": 1,
-            "multiplier": _multiplier(passed_rounds),
+            "labels_in_lottery": int(n),
         }
 
     @app.get("/api/progress")

src/aamcq/annotation/db.py

@@ -311,6 +311,26 @@ def email_passed_rounds(
     return passed
 
 
+def email_passed_label_count(
+    conn: sqlite3.Connection, email: str, acc_threshold: float
+) -> int:
+    """Total labels across all of this email's annotators whose session
+    (a) hit their cap and (b) has acc >= threshold. Each label = 1
+    lottery entry."""
+    rows = conn.execute(
+        "SELECT annotator_id, cap FROM annotators WHERE email = ?", (email,)
+    ).fetchall()
+    total = 0
+    for r in rows:
+        n_correct, n = session_accuracy(conn, r["annotator_id"])
+        cap = r["cap"]
+        if cap is None or n < cap or n == 0:
+            continue
+        if (n_correct / n) >= acc_threshold:
+            total += n
+    return total
+
+
 def count_annotator_labels(conn: sqlite3.Connection, annotator_id: str) -> int:
     return int(conn.execute(
         "SELECT COUNT(*) AS n FROM labels WHERE annotator_id = ?",