mirror of
https://github.com/nesquena/hermes-webui.git
synced 2026-05-14 10:37:23 +00:00
d2d464aac3
Replaces the 1.5s HTTP polling loop for clarify with a Server-Sent Events endpoint at /api/clarify/stream that pushes clarify events to the browser instantly. Mirrors the approval SSE pattern from v0.50.248 (#1350) including all the correctness lessons: - Atomic subscribe + initial snapshot under clarify._lock - _clarify_sse_notify called inside _lock for ordering guarantees (no notify-out-of-order race) - Notify passes head=q[0].data (head-fidelity, not the just-appended entry) - resolve_clarify also calls notify after pop so trailing clarifies surface immediately (no stuck-clarify bug) - Empty-state notify with None,0 after pop-empty so frontend hides the card - 30s keepalive comments, _CLIENT_DISCONNECT_ERRORS handling - Bounded queue (maxsize=16) with silent drop on full - Frontend: EventSource with automatic 3s HTTP polling fallback on onerror Co-authored-by: fxd-jason <wujiachen7@gmail.com>
182 lines
6.1 KiB
Python
182 lines
6.1 KiB
Python
"""Clarify prompt state for the WebUI.
|
|
|
|
This mirrors the approval flow structure, but the response is a free-form
|
|
clarification string instead of an approval decision.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import queue
|
|
import threading
|
|
import time
|
|
from typing import Optional
|
|
|
|
|
|
DEFAULT_TIMEOUT_SECONDS = 120
|
|
_lock = threading.Lock()
|
|
_pending: dict[str, dict] = {}
|
|
_gateway_queues: dict[str, list] = {}
|
|
_gateway_notify_cbs: dict[str, object] = {}
|
|
|
|
# ── SSE subscriber registry ─────────────────────────────────────────────
|
|
_clarify_sse_subscribers: dict[str, list[queue.Queue]] = {}
|
|
|
|
|
|
class _ClarifyEntry:
|
|
"""One pending clarify request inside a session."""
|
|
|
|
__slots__ = ("event", "data", "result")
|
|
|
|
def __init__(self, data: dict):
|
|
self.event = threading.Event()
|
|
self.data = data
|
|
self.result: Optional[str] = None
|
|
|
|
|
|
def register_gateway_notify(session_key: str, cb) -> None:
|
|
"""Register a per-session callback for sending clarify requests to the UI."""
|
|
with _lock:
|
|
_gateway_notify_cbs[session_key] = cb
|
|
|
|
|
|
def _clear_queue_locked(session_key: str) -> list[_ClarifyEntry]:
|
|
entries = _gateway_queues.pop(session_key, [])
|
|
_pending.pop(session_key, None)
|
|
return entries
|
|
|
|
|
|
def unregister_gateway_notify(session_key: str) -> None:
|
|
"""Unregister the per-session callback and unblock any waiting clarify prompt."""
|
|
with _lock:
|
|
_gateway_notify_cbs.pop(session_key, None)
|
|
entries = _clear_queue_locked(session_key)
|
|
for entry in entries:
|
|
entry.event.set()
|
|
|
|
|
|
def clear_pending(session_key: str) -> int:
|
|
"""Clear any pending clarify prompts for the session without removing the callback."""
|
|
with _lock:
|
|
entries = _clear_queue_locked(session_key)
|
|
for entry in entries:
|
|
entry.event.set()
|
|
return len(entries)
|
|
|
|
|
|
def _with_timeout_metadata(data: dict) -> dict:
|
|
item = dict(data or {})
|
|
requested_at = float(item.get("requested_at") or time.time())
|
|
timeout_seconds = int(item.get("timeout_seconds") or DEFAULT_TIMEOUT_SECONDS)
|
|
expires_at = float(item.get("expires_at") or requested_at + timeout_seconds)
|
|
item["requested_at"] = requested_at
|
|
item["timeout_seconds"] = timeout_seconds
|
|
item["expires_at"] = expires_at
|
|
return item
|
|
|
|
|
|
def _clarify_sse_notify(session_id: str, head: dict | None, total: int) -> None:
|
|
"""Push a clarify event to all SSE subscribers for a session."""
|
|
payload = {"pending": dict(head) if head else None, "pending_count": total}
|
|
for q in _clarify_sse_subscribers.get(session_id, ()):
|
|
try:
|
|
q.put_nowait(payload)
|
|
except queue.Full:
|
|
pass # drop if subscriber is slow
|
|
|
|
|
|
def sse_subscribe(session_id: str) -> queue.Queue:
|
|
"""Register a bounded Queue for SSE push to a given session."""
|
|
q: queue.Queue = queue.Queue(maxsize=16)
|
|
with _lock:
|
|
_clarify_sse_subscribers.setdefault(session_id, []).append(q)
|
|
return q
|
|
|
|
|
|
def sse_unsubscribe(session_id: str, q: queue.Queue) -> None:
|
|
"""Remove a subscriber Queue; clean up empty session entries."""
|
|
with _lock:
|
|
subs = _clarify_sse_subscribers.get(session_id)
|
|
if subs:
|
|
try:
|
|
subs.remove(q)
|
|
except ValueError:
|
|
pass
|
|
if not subs:
|
|
_clarify_sse_subscribers.pop(session_id, None)
|
|
|
|
|
|
def submit_pending(session_key: str, data: dict) -> _ClarifyEntry:
|
|
"""Queue a pending clarify request and notify the UI callback if registered."""
|
|
data = _with_timeout_metadata(data)
|
|
with _lock:
|
|
gw_queue = _gateway_queues.setdefault(session_key, [])
|
|
# De-duplicate while unresolved: if the most recent pending clarify is
|
|
# semantically identical, reuse it instead of stacking duplicates.
|
|
if gw_queue:
|
|
last = gw_queue[-1]
|
|
if (
|
|
str(last.data.get("question", "")) == str(data.get("question", ""))
|
|
and list(last.data.get("choices_offered") or [])
|
|
== list(data.get("choices_offered") or [])
|
|
):
|
|
entry = last
|
|
cb = _gateway_notify_cbs.get(session_key)
|
|
# Keep _pending aligned to the oldest unresolved entry.
|
|
_pending[session_key] = gw_queue[0].data
|
|
if cb:
|
|
try:
|
|
cb(dict(entry.data))
|
|
except Exception:
|
|
pass
|
|
return entry
|
|
|
|
entry = _ClarifyEntry(data)
|
|
gw_queue.append(entry)
|
|
_pending[session_key] = gw_queue[0].data
|
|
cb = _gateway_notify_cbs.get(session_key)
|
|
# Notify SSE subscribers from inside _lock for ordering guarantees.
|
|
_clarify_sse_notify(session_key, dict(gw_queue[0].data), len(gw_queue))
|
|
if cb:
|
|
try:
|
|
cb(data)
|
|
except Exception:
|
|
pass
|
|
return entry
|
|
|
|
|
|
def get_pending(session_key: str) -> dict | None:
|
|
"""Return the oldest pending clarify request for this session, if any."""
|
|
with _lock:
|
|
queue = _gateway_queues.get(session_key) or []
|
|
if queue:
|
|
return dict(queue[0].data)
|
|
pending = _pending.get(session_key)
|
|
return dict(pending) if pending else None
|
|
|
|
|
|
def has_pending(session_key: str) -> bool:
|
|
with _lock:
|
|
return bool(_gateway_queues.get(session_key))
|
|
|
|
|
|
def resolve_clarify(session_key: str, response: str, resolve_all: bool = False) -> int:
|
|
"""Resolve the oldest pending clarify request for a session."""
|
|
with _lock:
|
|
q = _gateway_queues.get(session_key)
|
|
if not q:
|
|
_pending.pop(session_key, None)
|
|
return 0
|
|
entries = list(q) if resolve_all else [q.pop(0)]
|
|
if q:
|
|
_pending[session_key] = q[0].data
|
|
_clarify_sse_notify(session_key, dict(q[0].data), len(q))
|
|
else:
|
|
_clear_queue_locked(session_key)
|
|
_clarify_sse_notify(session_key, None, 0)
|
|
count = 0
|
|
for entry in entries:
|
|
entry.result = response
|
|
entry.event.set()
|
|
count += 1
|
|
return count
|