Upload 2 files

app.py

@@ -6,8 +6,52 @@ import unicodedata, os
 app = Flask(__name__, static_folder='.', static_url_path='')
 
 API_KEY       = "4uwfiazjez9koo7aju9ig4zxhr"
-ELECTION_DATE = "2024-11-05"
 BASE_URL      = "https://api2-app2.onrender.com/v2/elections"
+ELECTION_DATE = "2024-11-05"
+POLL_INTERVAL = 15  # seconds
+
+_cache = {"states": {}, "districts": {}}
+_cache_lock = threading.Lock()
+
+import concurrent.futures
+
+ALL_STATES = [
+    "AL","AK","AZ","AR","CA","CO","CT","DE","FL","GA","HI","IA","ID","IL","IN","KS","KY",
+    "LA","MA","MD","ME","MI","MN","MO","MS","MT","NC","ND","NE","NH","NJ","NM","NV","NY",
+    "OH","OK","OR","PA","RI","SC","SD","TN","TX","UT","VA","VT","WA","WI","WV","WY"
+]
+
+def fetch_one(url, cache_key, cache_bucket):
+    try:
+        r = requests.get(url, headers={"x-api-key": API_KEY}, timeout=10)
+        if r.ok:
+            with _cache_lock:
+                _cache[cache_bucket][cache_key] = {"payload": r.text, "ts": time.time()}
+                print("Fetched upstream:", cache_key, "->", len(r.text), "bytes")
+    except Exception as e:
+        print("Poll error:", e)
+
+def poll_api():
+    while True:
+        start = time.time()
+        tasks = []
+        with concurrent.futures.ThreadPoolExecutor(max_workers=10) as pool:
+            for state in ALL_STATES:
+                # P, S, G
+                for office in ["P","S","G"]:
+                    url = f"{BASE_URL}/{ELECTION_DATE}?statepostal={state}&officeId={office}&level=ru"
+                    tasks.append(pool.submit(fetch_one, url, (state, office), "states"))
+                # House
+                url = f"{BASE_URL}/{ELECTION_DATE}".replace("/v2/elections", "/v2/districts")
+                url = f"{url}?statepostal={state}&officeId=H&level=ru"
+                tasks.append(pool.submit(fetch_one, url, (state,), "districts"))
+            concurrent.futures.wait(tasks)
+        elapsed = time.time() - start
+        time.sleep(max(0, POLL_INTERVAL - elapsed))
+
+threading.Thread(target=poll_api, daemon=True).start()
+
+
 
 @app.after_request
 def add_no_store(resp):
@@ -223,77 +267,61 @@ def per_county():
 # --- add this bulk endpoint next to /results_state ---
 @app.route("/results_districts")
 def per_districts_bulk():
-    state  = (request.args.get("state") or "").upper()
-    if not state:
-        return jsonify({"ok": False, "error": "missing-params"}), 200
-
-    # hit simulator's districts endpoint (same host/date as BASE_URL/ELECTION_DATE)
-    url_base = f"{BASE_URL}/{ELECTION_DATE}".replace("/v2/elections/", "/v2/districts/")
-    headers  = {"x-api-key": API_KEY}
-    try:
-        resp = requests.get(f"{url_base}?statepostal={state}&level=ru", headers=headers, timeout=6)
-        if resp.status_code != 200:
-            return jsonify({"ok": False, "error": f"upstream-{resp.status_code}"}), 200
-    except Exception as e:
-        return jsonify({"ok": False, "error": "api-unavailable", "detail": str(e)}), 200
+    state = (request.args.get("state") or "").upper()
+    with _cache_lock:
+        snap = _cache["districts"].get((state,))
+    if not snap:
+        return jsonify({"ok": False, "error": "no-snapshot"}), 200
 
-    # parse XML into the bulk shape the frontend expects
     try:
-        root = ET.fromstring(resp.text)
+        root = ET.fromstring(snap["payload"])
     except ET.ParseError:
         return jsonify({"ok": False, "error": "bad-xml"}), 200
 
-    by_geo = {}  # GEOID -> { candidates:[{name,party,votes}], total }
+    districts = {}
     for ru in root.iter("ReportingUnit"):
         geoid = (ru.attrib.get("DistrictId") or "").strip()
-        if not geoid:
-            continue
-        cands = []
-        total = 0
+        if not geoid: continue
+        cands, total = [], 0
         for c in ru.findall("Candidate"):
             votes = _safe_int(c.attrib.get("VoteCount"))
-            first = (c.attrib.get("First","") or "").strip()
-            last  = (c.attrib.get("Last","") or "").strip()
-            full  = f"{first} {last}".strip()
+            full  = f"{(c.attrib.get('First','') or '').strip()} {(c.attrib.get('Last','') or '').strip()}".strip()
             party = (c.attrib.get("Party") or "").upper()
             cands.append({"name": full, "party": party, "votes": votes})
             total += votes
-        by_geo[geoid] = {"candidates": cands, "total": total}
+        districts[geoid] = {"candidates": cands, "total": total}
 
     return jsonify({
         "ok": True,
         "state": state,
         "office": "H",
-        "districts": by_geo
+        "districts": districts
     }), 200
 
 
+
 @app.route("/results_state")
 def per_state_bulk():
-    """
-    OPTIONAL bulk endpoint: return all counties for a state in one call.
-    Front-end can switch to this to reduce thousands of requests → ~50.
-    """
     state  = (request.args.get("state") or "").upper()
     office = (request.args.get("office", "P") or "P").upper()
-    if not state:
-        return jsonify({"ok": False, "error": "missing-params"}), 200
+    with _cache_lock:
+        snap = _cache["states"].get((state, office))
+    if not snap:
+        return jsonify({"ok": False, "error": "no-snapshot"}), 200
 
     try:
-        snap = _get_parsed_state(state, office)
+        parsed = _parse_election_xml(snap["payload"])
     except Exception as e:
-        return jsonify({"ok": False, "error": "api-unavailable", "detail": str(e)}), 200
-
-    if not snap:
-        return jsonify({"ok": False, "error": "no-snapshot"}), 200
+        return jsonify({"ok": False, "error": "parse-failed", "detail": str(e)}), 200
 
     return jsonify({
         "ok": True,
         "state": state,
         "office": office,
-        "counties": snap  # { base_name: { candidates:[...], total:int }, ... }
+        "counties": parsed
     }), 200
 
+
 # (District endpoint left as-is; can be upgraded similarly later.)
 @app.route("/results_cd")
 def per_district():

index.html

@@ -7,6 +7,24 @@
 <script src="https://d3js.org/d3.v6.min.js"></script>
 <script src="https://d3js.org/topojson.v3.min.js"></script>
 <style>
+    /* map HUD */
+    #hud{
+      position:absolute; left:10px; bottom:10px; z-index:99999;
+      background:rgba(10,25,45,.85); color:#e9f2ff;
+      border:1px solid rgba(255,255,255,.18); border-radius:10px;
+      padding:10px 12px; max-width:320px; font-size:12px; line-height:1.35;
+      box-shadow:0 6px 24px rgba(0,0,0,.25), inset 0 1px 0 rgba(255,255,255,.06);
+      backdrop-filter: blur(4px);
+    }
+    #hud b{ color:#fff }
+    #hud .row{ margin:2px 0 }
+    #hud .dot{ display:inline-block; width:6px; height:6px; border-radius:50%; background:#8fd;
+              margin-right:6px; vertical-align:middle; }
+    #hud .muted{ opacity:.8 }
+    #hud .bar{ height:6px; background:rgba(255,255,255,.15); border-radius:999px; overflow:hidden; margin-top:6px }
+    #hud .bar > i{ display:block; height:100%; width:0%; background:#7fd;
+                   transition:width .2s ease }
+
   :root{ --gop:#ec1d19; --dem:#0067cb; --panel:#f6f8fc; --line:#d9e1ef; }
   html,body{height:100%;margin:0;font:14px/1.4 system-ui,-apple-system,Segoe UI,Roboto,Arial,sans-serif;color:#122}
   header{padding:.6rem 1rem;border-bottom:3px solid var(--dem);display:flex;align-items:center;justify-content:center}
@@ -54,6 +72,15 @@
       <g id="counties" style="display:none"></g>
       <g id="cds" style="display:none"></g>
     </svg>
+    <div id="hud" aria-live="polite">
+      <div class="row"><span class="dot"></span><b>Status:</b> Idle</div>
+      <div class="row"><b>Race:</b> — <span class="muted">(counties/districts)</span></div>
+      <div class="row"><b>Source:</b> —</div>
+      <div class="row"><b>Progress:</b> <span id="hud-progress">0 / 0</span></div>
+      <div class="bar"><i id="hud-bar"></i></div>
+      <div class="row muted" id="hud-sub">—</div>
+    </div>
+
   </div>
 
   <aside id="right">
@@ -128,6 +155,12 @@ raceBtnEls.forEach(btn=>{
     // Otherwise leave blank until user hits Refresh (or Auto).
     paintAll();
     rebuildWinners();
+    hud.set('race', `${labelFor(currentRace)} — ${describeLayer()}`);
+    hud.set('source', 'Server snapshot (backend caches upstream ~15s)');
+    hud.set('status', 'Ready to fetch / paint');
+    hud.set('progress', { text:'0 / 0', pct:0 });
+    hud.set('sub', 'Switch races freely; cached data is reused.');
+
     setStatus(fetchedStatesByRace[currentRace].size ? 'Showing cached data.' : 'Blank. Click Refresh to fetch.');
   });
 });
@@ -138,13 +171,18 @@ autoBtn.onclick = ()=>{
     clearInterval(autoTimer); autoTimer=null;
     autoBtn.textContent='Start Auto';
     setStatus('Auto refresh off.');
+    hud.set('status','Auto refresh off');
+    hud.set('sub','—');
   }else{
     autoTimer = setInterval(refreshAllForCurrentRace, 15000);
     autoBtn.textContent='Stop Auto';
     setStatus('Auto refresh on (15s).');
+    hud.set('status','Auto refresh on (every 15s)');
+    hud.set('sub','Will refresh all states on schedule.');
   }
 };
 
+
 /* ------------------------------- load maps -------------------------------- */
 Promise.all([
   d3.json("https://cdn.jsdelivr.net/npm/us-atlas@3/states-10m.json"),
@@ -234,21 +272,42 @@ Promise.all([
 });
 
 /* -------------------------- fetch (server snapshot) ------------------------ */
-async function refreshAllForCurrentRace(){
-  if (!currentRace){ setStatus('Choose a race first.'); return; }
+    async function refreshAllForCurrentRace(){
+      if (!currentRace){
+        setStatus('Choose a race first.');
+        return;
+      }
 
-  setStatus('Refreshing… (server snapshot)');
-  const states = Object.values(fipsToPostal);
+      hud.set('status', 'Refreshing…');
+      hud.set('source', 'Server snapshot (backend caches upstream ~15s)');
+      hud.set('race', `${labelFor(currentRace)} — ${describeLayer()}`);
+      hud.set('sub', 'Fetching all races, one state at a time; repainting after each.');
+
+      const states = Object.values(fipsToPostal);
+      
+      let done = 0;
+      hud.set('progress', { text: `0 / ${states.length}`, pct: 0 });
+
+      // Always fetch all four races
+      for (const st of states){
+        await fetchStateBulk(st, 'P');
+        await fetchStateBulk(st, 'G');
+        await fetchStateBulk(st, 'S');
+        await fetchDistrictBulk(st);
+        done++;
+        hud.set('progress', {
+          text: `${done} / ${states.length}`,
+          pct: Math.round(done/states.length*100)
+        });
+        hud.set('sub', `Last: ${st} (${new Date().toLocaleTimeString()})`);
+      }
 
-  if (currentRace === 'H'){
-    for (const st of states){ await fetchDistrictBulk(st); }
-  } else {
-    for (const st of states){ await fetchStateBulk(st, currentRace); }
-  }
-  setStatus('Last update: ' + new Date().toLocaleTimeString());
-  paintAll();
-  rebuildWinners();
-}
+      hud.set('status', 'Up to date');
+      hud.set('sub', 'Last paint: ' + new Date().toLocaleTimeString());
+      setStatus('Last update: ' + new Date().toLocaleTimeString());
+      paintAll();
+      rebuildWinners();
+    }
 
 async function fetchStateBulk(stateCode, race){
   const url = `/results_state?state=${stateCode}&office=${race}`;
@@ -494,6 +553,32 @@ function showCellDetails(title, cell, raceLabel){
 /* --------------------------------- helpers -------------------------------- */
 function labelFor(r){ return r==='P'?'President':r==='G'?'Governor':r==='S'?'Senate':'House'; }
 function setStatus(msg){ statusEl.textContent = msg; }
+/* ------------------------------- HUD helpers ------------------------------- */
+const hud = {
+  el: document.getElementById('hud'),
+  progEl: document.getElementById('hud-progress'),
+  barEl: document.getElementById('hud-bar'),
+  subEl: document.getElementById('hud-sub'),
+  set(k, v){
+    const map = {
+      status: 0, race: 1, source: 2, progress: 3, sub: 5
+    };
+    const rows = this.el.querySelectorAll('.row');
+    if (k === 'status') rows[0].innerHTML = `<span class="dot"></span><b>Status:</b> ${v}`;
+    if (k === 'race')   rows[1].innerHTML = `<b>Race:</b> ${v}`;
+    if (k === 'source') rows[2].innerHTML = `<b>Source:</b> ${v}`;
+    if (k === 'progress'){
+      this.progEl.textContent = v.text;
+      this.barEl.style.width = v.pct + '%';
+    }
+    if (k === 'sub') this.subEl.textContent = v;
+  }
+};
+
+function describeLayer(){
+  return (currentRace === 'H') ? 'districts (House)' : 'counties (' + labelFor(currentRace) + ')';
+}
+
 </script>
 </body>
 </html>