Upload app.py

app.py

@@ -429,8 +429,8 @@ def ui_batch_scrape(states, cats, retries, force=False):
     """
     Runs Start Scraping -> auto Fix Missing Data -> auto push for each selected
     state in turn, so multiple states can be scraped unattended in one click.
-    force=True skips the "already scraped" check (used after the user has
-    explicitly confirmed a re-scrape for a single state).
+    Any state already fully scraped for the selected categories is skipped
+    automatically (no confirmation prompt) unless force=True.
     """
     from hf_store import check_state_scraped
 
@@ -506,11 +506,6 @@ def ui_batch_scrape(states, cats, retries, force=False):
     _batch_abort["flag"] = False
 
 
-def ui_main_scrape_forced(states, cats, retries):
-    """Used after the user explicitly confirms re-scraping an already-scraped single state."""
-    yield from ui_batch_scrape(states, cats, retries, force=True)
-
-
 # ── Dashboard helpers ─────────────────────────────────────────────────────────
 def _metric_card(label, value, color="#6366f1"):
     return f"""
@@ -955,11 +950,10 @@ with gr.Blocks(title="School Data Fetcher", css=css, theme=custom_theme) as app:
                 scrape_btn = gr.Button("▶  Start Scraping", variant="primary", scale=3)
                 stop_btn_placeholder = gr.HTML("", visible=False)  # placeholder
 
-            with gr.Column(visible=False) as confirm_col:
-                gr.HTML("<div style='padding:15px; border-left:4px solid #f59e0b; background:#fffbeb; color:#92400e; border-radius:6px; margin: 10px 0;'><strong>⚠️ Warning:</strong> This state (and all selected categories) is already present in your dataset. Are you sure you want to scrape it again?</div>")
-                with gr.Row():
-                    confirm_yes_btn = gr.Button("Yes, Scrape Again", variant="stop")
-                    confirm_no_btn = gr.Button("No, Cancel", variant="secondary")
+            force_rescrape_cb = gr.Checkbox(
+                label="Force re-scrape (overwrite states already fully scraped for these categories)",
+                value=False,
+            )
 
             with gr.Row(visible=False) as stop_row:
                 stop_btn = gr.Button("⏹  Stop", variant="stop", scale=1)
@@ -1005,18 +999,12 @@ with gr.Blocks(title="School Data Fetcher", css=css, theme=custom_theme) as app:
                 retry_row, stop_row,
             ]
 
-            def handle_scrape_click(states, categories):
-                from hf_store import check_state_scraped
-                states = states or []
-                if not states:
-                    return gr.update(), gr.update(), False
-                if len(states) == 1 and check_state_scraped(states[0], categories):
-                    return gr.update(visible=False), gr.update(visible=True), False
-                return gr.update(visible=False), gr.update(visible=False), True
+            def handle_scrape_click(states):
+                return (gr.update(visible=False), True) if states else (gr.update(), False)
 
-            def ui_main_scrape_conditional(should_scrape, states, cats, retries):
+            def ui_main_scrape_conditional(should_scrape, states, cats, retries, force):
                 if should_scrape:
-                    yield from ui_batch_scrape(states, cats, retries, force=False)
+                    yield from ui_batch_scrape(states, cats, retries, force=force)
                 else:
                     yield tuple(gr.update() for _ in range(10))
 
@@ -1024,11 +1012,11 @@ with gr.Blocks(title="School Data Fetcher", css=css, theme=custom_theme) as app:
 
             scrape_btn.click(
                 fn=handle_scrape_click,
-                inputs=[state_dd, categories_cg],
-                outputs=[scrape_btn, confirm_col, should_scrape_state]
+                inputs=[state_dd],
+                outputs=[scrape_btn, should_scrape_state]
             ).then(
                 fn=ui_main_scrape_conditional,
-                inputs=[should_scrape_state, state_dd, categories_cg, retries_slider],
+                inputs=[should_scrape_state, state_dd, categories_cg, retries_slider, force_rescrape_cb],
                 outputs=batch_outputs
             ).then(
                 fn=lambda should: gr.update(visible=True) if should else gr.update(),
@@ -1036,22 +1024,6 @@ with gr.Blocks(title="School Data Fetcher", css=css, theme=custom_theme) as app:
                 outputs=[scrape_btn]
             )
 
-            confirm_yes_btn.click(
-                fn=lambda: (gr.update(visible=False), gr.update(visible=False)),
-                outputs=[confirm_col, scrape_btn]
-            ).then(
-                fn=ui_main_scrape_forced,
-                inputs=[state_dd, categories_cg, retries_slider],
-                outputs=batch_outputs
-            ).then(
-                fn=lambda: gr.update(visible=True),
-                outputs=[scrape_btn]
-            )
-
-            confirm_no_btn.click(
-                fn=lambda: (gr.update(visible=False), gr.update(visible=True)),
-                outputs=[confirm_col, scrape_btn]
-            )
             retry_btn.click( fn=ui_retry,       inputs=[state_dd, retries_slider],               outputs=stream_outputs)
             stop_btn.click(  fn=ui_stop,         inputs=[],                                      outputs=[progress_html])