Patch (#33)

Author: Josephrp

radioshaq/README.md

@@ -121,6 +121,33 @@ Then open **http://localhost:8000/** for the web UI and **http://localhost:8000/
 
 **Remote receiver (SDR):** For listen-only stations (e.g. Raspberry Pi + RTL-SDR) that stream to HQ, run `radioshaq run-receiver` after the same install. Set `JWT_SECRET`, `STATION_ID`, `HQ_URL`; optionally `pip install radioshaq[sdr]` or `radioshaq[hackrf]` for hardware support. HQ accepts uploads at `POST /receiver/upload`.
 
+### HackRF on Windows
+
+The `python-hackrf` package needs the **HackRF SDK** (headers and DLLs) at build time. By default it looks for `C:\Program Files\HackRF\include\hackrf.h` and `C:\Program Files\HackRF\lib\`.
+
+1. **Install the HackRF SDK for Windows** (pick one):
+   - **Prebuilt (easiest):** Download a Windows build from [greatscottgadgets/hackrf Actions](https://github.com/greatscottgadgets/hackrf/actions) (log in, pick a successful run, download the Windows artifact). Or check [python_hackrf Releases](https://github.com/GvozdevLeonid/python_hackrf/releases) for a ZIP that contains `include/` and `lib/`.
+   - **Extract** so you have:
+     - `C:\Program Files\HackRF\include\hackrf.h`
+     - `C:\Program Files\HackRF\lib\` with `hackrf.dll`, `hackrf.lib` (MSVC), and dependencies (e.g. `libusb-1.0.dll`, `pthreadVC2.dll`).
+   - **Or build from source:** See [HackRF docs – Windows: Building From Source](https://hackrf.readthedocs.io/en/latest/installing_hackrf_software.html) (Visual Studio, CMake, vcpkg). Then copy the built `include/` and `lib/` (or `.dll`/`.lib`) into `C:\Program Files\HackRF\` or set the env vars below.
+
+2. **Custom install path:** If you put HackRF elsewhere, set before building:
+   ```powershell
+   $env:PYTHON_HACKRF_INCLUDE_PATH = "C:\path\to\hackrf\include"
+   $env:PYTHON_HACKRF_LIB_PATH    = "C:\path\to\hackrf\lib"
+   $env:HACKRF_LIB_DIR            = "C:\path\to\hackrf\lib"
+   ```
+
+3. **Install the hackrf extra:** In this repo the `hackrf` extra is skipped on Windows by default so `uv sync --all-extras` doesn’t fail. After the SDK is in place, install the binding explicitly:
+   ```powershell
+   uv pip install python-hackrf
+   # Or add hackrf to the project and remove the Windows-only marker in pyproject.toml, then:
+   # uv sync --extra hackrf
+   ```
+
+**Driver:** For the device itself, use [Zadig](https://zadig.akeo.ie/) to install the WinUSB driver for HackRF One. Alternatively, [RadioConda](https://github.com/ryanvolz/radioconda) provides HackRF binaries and a Conda environment on Windows (use that Python/conda if you prefer).
+
 ## Development
 
 Install dependencies first (from the **radioshaq** directory): `uv sync --extra dev --extra test`. Then use `uv run` for all commands below so the correct environment (with geoalchemy2, loguru, etc.) is used.

radioshaq/pyproject.toml

@@ -1,11 +1,11 @@
 [project]
 name = "radioshaq"
-version = "0.1.2"
+version = "0.1.3"
 description = "RadioShaq: Ham Radio AI Orchestration and Remote SDR Reception System"
 readme = "../.github/PYPI_README.md"
 requires-python = ">=3.11"
 license = {text = "GPL-2.0-only"}
-license-files = ["../LICENSE.md"]
+license-files = ["LICENSE.md"]
 authors = [
     {name = "RadioShaq Contributors"}
 ]
@@ -105,8 +105,11 @@ test = [
 sdr = [
     "pyrtlsdr>=0.4",
 ]
+# python-hackrf requires HackRF SDK (hackrf.h) at build time; SDK not commonly
+# installed on Windows. Install only on non-Windows; use hackrf on Linux/macOS or
+# install HackRF for Windows and sync without --all-extras then add hackrf manually.
 hackrf = [
-    "python-hackrf>=1.5",
+    "python-hackrf>=1.5; sys_platform != 'win32'",
 ]
 
 # Optional: Hindsight semantic memory. Requires urllib3>=2 (conflicts with boto3 urllib3<2).

radioshaq/radioshaq/__init__.py

@@ -7,7 +7,7 @@
 
 from __future__ import annotations
 
-__version__ = "0.1.2"
+__version__ = "0.1.3"
 __logo__ = "📡"
 __description__ = "Strategic Autonomous Ham Radio and Knowledge Operations Dispatch System"
 

radioshaq/radioshaq/api/routes/callsigns.py

@@ -12,7 +12,9 @@
 from radioshaq.auth.jwt import TokenPayload
 from radioshaq.compliance_plugin import get_band_plan_source_for_config
 from radioshaq.config.schema import Config
+from radioshaq.constants import EXPLICIT_CONSENT_REGIONS
 from radioshaq.radio.bands import BAND_PLANS
+from radioshaq.utils.phone import normalize_e164
 
 router = APIRouter()
 
@@ -38,14 +40,6 @@ class PatchCallsignBandsBody(BaseModel):
 E164_PATTERN = re.compile(r"^\+?[0-9]{10,15}$")
 
 
-def _normalize_e164(phone: str) -> str:
-    """Normalize to E.164: digits only with + prefix."""
-    digits = re.sub(r"\D", "", (phone or "").strip())
-    if not digits:
-        return ""
-    return "+" + digits
-
-
 class PatchContactPreferencesBody(BaseModel):
     """Body for PATCH /callsigns/registered/{callsign}/contact-preferences (§8.1)."""
 
@@ -208,7 +202,7 @@ async def register_from_audio(
         Path(temp_path).unlink(missing_ok=True)
 
 
-@router.patch("/registered/{callsign:path}")
+@router.patch("/registered/{callsign}")
 async def patch_callsign_bands(
     request: Request,
     callsign: str,
@@ -240,7 +234,7 @@ async def patch_callsign_bands(
     return {"ok": True, "callsign": normalized, "preferred_bands": bands}
 
 
-@router.get("/registered/{callsign:path}/contact-preferences")
+@router.get("/registered/{callsign}/contact-preferences")
 async def get_contact_preferences(
     request: Request,
     callsign: str,
@@ -260,10 +254,10 @@ async def get_contact_preferences(
 
 def _require_explicit_consent_region(region: str) -> bool:
     """True if region requires explicit consent (EU/UK/ZA)."""
-    return (region or "").upper() in ("CEPT", "FR", "UK", "ES", "BE", "CH", "LU", "MC", "ZA")
+    return (region or "").strip().upper() in EXPLICIT_CONSENT_REGIONS
 
 
-@router.patch("/registered/{callsign:path}/contact-preferences")
+@router.patch("/registered/{callsign}/contact-preferences")
 async def patch_contact_preferences(
     request: Request,
     callsign: str,
@@ -290,7 +284,7 @@ async def patch_contact_preferences(
     if body.notify_sms_phone is not None:
         raw = (body.notify_sms_phone or "").strip()
         if raw:
-            sms_phone = _normalize_e164(raw)
+            sms_phone = normalize_e164(raw)
             if not E164_PATTERN.match(sms_phone):
                 raise HTTPException(status_code=400, detail="notify_sms_phone must be E.164 (10–15 digits)")
         else:
@@ -299,7 +293,7 @@ async def patch_contact_preferences(
     if body.notify_whatsapp_phone is not None:
         raw = (body.notify_whatsapp_phone or "").strip()
         if raw:
-            whatsapp_phone = _normalize_e164(raw)
+            whatsapp_phone = normalize_e164(raw)
             if not E164_PATTERN.match(whatsapp_phone):
                 raise HTTPException(status_code=400, detail="notify_whatsapp_phone must be E.164 (10–15 digits)")
         else:
@@ -326,7 +320,7 @@ async def patch_contact_preferences(
     return prefs or {}
 
 
-@router.delete("/registered/{callsign:path}")
+@router.delete("/registered/{callsign}")
 async def unregister_callsign(
     request: Request,
     callsign: str,

radioshaq/radioshaq/api/routes/emergency.py

@@ -16,17 +16,13 @@
 from radioshaq.auth.jwt import TokenPayload
 from radioshaq.config.schema import Config
 from radioshaq.messaging_compliance import emergency_messaging_allowed
+from radioshaq.utils.phone import normalize_e164
 
 router = APIRouter()
 
 E164_PATTERN = re.compile(r"^\+?[0-9]{10,15}$")
 
 
-def _normalize_e164(phone: str) -> str:
-    digits = re.sub(r"\D", "", (phone or "").strip())
-    return "+" + digits if digits else ""
-
-
 class EmergencyRequestBody(BaseModel):
     """Body for POST /emergency/request."""
 
@@ -67,7 +63,7 @@ async def create_emergency_request(
         )
     if body.contact_channel not in ("sms", "whatsapp"):
         raise HTTPException(status_code=400, detail="contact_channel must be sms or whatsapp")
-    phone = _normalize_e164(body.contact_phone)
+    phone = normalize_e164(body.contact_phone)
     if not E164_PATTERN.match(phone):
         raise HTTPException(status_code=400, detail="contact_phone must be E.164 (10–15 digits)")
     initiator = getattr(_user, "callsign", None) or getattr(_user, "sub", "api")
@@ -151,13 +147,14 @@ async def list_emergency_events(
     status: str | None = None,
     _user: TokenPayload = Depends(get_current_user),
 ) -> dict[str, Any]:
-    """List coordination events with event_type=emergency. Optional filter by status."""
+    """List coordination events with event_type=emergency. Optional filter by status (e.g. pending, approved, rejected)."""
     db = getattr(request.app.state, "db", None)
     if db is None or not hasattr(db, "get_pending_coordination_events"):
         return {"events": [], "count": 0}
-    events = await db.get_pending_coordination_events(max_results=1000, event_type="emergency")
-    if status:
-        events = [e for e in events if e.get("status") == status]
+    status_filter = status if status else "pending"
+    events = await db.get_pending_coordination_events(
+        max_results=1000, event_type="emergency", status=status_filter
+    )
     return {"events": events, "count": len(events)}
 
 
@@ -234,15 +231,15 @@ async def reject_emergency_event(
 ) -> dict[str, Any]:
     """Reject an emergency event (do not send). Sets status=rejected and records rejected_at, rejected_by."""
     db = getattr(request.app.state, "db", None)
-    if db is None or not hasattr(db, "get_coordination_event_by_id") or not hasattr(db, "update_coordination_event"):
+    if db is None or not hasattr(db, "claim_emergency_event_pending") or not hasattr(db, "get_coordination_event_by_id") or not hasattr(db, "update_coordination_event"):
         raise HTTPException(status_code=503, detail="Database not available")
+    claimed = await db.claim_emergency_event_pending(event_id)
+    if claimed is None:
+        raise HTTPException(status_code=400, detail="Event already processed")
     event = await db.get_coordination_event_by_id(event_id)
-    if not event:
-        raise HTTPException(status_code=404, detail="Event not found")
-    if event.get("event_type") != "emergency":
+    if not event or event.get("event_type") != "emergency":
+        await db.update_coordination_event(event_id, status="pending")
         raise HTTPException(status_code=400, detail="Not an emergency event")
-    if event.get("status") != "pending":
-        raise HTTPException(status_code=400, detail="Event already processed")
     rejector = getattr(_user, "sub", None) or getattr(_user, "callsign", "api")
     now = datetime.now(timezone.utc).isoformat()
     extra = event.get("extra_data") or {}

radioshaq/radioshaq/constants.py

@@ -2,6 +2,11 @@
 
 from __future__ import annotations
 
+# Regions that require explicit consent for notify-on-relay (§8.1, §8.3)
+EXPLICIT_CONSENT_REGIONS: frozenset[str] = frozenset(
+    ("CEPT", "FR", "UK", "ES", "BE", "CH", "LU", "MC", "ZA")
+)
+
 # ASR (Voxtral) languages supported for UI and validation (en, fr, es)
 ASR_SUPPORTED_LANGUAGE_CODES: tuple[str, ...] = ("en", "fr", "es")
 ASR_LANGUAGE_AUTO = "auto"

radioshaq/radioshaq/database/postgres_gis.py

@@ -567,25 +567,27 @@ async def get_pending_coordination_events(
         callsign: str | None = None,
         event_type: str | None = None,
         max_results: int = 100,
+        status: str | None = "pending",
     ) -> list[dict[str, Any]]:
-        """Get pending coordination events.
+        """Get coordination events, optionally filtered by status.
         
         Args:
             callsign: Filter by callsign (initiator or target)
             event_type: Filter by event_type (e.g. emergency)
             max_results: Maximum results
+            status: Filter by status (default "pending"). Pass None to get all statuses.
             
         Returns:
             List of event dicts
         """
         async with self.async_session() as session:
             query = (
                 select(CoordinationEvent)
-                .where(CoordinationEvent.status == "pending")
                 .order_by(CoordinationEvent.priority, CoordinationEvent.scheduled_time)
                 .limit(max_results)
             )
-            
+            if status is not None:
+                query = query.where(CoordinationEvent.status == status)
             if callsign:
                 callsign_upper = callsign.upper()
                 query = query.where(
@@ -835,25 +837,26 @@ async def record_opt_out(self, callsign: str, channel: str) -> bool:
             return True
 
     async def record_opt_out_by_phone(self, phone: str, channel: str) -> bool:
-        """Record opt-out by phone number (finds callsign by notify_sms_phone or notify_whatsapp_phone). Returns True if updated."""
+        """Record opt-out by phone number. Opts out all callsigns with this phone. Returns True if at least one row was updated."""
         phone = (phone or "").strip()
         if not phone or channel not in ("sms", "whatsapp"):
             return False
         async with self.async_session() as session:
             col = RegisteredCallsign.notify_sms_phone if channel == "sms" else RegisteredCallsign.notify_whatsapp_phone
-            result = await session.execute(select(RegisteredCallsign).where(col == phone))
-            row = result.scalar_one_or_none()
-            if not row:
-                return False
+            opt_out_col = (
+                RegisteredCallsign.notify_opt_out_at_sms if channel == "sms" else RegisteredCallsign.notify_opt_out_at_whatsapp
+            )
             now = datetime.now(timezone.utc)
-            if channel == "sms":
-                row.notify_opt_out_at_sms = now
-                row.notify_sms_phone = None
-            else:
-                row.notify_opt_out_at_whatsapp = now
-                row.notify_whatsapp_phone = None
+            stmt = (
+                update(RegisteredCallsign)
+                .where(col == phone)
+                .values({opt_out_col: now, col: None})
+                .returning(RegisteredCallsign.id)
+            )
+            result = await session.execute(stmt)
+            updated_ids = result.scalars().all()
             await session.commit()
-            return True
+            return len(updated_ids) > 0
 
     async def unregister_callsign(self, callsign: str) -> bool:
         """Remove a callsign from the registry. Returns True if a row was deleted."""

radioshaq/radioshaq/listener/relay_delivery.py

@@ -8,12 +8,10 @@
 from loguru import logger
 
 from radioshaq.compliance_plugin import get_band_plan_source_for_config
+from radioshaq.constants import EXPLICIT_CONSENT_REGIONS
 from radioshaq.radio.bands import BAND_PLANS
 from radioshaq.radio.injection import get_injection_queue
 
-# Regions that require explicit consent for notify-on-relay (§8.1, §8.3)
-_EXPLICIT_CONSENT_REGIONS = frozenset(("CEPT", "FR", "UK", "ES", "BE", "CH", "LU", "MC", "ZA"))
-
 
 def _is_consent_valid_for_region(region: str | None, prefs: dict[str, Any]) -> bool:
     """True if contact preferences have valid consent for this region."""
@@ -23,7 +21,7 @@ def _is_consent_valid_for_region(region: str | None, prefs: dict[str, Any]) -> b
     if not region:
         return True
     region_upper = (region or "").strip().upper()
-    if region_upper in _EXPLICIT_CONSENT_REGIONS:
+    if region_upper in EXPLICIT_CONSENT_REGIONS:
         return bool(consent_at)
     return True
 

radioshaq/radioshaq/specialized/sms_agent.py

@@ -2,23 +2,12 @@
 
 from __future__ import annotations
 
-import re
 from typing import Any
 
 from loguru import logger
 
 from radioshaq.specialized.base import SpecializedAgent
-
-
-def _e164(phone: str) -> str:
-    """Normalize to E.164-like form: strip all non-digit characters and ensure + prefix."""
-    s = (phone or "").strip()
-    if not s:
-        return ""
-    digits = re.sub(r"\D", "", s)
-    if not digits:
-        return ""
-    return "+" + digits
+from radioshaq.utils.phone import normalize_e164
 
 
 class SMSAgent(SpecializedAgent):
@@ -60,7 +49,7 @@ async def _send(
         self, task: dict[str, Any], upstream_callback: Any
     ) -> dict[str, Any]:
         """Send SMS via Twilio. Phone numbers are normalized to E.164."""
-        to = _e164(task.get("to") or "")
+        to = normalize_e164(task.get("to") or "")
         body = task.get("message", "") or task.get("body", "")
 
         await self.emit_progress(upstream_callback, "sending", to=to)
@@ -78,7 +67,7 @@ async def _send(
         try:
             msg = self.twilio_client.messages.create(
                 body=body,
-                from_=_e164(self.from_number),
+                from_=normalize_e164(self.from_number),
                 to=to,
             )
             result = {