Upload 5 files

app.py

@@ -3,27 +3,24 @@ app.py — Multi-source OSINT Analyst Space
 Agentic loop powered by smolagents + HuggingFace Inference API.
 
 Required Space Secrets:
-  ACLED_USERNAME  — your myACLED account email (from https://developer.acleddata.com)
-  ACLED_PASSWORD  — your myACLED account password
+  ACLED_API_KEY   — from https://developer.acleddata.com
+  ACLED_EMAIL     — email used to register for ACLED access
   HF_TOKEN        — HuggingFace token (for Inference API, set automatically in Spaces)
 """
 
 import os
-import time
 from datetime import datetime
-from typing import Optional
 
 import gradio as gr
 from smolagents import InferenceClientModel, ToolCallingAgent
 
-from tools import fetch_acled_events, fetch_rss_headlines, list_available_sources, fetch_travel_advisory
+from tools import fetch_acled_events, fetch_rss_headlines, fetch_airspace_status, list_available_sources
 from brief import (
     BRIEF_PROMPT_SCHEMA,
     ThreatBrief,
     parse_brief_from_llm,
     render_brief_html,
 )
-from export import generate_pdf
 
 # ---------------------------------------------------------------------------
 # Model + Agent setup
@@ -33,14 +30,13 @@ MODEL_ID = "Qwen/Qwen2.5-72B-Instruct"   # Strong free model on HF Inference
 
 def build_agent() -> ToolCallingAgent:
     model = InferenceClientModel(
-        model_id=MODEL_ID,
-        token=os.environ.get("HF_TOKEN"),
-        timeout=90,             # per-call timeout in seconds
-    )
+    model_id=MODEL_ID,
+    token=os.environ.get("HF_TOKEN"),
+)
     agent = ToolCallingAgent(
-        tools=[fetch_acled_events, fetch_rss_headlines, list_available_sources, fetch_travel_advisory],
+        tools=[fetch_acled_events, fetch_rss_headlines, fetch_airspace_status, list_available_sources],
         model=model,
-        max_steps=12,
+        max_steps=8,
         verbosity_level=1,
     )
     return agent
@@ -53,8 +49,8 @@ def build_agent() -> ToolCallingAgent:
 SYSTEM_PROMPT = """You are a professional OSINT intelligence analyst specializing
 in geopolitical conflict and security threat assessment. Your job is to:
 
-1. Call the available tools to gather data from ACLED and RSS news sources.
-2. Collect enough information to assess the security situation.
+1. Call the available tools to gather data from ACLED, RSS news sources, and airspace feeds.
+2. Collect enough information to assess the security situation, including airspace status.
 3. Synthesize your findings into a structured threat brief.
 
 Always start by checking what sources are available if needed.
@@ -64,82 +60,52 @@ Be thorough — use multiple sources before drawing conclusions.
 
 def run_analysis(
     country: str,
-    passport_country: str,
     rss_sources: list,
     days_back: int,
     progress=gr.Progress(),
-) -> tuple:
+) -> tuple[str, str]:
     """
     Runs the agentic OSINT analysis loop and returns:
     - Structured HTML threat brief
     - Raw agent trace for transparency
-    - ThreatBrief object (stored in gr.State for PDF export)
     """
-    if not country or not str(country).strip():
-        return "<p style='color:red'>Please select a country or region.</p>", "", None
-    country = str(country).strip()
+    if not country.strip():
+        return "<p style='color:red'>Please enter a country or region.</p>", ""
 
     progress(0.1, desc="Initializing agent...")
 
     sources_str = ",".join(rss_sources) if rss_sources else "reuters_world,bbc_world"
 
-    include_embassy = bool(passport_country and passport_country != "Not specified")
-
-    embassy_instruction = (
-        f"4. REQUIRED — Populate the 'embassy' JSON field with the {passport_country} embassy "
-        f"or nearest consulate in '{country}'. Include: name, street address, main phone number, "
-        f"after-hours emergency phone, and official website URL.\n"
-        if include_embassy else ""
-    )
-    step_analyse = 5 if include_embassy else 4
-    step_output  = 6 if include_embassy else 5
-
     task = f"""
 Conduct an OSINT threat assessment for: {country}
-{f"Traveller passport country: {passport_country}" if include_embassy else ""}
 
 Instructions:
 1. Fetch ACLED armed conflict events for '{country}' over the last {days_back} days.
 2. Fetch recent RSS news headlines related to '{country}' from these sources: {sources_str}.
-3. REQUIRED — Call fetch_travel_advisory for '{country}' and include the result in the travel_advisory fields.
-{embassy_instruction}{step_analyse}. Analyse all collected data carefully.
-{step_output}. Produce your final output as ONLY a JSON threat brief matching this schema:
+3. Fetch airspace status for '{country}' using the airspace tool.
+4. Analyze all collected data carefully.
+5. Produce your final output as ONLY a JSON threat brief matching this schema:
 
 {BRIEF_PROMPT_SCHEMA}
 
 Today's date: {datetime.utcnow().strftime('%Y-%m-%d')}
 """
 
+    agent = build_agent()
+
     progress(0.2, desc="Agent gathering OSINT data...")
 
-    raw_output = None
-    last_error = None
-    for attempt in range(1, 4):          # up to 3 attempts
-        try:
-            agent = build_agent()
-            raw_output = agent.run(task, additional_args={"system_prompt": SYSTEM_PROMPT})
-            break                        # success — exit retry loop
-        except Exception as e:
-            last_error = e
-            err_str = str(e).lower()
-            is_timeout = any(k in err_str for k in ("504", "timeout", "gateway", "timed out"))
-            if is_timeout and attempt < 3:
-                progress(0.2 + attempt * 0.1, desc=f"HF API timeout — retrying (attempt {attempt + 1}/3)...")
-                time.sleep(5 * attempt)  # 5s, then 10s back-off
-                continue
-            # Non-retryable error or final attempt — surface it
-            error_html = f"""
-            <div style='padding:20px;background:#fff3f3;border:1px solid #cc0000;border-radius:8px'>
-                <strong>Analysis failed (attempt {attempt}/3):</strong><br>
-                <code style='font-size:0.85em'>{e}</code><br><br>
-                <em>If you see a 504 / gateway timeout, the HF Inference API is under heavy load.
-                Wait a minute and try again, or reduce the number of selected news sources.</em>
-            </div>
-            """
-            return error_html, str(e), None
-
-    if raw_output is None:
-        return "<p style='color:red'>Analysis failed after 3 attempts. Please try again later.</p>", str(last_error), None
+    try:
+        raw_output = agent.run(task, additional_args={"system_prompt": SYSTEM_PROMPT})
+    except Exception as e:
+        error_html = f"""
+        <div style='padding:20px;background:#fff3f3;border:1px solid #ff0000;border-radius:8px'>
+            <strong>Analysis failed:</strong> {e}<br><br>
+            <em>Common causes: ACLED credentials missing, HF Inference API overloaded,
+            or model timeout. Check Space secrets and try again.</em>
+        </div>
+        """
+        return error_html, str(e)
 
     progress(0.85, desc="Parsing intelligence brief...")
 
@@ -153,10 +119,6 @@ Today's date: {datetime.utcnow().strftime('%Y-%m-%d')}
             confidence="Low",
         )
 
-    # Stamp passport country so PDF / HTML renderer can use it even if LLM omitted it
-    if passport_country and passport_country != "Not specified":
-        brief.passport_country = passport_country
-
     progress(0.95, desc="Rendering brief...")
 
     html_output = render_brief_html(brief)
@@ -164,14 +126,14 @@ Today's date: {datetime.utcnow().strftime('%Y-%m-%d')}
     # Build a plain-text trace for the "Raw Trace" tab
     trace_lines = [f"=== OSINT Analysis: {country} ==="]
     trace_lines.append(f"Model: {MODEL_ID}")
-    trace_lines.append(f"Sources: ACLED + {sources_str}")
+    trace_lines.append(f"Sources: ACLED + Airspace + {sources_str}")
     trace_lines.append(f"Days back: {days_back}")
     trace_lines.append(f"Date: {datetime.utcnow().strftime('%Y-%m-%d %H:%M UTC')}")
     trace_lines.append("\n--- Raw Agent Output ---")
     trace_lines.append(str(raw_output))
 
     progress(1.0, desc="Done.")
-    return html_output, "\n".join(trace_lines), brief
+    return html_output, "\n".join(trace_lines)
 
 
 # ---------------------------------------------------------------------------
@@ -179,110 +141,21 @@ Today's date: {datetime.utcnow().strftime('%Y-%m-%d')}
 # ---------------------------------------------------------------------------
 
 RSS_SOURCE_OPTIONS = [
-    # General world news
-    ("BBC World",              "bbc_world"),
-    ("Al Jazeera",             "al_jazeera"),
-    ("France 24",              "france24"),
-    ("Euronews",               "euronews"),
-    ("NPR World",              "npr_world"),
-    ("Sky News",               "sky_news"),
-    ("UN News",                "un_news"),
-    ("Intl Business Times",    "ibt"),
-    # Regional: Middle East
-    ("Middle East Eye",        "middle_east_eye"),
-    ("Al-Monitor",             "al_monitor"),
-    ("Arab News",              "arab_news"),
-    # Regional: Africa
-    ("AllAfrica",              "allafrica"),
-    # Regional: Asia-Pacific
-    ("Radio Free Asia",        "radio_free_asia"),
-    ("S. China Morning Post",  "scmp"),
-    # Regional: South Asia
-    ("Dawn (Pakistan)",        "dawn"),
-    # Regional: Russia / E. Europe
-    ("The Moscow Times",       "moscow_times"),
-    # OSINT / investigative
-    ("Bellingcat",             "bellingcat"),
-    ("The Intercept",          "the_intercept"),
-    ("OCCRP",                  "occrp"),
-    # Policy / security analysis
-    ("Crisis Group",           "crisis_group"),
-    ("War on the Rocks",       "war_on_rocks"),
-    ("Just Security",          "just_security"),
-    ("Defense One",            "defense_one"),
-    ("The Cipher Brief",       "cipher_brief"),
-    ("Stimson Center",         "stimson"),
-    # Human rights
-    ("Human Rights Watch",     "hrw"),
-    ("Amnesty Intl",           "amnesty"),
-]
-
-DESTINATION_COUNTRIES = [
-    "Afghanistan", "Albania", "Algeria", "Andorra", "Angola", "Antigua and Barbuda",
-    "Argentina", "Armenia", "Australia", "Austria", "Azerbaijan",
-    "Bahamas", "Bahrain", "Bangladesh", "Barbados", "Belarus", "Belgium", "Belize",
-    "Benin", "Bhutan", "Bolivia", "Bosnia and Herzegovina", "Botswana", "Brazil",
-    "Brunei", "Bulgaria", "Burkina Faso", "Burundi",
-    "Cabo Verde", "Cambodia", "Cameroon", "Canada", "Central African Republic", "Chad",
-    "Chile", "China", "Colombia", "Comoros", "Congo (Republic)", "Congo (DRC)",
-    "Costa Rica", "Croatia", "Cuba", "Cyprus", "Czech Republic",
-    "Denmark", "Djibouti", "Dominica", "Dominican Republic",
-    "Ecuador", "Egypt", "El Salvador", "Equatorial Guinea", "Eritrea", "Estonia",
-    "Eswatini", "Ethiopia",
-    "Fiji", "Finland", "France",
-    "Gabon", "Gambia", "Georgia", "Germany", "Ghana", "Greece", "Grenada",
-    "Guatemala", "Guinea", "Guinea-Bissau", "Guyana",
-    "Haiti", "Honduras", "Hungary",
-    "Iceland", "India", "Indonesia", "Iran", "Iraq", "Ireland", "Israel", "Italy",
-    "Jamaica", "Japan", "Jordan",
-    "Kazakhstan", "Kenya", "Kiribati", "Kosovo", "Kuwait", "Kyrgyzstan",
-    "Laos", "Latvia", "Lebanon", "Lesotho", "Liberia", "Libya", "Liechtenstein",
-    "Lithuania", "Luxembourg",
-    "Madagascar", "Malawi", "Malaysia", "Maldives", "Mali", "Malta", "Marshall Islands",
-    "Mauritania", "Mauritius", "Mexico", "Micronesia", "Moldova", "Monaco", "Mongolia",
-    "Montenegro", "Morocco", "Mozambique", "Myanmar",
-    "Namibia", "Nauru", "Nepal", "Netherlands", "New Zealand", "Nicaragua", "Niger",
-    "Nigeria", "North Korea", "North Macedonia", "Norway",
-    "Oman",
-    "Pakistan", "Palau", "Palestine", "Panama", "Papua New Guinea", "Paraguay", "Peru",
-    "Philippines", "Poland", "Portugal",
-    "Qatar",
-    "Romania", "Russia", "Rwanda",
-    "Saint Kitts and Nevis", "Saint Lucia", "Saint Vincent and the Grenadines",
-    "Samoa", "San Marino", "Sao Tome and Principe", "Saudi Arabia", "Senegal",
-    "Serbia", "Seychelles", "Sierra Leone", "Singapore", "Slovakia", "Slovenia",
-    "Solomon Islands", "Somalia", "South Africa", "South Korea", "South Sudan", "Spain",
-    "Sri Lanka", "Sudan", "Suriname", "Sweden", "Switzerland", "Syria",
-    "Taiwan", "Tajikistan", "Tanzania", "Thailand", "Timor-Leste", "Togo", "Tonga",
-    "Trinidad and Tobago", "Tunisia", "Turkey", "Turkmenistan", "Tuvalu",
-    "Uganda", "Ukraine", "United Arab Emirates", "United Kingdom", "United States",
-    "Uruguay", "Uzbekistan",
-    "Vanuatu", "Vatican City", "Venezuela", "Vietnam",
-    "Yemen",
-    "Zambia", "Zimbabwe",
-]
-
-PASSPORT_COUNTRIES = [
-    "Not specified",
-    "Afghanistan", "Albania", "Algeria", "Argentina", "Australia", "Austria",
-    "Bangladesh", "Belgium", "Bolivia", "Brazil", "Cambodia", "Canada", "Chile",
-    "China", "Colombia", "Croatia", "Czech Republic", "Denmark", "Ecuador", "Egypt",
-    "Ethiopia", "Finland", "France", "Germany", "Ghana", "Greece", "Guatemala",
-    "Hungary", "India", "Indonesia", "Iran", "Iraq", "Ireland", "Israel", "Italy",
-    "Japan", "Jordan", "Kazakhstan", "Kenya", "Kuwait", "Malaysia", "Mexico",
-    "Morocco", "Nepal", "Netherlands", "New Zealand", "Nigeria", "Norway",
-    "Pakistan", "Peru", "Philippines", "Poland", "Portugal", "Qatar",
-    "Romania", "Russia", "Saudi Arabia", "Senegal", "Singapore", "South Africa",
-    "South Korea", "Spain", "Sri Lanka", "Sudan", "Sweden", "Switzerland",
-    "Taiwan", "Thailand", "Turkey", "Ukraine", "United Arab Emirates",
-    "United Kingdom", "United States", "Venezuela", "Vietnam", "Zimbabwe",
+    ("Reuters World", "reuters_world"),
+    ("BBC World", "bbc_world"),
+    ("Al Jazeera", "al_jazeera"),
+    ("Bellingcat", "bellingcat"),
+    ("Crisis Group", "crisis_group"),
+    ("ACLED Blog", "acled_blog"),
+    ("UN News", "un_news"),
+    ("Foreign Policy", "foreign_policy"),
 ]
 
 EXAMPLE_QUERIES = [
-    ["Sudan",   ["bbc_world", "al_jazeera", "middle_east_eye", "hrw"], 14],
-    ["Myanmar", ["bbc_world", "crisis_group", "radio_free_asia", "hrw"], 21],
-    ["Ukraine", ["bbc_world", "npr_world", "sky_news", "war_on_rocks"], 7],
-    ["Haiti",   ["bbc_world", "al_jazeera", "un_news", "amnesty"], 14],
+    ["Sudan", ["reuters_world", "bbc_world", "al_jazeera"], 14],
+    ["Myanmar", ["reuters_world", "crisis_group", "bellingcat"], 21],
+    ["Ukraine", ["reuters_world", "bbc_world", "foreign_policy"], 7],
+    ["Haiti", ["reuters_world", "al_jazeera", "un_news"], 14],
 ]
 
 CSS = """
@@ -294,48 +167,29 @@ footer { display: none !important; }
 
 with gr.Blocks(title="OSINT Threat Analyst", css=CSS, theme=gr.themes.Soft()) as demo:
 
-    brief_state = gr.State(None)
-
     gr.HTML("""
     <div style="text-align:center;padding:20px 0 10px 0">
-      <h1 style="font-size:2em;margin:0">OSINT Threat Analyst</h1>
+      <h1 style="font-size:2em;margin:0">🌐 OSINT Threat Analyst</h1>
       <p style="color:#666;margin:6px 0 0 0">
-        Agentic multi-source intelligence briefing · ACLED + RSS · State Dept advisories · Powered by HuggingFace
+        Agentic multi-source intelligence briefing · ACLED + RSS · Powered by HuggingFace
       </p>
     </div>
-    <div style="text-align:center;background:#f0f4ff;border:1px solid #c7d4f0;border-radius:8px;padding:12px 24px;max-width:700px;margin:0 auto 16px auto;color:#1a2a5e;font-size:0.95em">
-      Enter the country or region you are researching or travelling to, select your preferred news sources, and click <strong>Run Analysis</strong> to generate a full intelligence brief.
-    </div>
     """)
 
     with gr.Row():
         with gr.Column(scale=1):
             gr.Markdown("### Configure Analysis")
 
-            country_input = gr.Dropdown(
-                choices=DESTINATION_COUNTRIES,
-                value=None,
-                label="Country / Region of Interest",
-                info="Type to search and select the country you are researching or travelling to.",
-                filterable=True,
-                allow_custom_value=True,
+            country_input = gr.Textbox(
+                label="Country / Region",
+                placeholder="e.g. Sudan, Myanmar, Haiti...",
+                max_lines=1,
             )
 
-            passport_input = gr.Dropdown(
-                choices=PASSPORT_COUNTRIES,
-                value="Not specified",
-                label="Passport Country",
-                info="Select your passport country to include embassy and consulate information in the report.",
-                filterable=True,
-            )
-
-            with gr.Row():
-                select_all_btn = gr.Button("Deselect All", size="sm", scale=1)
-
             rss_sources = gr.CheckboxGroup(
                 choices=RSS_SOURCE_OPTIONS,
-                value=[v for _, v in RSS_SOURCE_OPTIONS],   # all selected by default
-                label="News Sources",
+                value=["reuters_world", "bbc_world", "al_jazeera"],
+                label="RSS News Sources",
             )
 
             days_back = gr.Slider(
@@ -347,21 +201,26 @@ with gr.Blocks(title="OSINT Threat Analyst", css=CSS, theme=gr.themes.Soft()) as
             )
 
             analyze_btn = gr.Button(
-                "Run Analysis",
+                "🔍 Run Analysis",
                 variant="primary",
                 elem_id="analyze-btn",
             )
 
+            gr.Markdown(
+                "**Note:** ACLED requires free API credentials set as Space secrets. "
+                "[Register here](https://developer.acleddata.com).",
+                elem_classes=["note"],
+            )
 
         with gr.Column(scale=2):
             with gr.Tabs():
-                with gr.Tab("Threat Brief"):
+                with gr.Tab("📋 Threat Brief"):
                     brief_output = gr.HTML(
                         value="<div style='padding:40px;text-align:center;color:#999'>"
                               "Configure your query and click Run Analysis.</div>"
                     )
 
-                with gr.Tab("Raw Agent Trace"):
+                with gr.Tab("🔎 Raw Agent Trace"):
                     trace_output = gr.Textbox(
                         label="Agent trace",
                         lines=30,
@@ -369,57 +228,16 @@ with gr.Blocks(title="OSINT Threat Analyst", css=CSS, theme=gr.themes.Soft()) as
                         placeholder="Agent reasoning and tool calls will appear here...",
                     )
 
-            with gr.Row():
-                export_btn = gr.Button(
-                    "Export PDF Report",
-                    variant="secondary",
-                    interactive=False,
-                    scale=1,
-                )
-
-            pdf_file = gr.File(
-                label="Download PDF Report",
-                visible=False,
-                interactive=False,
-            )
-
     gr.Examples(
         examples=EXAMPLE_QUERIES,
         inputs=[country_input, rss_sources, days_back],
         label="Example Queries",
     )
 
-    _ALL_SOURCE_KEYS = [v for _, v in RSS_SOURCE_OPTIONS]
-
-    def toggle_sources(current_values):
-        """Select all if any are unchecked; deselect all if all are checked."""
-        if len(current_values) == len(_ALL_SOURCE_KEYS):
-            return gr.update(value=[]), gr.update(value="Select All")
-        return gr.update(value=_ALL_SOURCE_KEYS), gr.update(value="Deselect All")
-
-    select_all_btn.click(
-        fn=toggle_sources,
-        inputs=[rss_sources],
-        outputs=[rss_sources, select_all_btn],
-    )
-
     analyze_btn.click(
         fn=run_analysis,
-        inputs=[country_input, passport_input, rss_sources, days_back],
-        outputs=[brief_output, trace_output, brief_state],
-    ).then(
-        fn=lambda b: gr.update(interactive=b is not None),
-        inputs=[brief_state],
-        outputs=[export_btn],
-    )
-
-    export_btn.click(
-        fn=lambda b: generate_pdf(b) if b is not None else None,
-        inputs=[brief_state],
-        outputs=[pdf_file],
-    ).then(
-        fn=lambda: gr.update(visible=True),
-        outputs=[pdf_file],
+        inputs=[country_input, rss_sources, days_back],
+        outputs=[brief_output, trace_output],
     )
 
     gr.HTML("""

brief.py

@@ -36,27 +36,17 @@ class ThreatBrief:
     event_types: List[str] = field(default_factory=list)
     key_locations: List[str] = field(default_factory=list)
     fatalities_reported: Optional[int] = None
-    country_summary: str = ""
     narrative_summary: str = ""
-    risk_analysis: str = ""
     key_findings: List[str] = field(default_factory=list)
     indicators_of_escalation: List[str] = field(default_factory=list)
     recommended_watch_items: List[str] = field(default_factory=list)
     source_types_used: List[str] = field(default_factory=list)
-    recent_events: List[str] = field(default_factory=list)
     notable_news: List[NewsItem] = field(default_factory=list)
-    travel_advisory_level: str = ""
-    travel_advisory_level_text: str = ""
-    travel_advisory_indicators: List[str] = field(default_factory=list)
-    travel_advisory_date: str = ""
-    travel_advisory_url: str = ""
-    passport_country: str = ""
-    embassy_name: str = ""
-    embassy_address: str = ""
-    embassy_phone: str = ""
-    embassy_emergency_phone: str = ""
-    embassy_website: str = ""
-    embassy_notes: str = ""
+    airspace_status: str = ""
+    airspace_restrictions: List[str] = field(default_factory=list)
+    no_fly_zones: List[str] = field(default_factory=list)
+    air_defense_activity: List[str] = field(default_factory=list)
+    aviation_notes: str = ""
 
     def to_dict(self) -> dict:
         d = asdict(self)
@@ -101,58 +91,36 @@ produce a threat brief as a JSON object with EXACTLY these fields:
   "event_types": ["<type1>", "<type2>"],
   "key_locations": ["<location1>", "<location2>"],
   "fatalities_reported": <integer or null>,
-  "country_summary": "<3-5 sentence factual background on the country: geography, population, political system, recent history, and why it is geopolitically significant>",
   "narrative_summary": "<2-4 sentence analytical narrative synthesizing all sources>",
-  "risk_analysis": "<3-5 sentence focused risk assessment covering: (1) primary threat vectors and actors posing the greatest danger, (2) likelihood of near-term escalation, (3) risk to civilians, travelers, and humanitarian operations, (4) any compounding factors such as economic collapse, displacement, or regional spillover>",
   "key_findings": ["<finding1>", "<finding2>", "<finding3>"],
   "indicators_of_escalation": ["<indicator1>", "<indicator2>"],
   "recommended_watch_items": ["<watch_item1>", "<watch_item2>"],
-  "source_types_used": ["ACLED", "RSS", "State Dept Travel Advisory"],
-  "recent_events": [
-    "<one-line summary of a specific ACLED event, e.g. '2026-05-10 | Rakhine State — Armed clash between Arakan Army and military forces, 4 fatalities reported'>",
-    "<repeat for each significant event, up to 10>"
-  ],
-  "travel_advisory": {
-    "level": "<1|2|3|4 — just the number, or 'Unknown'>",
-    "level_text": "<full level string, e.g. 'Level 3: Reconsider Travel'>",
-    "indicators": ["<e.g. Crime>", "<e.g. Terrorism>"],
-    "date_updated": "<date string from advisory>",
-    "url": "<full URL to the advisory page, or empty string>"
-  },
-  "embassy": {
-    "name": "<full official name of the embassy or consulate, e.g. 'U.S. Embassy Nairobi'>",
-    "address": "<street address of the embassy in the destination country>",
-    "phone": "<main switchboard phone number including country code>",
-    "emergency_phone": "<after-hours emergency line for citizens, including country code>",
-    "website": "<full URL to the embassy website>",
-    "notes": "<1-2 sentences on anything a traveller should know: nearest consulate if no embassy, appointment requirements, or special emergency procedures>"
-  },
+  "source_types_used": ["ACLED", "RSS", "AIRSPACE"],
   "notable_news": [
     {
       "title": "<article headline>",
       "source": "<news source name>",
       "published": "<publication date>",
-      "summary": "<1-2 sentence analytical summary explaining why this article matters>",
+      "summary": "<1-2 sentence summary of why this article is significant>",
       "url": "<article URL>",
       "notable": true
     }
-  ]
+  ],
+  "airspace_status": "<one of: Open | Restricted | Partially Restricted | Closed | Unknown>",
+  "airspace_restrictions": ["<restriction or NOTAM description1>", "<restriction2>"],
+  "no_fly_zones": ["<zone name or description1>", "<zone2>"],
+  "air_defense_activity": ["<activity description1>", "<activity2>"],
+  "aviation_notes": "<1-2 sentence summary of overall airspace picture and commercial aviation impact>"
 }
 
-For embassy: provide the PASSPORT_COUNTRY's embassy or nearest consulate in the destination country.
-If no embassy exists there, name the nearest one in a neighbouring country and explain in notes.
-Use your best knowledge of official embassy details; always include the website so the traveller can verify.
-
-For recent_events: list each significant ACLED event as a single line in the format
-"DATE | LOCATION — description, N fatalities". Include up to 10 events ordered
-most-recent first. If ACLED returned no data, use an empty array [].
+For notable_news: include the 3-6 most significant articles from the RSS results.
+Prioritize articles marked as NOTABLE in the RSS output. Write the summary field
+in your own analytical words — explain WHY the article matters to the threat picture,
+not just what it says. If no notable articles were found, use an empty array [].
 
-For notable_news: include ALL relevant articles from the RSS results, up to 10.
-Do NOT filter only by the NOTABLE flag — include any article that relates to the
-country's security, politics, humanitarian situation, or conflict dynamics.
-Write the summary field in your own analytical words — explain WHY the article
-matters to the threat picture, not just what it says.
-If no RSS articles were retrieved, use an empty array [].
+For airspace fields: use data from the AIRSPACE tool output. If no airspace data
+was retrieved, set airspace_status to "Unknown" and use empty arrays. Be concise
+and factual — cite specific restrictions, zones, or incidents where available.
 
 Return ONLY the JSON object. No preamble, no markdown fences.
 """
@@ -182,9 +150,6 @@ def parse_brief_from_llm(raw_text: str) -> ThreatBrief:
                 notable=n.get("notable", True),
             ))
 
-        ta = data.get("travel_advisory", {})
-        em = data.get("embassy", {})
-
         return ThreatBrief(
             region=data.get("region", ""),
             country=data.get("country", ""),
@@ -195,26 +160,17 @@ def parse_brief_from_llm(raw_text: str) -> ThreatBrief:
             event_types=data.get("event_types", []),
             key_locations=data.get("key_locations", []),
             fatalities_reported=data.get("fatalities_reported"),
-            country_summary=data.get("country_summary", ""),
             narrative_summary=data.get("narrative_summary", raw_text),
-            risk_analysis=data.get("risk_analysis", ""),
             key_findings=data.get("key_findings", []),
             indicators_of_escalation=data.get("indicators_of_escalation", []),
             recommended_watch_items=data.get("recommended_watch_items", []),
             source_types_used=data.get("source_types_used", []),
-            recent_events=data.get("recent_events", []),
             notable_news=news_items,
-            travel_advisory_level=str(ta.get("level", "")),
-            travel_advisory_level_text=ta.get("level_text", ""),
-            travel_advisory_indicators=ta.get("indicators", []),
-            travel_advisory_date=ta.get("date_updated", ""),
-            travel_advisory_url=ta.get("url", ""),
-            embassy_name=em.get("name", ""),
-            embassy_address=em.get("address", ""),
-            embassy_phone=em.get("phone", ""),
-            embassy_emergency_phone=em.get("emergency_phone", ""),
-            embassy_website=em.get("website", ""),
-            embassy_notes=em.get("notes", ""),
+            airspace_status=data.get("airspace_status", "Unknown"),
+            airspace_restrictions=data.get("airspace_restrictions", []),
+            no_fly_zones=data.get("no_fly_zones", []),
+            air_defense_activity=data.get("air_defense_activity", []),
+            aviation_notes=data.get("aviation_notes", ""),
         )
     except json.JSONDecodeError:
         return _fallback_brief(raw_text)
@@ -233,95 +189,6 @@ def _fallback_brief(raw_text: str) -> ThreatBrief:
 # HTML Renderer — system dark mode aware via CSS custom properties
 # ---------------------------------------------------------------------------
 
-def _render_travel_advisory(brief: ThreatBrief) -> str:
-    level = brief.travel_advisory_level.strip()
-    if not level or level == "Unknown":
-        return """
-  <div class="section muted-section" style="border-top:none">
-    <p class="muted-text">US State Department travel advisory not available for this country.</p>
-  </div>"""
-
-    color = ADVISORY_LEVEL_COLORS.get(level, "#999")
-    label = ADVISORY_LEVEL_LABELS.get(level, brief.travel_advisory_level_text or f"Level {level}")
-    indicators_html = (
-        " &nbsp;·&nbsp; ".join(f'<span class="risk-tag">{i}</span>' for i in brief.travel_advisory_indicators)
-        if brief.travel_advisory_indicators
-        else "<em>None listed</em>"
-    )
-    link_html = (
-        f' &nbsp;<a href="{brief.travel_advisory_url}" target="_blank" style="font-size:0.82em;color:var(--text-link)">Full advisory →</a>'
-        if brief.travel_advisory_url else ""
-    )
-    date_html = f'<span style="color:var(--text-muted);font-size:0.82em">Updated: {brief.travel_advisory_date}</span>' if brief.travel_advisory_date else ""
-
-    return f"""
-  <div class="section" style="border-top:none;border-left:4px solid {color}">
-    <h3 style="margin-top:0;margin-bottom:10px">
-      🗺️ US State Dept Travel Advisory
-      <span style="background:{color};color:white;padding:2px 12px;border-radius:12px;font-size:0.82em;font-weight:bold;margin-left:8px">
-        Level {level}: {label}
-      </span>
-      {link_html}
-    </h3>
-    <div style="margin-bottom:6px"><strong>Risk categories:</strong> &nbsp;{indicators_html}</div>
-    {date_html}
-  </div>"""
-
-
-ADVISORY_LEVEL_COLORS = {
-    "1": "#27AE60",
-    "2": "#F39C12",
-    "3": "#E67E22",
-    "4": "#C0392B",
-}
-
-ADVISORY_LEVEL_LABELS = {
-    "1": "Exercise Normal Precautions",
-    "2": "Exercise Increased Caution",
-    "3": "Reconsider Travel",
-    "4": "Do Not Travel",
-}
-
-
-def _render_embassy(brief: ThreatBrief) -> str:
-    if not brief.passport_country:
-        return ""
-
-    if not brief.embassy_name:
-        return f"""
-  <div class="section muted-section" style="border-top:none">
-    <p class="muted-text">Embassy information for {brief.passport_country} passport holders not available.</p>
-  </div>"""
-
-    website_html = (
-        f'<a href="{brief.embassy_website}" target="_blank" style="color:var(--text-link);font-size:0.85em">{brief.embassy_website}</a>'
-        if brief.embassy_website else "<em>Not available</em>"
-    )
-
-    rows = []
-    if brief.embassy_address:
-        rows.append(f"<tr><td style='width:160px;color:var(--text-muted);padding:4px 12px 4px 0;vertical-align:top'>Address</td><td style='color:var(--text-body)'>{brief.embassy_address}</td></tr>")
-    if brief.embassy_phone:
-        rows.append(f"<tr><td style='color:var(--text-muted);padding:4px 12px 4px 0'>Main phone</td><td style='color:var(--text-body)'>{brief.embassy_phone}</td></tr>")
-    if brief.embassy_emergency_phone:
-        rows.append(f"<tr><td style='color:var(--text-muted);padding:4px 12px 4px 0'>Emergency line</td><td style='color:var(--text-body);font-weight:600'>{brief.embassy_emergency_phone}</td></tr>")
-    rows.append(f"<tr><td style='color:var(--text-muted);padding:4px 12px 4px 0'>Website</td><td>{website_html}</td></tr>")
-
-    notes_html = f'<p style="margin:10px 0 0 0;font-size:0.88em;color:var(--text-muted);font-style:italic">{brief.embassy_notes}</p>' if brief.embassy_notes else ""
-
-    return f"""
-  <div class="section" style="border-top:none;border-left:4px solid #1a56db">
-    <h3 style="margin-top:0;margin-bottom:10px">
-      {brief.passport_country} Embassy / Consulate
-      <span style="font-size:0.75em;font-weight:normal;color:var(--text-muted);margin-left:8px">in {brief.country}</span>
-    </h3>
-    <div style="font-weight:600;color:var(--text-primary);margin-bottom:8px">{brief.embassy_name}</div>
-    <table style="border-collapse:collapse;font-size:0.9em">{" ".join(rows)}</table>
-    {notes_html}
-    <p style="margin:10px 0 0 0;font-size:0.78em;color:var(--text-muted)">Verify contact details before travel — embassy information can change.</p>
-  </div>"""
-
-
 def render_brief_html(brief: ThreatBrief) -> str:
     sev_color  = SEVERITY_COLORS.get(brief.severity, "#999")
     conf_color = CONFIDENCE_COLORS.get(brief.confidence, "#999")
@@ -344,65 +211,80 @@ def render_brief_html(brief: ThreatBrief) -> str:
     )
     sources_str = ", ".join(brief.source_types_used) if brief.source_types_used else "N/A"
 
-    # Build recent events section
-    if brief.recent_events:
-        event_rows = "".join(
-            f"<tr><td style='padding:4px 8px;border-bottom:1px solid var(--border);font-family:monospace;font-size:0.82em;color:var(--text-body)'>{e}</td></tr>"
-            for e in brief.recent_events
-        )
-        events_section = f"""
+    # Build notable news cards
+    if brief.notable_news:
+        cards = []
+        for item in brief.notable_news:
+            link_html = (
+                f'<a href="{item.url}" target="_blank" class="news-link">Read full article →</a>'
+                if item.url else ""
+            )
+            cards.append(f"""
+            <div class="news-card">
+              <div class="news-meta">
+                <span class="news-source-badge">{item.source}</span>
+                <span class="news-date">{item.published[:25] if item.published else ""}</span>
+              </div>
+              <div class="news-title">{item.title}</div>
+              <div class="news-summary">{item.summary}</div>
+              {link_html}
+            </div>""")
+        news_section = f"""
   <div class="section">
-    <h3 class="section-title">Recent Conflict Events
-      <span class="section-count">{len(brief.recent_events)} events · ACLED</span>
+    <h3 class="section-title">📰 Notable News
+      <span class="section-count">{len(brief.notable_news)} articles</span>
     </h3>
-    <table style="width:100%;border-collapse:collapse">
-      {event_rows}
-    </table>
+    {"".join(cards)}
   </div>"""
     else:
-        events_section = """
+        news_section = """
   <div class="section muted-section">
-    <h3 class="section-title">Recent Conflict Events</h3>
-    <p class="muted-text">No ACLED conflict events retrieved. Check ACLED credentials or try a different date range.</p>
+    <p class="muted-text">No notable news articles retrieved.</p>
   </div>"""
 
-    # Build news cards — always render the section
-    cards = []
-    for item in brief.notable_news:
-        link_html = (
-            f'<a href="{item.url}" target="_blank" class="news-link">Read full article →</a>'
-            if item.url else ""
-        )
-        notable_badge = (
-            '<span style="background:#fef3c7;color:#92400e;font-size:0.72em;'
-            'padding:1px 6px;border-radius:8px;margin-left:6px;font-weight:600">NOTABLE</span>'
-            if item.notable else ""
-        )
-        cards.append(f"""
-        <div class="news-card">
-          <div class="news-meta">
-            <span class="news-source-badge">{item.source}</span>
-            <span class="news-date">{item.published[:25] if item.published else ""}</span>
-            {notable_badge}
-          </div>
-          <div class="news-title">{item.title}</div>
-          <div class="news-summary">{item.summary}</div>
-          {link_html}
-        </div>""")
-
-    if cards:
-        news_section = f"""
-  <div class="section">
-    <h3 class="section-title">Recent News
-      <span class="section-count">{len(brief.notable_news)} articles</span>
+    AIRSPACE_STATUS_COLORS = {
+        "Open":                 "#27AE60",
+        "Restricted":           "#E67E22",
+        "Partially Restricted": "#F39C12",
+        "Closed":               "#C0392B",
+        "Unknown":              "#7F8C8D",
+    }
+    as_color = AIRSPACE_STATUS_COLORS.get(brief.airspace_status, "#7F8C8D")
+
+    has_airspace_data = (
+        brief.airspace_restrictions
+        or brief.no_fly_zones
+        or brief.air_defense_activity
+        or brief.aviation_notes
+        or (brief.airspace_status and brief.airspace_status != "Unknown")
+    )
+
+    if has_airspace_data:
+        airspace_section = f"""
+  <div class="section airspace-section">
+    <h3 class="section-title">✈️ Airspace &amp; Aviation Status
+      <span style="margin-left:10px">{badge(brief.airspace_status or 'Unknown', as_color)}</span>
     </h3>
-    {"".join(cards)}
+    {f'<p class="airspace-notes">{brief.aviation_notes}</p>' if brief.aviation_notes else ""}
+    <div class="airspace-grid">
+      <div class="airspace-cell">
+        <h4>🚫 No-Fly Zones</h4>
+        <ul>{bullet_list(brief.no_fly_zones)}</ul>
+      </div>
+      <div class="airspace-cell">
+        <h4>⚠️ Active Restrictions / NOTAMs</h4>
+        <ul>{bullet_list(brief.airspace_restrictions)}</ul>
+      </div>
+      <div class="airspace-cell airspace-cell-full">
+        <h4>🛡️ Air Defense Activity</h4>
+        <ul>{bullet_list(brief.air_defense_activity)}</ul>
+      </div>
+    </div>
   </div>"""
     else:
-        news_section = """
+        airspace_section = """
   <div class="section muted-section">
-    <h3 class="section-title">Recent News</h3>
-    <p class="muted-text">No news articles were retrieved for this query. Try adding more RSS sources or broadening the search.</p>
+    <p class="muted-text">✈️ No airspace restriction data retrieved for this country.</p>
   </div>"""
 
     html = f"""
@@ -552,6 +434,43 @@ def render_brief_html(brief: ThreatBrief) -> str:
   }}
   .news-link:hover {{ text-decoration: underline; }}
 
+  .airspace-section {{
+    background: var(--bg-primary);
+    border: 1px solid var(--border);
+    border-top: none;
+    padding: 18px 24px;
+    color: var(--text-body);
+  }}
+  .airspace-notes {{
+    line-height: 1.7;
+    margin: 0 0 14px 0;
+    color: var(--text-body);
+  }}
+  .airspace-grid {{
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+    gap: 0;
+  }}
+  .airspace-cell {{
+    padding: 12px 16px 12px 0;
+    border-right: 1px solid var(--border);
+  }}
+  .airspace-cell:last-child {{ border-right: none; padding-right: 0; }}
+  .airspace-cell-full {{
+    grid-column: 1 / -1;
+    border-right: none;
+    border-top: 1px solid var(--border);
+    padding-top: 12px;
+    margin-top: 4px;
+  }}
+  .airspace-cell h4 {{
+    color: var(--text-primary);
+    margin-top: 0;
+    margin-bottom: 8px;
+    font-size: 0.95em;
+  }}
+  .airspace-cell ul {{ padding-left: 18px; line-height: 1.9; margin: 0; }}
+
   .warn-section {{
     background: var(--bg-warn);
     border: 1px solid var(--border);
@@ -562,15 +481,6 @@ def render_brief_html(brief: ThreatBrief) -> str:
   .warn-section h4 {{ color: var(--text-primary); margin-top: 0; }}
   .warn-section ul {{ padding-left: 18px; line-height: 1.9; margin: 0; }}
 
-  .risk-tag {{
-    background: var(--bg-accent);
-    border: 1px solid var(--border);
-    color: var(--text-body);
-    padding: 1px 8px;
-    border-radius: 6px;
-    font-size: 0.82em;
-  }}
-
   .brief-footer {{
     background: var(--bg-secondary);
     border: 1px solid var(--border);
@@ -585,7 +495,7 @@ def render_brief_html(brief: ThreatBrief) -> str:
 <div class="brief-wrap">
 
   <div class="brief-header">
-    <h2>OSINT Threat Brief</h2>
+    <h2>🛡️ OSINT Threat Brief</h2>
     <p>{brief.country or 'Unknown'} &nbsp;|&nbsp; {brief.region} &nbsp;|&nbsp; {brief.assessment_date}</p>
   </div>
 
@@ -596,53 +506,39 @@ def render_brief_html(brief: ThreatBrief) -> str:
     <span><strong>Fatalities:</strong> {fatalities_str}</span>
   </div>
 
-  <div class="section">
-    <h3>Country Background</h3>
-    <p>{brief.country_summary or '<em>Not available</em>'}</p>
-  </div>
-
-  {_render_travel_advisory(brief)}
-
-  {_render_embassy(brief)}
-
   <div class="section">
     <h3>Analytical Summary</h3>
     <p>{brief.narrative_summary or '<em>Not available</em>'}</p>
   </div>
 
-  <div class="section" style="border-left:4px solid #C0392B">
-    <h3 style="margin-top:0;color:#C0392B">Risk Assessment</h3>
-    <p>{brief.risk_analysis or '<em>Risk assessment not available.</em>'}</p>
-  </div>
-
   <div class="grid-2">
     <div class="grid-cell grid-cell-border">
-      <h4>Key Findings</h4>
+      <h4>🔍 Key Findings</h4>
       <ul>{bullet_list(brief.key_findings)}</ul>
     </div>
     <div class="grid-cell">
-      <h4>Escalation Indicators</h4>
+      <h4>⚠️ Escalation Indicators</h4>
       <ul>{bullet_list(brief.indicators_of_escalation)}</ul>
     </div>
   </div>
 
   <div class="grid-2">
     <div class="grid-cell grid-cell-border" style="border-top:1px solid var(--border)">
-      <h4>Primary Actors</h4>
+      <h4>🎭 Primary Actors</h4>
       <ul>{bullet_list(brief.primary_actors)}</ul>
     </div>
     <div class="grid-cell" style="border-top:1px solid var(--border)">
-      <h4>Key Locations</h4>
+      <h4>📍 Key Locations</h4>
       <ul>{bullet_list(brief.key_locations)}</ul>
     </div>
   </div>
 
-  {events_section}
-
   {news_section}
 
+  {airspace_section}
+
   <div class="warn-section">
-    <h4>Recommended Watch Items</h4>
+    <h4>📡 Recommended Watch Items</h4>
     <ul>{bullet_list(brief.recommended_watch_items)}</ul>
   </div>
 

requirements.txt

@@ -2,5 +2,3 @@ gradio>=5.23.0
 smolagents>=1.10.0
 feedparser>=6.0.10
 requests>=2.31.0
-fpdf2>=2.7.0
-Pillow>=10.0.0

tools.py

@@ -2,8 +2,11 @@
 tools.py — OSINT data source tools for the agentic analyst loop.
 
 Required Space Secrets:
-  ACLED_USERNAME  — your myACLED account email (from https://developer.acleddata.com)
-  ACLED_PASSWORD  — your myACLED account password
+  ACLED_USERNAME  — your myACLED email address
+  ACLED_PASSWORD  — your myACLED password
+
+Optional Space Secrets (enhance airspace data):
+  AVWX_TOKEN      — free API token from https://avwx.rest (enables per-airport NOTAM lookups)
 """
 
 import os
@@ -16,26 +19,20 @@ from datetime import datetime, timedelta
 from smolagents import tool
 
 # ---------------------------------------------------------------------------
-# ACLED OAuth 2.0 token cache
-# API docs: https://acleddata.com/api-documentation/acled-endpoint
-# Auth: password grant flow → Bearer token in Authorization header
+# ACLED OAuth token cache
 # ---------------------------------------------------------------------------
 
-ACLED_TOKEN_URL = "https://acleddata.com/oauth/token"
-ACLED_BASE      = "https://acleddata.com/api/acled/read"
-
-_token_cache: dict = {
+_token_cache = {
     "access_token": None,
-    "expires_at":   0.0,
-    "lock":         threading.Lock(),
+    "expires_at": 0,
+    "lock": threading.Lock(),
 }
 
+ACLED_TOKEN_URL = "https://acleddata.com/oauth/token"
+ACLED_BASE      = "https://acleddata.com/api/acled/read"
+
 
 def _get_acled_token() -> str:
-    """
-    Return a valid Bearer token, refreshing via OAuth password grant if needed.
-    Caches the token so we don't re-auth on every tool call.
-    """
     with _token_cache["lock"]:
         now = time.time()
         if _token_cache["access_token"] and now < _token_cache["expires_at"]:
@@ -46,47 +43,31 @@ def _get_acled_token() -> str:
 
         if not username or not password:
             raise EnvironmentError(
-                "ACLED credentials missing. "
-                "Add ACLED_USERNAME and ACLED_PASSWORD as Space secrets "
-                "(Settings → Variables and Secrets). "
-                "Register free at https://developer.acleddata.com"
+                "ACLED credentials missing. Add ACLED_USERNAME and ACLED_PASSWORD "
+                "as Space secrets under Settings -> Variables and Secrets."
             )
 
-        try:
-            resp = requests.post(
-                ACLED_TOKEN_URL,
-                data={
-                    "grant_type": "password",
-                    "client_id":  "acled",
-                    "username":   username,
-                    "password":   password,
-                },
-                headers={"Content-Type": "application/x-www-form-urlencoded"},
-                timeout=20,
-            )
-        except requests.RequestException as e:
-            raise EnvironmentError(f"ACLED token request failed (network): {e}") from e
+        resp = requests.post(
+            ACLED_TOKEN_URL,
+            headers={"Content-Type": "application/x-www-form-urlencoded"},
+            data={
+                "username": username,
+                "password": password,
+                "grant_type": "password",
+                "client_id": "acled",
+            },
+            timeout=15,
+        )
 
         if resp.status_code != 200:
             raise EnvironmentError(
-                f"ACLED token request failed (HTTP {resp.status_code}): {resp.text[:300]}"
+                f"ACLED token request failed ({resp.status_code}): {resp.text[:200]}"
             )
 
-        try:
-            token_data = resp.json()
-        except ValueError:
-            raise EnvironmentError(f"ACLED token response not JSON: {resp.text[:300]}")
-
-        access_token = token_data.get("access_token")
-        if not access_token:
-            raise EnvironmentError(
-                f"ACLED token response missing 'access_token'. Got: {token_data}"
-            )
-
-        expires_in = token_data.get("expires_in", 86400)
-        _token_cache["access_token"] = access_token
-        _token_cache["expires_at"]   = now + int(expires_in) - 300   # refresh 5 min early
-        return access_token
+        token_data = resp.json()
+        _token_cache["access_token"] = token_data["access_token"]
+        _token_cache["expires_at"] = now + token_data.get("expires_in", 86400) - 300
+        return _token_cache["access_token"]
 
 
 def _strip_html(text: str) -> str:
@@ -101,7 +82,7 @@ def _strip_html(text: str) -> str:
 # ---------------------------------------------------------------------------
 
 @tool
-def fetch_acled_events(country: str, days_back: int = 14, limit: int = 15) -> str:
+def fetch_acled_events(country: str, days_back: int = 14, limit: int = 25) -> str:
     """
     Fetches recent armed conflict events from ACLED for a given country.
     Returns dates, locations, actor names, event types, and fatality counts.
@@ -115,38 +96,34 @@ def fetch_acled_events(country: str, days_back: int = 14, limit: int = 15) -> st
         token = _get_acled_token()
     except EnvironmentError as e:
         return f"[ACLED] Auth error: {e}"
+    except requests.RequestException as e:
+        return f"[ACLED] Failed to obtain token: {e}"
 
     since = (datetime.utcnow() - timedelta(days=days_back)).strftime("%Y-%m-%d")
 
     params = {
-        "country":          country,
-        "event_date":       since,
+        "country": country,
+        "event_date": since,
         "event_date_where": ">=",
-        "limit":            min(limit, 50),
-        "fields":           "event_date|event_type|sub_event_type|actor1|actor2|location|admin1|fatalities|notes",
-        "_format":          "json",
+        "limit": min(limit, 50),
+        "fields": "event_date|event_type|sub_event_type|actor1|actor2|location|admin1|fatalities|notes",
+        "_format": "json",
     }
 
-    headers = {"Authorization": f"Bearer {token}"}
-
-    try:
-        resp = requests.get(ACLED_BASE, params=params, headers=headers, timeout=20)
-    except requests.RequestException as e:
-        return f"[ACLED] Request failed (network): {e}"
-
-    # Surface any non-200 HTTP status before trying to parse JSON
-    if resp.status_code != 200:
-        return f"[ACLED] HTTP {resp.status_code}: {resp.text[:300]}"
+    headers = {
+        "Authorization": f"Bearer {token}",
+        "Content-Type": "application/json",
+    }
 
     try:
+        resp = requests.get(ACLED_BASE, params=params, headers=headers, timeout=15)
+        resp.raise_for_status()
         data = resp.json()
-    except ValueError:
-        return f"[ACLED] Could not parse response as JSON. Raw: {resp.text[:300]}"
+    except requests.RequestException as e:
+        return f"[ACLED] Request failed: {e}"
 
-    api_status = data.get("status")
-    if api_status != 200:
-        msg = data.get("error") or data.get("message") or str(data)[:300]
-        return f"[ACLED] API status {api_status}: {msg}"
+    if data.get("status") != 200:
+        return f"[ACLED] API error: {data.get('error', data)}"
 
     events = data.get("data", [])
     if not events:
@@ -156,15 +133,15 @@ def fetch_acled_events(country: str, days_back: int = 14, limit: int = 15) -> st
     total_fatalities = 0
 
     for ev in events:
-        fatalities = int(ev.get("fatalities") or 0)
+        fatalities = int(ev.get("fatalities", 0))
         total_fatalities += fatalities
         actor2_str = f" vs {ev['actor2']}" if ev.get("actor2") else ""
         lines.append(
-            f"* {ev.get('event_date', '?')} | {ev.get('event_type', '?')} / {ev.get('sub_event_type', '')} | "
+            f"* {ev['event_date']} | {ev['event_type']} / {ev.get('sub_event_type', '')} | "
             f"{ev.get('location', '?')}, {ev.get('admin1', '?')} | "
             f"{ev.get('actor1', '?')}{actor2_str} | "
             f"Fatalities: {fatalities} | "
-            f"Notes: {str(ev.get('notes', ''))[:80]}"
+            f"Notes: {ev.get('notes', '')[:120]}"
         )
 
     lines.append(f"\nTotal reported fatalities: {total_fatalities}")
@@ -176,55 +153,33 @@ def fetch_acled_events(country: str, days_back: int = 14, limit: int = 15) -> st
 # ---------------------------------------------------------------------------
 
 RSS_FEED_REGISTRY = {
-    # Verified working as of 2026-05
-
-    # --- General world news ---
-    "bbc_world":       "https://feeds.bbci.co.uk/news/world/rss.xml",
-    "al_jazeera":      "https://www.aljazeera.com/xml/rss/all.xml",
-    "france24":        "https://www.france24.com/en/rss",
-    "euronews":        "https://feeds.feedburner.com/euronews/en/news/",
-    "npr_world":       "https://feeds.npr.org/1004/rss.xml",
-    "sky_news":        "https://feeds.skynews.com/feeds/rss/world.xml",
-    "un_news":         "https://news.un.org/feed/subscribe/en/news/all/rss.xml",
-    "ibt":             "https://www.ibtimes.com/rss",
-
-    # --- Regional: Middle East ---
-    "middle_east_eye": "https://www.middleeasteye.net/rss",
-    "al_monitor":      "https://www.almonitor.com/rss",
-    "arab_news":       "https://www.arabnews.com/rss.xml",
-
-    # --- Regional: Africa ---
-    "allafrica":       "https://allafrica.com/tools/headlines/rdf/latest/headlines.rdf",
-
-    # --- Regional: Asia-Pacific ---
-    "radio_free_asia": "https://www.rfa.org/english/rss2.xml",
-    "scmp":            "https://www.scmp.com/rss/91/feed",
-
-    # --- Regional: South Asia ---
-    "dawn":            "https://www.dawn.com/feeds/home",
-
-    # --- Regional: Russia / Eastern Europe ---
-    "moscow_times":    "https://www.themoscowtimes.com/rss/news",
-
-    # --- OSINT / investigative ---
-    "bellingcat":      "https://www.bellingcat.com/feed/",
-    "the_intercept":   "https://theintercept.com/feed/?rss",
-    "occrp":           "https://www.occrp.org/en/component/rssfeed/index.xml",
-
-    # --- Policy / security analysis ---
-    "crisis_group":    "https://www.crisisgroup.org/rss.xml",
-    "war_on_rocks":    "https://warontherocks.com/feed/",
-    "just_security":   "https://www.justsecurity.org/feed/",
-    "defense_one":     "https://www.defenseone.com/rss/all/",
-    "cipher_brief":    "https://www.thecipherbrief.com/feed",
-    "stimson":         "https://www.stimson.org/feed/",
-
-    # --- Human rights ---
-    "hrw":             "https://www.hrw.org/rss.xml",
-    "amnesty":         "https://www.amnesty.org/en/feed/",
+    "reuters_world":  "https://feeds.reuters.com/reuters/worldNews",
+    "bbc_world":      "https://feeds.bbci.co.uk/news/world/rss.xml",
+    "al_jazeera":     "https://www.aljazeera.com/xml/rss/all.xml",
+    "bellingcat":     "https://www.bellingcat.com/feed/",
+    "crisis_group":   "https://www.crisisgroup.org/rss.xml",
+    "acled_blog":     "https://acleddata.com/feed/",
+    "un_news":        "https://news.un.org/feed/subscribe/en/news/feed/rss.xml",
+    "foreign_policy": "https://foreignpolicy.com/feed/",
 }
 
-SCAN_LIMIT = 20   # Max entries scanned per feed — keeps LLM context manageable
+AVIATION_RSS_SOURCES = {
+    "aviation_herald":   "https://avherald.com/h?subscribe=rss",
+    "the_aviationist":   "https://theaviationist.com/feed/",
+    "flight_global":     "https://www.flightglobal.com/rss/",
+    "aviation_week":     "https://aviationweek.com/rss/all",
+    "alert5":            "https://alert5.com/feed/",
+}
+
+AIRSPACE_SIGNALS = [
+    "notam", "no-fly", "no fly", "airspace", "flight ban", "flight restriction",
+    "fir", "air defense", "air defence", "missile", "anti-aircraft",
+    "flight advisory", "aviation", "closed airspace", "restricted airspace",
+    "drone", "uav", "uas", "aircraft", "airline", "airport", "runway",
+    "air traffic", "eurocontrol", "icao", "overflight", "air corridor",
+]
+
+SCAN_LIMIT = 50
 
 # Signal words that bump an article to "notable"
 NOTABLE_SIGNALS = [
@@ -246,8 +201,8 @@ def _is_notable(title: str, summary: str) -> bool:
 @tool
 def fetch_rss_headlines(
     topic: str,
-    sources: str = "bbc_world,al_jazeera,france24",
-    max_articles: int = 10,
+    sources: str = "reuters_world,bbc_world,al_jazeera",
+    max_articles: int = 20,
 ) -> str:
     """
     Fetches recent RSS news headlines related to a topic or region.
@@ -263,21 +218,8 @@ def fetch_rss_headlines(
                  al_jazeera, bellingcat, crisis_group, acled_blog, un_news, foreign_policy.
         max_articles: Maximum total articles to return across all sources (default 20).
     """
-    # Common country aliases so searches don't miss alternate names in articles
-    _ALIASES = {
-        "myanmar": ["myanmar", "burma"],
-        "burma": ["myanmar", "burma"],
-        "ivory coast": ["ivory coast", "côte d'ivoire"],
-        "drc": ["drc", "congo", "democratic republic"],
-        "car": ["central african republic", "car"],
-        "uae": ["uae", "united arab emirates"],
-    }
-
     source_keys = [s.strip() for s in sources.split(",") if s.strip()]
-    base_keywords = [w.lower() for w in topic.lower().split() if len(w) > 2]
-    topic_lower = topic.lower().strip()
-    extra = _ALIASES.get(topic_lower, [])
-    keywords = list(dict.fromkeys(base_keywords + extra))  # deduplicate, preserve order
+    keywords = [w.lower() for w in topic.lower().split() if len(w) > 2]
     articles = []
     feed_errors = []
 
@@ -307,7 +249,7 @@ def fetch_rss_headlines(
 
             title     = entry.get("title", "").strip()
             raw_summary = entry.get("summary", entry.get("description", ""))
-            summary   = _strip_html(raw_summary)[:150]
+            summary   = _strip_html(raw_summary)[:300]
             published = entry.get("published", entry.get("updated", ""))
             link      = entry.get("link", "")
 
@@ -359,94 +301,296 @@ def fetch_rss_headlines(
 
 
 # ---------------------------------------------------------------------------
-# US State Department Travel Advisory Tool
+# Airspace helpers — EASA CZIBs, AviationWeather SIGMETs, AVWX NOTAMs
 # ---------------------------------------------------------------------------
 
-_ADVISORY_API = "https://cadataapi.state.gov/api/TravelAdvisories"
-
-_RISK_KEYWORDS = {
-    "crime": "Crime",
-    "terrorism": "Terrorism",
-    "civil unrest": "Civil Unrest",
-    "health": "Health",
-    "natural disaster": "Natural Disaster",
-    "kidnapping": "Kidnapping",
-    "wrongful detention": "Wrongful Detention",
-    "piracy": "Piracy",
-    "maritime": "Maritime",
+# Country name → list of primary ICAO airport codes (for AVWX NOTAM lookups)
+COUNTRY_ICAO_MAP: dict[str, list[str]] = {
+    "ukraine":                       ["UKBB", "UKKK", "UKLL"],
+    "russia":                        ["UUEE", "UUDD", "ULLI"],
+    "sudan":                         ["HSSS"],
+    "myanmar":                       ["VYYY", "VYBR"],
+    "haiti":                         ["MTPP"],
+    "syria":                         ["OSDI", "OSLK"],
+    "iraq":                          ["ORBI", "ORMM", "ORKK"],
+    "libya":                         ["HLLT", "HLLB"],
+    "somalia":                       ["HCMM"],
+    "yemen":                         ["OYAA", "OYAB"],
+    "afghanistan":                   ["OAKB"],
+    "ethiopia":                      ["HAAB"],
+    "nigeria":                       ["DNMM", "DNKN", "DNAA"],
+    "mali":                          ["GABS", "GAMB"],
+    "burkina faso":                  ["DFFD"],
+    "niger":                         ["DRRN"],
+    "mozambique":                    ["FQMA"],
+    "central african republic":      ["FEFF"],
+    "democratic republic of congo":  ["FZAA", "FZNA"],
+    "drc":                           ["FZAA"],
+    "israel":                        ["LLBG", "LLHA"],
+    "palestine":                     ["LVGZ"],
+    "iran":                          ["OIIE", "OIII", "OIMM"],
+    "pakistan":                      ["OPKC", "OPLA", "OPPS"],
+    "north korea":                   ["ZKPY"],
+    "venezuela":                     ["SVMI", "SVMC"],
+    "mexico":                        ["MMMX", "MMGL", "MMMY"],
+    "colombia":                      ["SKBO", "SKCL"],
+    "lebanon":                       ["OLBA"],
+    "georgia":                       ["UGTB"],
+    "armenia":                       ["UDYZ"],
+    "azerbaijan":                    ["UBBB"],
 }
 
 
+def _keywords(country: str) -> list[str]:
+    return [w.lower() for w in country.lower().split() if len(w) > 2]
+
+
+def _fetch_easa_czibs(country: str) -> list[str]:
+    """Scrape EASA's live Conflict Zone Information Bulletins table."""
+    url = "https://www.easa.europa.eu/en/domains/air-operations/czibs"
+    try:
+        resp = requests.get(
+            url,
+            timeout=15,
+            headers={"User-Agent": "Mozilla/5.0 (compatible; OSINTBot/1.0)"},
+        )
+        resp.raise_for_status()
+    except requests.RequestException as e:
+        return [f"[EASA CZIB] Request failed: {e}"]
+
+    kws = _keywords(country)
+    html_text = resp.text
+
+    # Each bulletin row: strip tags → plain text; keep rows matching country
+    rows = re.findall(r"<tr[^>]*>(.*?)</tr>", html_text, re.DOTALL | re.IGNORECASE)
+    results = []
+    for row in rows:
+        cell_text = re.sub(r"<[^>]+>", " ", row)
+        cell_text = re.sub(r"\s+", " ", cell_text).strip()
+        if cell_text and any(kw in cell_text.lower() for kw in kws):
+            # Extract detail page link if present
+            link_match = re.search(r'href="(/en/domains/air-operations/czibs/[^"]+)"', row)
+            link = f"https://www.easa.europa.eu{link_match.group(1)}" if link_match else ""
+            entry = f"EASA CZIB | {cell_text}"
+            if link:
+                entry += f" | {link}"
+            results.append(entry)
+
+    if not results:
+        return [f"[EASA CZIB] No active conflict zone bulletins found for '{country}'."]
+    return results
+
+
+def _fetch_sigmets(country: str) -> list[str]:
+    """Fetch active international SIGMETs from AviationWeather.gov for the country's FIRs."""
+    url = "https://aviationweather.gov/api/data/isigmet?format=json"
+    try:
+        resp = requests.get(url, timeout=15)
+        resp.raise_for_status()
+        sigmets = resp.json()
+    except (requests.RequestException, ValueError) as e:
+        return [f"[SIGMET] Request failed: {e}"]
+
+    if not isinstance(sigmets, list):
+        return ["[SIGMET] Unexpected response format."]
+
+    kws = _keywords(country)
+    results = []
+    for s in sigmets:
+        fir_name = s.get("firName", "")
+        raw      = s.get("rawSigmet", "")
+        searchable = (fir_name + " " + raw).lower()
+
+        if not any(kw in searchable for kw in kws):
+            continue
+
+        try:
+            valid_from = datetime.utcfromtimestamp(s["validTimeFrom"]).strftime("%Y-%m-%d %H:%MZ")
+            valid_to   = datetime.utcfromtimestamp(s["validTimeTo"]).strftime("%Y-%m-%d %H:%MZ")
+        except (KeyError, TypeError, OSError):
+            valid_from = valid_to = "?"
+
+        base = s.get("base") or "SFC"
+        top  = s.get("top", "?")
+
+        results.append(
+            f"SIGMET | {fir_name} | Hazard: {s.get('hazard','?')} {s.get('qualifier','')}"
+            f" | Valid: {valid_from} → {valid_to}"
+            f" | FL: {base}–{top}"
+            f" | {raw[:150]}"
+        )
+
+    if not results:
+        return [f"[SIGMET] No active SIGMETs found for '{country}'."]
+    return results
+
+
+def _fetch_avwx_notams(country: str, token: str) -> list[str]:
+    """Fetch NOTAMs via AVWX for the country's main airports (requires AVWX_TOKEN)."""
+    country_lower = country.lower()
+
+    # Direct or partial match in the ICAO map
+    icao_codes = COUNTRY_ICAO_MAP.get(country_lower)
+    if not icao_codes:
+        for k, v in COUNTRY_ICAO_MAP.items():
+            if country_lower in k or k in country_lower:
+                icao_codes = v
+                break
+
+    if not icao_codes:
+        return [f"[NOTAM] No ICAO airport codes mapped for '{country}'. Skipping AVWX lookup."]
+
+    headers = {"Authorization": f"BEARER {token}"}
+    results = []
+
+    for icao in icao_codes[:2]:      # max 2 airports to stay within rate limits
+        try:
+            resp = requests.get(
+                f"https://avwx.rest/api/notam/{icao}",
+                headers=headers,
+                timeout=12,
+            )
+            if resp.status_code == 401:
+                return ["[NOTAM] AVWX token invalid or expired — check AVWX_TOKEN secret."]
+            resp.raise_for_status()
+            data = resp.json()
+        except (requests.RequestException, ValueError) as e:
+            results.append(f"[NOTAM] {icao}: {e}")
+            continue
+
+        notam_list = data if isinstance(data, list) else data.get("data", [])
+        if not notam_list:
+            results.append(f"[NOTAM] {icao}: No active NOTAMs.")
+            continue
+
+        for n in notam_list[:6]:
+            raw = (
+                n.get("raw")
+                or n.get("text", {}).get("repr", "")
+                or str(n)
+            )[:200]
+            results.append(f"NOTAM | {icao} | {raw}")
+
+        time.sleep(0.2)
+
+    return results if results else [f"[NOTAM] No NOTAMs returned for '{country}'."]
+
+
+# ---------------------------------------------------------------------------
+# Airspace tool — integrates EASA CZIBs + SIGMETs + AVWX NOTAMs + aviation RSS
+# ---------------------------------------------------------------------------
+
 @tool
-def fetch_travel_advisory(country: str) -> str:
+def fetch_airspace_status(country: str, max_articles: int = 12) -> str:
     """
-    Fetches the current US State Department travel advisory for a country
-    using the official State Department data API.
-    Returns the advisory level (1–4), risk categories, publication date,
-    a plain-text summary, and a link to the full advisory.
+    Fetches airspace disruption intelligence for a given country from three
+    structured sources plus aviation news RSS feeds:
+
+    1. EASA Conflict Zone Information Bulletins (CZIBs) — official EU conflict
+       zone airspace warnings (no auth required).
+    2. AviationWeather.gov international SIGMETs — active hazards (thunderstorms,
+       volcanic ash, turbulence, tropical cyclones) within the country's FIRs
+       (no auth required).
+    3. AVWX NOTAMs — per-airport notices to airmen for the country's main airports
+       (requires optional AVWX_TOKEN Space secret).
+    4. Aviation news RSS feeds — filtered for country + airspace keywords.
 
-    Advisory levels:
-      1 = Exercise Normal Precautions
-      2 = Exercise Increased Caution
-      3 = Reconsider Travel
-      4 = Do Not Travel
+    Returns a combined report suitable for inclusion in a threat brief's airspace
+    section, covering no-fly zones, active restrictions, and aviation disruptions.
 
     Args:
-        country: Country name to look up (e.g. 'Sudan', 'Ukraine', 'Haiti').
+        country: Country name to query (e.g. 'Ukraine', 'Sudan', 'Libya').
+        max_articles: Maximum RSS articles to include (default 12).
     """
-    try:
-        resp = requests.get(_ADVISORY_API, timeout=20)
-        resp.raise_for_status()
-        advisories = resp.json()
-    except requests.RequestException as e:
-        return f"[Travel Advisory] Request failed: {e}"
-    except ValueError:
-        return "[Travel Advisory] Could not parse API response as JSON."
-
-    country_lower = country.lower().strip()
-
-    match = None
-    for entry in advisories:
-        title = entry.get("Title", "")
-        # Title format: "Country Name - Level N: Description"
-        dest = title.split(" - Level ")[0].strip()
-        if country_lower in dest.lower():
-            match = entry
+    kws = _keywords(country)
+    sections: list[str] = []
+
+    # -- 1. EASA CZIBs --------------------------------------------------------
+    czib_results = _fetch_easa_czibs(country)
+    sections.append("=== EASA Conflict Zone Bulletins (CZIBs) ===")
+    sections.extend(czib_results)
+
+    # -- 2. AviationWeather SIGMETs -------------------------------------------
+    sigmet_results = _fetch_sigmets(country)
+    sections.append("\n=== Active SIGMETs (AviationWeather.gov) ===")
+    sections.extend(sigmet_results)
+
+    # -- 3. AVWX NOTAMs (optional) --------------------------------------------
+    avwx_token = os.environ.get("AVWX_TOKEN", "").strip()
+    if avwx_token:
+        notam_results = _fetch_avwx_notams(country, avwx_token)
+        sections.append("\n=== NOTAMs (AVWX) ===")
+        sections.extend(notam_results)
+    else:
+        sections.append("\n=== NOTAMs (AVWX) ===")
+        sections.append("[NOTAM] AVWX_TOKEN not set — skipping NOTAM lookup.")
+
+    # -- 4. Aviation RSS news -------------------------------------------------
+    articles = []
+    feed_errors = []
+
+    all_sources = {**AVIATION_RSS_SOURCES, **{
+        k: v for k, v in RSS_FEED_REGISTRY.items()
+        if k in ("reuters_world", "bbc_world", "al_jazeera")
+    }}
+
+    for key, url in all_sources.items():
+        if len(articles) >= max_articles:
             break
+        try:
+            feed = feedparser.parse(url)
+            if feed.bozo and not feed.entries:
+                feed_errors.append(f"[{key}] Feed error")
+                continue
+        except Exception as e:
+            feed_errors.append(f"[{key}] Exception: {e}")
+            continue
 
-    if not match:
-        return (
-            f"[Travel Advisory] No advisory found for '{country}'. "
-            "Check spelling or try the country's common English name."
-        )
+        source_name = feed.feed.get("title", key)
 
-    title = match.get("Title", "")
-    link = match.get("Link", "")
-    published = match.get("Published", match.get("Updated", ""))
-    raw_summary = match.get("Summary", "")
-    summary = _strip_html(raw_summary)[:250]
-
-    level_match = re.search(r"Level\s+(\d)", title, re.IGNORECASE)
-    level_num = level_match.group(1) if level_match else "Unknown"
-
-    summary_lower = summary.lower()
-    indicators = [
-        label for keyword, label in _RISK_KEYWORDS.items()
-        if keyword in summary_lower
-    ]
-
-    # Parse ISO timestamp to a readable date
-    date_str = published[:10] if published else ""
-
-    lines = [
-        f"[Travel Advisory] {title}",
-        f"Risk Categories: {', '.join(indicators) if indicators else 'See summary'}",
-        f"Published: {date_str}",
-        f"Summary: {summary}",
-    ]
-    if link:
-        lines.append(f"Full Advisory: {link}")
-    return "\n".join(lines)
+        for entry in feed.entries[:SCAN_LIMIT]:
+            if len(articles) >= max_articles:
+                break
+
+            title       = entry.get("title", "").strip()
+            raw_summary = entry.get("summary", entry.get("description", ""))
+            summary     = _strip_html(raw_summary)[:300]
+            published   = entry.get("published", entry.get("updated", ""))
+            link        = entry.get("link", "")
+            searchable  = (title + " " + summary).lower()
+
+            if not (
+                any(kw in searchable for kw in kws)
+                and any(sig in searchable for sig in AIRSPACE_SIGNALS)
+            ):
+                continue
+
+            articles.append({
+                "source_name": source_name,
+                "published":   published,
+                "title":       title,
+                "summary":     summary,
+                "url":         link,
+            })
+
+        time.sleep(0.3)
+
+    sections.append(f"\n=== Aviation News ({len(articles)} articles) ===")
+    if articles:
+        for i, a in enumerate(articles, 1):
+            sections.append(
+                f"[{i}] {a['source_name']} | {a['published']}\n"
+                f"  Title: {a['title']}\n"
+                f"  Summary: {a['summary']}\n"
+                f"  URL: {a['url']}"
+            )
+    else:
+        sections.append(f"No aviation news matched for '{country}'.")
+
+    if feed_errors:
+        sections.append(f"\n[Feed warnings: {'; '.join(feed_errors)}]")
+
+    return "\n".join(sections)
 
 
 # ---------------------------------------------------------------------------
@@ -463,5 +607,12 @@ def list_available_sources() -> str:
     lines = ["Available RSS sources:"]
     for key, url in RSS_FEED_REGISTRY.items():
         lines.append(f"  * {key}: {url}")
+    lines.append("\nAviation RSS sources (used by fetch_airspace_status):")
+    for key, url in AVIATION_RSS_SOURCES.items():
+        lines.append(f"  * {key}: {url}")
+    lines.append("\nStructured airspace sources (used by fetch_airspace_status):")
+    lines.append("  * EASA CZIBs (no auth): https://www.easa.europa.eu/en/domains/air-operations/czibs")
+    lines.append("  * AviationWeather SIGMETs (no auth): https://aviationweather.gov/api/data/isigmet")
+    lines.append("  * AVWX NOTAMs (requires AVWX_TOKEN secret): https://avwx.rest")
     lines.append("\nACLED is also available for structured armed conflict event data.")
     return "\n".join(lines)