Upload 2 files

app.py

@@ -36,6 +36,8 @@ from study_utils import (
     log_survey_responses,
     log_final_selections,
     log_final_survey,
+    firestore_batch_add,
+    _iso_ts,
 )
 
 EMPTY_ATTR = {"attribute": "", "weight": 0.7}
@@ -1255,8 +1257,9 @@ with gr.Blocks(
                 if errors:
                     return _err("\n\n".join(errors[:10]))
 
-                # ── Save annotations to Firebase ──
+                # ── Collect all writes, then batch-commit to Firebase ──
                 try:
+                    writes = []  # list of (collection, data_dict)
                     for q in range(NUM_QUERIES):
                         qmeta = (all_meta or {}).get(q, {})
                         qr = radio_vals[q * 10:(q + 1) * 10]
@@ -1267,38 +1270,54 @@ with gr.Blocks(
                         linear_ids = qmeta.get("linear_ids", [])
                         all_ids = base_ids[:5] + linear_ids[:5]
                         all_ids += [None] * (10 - len(all_ids))
+                        ts = _iso_ts()
 
                         for i, (img_id, rv) in enumerate(zip(all_ids, qr)):
                             if img_id:
                                 method = "baseline" if i < 5 else "linear"
-                                log_image_annotations(
-                                    pid, q, img_id, method,
-                                    1 if str(rv).strip() == "Yes" else 0,
-                                )
-                        log_method_comparison(pid, q, cv)
-                        log_survey_responses(
-                            pid, q, ql[0], ql[1], ql[2], ql[3],
-                            qmeta.get("round_sat", 0),
-                            qmeta.get("time_elapsed", 0),
-                        )
-                        log_final_selections(
-                            pid, q,
-                            ",".join(base_ids[:5]),
-                            ",".join(linear_ids[:5]),
-                            qmeta.get("round_sat", 0),
-                            qmeta.get("time_elapsed", 0),
-                        )
-                except Exception as e:
-                    return _err(f"Annotation save error: {str(e)}. Please try again.")
-
-                # ── Save final survey ──
-                try:
+                                writes.append(("image_annotations", {
+                                    "participant_id": pid, "query_id": q,
+                                    "image_id": img_id, "method": method,
+                                    "meets_intent": 1 if str(rv).strip() == "Yes" else 0,
+                                    "timestamp": ts,
+                                }))
+                        writes.append(("method_comparison", {
+                            "participant_id": pid, "query_id": q,
+                            "linear_better": cv, "timestamp": ts,
+                        }))
+                        writes.append(("survey_responses", {
+                            "participant_id": pid, "query_id": q,
+                            "alignment_score": ql[0], "agency_score": ql[1],
+                            "satisfaction_score": ql[2], "frustration_score": ql[3],
+                            "round_satisfied": qmeta.get("round_sat", 0),
+                            "time_elapsed": qmeta.get("time_elapsed", 0),
+                            "timestamp": ts,
+                        }))
+                        writes.append(("final_selections", {
+                            "participant_id": pid, "query_id": q,
+                            "baseline_final_image_ids": ",".join(base_ids[:5]),
+                            "linear_final_image_ids": ",".join(linear_ids[:5]),
+                            "round_satisfied": qmeta.get("round_sat", 0),
+                            "time_elapsed": qmeta.get("time_elapsed", 0),
+                            "timestamp": ts,
+                        }))
+
+                    # Final survey (1 document)
                     open_fb = (feedback or "").strip()
                     if conc_val == "Yes" and (concept_text or "").strip():
                         open_fb = (concept_text or "").strip() + "\n\n" + open_fb
-                    log_final_survey(pid, pref_val, conc_val, open_fb)
+                    writes.append(("final_survey", {
+                        "participant_id": pid,
+                        "preferred_system": pref_val,
+                        "concept_changed": conc_val,
+                        "open_feedback": open_fb,
+                        "timestamp": _iso_ts(),
+                    }))
+
+                    # Single batch commit (~287 docs in 1 round-trip)
+                    firestore_batch_add(writes)
                 except Exception as e:
-                    return _err(f"Survey save error: {str(e)}. Please try again.")
+                    return _err(f"Save error: {str(e)}. Please try again.")
 
                 return gr.update(visible=False), gr.update(value=""), gr.update(visible=True)
 

study_utils.py

@@ -91,6 +91,24 @@ def firestore_add(collection: str, data: dict) -> None:
     db.collection(collection).add(data)
 
 
+def firestore_batch_add(items: list[tuple[str, dict]]) -> None:
+    """Add many documents efficiently using Firestore batch writes.
+
+    Args:
+        items: list of (collection_name, data_dict) tuples.
+               Firestore batches support up to 500 ops each;
+               this function auto-splits into multiple batches.
+    """
+    db = _get_db()
+    BATCH_LIMIT = 450  # stay under Firestore's 500-op limit
+    for start in range(0, len(items), BATCH_LIMIT):
+        batch = db.batch()
+        for collection, data in items[start:start + BATCH_LIMIT]:
+            ref = db.collection(collection).document()
+            batch.set(ref, data)
+        batch.commit()
+
+
 def firestore_query_exists(collection: str, field: str, value) -> bool:
     """Return True if at least one document matches field == value."""
     db = _get_db()