Update app.py

app.py

@@ -12,7 +12,7 @@ import requests
 # Config
 # -----------------------------
 BASE_RSS = "https://sachet.ndma.gov.in/cap_public_website/rss"
-UA = "SachetMapRSS/1.0 (+https://huggingface.co/spaces)"
+UA = "SachetMapRSS/1.1 (+https://huggingface.co/spaces)"
 
 # Known tricky slugs or long names -> explicit mapping to RSS file names (without '.xml')
 MANUAL_SLUGS: Dict[str, str] = {
@@ -28,7 +28,7 @@ MANUAL_SLUGS: Dict[str, str] = {
     "dadra and nagar haveli": "dadra_and_nagar_haveli_and_daman_and_diu",
 }
 
-# State/UT centroids (approx.) for click targets (lat, lon).
+# State/UT centroids (approx.) for display markers (lat, lon).
 # 36 entities: 28 States + 8 UTs
 STATES = [
     ("Andhra Pradesh", 15.9, 79.7),
@@ -80,14 +80,13 @@ def _slugify(name: str) -> str:
     key = name.strip().lower()
     if key in MANUAL_SLUGS:
         return MANUAL_SLUGS[key]
-    # Generic rule: replace non-alnum with underscores; collapse repeats
     import re
     s = re.sub(r"[^a-z0-9]+", "_", key).strip("_")
     return s
 
 def state_to_feed(name: str, mapping_override: Dict[str, str] | None = None) -> str:
     """
-    Build a candidate RSS URL for a state/UT. Accepts optional overrides:
+    Build the RSS URL for a state/UT. Accepts optional overrides:
     {'Tamil Nadu': 'https://.../rss_tamil_nadu.xml'}
     """
     if mapping_override and name in mapping_override:
@@ -153,7 +152,7 @@ def render_items_html(feed_title: str, items: List[Dict]) -> str:
 
 
 # -----------------------------
-# Plotly Map
+# Plotly Map (display only)
 # -----------------------------
 def make_map() -> go.Figure:
     lats = [lat for _, lat, _ in STATES]
@@ -165,7 +164,7 @@ def make_map() -> go.Figure:
             lat=lats,
             lon=lons,
             text=names,
-            customdata=names,   # we read this on click
+            customdata=names,   # for potential future use
             mode="markers+text",
             textposition="top center",
             marker=dict(size=8),
@@ -216,16 +215,23 @@ CSS = """
 .badge { display:inline-block; padding:2px 8px; border:1px solid rgba(127,127,127,.25); border-radius:999px; font-size:12px; color:var(--muted); }
 """
 
+STATE_CHOICES = ["India (National Feed)"] + [s[0] for s in STATES]
+
 with gr.Blocks(css=CSS, fill_height=True, theme=gr.themes.Soft()) as demo:
     gr.Markdown("## SACHET — India Map of State/UT RSS Feeds (Minimal)")
 
     with gr.Row():
-        map_plot = gr.Plot(value=make_map(), label="Click a marker to load the state/UT feed")
-        with gr.Column(scale=1, min_width=300):
-            selected = gr.Textbox(label="Selected State/UT", interactive=False)
+        map_plot = gr.Plot(value=make_map(), label="Reference Map (static)")
+        with gr.Column(scale=1, min_width=320):
+            state_dropdown = gr.Dropdown(
+                choices=STATE_CHOICES,
+                value="India (National Feed)",
+                label="Select State/UT"
+            )
+            selected = gr.Textbox(label="Selected", interactive=False)
             feed_url_box = gr.Textbox(label="Resolved Feed URL", interactive=False)
             max_items = gr.Slider(5, 50, value=20, step=1, label="Items")
-            refresh = gr.Button("Refresh")
+            refresh = gr.Button("Load/Refresh", variant="primary")
             gr.Markdown(
                 "### Optional: Custom mapping\n"
                 "Paste JSON as `{ \"Tamil Nadu\": \"https://.../rss_tamil_nadu.xml\", ... }`"
@@ -237,24 +243,14 @@ with gr.Blocks(css=CSS, fill_height=True, theme=gr.themes.Soft()) as demo:
         with gr.Column():
             feed_html = gr.HTML(elem_classes=["feedbox"])
 
-    def resolve_and_render(state_click_payload, items_n, mapping_text):
-        """
-        state_click_payload: Plotly 'selected' or 'click' data
-        """
-        # Extract the state name from click payload
-        state = None
-        try:
-            # Gradio 4: for .select the payload is dict with 'points'
-            if isinstance(state_click_payload, dict) and "points" in state_click_payload and state_click_payload["points"]:
-                state = state_click_payload["points"][0].get("customdata") or state_click_payload["points"][0].get("text")
-            # Some Gradio variants may send just the label
-            elif isinstance(state_click_payload, str):
-                state = state_click_payload
-        except Exception:
-            state = None
-
+    # -------------------------
+    # Actions
+    # -------------------------
+    def resolve_and_render(state_name: str, items_n: int, mapping_text: str):
+        # Normalize state label
+        state = (state_name or "").strip()
         if not state:
-            return gr.update(value=""), gr.update(value=""), gr.update(value=""), "<div class='badge'>Select a marker on the map.</div>"
+            return "", "", "", "<div class='badge'>Select a state/UT.</div>"
 
         # Optional mapping overrides (user input)
         overrides = {}
@@ -267,46 +263,58 @@ with gr.Blocks(css=CSS, fill_height=True, theme=gr.themes.Soft()) as demo:
                 overrides = {}
 
         # Resolve URL
-        url = state_to_feed(state, overrides)
+        if state.lower().startswith("india"):
+            url = NATIONAL_FEED
+        else:
+            url = state_to_feed(state, overrides)
 
-        # Try fetch and parse; fall back to national feed if 404
+        # Try fetch and parse; fallback to national if error
         try:
             title, items = parse_feed(url, max_items=int(items_n))
             html_out = render_items_html(f"{state} — {title}", items)
             return state, url, "", html_out
         except Exception as e:
-            # Try a secondary slug variant: remove underscores
-            alt_url = url.replace("_", "")
-            try:
-                title, items = parse_feed(alt_url, max_items=int(items_n))
-                html_out = render_items_html(f"{state} — {title}", items)
-                return state, alt_url, f"Note: primary URL failed, used fallback.", html_out
-            except Exception as e2:
-                # Fall back to national feed to keep UI useful
+            # Try a secondary slug variant if not India
+            if not state.lower().startswith("india"):
+                alt_url = url.replace("_", "")
                 try:
-                    title, items = parse_feed(NATIONAL_FEED, max_items=int(items_n))
-                    html_out = (
-                        f"<div class='badge'>Could not load <code>{html.escape(url)}</code>. "
-                        f"Showing national feed instead.</div>"
-                    ) + render_items_html(f"India — {title}", items)
-                    return state, url, f"⚠️ {type(e2).__name__}: {e2}", html_out
-                except Exception as e3:
-                    return state, url, f"⚠️ {type(e3).__name__}: {e3}", "<div class='empty'>No data.</div>"
-
-    # Initial: show national feed
-    def initial_load(n_items):
+                    title, items = parse_feed(alt_url, max_items=int(items_n))
+                    html_out = render_items_html(f"{state} — {title}", items)
+                    return state, alt_url, "Note: primary URL failed, used fallback.", html_out
+                except Exception:
+                    pass
+            # Final fallback: national
+            try:
+                title, items = parse_feed(NATIONAL_FEED, max_items=int(items_n))
+                html_out = (
+                    f"<div class='badge'>Could not load <code>{html.escape(url)}</code>. "
+                    f"Showing national feed instead.</div>"
+                ) + render_items_html(f"India — {title}", items)
+                return state, url, f"⚠️ {type(e).__name__}: {e}", html_out
+            except Exception as e3:
+                return state, url, f"⚠️ {type(e3).__name__}: {e3}", "<div class='empty'>No data.</div>"
+
+    def initial_load(n_items: int):
         try:
             title, items = parse_feed(NATIONAL_FEED, max_items=int(n_items))
             return render_items_html(f"India — {title}", items)
         except Exception as e:
             return f"<div class='empty'>Could not load national feed. {html.escape(str(e))}</div>"
 
+    # Initial content
     demo.load(lambda n: initial_load(n), [max_items], [feed_html])
 
-    # Wire both click and select events for robustness
-    map_plot.select(resolve_and_render, [map_plot, max_items, mapping_json], [selected, feed_url_box, error_box, feed_html])
-    map_plot.click(resolve_and_render, [map_plot, max_items, mapping_json], [selected, feed_url_box, error_box, feed_html])
-    refresh.click(resolve_and_render, [map_plot, max_items, mapping_json], [selected, feed_url_box, error_box, feed_html])
+    # Wire dropdown and button
+    state_dropdown.change(
+        resolve_and_render,
+        [state_dropdown, max_items, mapping_json],
+        [selected, feed_url_box, error_box, feed_html],
+    )
+    refresh.click(
+        resolve_and_render,
+        [state_dropdown, max_items, mapping_json],
+        [selected, feed_url_box, error_box, feed_html],
+    )
 
 if __name__ == "__main__":
     demo.launch()