Some checks failed
Release & Docker / release (push) Has been cancelled
* refactor(routes): extract approval SSE state into api/route_approvals.py (#3575) Co-authored-by: Rod Boev <rod.boev@gmail.com> * docs(changelog): v0.51.275 — Release IQ (stage-p3d) --------- Co-authored-by: nesquena-hermes <[email protected]> Co-authored-by: Rod Boev <rod.boev@gmail.com>
137 lines
5.5 KiB
Python
137 lines
5.5 KiB
Python
"""Approval SSE state and helpers.
|
|
|
|
State-extraction prelude to the routes.py split tracked in #1907.
|
|
Extracts approval state, not handlers, by design.
|
|
"""
|
|
import queue
|
|
import threading
|
|
import uuid
|
|
|
|
from api.session_events import publish_session_list_changed
|
|
|
|
# Approval system (optional -- graceful fallback if agent not available)
|
|
try:
|
|
from tools.approval import (
|
|
submit_pending as _submit_pending_raw,
|
|
approve_session,
|
|
approve_permanent,
|
|
save_permanent_allowlist,
|
|
is_approved,
|
|
_pending,
|
|
_lock,
|
|
_permanent_approved,
|
|
_gateway_queues,
|
|
resolve_gateway_approval,
|
|
enable_session_yolo,
|
|
disable_session_yolo,
|
|
is_session_yolo_enabled,
|
|
)
|
|
except ImportError:
|
|
_submit_pending_raw = lambda *a, **k: None
|
|
approve_session = lambda *a, **k: None
|
|
approve_permanent = lambda *a, **k: None
|
|
save_permanent_allowlist = lambda *a, **k: None
|
|
is_approved = lambda *a, **k: True
|
|
resolve_gateway_approval = lambda *a, **k: 0
|
|
enable_session_yolo = lambda *a, **k: None
|
|
disable_session_yolo = lambda *a, **k: None
|
|
is_session_yolo_enabled = lambda *a, **k: False
|
|
_pending = {}
|
|
_lock = threading.Lock()
|
|
_permanent_approved = set()
|
|
_gateway_queues = {}
|
|
|
|
|
|
# ── Approval SSE subscribers (long-connection push) ──────────────────────────
|
|
_approval_sse_subscribers: dict[str, list[queue.Queue]] = {}
|
|
|
|
|
|
def _approval_sse_subscribe(session_id: str) -> queue.Queue:
|
|
"""Register an SSE subscriber for approval events on a given session."""
|
|
q = queue.Queue(maxsize=16)
|
|
with _lock:
|
|
_approval_sse_subscribers.setdefault(session_id, []).append(q)
|
|
return q
|
|
|
|
|
|
def _approval_sse_unsubscribe(session_id: str, q: queue.Queue) -> None:
|
|
"""Remove an SSE subscriber."""
|
|
with _lock:
|
|
subs = _approval_sse_subscribers.get(session_id)
|
|
if subs and q in subs:
|
|
subs.remove(q)
|
|
if not subs:
|
|
_approval_sse_subscribers.pop(session_id, None)
|
|
|
|
|
|
def _approval_sse_notify_locked(session_id: str, head: dict | None, total: int) -> None:
|
|
"""Push an approval event to all SSE subscribers for a session.
|
|
|
|
CALLER MUST HOLD `_lock`. Snapshots the subscriber list under the held
|
|
lock and then calls `q.put_nowait()` on each (which is itself thread-safe).
|
|
|
|
`head` is the approval entry currently at the head of the queue (the one
|
|
the UI should display) — NOT the just-appended entry. With multiple
|
|
parallel approvals (#527), the just-appended entry is at the TAIL, but
|
|
`/api/approval/pending` always returns the HEAD, so SSE must match.
|
|
|
|
`total` is the total number of pending approvals.
|
|
|
|
Pass `head=None` and `total=0` when the queue has just been emptied (e.g.
|
|
`_handle_approval_respond` popped the last entry) so the client knows to
|
|
hide its approval card.
|
|
"""
|
|
payload = {"pending": dict(head) if head else None, "pending_count": total}
|
|
subs = _approval_sse_subscribers.get(session_id, ())
|
|
for q in subs:
|
|
try:
|
|
q.put_nowait(payload)
|
|
except queue.Full:
|
|
pass # drop if subscriber is slow (bounded queue prevents memory leak)
|
|
|
|
|
|
def _approval_sse_notify(session_id: str, head: dict | None, total: int) -> None:
|
|
"""Convenience wrapper that takes `_lock` itself.
|
|
|
|
Use only from contexts that don't already hold `_lock`. Production call
|
|
sites (submit_pending, _handle_approval_respond) MUST hold the lock and
|
|
call `_approval_sse_notify_locked` directly to avoid a notify-ordering
|
|
race where a later append's notify can fire before an earlier append's
|
|
notify (resulting in stale `pending_count`).
|
|
"""
|
|
with _lock:
|
|
_approval_sse_notify_locked(session_id, head, total)
|
|
|
|
|
|
def submit_pending(session_key: str, approval: dict) -> None:
|
|
"""Append a pending approval to the per-session queue.
|
|
|
|
Wraps the agent's submit_pending to:
|
|
- Add a stable approval_id (uuid4 hex) so the respond endpoint can target
|
|
a specific entry even when multiple approvals are queued simultaneously.
|
|
- Change the storage from a single overwriting dict value to a list, so
|
|
parallel tool calls each get their own approval slot (fixes #527).
|
|
- Notify any connected SSE subscribers immediately.
|
|
"""
|
|
entry = dict(approval)
|
|
entry.setdefault("approval_id", uuid.uuid4().hex)
|
|
with _lock:
|
|
queue_list = _pending.setdefault(session_key, [])
|
|
# Replace a legacy non-list value if the agent version uses the old pattern.
|
|
if not isinstance(queue_list, list):
|
|
_pending[session_key] = [queue_list]
|
|
queue_list = _pending[session_key]
|
|
queue_list.append(entry)
|
|
total = len(queue_list)
|
|
head = queue_list[0] # /api/approval/pending always returns head
|
|
# Push to SSE subscribers from inside _lock so two parallel
|
|
# submit_pending calls can't deliver out-of-order (T2's later
|
|
# notify arriving before T1's earlier notify with a stale count).
|
|
_approval_sse_notify_locked(session_key, head, total)
|
|
publish_session_list_changed("attention_pending")
|
|
# NOTE: We do NOT call _submit_pending_raw here — that function overwrites
|
|
# _pending[session_key] with a single dict, which would undo the list we just
|
|
# built. The gateway blocking path uses _gateway_queues (a separate mechanism
|
|
# managed by check_all_command_guards / register_gateway_notify), which is
|
|
# unaffected by _pending. The _pending dict is only used for UI polling.
|