Merge changes from grants_rag_app: UI, config, and state JSONs

app/ui_streamlit.py

@@ -284,13 +284,13 @@ default_q = {
 q = st.text_input("Search query", value=default_q)
 
 # No defaults -> no filtering unless the user selects something
-geo = st.multiselect("Geo filter (optional)", options=["US", "MD", "MA"], default=[])
+geo = st.multiselect("Geo filter (optional)", options=["US", "MD", "PA"], default=[])
 categories = st.multiselect(
     "Category filter (optional)",
     options=[
         "capacity_building","elderly","prison_ministry","evangelism",
         "transportation","vehicle",
-        "justice","reentry","victim_services","youth","women","workforce"
+        "justice","reentry","victim_services","youth","women","food","workforce"
     ],
     default=[]
 )
@@ -303,6 +303,8 @@ sort_by = st.selectbox(
     index=0,
 )
 only_open = st.checkbox("Only show opportunities with a future deadline", value=True)
+ministry_focus = st.checkbox("Ministry Focus (hide research/defense/academic BAAs)", value=True)
+
 
 # Build filters only when selected
 filters = {}
@@ -398,8 +400,71 @@ if sort_by.startswith("Deadline") and results:
             _to_date(r.get("deadline")) or date.max,
         )
     )
+def _ministry_filter(rows):
+    if not rows:
+        return rows
+
+    # Terms that usually mean R&D, military, or academic-only
+    banned_terms = [
+        "broad agency announcement", "baa",
+        "research", "r&d", "prototype", "laboratory", "university",
+        "sbir", "sttr",
+        "darpa", "office of naval research", "onr", "naval", "air force", "army",
+        "w911", "n00014", "fa-", "afrl", "arpa"
+    ]
+
+    # Agencies we’re usually OK highlighting for ministry use
+    # (still allow others if content looks practical)
+    preferred_agencies = {
+        "FTA", "HHS", "ACL", "USDA", "USDA-FNS", "USDA-RD", "DOL", "DOJ", "OJP", "OVW",
+        "EDA", "HRSA", "SAMHSA", "CFPB", "HUD"
+    }
+
+    # Positive “community-service” cues. If present, we lean to keep even if agency isn’t in the preferred list.
+    required_any_terms = [
+        "vehicle", "van", "bus", "paratransit", "mobility",
+        "congregate meals", "home-delivered meals", "senior nutrition",
+        "food pantry", "food bank", "hunger relief", "refrigeration", "freezer",
+        "community", "faith", "church", "ministry", "nonprofit",
+        "reentry", "workforce", "case management", "technical assistance"
+    ]
+
+    def txt(r):
+        return " ".join([
+            str(r.get("title","")),
+            str(r.get("synopsis") or r.get("summary") or ""),
+            str(r.get("agency") or ""),
+        ]).lower()
+
+    kept = []
+    for r in rows:
+        t = txt(r)
+
+        # ban obvious R&D/defense/academic
+        if any(b in t for b in banned_terms):
+            continue
+
+        # prefer common ministry-friendly agencies or the record’s own tags
+        agency = (r.get("agency") or "").upper()
+        cats = [c.lower() for c in (r.get("categories") or [])]
+        is_preferred_agency = any(agency.startswith(a) for a in preferred_agencies)
+        has_ministry_cue = any(term in t for term in required_any_terms) or any(
+            c in {"transportation","vehicle","elderly","disabled","food","community","justice","reentry","workforce"} for c in cats
+        )
+
+        if is_preferred_agency or has_ministry_cue:
+            kept.append(r)
+
+    return kept
+
 
 # ---- Render results ----
+
+results = st.session_state.get("results", [])
+
+if ministry_focus and results:
+    results = _ministry_filter(results)
+
 if results:
     st.caption(f"Results: {len(results)}")
     for r in results:

config/v6.yaml

@@ -1,91 +1,157 @@
-# Minimal, valid config — v6.2
+# Minimal, valid config — v6.3
 sources:
   - name: "Grants.gov (API: capacity building - general)"
     type: grantsgov_api
     enabled: true
-    url: "https://apply07.grants.gov/grantsws/rest/opportunities/search/"
+    url: "https://www.grants.gov/grantsws/rest/opportunities/search/"
     fallback_json: data/grants_fallback_sample.json
     geo: "US"
-    categories:
-      - capacity_building
+    categories: ["capacity_building"]
     api:
       page_size: 25
       max_pages: 1
       payload:
         keyword: "capacity building"
-        oppStatuses: "posted"
-
-- name: "DOL — Reentry & Workforce Capacity"
-  type: grantsgov_api
-  enabled: true
-  url: "https://www.grants.gov/grantsws/rest/opportunities/search/"
-  geo: "US"
-  categories: ["justice","reentry","workforce"]   # simple, uncluttered tags
-  api:
-    page_size: 100
-    max_pages: 5
-    payload:
-      keyword: "reentry workforce employment training apprenticeships transitional jobs capacity building technical assistance"
-      oppStatuses: ["posted"]
-      agencies: ["DOL"]   # broad DOL umbrella
+        oppStatuses: ["posted"]
 
   - name: "Grants.gov (API: capacity building - vehicles/transportation)"
     type: grantsgov_api
     enabled: true
-    url: "https://apply07.grants.gov/grantsws/rest/opportunities/search/"
+    url: "https://www.grants.gov/grantsws/rest/opportunities/search/"
     fallback_json: data/grants_fallback_sample.json
     geo: "US"
-    categories:
-      - capacity_building
-      - transportation
-      - vehicle
+    categories: ["capacity_building","transportation","vehicle"]
     api:
       page_size: 25
       max_pages: 1
       payload:
         keyword: "capacity building transportation vehicle bus van transit mobility"
-        oppStatuses: "posted"
+        oppStatuses: ["posted"]
 
   - name: "Grants.gov (API: FTA Section 5310 - Enhanced Mobility)"
     type: grantsgov_api
     enabled: true
-    url: "https://apply07.grants.gov/grantsws/rest/opportunities/search/"
+    url: "https://www.grants.gov/grantsws/rest/opportunities/search/"
     fallback_json: data/grants_fallback_sample.json
     geo: "US"
-    categories:
-      - capacity_building
-      - elderly
-      - transportation
-      - vehicle
+    categories: ["capacity_building","elderly","transportation","vehicle"]
     api:
       page_size: 25
       max_pages: 1
       payload:
-        keyword: "5310 Enhanced Mobility Seniors Individuals with Disabilities"
-        oppStatuses: "posted"
-        agencyCodes: ["FTA"]
+        keyword: "5310 Enhanced Mobility Seniors Individuals with Disabilities paratransit"
+        oppStatuses: ["posted"]
+        agencies: ["FTA"]     # <-- use 'agencies', not 'agencyCodes'
+
+# --- State DOT 5310 (local feeds) ---
+  - name: "Maryland — 5310 Sub-Recipient Program"
+    type: local_sample
+    enabled: true
+    geo: "MD"
+    categories: ["transportation","vehicle","elderly","disabled"]
+    path: "data/state_md_5310.json"
+
+  - name: "Pennsylvania — 5310 Sub-Recipient Program"
+    type: local_sample
+    enabled: true
+    geo: "PA"
+    categories: ["transportation","vehicle","elderly","disabled"]
+    path: "data/state_pa_5310.json"
+
+# --- FOOD PROGRAMS / COMMUNITY NUTRITION (ministry-friendly) ---
+  - name: "USDA — Community Nutrition & Hunger Relief"
+    type: grantsgov_api
+    enabled: true
+    url: "https://www.grants.gov/grantsws/rest/opportunities/search/"
+    geo: "US"
+    categories: ["food","community","capacity_building"]
+    api:
+      page_size: 100
+      max_pages: 5
+      payload:
+        keyword: "food bank food pantry emergency food hunger relief community nutrition meal delivery mobile pantry refrigeration freezer cold storage congregate meals SNAP-Ed"
+        oppStatuses: ["posted"]
+        # agencies: ["USDA","USDA-FNS"]  # (optional) uncomment to narrow later
+
+  - name: "HHS/ACL — Senior Nutrition (Older Americans Act)"
+    type: grantsgov_api
+    enabled: true
+    url: "https://www.grants.gov/grantsws/rest/opportunities/search/"
+    geo: "US"
+    categories: ["food","elderly","community"]
+    api:
+      page_size: 100
+      max_pages: 5
+      payload:
+        keyword: "senior nutrition Older Americans Act OAA congregate meals home-delivered meals aging services meal program"
+        oppStatuses: ["posted"]
+        # agencies: ["HHS-ACL"]  # (optional) restrict to ACL
+
+  - name: "USDA Rural — Community Facilities (Food Assets)"
+    type: grantsgov_api
+    enabled: true
+    url: "https://www.grants.gov/grantsws/rest/opportunities/search/"
+    geo: "US"
+    categories: ["food","community","capacity_building","vehicle"]
+    api:
+      page_size: 100
+      max_pages: 5
+      payload:
+        keyword: "community facilities kitchen renovation commercial kitchen refrigeration freezer delivery van box truck food distribution"
+        oppStatuses: ["posted"]
+        # agencies: ["USDA-RD"]  # (optional) restrict to Rural Development
+
+# ---- NEW: FTA Buses/Facilities (5339 etc.) ----
+  - name: "FTA — Buses/Bus Facilities (5339) & Paratransit"
+    type: grantsgov_api
+    enabled: true
+    url: "https://www.grants.gov/grantsws/rest/opportunities/search/"
+    geo: "US"
+    categories: ["transportation","vehicle","elderly"]
+    api:
+      page_size: 100
+      max_pages: 5
+      payload:
+        keyword: "buses bus facility replacement purchase van paratransit mobility 5339"
+        oppStatuses: ["posted"]
+        agencies: ["FTA"]
+
+# ---- DOL ----
+  - name: "DOL — Reentry & Workforce Capacity"
+    type: grantsgov_api
+    enabled: true
+    url: "https://www.grants.gov/grantsws/rest/opportunities/search/"
+    geo: "US"
+    categories: ["justice","reentry","workforce"]
+    api:
+      page_size: 100
+      max_pages: 5
+      payload:
+        keyword: "reentry workforce employment training apprenticeships transitional jobs capacity building technical assistance"
+        oppStatuses: ["posted"]
+        agencies: ["DOL"]
 
-  # --- DOJ / OJP family via Grants.gov ---
+# ---- DOJ / OJP family ----
   - name: "DOJ (All) — Capacity/Reentry"
     type: grantsgov_api
     enabled: true
     url: "https://www.grants.gov/grantsws/rest/opportunities/search/"
     geo: "US"
-    categories: ["justice", "reentry"]
+    categories: ["justice","reentry"]
     api:
       page_size: 100
       max_pages: 5
       payload:
         keyword: "capacity building reentry community outreach victim services youth violence prevention"
         oppStatuses: ["posted"]
-        agencies: ["DOJ"]   # parent Dept. of Justice
+        agencies: ["DOJ"]
 
   - name: "OJP (BJA/OJJDP/OVC/BJS) — Capacity"
     type: grantsgov_api
     enabled: true
     url: "https://www.grants.gov/grantsws/rest/opportunities/search/"
     geo: "US"
-    categories: ["justice", "victim_services", "youth", "reentry"]
+    categories: ["justice","victim_services","youth","reentry"]
     api:
       page_size: 100
       max_pages: 5
@@ -99,7 +165,7 @@ sources:
     enabled: true
     url: "https://www.grants.gov/grantsws/rest/opportunities/search/"
     geo: "US"
-    categories: ["justice", "victim_services", "women"]
+    categories: ["justice","victim_services","women"]
     api:
       page_size: 100
       max_pages: 5

data/state_md_5310.json

@@ -0,0 +1,15 @@
+{
+  "opportunities": [
+    {
+      "opportunityNumber": "MD-5310-2025",
+      "opportunityTitle": "Maryland DOT / MTA — Section 5310: Enhanced Mobility for Seniors and Individuals with Disabilities",
+      "synopsis": "Capital and operating assistance for nonprofit and public agencies providing transportation to older adults and individuals with disabilities. Typical costs include accessible vans, mobility management, driver training, insurance, and maintenance.",
+      "agency": "Maryland Department of Transportation (MDOT) / Maryland Transit Administration (MTA)",
+      "postedDate": "2025-08-01",
+      "closeDate": "2025-10-15",
+      "url": "https://<INSERT-OFFICIAL-MD-5310-PAGE>",
+      "geo": "MD",
+      "categories": ["transportation","vehicle","elderly","disabled"]
+    }
+  ]
+}

data/state_pa_5310.json

@@ -0,0 +1,15 @@
+{
+  "opportunities": [
+    {
+      "opportunityNumber": "PA-5310-2025",
+      "opportunityTitle": "PennDOT — Section 5310: Enhanced Mobility for Seniors and Individuals with Disabilities",
+      "synopsis": "Funding for accessible vehicles and mobility services for seniors and persons with disabilities. Eligible applicants typically include private nonprofits and public bodies coordinating human service transportation.",
+      "agency": "Pennsylvania Department of Transportation (PennDOT)",
+      "postedDate": "2025-08-10",
+      "closeDate": "2025-10-20",
+      "url": "https://<INSERT-OFFICIAL-PA-5310-PAGE>",
+      "geo": "PA",
+      "categories": ["transportation","vehicle","elderly","disabled"]
+    }
+  ]
+}