Update main.py

main.py

@@ -92,6 +92,15 @@ DEFAULT_IA_QUERY = os.environ.get(
 ALLOW_DEV_BOOTSTRAP = os.environ.get("ALLOW_DEV_BOOTSTRAP", "0") == "1"
 ALLOW_DEV_DIAGNOSTICS = os.environ.get("ALLOW_DEV_DIAGNOSTICS", "0") == "1"
 
+FALLBACK_IA_QUERIES = [
+    # 1) broad (fastest win)
+    '(mediatype:image AND (format:JPEG OR format:PNG))',
+    # 2) portraits bias (nice for the game)
+    '(mediatype:image AND (format:JPEG OR format:PNG) AND (subject:portrait OR title:portrait))',
+    # 3) slightly narrower but still broad
+    '(mediatype:image AND format:JPEG)',
+]
+
 # -----------------------------------------------------------------------------
 # 2) UTILS
 # -----------------------------------------------------------------------------
@@ -420,16 +429,26 @@ def ensure_minimum_ia_pool(min_items: int = MIN_IA_POOL, rows: int = 100, max_pa
     cached = 0
     log.info(f"ensure_minimum_ia_pool: have={have}, target={min_items}")
 
-    if have < min_items:
+    # Decide which queries to try: env IA_QUERY first, then fallbacks
+    candidate_queries = []
+    if DEFAULT_IA_QUERY:
+        candidate_queries.append(DEFAULT_IA_QUERY)
+    candidate_queries.extend([q for q in FALLBACK_IA_QUERIES if q not in candidate_queries])
+
+    # Ingest until we reach the target or run out of queries/pages
+    for q in candidate_queries:
+        if have + added >= min_items:
+            break
+        log.info(f"IA ingest: trying query: {q}")
         page = 1
         while have + added < min_items and page <= max_pages:
             try:
-                docs = ia_advanced_search(DEFAULT_IA_QUERY, rows=rows, page=page)
+                docs = ia_advanced_search(q, rows=rows, page=page)
             except Exception:
-                log.warning(f"IA search failed on page {page}, stopping ingest loop")
+                log.warning(f"IA search failed on page {page} for query {q!r}, moving on")
                 break
+            log.info(f"IA search page={page} -> {len(docs)} docs for query {q!r}")
             if not docs:
-                log.warning("IA search returned 0 docs; stopping")
                 break
             for d in docs:
                 ident = d.get("identifier")
@@ -442,13 +461,13 @@ def ensure_minimum_ia_pool(min_items: int = MIN_IA_POOL, rows: int = 100, max_pa
                     if rec:
                         added += 1
                 except Exception:
-                    log.exception(f"Failed to ingest {ident}")
+                    log.exception(f"Ingest failed for {ident}")
                     continue
                 if have + added >= min_items:
                     break
             page += 1
 
-    # Cache up to min_items
+    # Cache up to min_items (unchanged)
     pool = ia_pool_ref().get() or {}
     have_now = len(pool)
     need_cache = max(0, min_items - have_now)
@@ -462,6 +481,7 @@ def ensure_minimum_ia_pool(min_items: int = MIN_IA_POOL, rows: int = 100, max_pa
     log.info(f"ensure_minimum_ia_pool: stats={stats}")
     return stats
 
+
 # -----------------------------------------------------------------------------
 # 4) CASE GENERATION (uses IA for authentic image, Gemini for forgeries/meta)
 # -----------------------------------------------------------------------------
@@ -816,16 +836,28 @@ def admin_generate_today():
 def admin_bootstrap_now():
     if not ALLOW_DEV_BOOTSTRAP:
         return jsonify({"error": "Disabled. Set ALLOW_DEV_BOOTSTRAP=1 to enable."}), 403
+
     cfg = request.get_json() or {}
     min_items = int(cfg.get("min_items", MIN_IA_POOL))
     rows = int(cfg.get("rows", 100))
     max_pages = int(cfg.get("max_pages", 5))
+    custom_q = cfg.get("query")
+
+    global DEFAULT_IA_QUERY
+    original_q = DEFAULT_IA_QUERY
+    if custom_q:
+        log.warning(f"DEV bootstrap using custom query: {custom_q!r}")
+        DEFAULT_IA_QUERY = custom_q  # temporary override
+
     try:
         stats = ensure_minimum_ia_pool(min_items=min_items, rows=rows, max_pages=max_pages)
-        return jsonify({"ok": True, "stats": stats})
+        return jsonify({"ok": True, "stats": stats, "effective_query": DEFAULT_IA_QUERY})
     except Exception as e:
         log.exception("bootstrap-now failed")
         return jsonify({"ok": False, "error": str(e)}), 500
+    finally:
+        DEFAULT_IA_QUERY = original_q  # restore
+
 
 # --- DEV-ONLY: diagnostics (network + firebase sanity) ---
 @app.route("/admin/diagnostics", methods=["GET"])