16652eea18
# Conflicts: # gateway/config.py # gateway/config_loader.py # gateway/readiness.py # hermes_cli/managed_scope.py # hermes_cli/plugin_python_deps.py # hermes_cli/plugins_cmd.py # hermes_cli/update_cmd_maint.py # plugin-catalog/hindsight.yaml # plugins/plugin_loader.py # providers/__init__.py # scripts/run_tests.sh # tests/gateway/test_control_socket_windows_live.py # tests/gateway/test_gateway_streaming_nested_config.py # tests/hermes_cli/test_doctor.py # tests/hermes_cli/test_plan_reconciliation_windows_live.py # tests/hermes_cli/test_update_apply_shallow_count.py # tests/hermes_cli/test_update_concurrent_quarantine.py # tests/hermes_cli/test_update_shim_self_lock.py # tests/hermes_cli/test_verify_console_scripts.py # tests/tools/test_lazy_deps.py # tests/tui_gateway/test_subprocess_encoding.py # tools/lazy_deps.py
1208 lines
64 KiB
Python
1208 lines
64 KiB
Python
"""Durable ``/v1/runs`` admission, status, events, and control handlers."""
|
|
|
|
import asyncio
|
|
import hashlib
|
|
import json
|
|
import logging
|
|
import os
|
|
import threading
|
|
import time
|
|
import uuid
|
|
from contextlib import suppress
|
|
from dataclasses import dataclass
|
|
from typing import Any, Callable, Dict, List, Optional, Tuple
|
|
|
|
try:
|
|
from aiohttp import web
|
|
except ImportError:
|
|
web = None # type: ignore[assignment]
|
|
try:
|
|
from aiohttp.web_request import RequestKey
|
|
except ImportError:
|
|
# Separate block: aiohttp < 3.14 lacks RequestKey, and a shared except
|
|
# would reset the already-imported ``web`` to None (500 on POST /v1/runs).
|
|
RequestKey = None # type: ignore[assignment,misc]
|
|
|
|
from gateway.platforms.api_server_room_grants import _json_error, _room_grant_error_response
|
|
from gateway.platforms.api_server_run_idempotency import TERMINAL_STATUSES
|
|
|
|
|
|
logger = logging.getLogger("gateway.platforms.api_server")
|
|
|
|
# Executor-thread lifetime for API-server agent turns (#116535). The handler-side
|
|
# ``_inflight_agent_runs`` count in api_server.py drops in the handler's ``finally`` when the
|
|
# handler task is cancelled (disconnect/shutdown) while the executor thread behind
|
|
# ``run_in_executor`` keeps running -- so the shutdown close gate cannot rely on it. This
|
|
# module-level count is taken on the submitting thread before ``run_in_executor`` and released
|
|
# in the worker thread's own ``finally``, which also keeps it visible past ``adapters.clear()``.
|
|
_API_WORKER_LOCK = threading.Lock()
|
|
_API_WORKER_LIVE = 0
|
|
|
|
|
|
def api_worker_live_count() -> int:
|
|
"""Executor threads still inside an API-server agent turn (``_run_agent`` and ``/v1/runs``)."""
|
|
with _API_WORKER_LOCK:
|
|
return _API_WORKER_LIVE
|
|
|
|
|
|
def _submit_api_worker(loop, fn):
|
|
"""``loop.run_in_executor(None, fn)`` with the worker-lifetime count held for the submission.
|
|
|
|
Increment on the submitting (handler) thread so the count is live before the worker can
|
|
exit; decrement in the worker thread's own ``finally`` so handler cancellation cannot drop
|
|
it early. When submission itself fails (default executor already shut down during quiesce
|
|
-> RuntimeError) the worker never runs, so the count is released here instead — a leaked
|
|
count would make the shutdown close gate skip the SessionDB close for the process lifetime.
|
|
"""
|
|
global _API_WORKER_LIVE
|
|
with _API_WORKER_LOCK:
|
|
_API_WORKER_LIVE += 1
|
|
|
|
def _counted():
|
|
try:
|
|
return fn()
|
|
finally:
|
|
global _API_WORKER_LIVE
|
|
with _API_WORKER_LOCK:
|
|
_API_WORKER_LIVE -= 1
|
|
|
|
try:
|
|
return loop.run_in_executor(None, _counted)
|
|
except BaseException:
|
|
with _API_WORKER_LOCK:
|
|
_API_WORKER_LIVE -= 1
|
|
raise
|
|
_ROOM_RETENTION_REQUEST_KEY = (
|
|
RequestKey("hermes.room_run_retention_until", float) if RequestKey is not None
|
|
else "hermes.room_run_retention_until")
|
|
# Forwarded subagent lifecycle fields; free-text ones are secret-redacted.
|
|
_SUBAGENT_EVENT_KEYS = (
|
|
"goal", "task_count", "task_index", "subagent_id", "child_session_id", "delegation_id", "parent_id",
|
|
"depth", "model", "tool_count", "status", "summary", "duration_seconds", "input_tokens",
|
|
"output_tokens", "reasoning_tokens", "api_calls", "cost_usd", "files_read", "files_written",
|
|
"output_tail")
|
|
_SUBAGENT_TEXT_KEYS = ("goal", "summary", "output_tail")
|
|
# Terminal usage payload: (wire key, agent attribute), in wire order. Cache reads ride along so a
|
|
# cost poller does not book them as full-price input (#102101).
|
|
_USAGE_FIELDS = (
|
|
("input_tokens", "session_prompt_tokens"), ("output_tokens", "session_completion_tokens"),
|
|
("total_tokens", "session_total_tokens"), ("cache_read_tokens", "session_cache_read_tokens"),
|
|
("cache_write_tokens", "session_cache_write_tokens"))
|
|
# Tool-progress event -> SSE payload fields (tool_name, preview, kwargs); key order is wire format.
|
|
_FIXED_EVENT_FIELDS = {
|
|
"tool.started": lambda tool, preview, kw: {"tool": tool, "preview": preview},
|
|
"tool.completed": lambda tool, preview, kw: {
|
|
"tool": tool, "duration": round(kw.get("duration", 0), 3), "error": kw.get("is_error", False)},
|
|
"reasoning.available": lambda tool, preview, kw: {"text": preview or ""}}
|
|
_TOOL_COMPLETED_PREVIEW_MAX_CHARS = 500
|
|
|
|
|
|
def _tool_completed_preview(result: Any, redact_sensitive_text: Callable[..., str]) -> str:
|
|
"""Bounded, secret-redacted result summary for the public run stream — redacted BEFORE
|
|
truncation so a cut never leaves a secret's prefix on the wire."""
|
|
if result is None:
|
|
return ""
|
|
text = result if isinstance(result, str) else json.dumps(result, ensure_ascii=False, default=str)
|
|
preview = redact_sensitive_text(text, force=True)
|
|
limit = _TOOL_COMPLETED_PREVIEW_MAX_CHARS
|
|
return preview if len(preview) <= limit else preview[: limit - 3] + "..."
|
|
|
|
|
|
def _remember_room_retention(request: "web.Request", claims: dict[str, Any]) -> None:
|
|
value = float(claims.get("status_expires_at") or claims.get("expires_at") or 0)
|
|
try:
|
|
request[_ROOM_RETENTION_REQUEST_KEY] = value
|
|
except (AttributeError, TypeError):
|
|
setattr(request, "_hermes_room_run_retention_until", value)
|
|
|
|
|
|
def _room_retention_until(request: "web.Request") -> float:
|
|
try:
|
|
value = request.get(_ROOM_RETENTION_REQUEST_KEY, 0)
|
|
except AttributeError:
|
|
value = getattr(request, "_hermes_room_run_retention_until", 0)
|
|
return max(0.0, float(value or 0))
|
|
|
|
|
|
def _run_event(run_id: str, name: str, **fields: Any) -> Dict[str, Any]:
|
|
"""Build one SSE event payload (key order is part of the wire format)."""
|
|
return {"event": name, "run_id": run_id, "timestamp": time.time(), **fields}
|
|
|
|
|
|
def terminal_run_status(result: Dict[str, Any]) -> Tuple[str, Dict[str, Any]]:
|
|
"""Map a ``run_conversation`` result to its terminal run status and the wire fields every
|
|
terminal event/status carries. An interrupted turn is ``cancelled``; a turn that ended
|
|
without finishing (``failed``, ``partial``, or ``completed=False`` such as the iteration
|
|
budget) is ``failed``, so ``completed: true`` never rides next to ``partial: true``."""
|
|
interrupted = bool(result.get("interrupted"))
|
|
finished = (
|
|
not interrupted and not result.get("failed") and not result.get("partial")
|
|
and result.get("completed") is not False
|
|
)
|
|
status = "cancelled" if interrupted else "completed" if finished else "failed"
|
|
fields: Dict[str, Any] = {
|
|
"completed": finished, "partial": bool(result.get("partial")), "interrupted": interrupted,
|
|
}
|
|
if not finished and result.get("turn_exit_reason"):
|
|
fields["turn_exit_reason"] = str(result["turn_exit_reason"])
|
|
if result.get("pending_steer"):
|
|
# Undelivered steer text rides on every terminal event/status for client replay.
|
|
fields["pending_steer"] = result["pending_steer"]
|
|
return status, fields
|
|
|
|
|
|
def _run_not_found(_openai_error, run_id: str) -> "web.Response":
|
|
return _json_error(_openai_error, f"Run not found: {run_id}", code="run_not_found", status=404)
|
|
|
|
|
|
def _uses_room_run_auth(self, request: "web.Request") -> bool:
|
|
return request.path.endswith("/v1/runs") and bool(self._room_grant_token(request))
|
|
|
|
|
|
def _initialize_run_state(self, *, store_factory) -> None:
|
|
"""Initialize adapter-owned durable and live ``/v1/runs`` state."""
|
|
self._run_idempotency_store = store_factory()
|
|
self._run_owner_pid = os.getpid()
|
|
try:
|
|
from gateway.status import get_process_start_time
|
|
self._run_owner_started = int(get_process_start_time(self._run_owner_pid) or 0)
|
|
except Exception:
|
|
self._run_owner_started = 0
|
|
# All keyed by run_id: SSE queues (+creation time for the TTL sweep), connected
|
|
# subscribers, live agent/task refs for cooperative stop (the executor thread may
|
|
# outlive the request, hence the separate stopping set), pollable statuses, and
|
|
# approval session keys (approval core resolves by session key, clients by run_id).
|
|
self._run_idempotency_ids: set[str] = set()
|
|
self._run_stream_subscribers: set[str] = set()
|
|
self._stopping_run_ids: set[str] = set()
|
|
self._shutdown_interrupted_run_ids: set[str] = set()
|
|
self._run_shutdown_requested_at: Optional[float] = None
|
|
(
|
|
self._run_owners, self._run_streams, self._run_streams_created, self._active_run_agents,
|
|
self._active_run_tasks, self._run_statuses, self._run_approval_sessions,
|
|
) = ({} for _ in range(7))
|
|
|
|
|
|
def _http_routes(self) -> list[tuple[str, str, Any]]:
|
|
return [
|
|
("POST", "/v1/runs", self._handle_runs), ("GET", "/v1/runs/{run_id}", self._handle_get_run),
|
|
("GET", "/v1/runs/{run_id}/events", self._handle_run_events),
|
|
("POST", "/v1/runs/{run_id}/approval", self._handle_run_approval),
|
|
("POST", "/v1/runs/{run_id}/steer", self._handle_steer_run),
|
|
("POST", "/v1/runs/{run_id}/stop", self._handle_stop_run)]
|
|
|
|
|
|
def _idempotency_capabilities(self, *, store_type) -> dict[str, Any]:
|
|
return {
|
|
"supported": True,
|
|
"durable": self._run_idempotency_store.durable,
|
|
"retention_seconds": store_type.RETENTION_SECONDS}
|
|
|
|
|
|
def _close_run_state(self) -> None:
|
|
try:
|
|
if getattr(self, "_run_idempotency_store", None) is not None:
|
|
self._run_idempotency_store.close()
|
|
except Exception:
|
|
logger.debug("Failed to close run idempotency store for %s", self.name, exc_info=True)
|
|
|
|
|
|
def _set_run_status(self, run_id: str, status: str, **fields: Any) -> Dict[str, Any]:
|
|
"""Update pollable run status without exposing private agent objects."""
|
|
now = time.time()
|
|
current = self._run_statuses.get(run_id, {})
|
|
previous_status = str(current.get("status") or "")
|
|
field_names = set(fields)
|
|
current.update({"object": "hermes.run", "run_id": run_id, "status": status, "updated_at": now})
|
|
current.setdefault("created_at", fields.pop("created_at", now))
|
|
current.update(fields)
|
|
shutdown_requested_at = getattr(self, "_run_shutdown_requested_at", None)
|
|
if shutdown_requested_at is not None and status not in TERMINAL_STATUSES:
|
|
current.setdefault("shutdown_requested_at", shutdown_requested_at)
|
|
if status != "waiting_for_approval":
|
|
current.pop("approval", None)
|
|
self._run_statuses[run_id] = current
|
|
should_persist = (
|
|
status != previous_status
|
|
or status in TERMINAL_STATUSES
|
|
or bool(field_names & {
|
|
"output", "error", "usage", "pending_steer", "session_id", "shutdown_requested_at"}))
|
|
if run_id in self._run_idempotency_ids and should_persist:
|
|
try:
|
|
self._run_idempotency_store.update_status(run_id, current)
|
|
except Exception:
|
|
logger.exception("[api_server] failed to persist idempotent run status %s", run_id)
|
|
return current
|
|
|
|
|
|
def _mark_shutdown_interrupted_runs(self, run_ids) -> None:
|
|
"""Publish the shutdown outcome before cooperative interruption can race teardown."""
|
|
for run_id in run_ids:
|
|
self._shutdown_interrupted_run_ids.add(run_id)
|
|
self._set_run_status(
|
|
run_id,
|
|
"interrupted",
|
|
error="Gateway shutdown interrupted the run.",
|
|
last_event="run.interrupted",
|
|
)
|
|
|
|
|
|
def _mark_shutdown_requested(self) -> int:
|
|
"""Persist when gateway shutdown began without changing the run state vocabulary."""
|
|
shutdown_requested_at = getattr(self, "_run_shutdown_requested_at", None)
|
|
if shutdown_requested_at is None:
|
|
shutdown_requested_at = time.time()
|
|
self._run_shutdown_requested_at = shutdown_requested_at
|
|
marked = 0
|
|
for run_id, current in list(self._run_statuses.items()):
|
|
if current.get("status") in TERMINAL_STATUSES or "shutdown_requested_at" in current:
|
|
continue
|
|
self._set_run_status(
|
|
run_id, str(current.get("status") or "running"),
|
|
shutdown_requested_at=shutdown_requested_at)
|
|
marked += 1
|
|
return marked
|
|
|
|
|
|
def _make_run_event_callback(self, run_id: str, loop: "asyncio.AbstractEventLoop", *, _api_server):
|
|
"""Return a callback that pushes structured events to the run SSE queue."""
|
|
redact_sensitive_text = _api_server.redact_sensitive_text
|
|
|
|
def _push(event: Dict[str, Any]) -> None:
|
|
self._set_run_status(
|
|
run_id, self._run_statuses.get(run_id, {}).get("status", "running"), last_event=event.get("event"))
|
|
q = self._run_streams.get(run_id)
|
|
if q is not None:
|
|
with suppress(Exception):
|
|
loop.call_soon_threadsafe(q.put_nowait, event)
|
|
|
|
def _callback(event_type: str, tool_name: str = None, preview: str = None, args=None, **kwargs):
|
|
# _thinking / subagent.tool / subagent_progress are deliberately dropped (UI noise);
|
|
# lifecycle boundaries must land so clients can observe delegate_task failures.
|
|
fields = _FIXED_EVENT_FIELDS.get(event_type)
|
|
if fields is not None:
|
|
event_fields = fields(tool_name, preview, kwargs)
|
|
if event_type == "tool.completed":
|
|
event_fields["preview"] = _tool_completed_preview(
|
|
kwargs.get("result"), redact_sensitive_text)
|
|
_push(_run_event(run_id, event_type, **event_fields))
|
|
elif event_type in {"subagent.start", "subagent.complete"}:
|
|
event = _run_event(run_id, event_type)
|
|
if preview is not None:
|
|
event["preview"] = redact_sensitive_text(str(preview), force=True)
|
|
for key in _SUBAGENT_EVENT_KEYS:
|
|
value = kwargs.get(key)
|
|
if value is not None:
|
|
# Free text may carry child tool output: force secret redaction on this public stream.
|
|
redact = key in _SUBAGENT_TEXT_KEYS and isinstance(value, str)
|
|
event[key] = redact_sensitive_text(value, force=True) if redact else value
|
|
_push(event)
|
|
|
|
return _callback
|
|
|
|
|
|
def _room_permission_for(request: "web.Request") -> str:
|
|
if request.path.endswith("/stop"):
|
|
return "stop"
|
|
if request.path.endswith("/approval"):
|
|
return "approve"
|
|
return "status" if request.method == "GET" else "dispatch"
|
|
|
|
|
|
def _run_idempotency_scope(self, request: "web.Request", *, _api_server) -> str:
|
|
"""Opaque auth/profile namespace; never persist bearer credentials."""
|
|
if self._room_grant_token(request):
|
|
claims = self._room_grant_claims(request, permission=_room_permission_for(request))
|
|
_remember_room_retention(request, claims)
|
|
parts = (claims[k] for k in (
|
|
"room_id", "home_install_id", "authority_gateway_id", "authority_epoch",
|
|
"member_id", "target_install_id", "target_profile"))
|
|
else:
|
|
parts = (_api_server._api_request_profile.get() or "default",
|
|
self._expected_api_key() or "unauthenticated-test-listener")
|
|
return hashlib.sha256("\0".join(map(str, parts)).encode()).hexdigest()
|
|
|
|
|
|
def _check_run_auth(self, request: "web.Request", *, permission: str, _api_server) -> "web.Response | None":
|
|
if not self._room_grant_token(request):
|
|
return self._check_auth(request)
|
|
try:
|
|
self._room_grant_claims(request, permission=permission)
|
|
except Exception as exc:
|
|
return _room_grant_error_response(exc, _openai_error=_api_server._openai_error)
|
|
return None
|
|
|
|
|
|
def _owner_alive(owner_pid: int, owner_started: int) -> bool:
|
|
"""True when the recorded owner pid still exists and is the same process incarnation."""
|
|
try:
|
|
from gateway.status import _pid_exists, get_process_start_time, start_time_fingerprints_match
|
|
return owner_pid > 0 and bool(_pid_exists(owner_pid)) and (
|
|
not owner_started
|
|
or start_time_fingerprints_match(owner_started, get_process_start_time(owner_pid) or 0))
|
|
except Exception:
|
|
return False
|
|
|
|
|
|
def _durable_run_status(self, request: "web.Request", run_id: str) -> Dict[str, Any] | None:
|
|
"""Hydrate a scoped run status and fail stale owners closed."""
|
|
status = self._run_statuses.get(run_id)
|
|
if status is not None:
|
|
if run_id in self._run_idempotency_ids:
|
|
scope = self._run_idempotency_scope(request)
|
|
self._run_idempotency_store.extend_retention(scope, run_id, _room_retention_until(request))
|
|
return status
|
|
scope = self._run_idempotency_scope(request)
|
|
record = self._run_idempotency_store.status_for_run(
|
|
scope, run_id, retention_until=_room_retention_until(request))
|
|
if record is None:
|
|
return None
|
|
status = dict(record["status"])
|
|
if status.get("status") not in TERMINAL_STATUSES and not _owner_alive(
|
|
int(record.get("owner_pid") or 0), int(record.get("owner_started") or 0)):
|
|
status.update(
|
|
status="interrupted", error="The gateway restarted before this run settled.",
|
|
last_event="run.interrupted", updated_at=time.time())
|
|
self._run_idempotency_store.update_status(run_id, status)
|
|
self._run_statuses[run_id] = status
|
|
self._run_idempotency_ids.add(run_id)
|
|
self._run_owners[run_id] = scope
|
|
return status
|
|
|
|
|
|
def _resolve_conversation_history(
|
|
self, body: dict, raw_input: Any, *, _openai_error
|
|
) -> "tuple[List[Dict[str, str]], Any, Any, web.Response | None]":
|
|
"""Return ``(history, instructions, stored_session_id, error)``; precedence:
|
|
``conversation_history`` > ``previous_response_id`` chain > all-but-last ``input`` messages."""
|
|
instructions = body.get("instructions")
|
|
previous_response_id = body.get("previous_response_id")
|
|
conversation_history: List[Dict[str, str]] = []
|
|
raw_history = body.get("conversation_history")
|
|
if raw_history:
|
|
if not isinstance(raw_history, list):
|
|
return [], instructions, None, _json_error(
|
|
_openai_error, "'conversation_history' must be an array of message objects", status=400)
|
|
for i, entry in enumerate(raw_history):
|
|
if not isinstance(entry, dict) or {"role", "content"} - set(entry):
|
|
return [], instructions, None, _json_error(
|
|
_openai_error, f"conversation_history[{i}] must have 'role' and 'content' fields",
|
|
status=400)
|
|
conversation_history.append({"role": str(entry["role"]), "content": str(entry["content"])})
|
|
if previous_response_id:
|
|
logger.debug("Both conversation_history and previous_response_id provided; using conversation_history")
|
|
stored_session_id = None
|
|
if not conversation_history and previous_response_id:
|
|
stored = self._current_response_store().get(previous_response_id)
|
|
if stored:
|
|
conversation_history = list(stored.get("conversation_history", []))
|
|
stored_session_id = stored.get("session_id")
|
|
if instructions is None:
|
|
instructions = stored.get("instructions")
|
|
if not conversation_history and isinstance(raw_input, list) and len(raw_input) > 1:
|
|
for msg in raw_input[:-1]:
|
|
if isinstance(msg, dict) and msg.get("role") and msg.get("content"):
|
|
content = msg["content"]
|
|
if isinstance(content, list): # flatten multi-part content blocks to text
|
|
content = " ".join(p.get("text", "") for p in content
|
|
if isinstance(p, dict) and p.get("type") == "text")
|
|
conversation_history.append({"role": msg["role"], "content": str(content)})
|
|
return conversation_history, instructions, stored_session_id, None
|
|
|
|
|
|
def _accepted_response(run_id: str, status: str, gateway_session_key, *, replayed: bool) -> "web.Response":
|
|
"""202 admission response; replays are flagged via ``Idempotency-Replayed``."""
|
|
headers = {"Idempotency-Replayed": "true"} if replayed else {}
|
|
if gateway_session_key:
|
|
headers["X-Hermes-Session-Key"] = gateway_session_key
|
|
return web.json_response(
|
|
{"run_id": run_id, "status": status, "replayed": replayed}, status=202, headers=headers)
|
|
|
|
|
|
def _replay_or_conflict(self, request, outcome, record, gateway_session_key, _openai_error) -> "web.Response":
|
|
"""409 for a fingerprint conflict, else a 202 replay of the already-admitted run."""
|
|
if outcome == "conflict":
|
|
return _json_error(
|
|
_openai_error, "Idempotency-Key was already used with a different request payload",
|
|
code="idempotency_key_conflict", status=409)
|
|
original_id = str(record["run_id"])
|
|
status = self._durable_run_status(request, original_id) or record["status"]
|
|
return _accepted_response(original_id, status.get("status", "queued"), gateway_session_key, replayed=True)
|
|
|
|
|
|
@dataclass(slots=True)
|
|
class _RunLaunch:
|
|
"""State for an admitted run's background task; contextvars are captured here
|
|
because the task outlives the request (and its middleware profile scope)."""
|
|
|
|
owner: Any
|
|
run_id: str
|
|
queue: "asyncio.Queue[Optional[Dict]]"
|
|
session_id: str
|
|
gateway_session_key: Optional[str]
|
|
declared_selected: bool
|
|
user_message: str
|
|
conversation_history: List[Dict[str, str]]
|
|
# #98619: only continuation paths that reload session history may grant wake authority —
|
|
# a previous_response_id continuation consumes its ResponseStore snapshot instead, and a
|
|
# caller-supplied conversation_history is authoritative for the turn; neither consumes a
|
|
# SessionDB delivery row, so both stay default-denied.
|
|
session_history_delivery: bool
|
|
agent_kwargs: dict # ``_create_agent`` keyword arguments (prompt, model overrides, route, room policy)
|
|
request_profile: Any
|
|
browser_control_principal: Any
|
|
browser_control_transport_family: Any
|
|
turn_author: Optional[Dict[str, Any]] = None # memory-attribution label only; grants nothing
|
|
|
|
@property
|
|
def approval_session_key(self) -> str:
|
|
# Isolated per run: session ids are conversation scopes, not authorization namespaces.
|
|
return self.run_id
|
|
|
|
def put_event(self, event: Optional[Dict]) -> None:
|
|
"""Enqueue only while this run still owns live transport state."""
|
|
if self.owner._run_streams.get(self.run_id) is self.queue:
|
|
self.queue.put_nowait(event)
|
|
|
|
|
|
def _forget_run(self, run_id: str, *tables) -> None:
|
|
"""Drop *run_id* from the given run-keyed dicts/sets, then release its owner stamp."""
|
|
for table in tables:
|
|
(table.discard if isinstance(table, set) else lambda k: table.pop(k, None))(run_id)
|
|
self._release_run_owner_if_forgotten(run_id)
|
|
|
|
|
|
def _retire_live_run(self, run_id: str) -> None:
|
|
"""Retire agent/task/approval control state once the executor-backed task is done."""
|
|
_forget_run(self, run_id, self._active_run_agents, self._active_run_tasks, self._run_approval_sessions,
|
|
self._stopping_run_ids, self._shutdown_interrupted_run_ids)
|
|
|
|
|
|
def _drop_run_transport(self, run_id: str) -> None:
|
|
_forget_run(self, run_id, self._run_streams, self._run_streams_created)
|
|
|
|
|
|
async def _resolve_live_session_id(self, session_id: str) -> str:
|
|
"""Adopt the live compression-continuation tip for a client-addressed session (#98619):
|
|
a /v1/runs run bound to a pre-rotation id would otherwise load a stale history slice and
|
|
write its turn into the closed parent (CompressionSessionClosedError). Same canonical
|
|
resolution ``/api/sessions/{id}/messages`` reads use; fails open to the original id."""
|
|
db = await self._ensure_session_db_async()
|
|
resolver = getattr(db, "resolve_resume_session_id", None) if db is not None else None
|
|
if not callable(resolver):
|
|
return session_id
|
|
try:
|
|
resolved = await asyncio.to_thread(resolver, session_id)
|
|
return str(resolved) if resolved else session_id
|
|
except Exception:
|
|
logger.debug("/v1/runs live-session resolve failed for %s", session_id, exc_info=True)
|
|
return session_id
|
|
|
|
|
|
async def run_internal_session_turn(self, *, session_id: str, text: str, profile: str,
|
|
notification_category: str = "result", _api_server) -> None:
|
|
"""Run one background wake turn against a raw session id IN-PROCESS (no HTTP, no API key).
|
|
|
|
The HTTP wake self-post cannot serve a multiplexed *served* profile: ``/p/<profile>/`` on
|
|
the shared listener authenticates with that profile's own ``API_SERVER_KEY`` — which a
|
|
route-only profile legitimately does not have — while an unprefixed self-post would resume
|
|
the session in the DEFAULT profile's store. ``gateway.wake`` therefore runs the turn here,
|
|
inside the owner profile's runtime scope (the session DB, model resolution and tool policy
|
|
all follow the ambient scope), with ``profile`` naming the profile the caller proved owns
|
|
the session — never derived here, so a missing proof cannot silently become the default.
|
|
Raises on failure so the caller can rewind its cursor: a draining gateway fails at once
|
|
(the HTTP self-post's 503) while a saturated concurrent-run cap is retried with the same
|
|
backoff the HTTP self-post uses for a 429.
|
|
"""
|
|
from gateway.wake import _RETRY_DELAYS_SECONDS
|
|
profile = (profile or "").strip()
|
|
if not profile:
|
|
raise ValueError("run_internal_session_turn requires the owning profile")
|
|
token = _api_server._api_request_profile.set(profile)
|
|
attempts = 1 + len(_RETRY_DELAYS_SECONDS)
|
|
last_err: Optional[BaseException] = None
|
|
try:
|
|
for attempt in range(attempts):
|
|
if attempt:
|
|
await asyncio.sleep(_RETRY_DELAYS_SECONDS[attempt - 1])
|
|
if self._draining_response() is not None:
|
|
raise RuntimeError(
|
|
f"internal wake refused for session {session_id}: the gateway is draining")
|
|
# Transient: the cap clears on its own, exactly as the HTTP self-post's 429 does.
|
|
if self._concurrency_limited_response() is not None:
|
|
last_err = RuntimeError(
|
|
"internal wake deferred: the API server is at its concurrent-run cap")
|
|
logger.warning("%s; attempt %d/%d", last_err, attempt + 1, attempts)
|
|
continue
|
|
# #98619/#13437: adopt the live continuation tip first, the same canonical
|
|
# resolution the HTTP self-post consumes — a compressed origin must be woken on the
|
|
# transcript that is actually live, never the retired parent slice.
|
|
resolved = await _resolve_live_session_id(self, session_id)
|
|
session, err = await self._get_existing_session_or_404(resolved)
|
|
if err is not None or not session:
|
|
raise RuntimeError(
|
|
f"internal wake target session {resolved!r} is not in the active profile store")
|
|
history = await self._conversation_history_for_session(resolved)
|
|
# Same route resolution as the HTTP self-post (/v1/chat/completions): a model_routes
|
|
# alias for the virtual model applies to the wake turn too.
|
|
route, overrides, err = self._select_request_route(
|
|
{"model": self._model_name}, session_id=resolved, gateway_session_key=None,
|
|
model_alias=self._model_name)
|
|
if err is not None:
|
|
raise RuntimeError(f"internal wake route conflict for session {resolved!r}")
|
|
await self._run_agent(
|
|
user_message=text, conversation_history=history, session_id=resolved,
|
|
gateway_session_key=None, **overrides, route=route, requested_runtime={},
|
|
route_source="global", session_history_delivery="1",
|
|
notification_category=notification_category,
|
|
)
|
|
return
|
|
raise RuntimeError(
|
|
f"internal wake gave up for session {session_id} after {attempts} attempts: {last_err}")
|
|
finally:
|
|
if token is not None:
|
|
_api_server._api_request_profile.reset(token)
|
|
|
|
|
|
async def _handle_runs(self, request: "web.Request", *, _api_server) -> "web.Response":
|
|
"""POST /v1/runs — start an agent run, return run_id immediately."""
|
|
_openai_error = _api_server._openai_error
|
|
# Long-term memory scope header (see chat_completions for details).
|
|
gateway_session_key, key_err = self._parse_session_key_header(request)
|
|
if key_err is not None:
|
|
return key_err
|
|
try:
|
|
body = await request.json()
|
|
except Exception:
|
|
return _json_error(_openai_error, "Invalid JSON", status=400)
|
|
body, room_error = await self._normalize_room_dispatch(request, body)
|
|
if room_error is not None:
|
|
return room_error
|
|
room_dispatch, room_execution_policy = (
|
|
v if isinstance(v, dict) else None for v in (
|
|
(body.get("hosted_room_dispatch"), body.get("_room_execution_policy"))
|
|
if isinstance(body, dict) else (None, None)))
|
|
idempotency_key = request.headers.get("Idempotency-Key", "").strip()
|
|
if len(idempotency_key) > 255 or any(ord(ch) < 33 or ord(ch) > 126 for ch in idempotency_key):
|
|
return _json_error(
|
|
_openai_error, "Idempotency-Key must be 1-255 visible ASCII characters",
|
|
code="invalid_idempotency_key", status=400)
|
|
idempotency_scope = idempotency_fingerprint = ""
|
|
if idempotency_key:
|
|
idempotency_scope = self._run_idempotency_scope(request)
|
|
idempotency_fingerprint = hashlib.sha256(json.dumps(
|
|
{"body": body, "gateway_session_key": gateway_session_key or ""},
|
|
sort_keys=True, separators=(",", ":"), ensure_ascii=False,
|
|
).encode()).hexdigest()
|
|
raw_input = body.get("input")
|
|
if not raw_input:
|
|
return _json_error(_openai_error, "Missing 'input' field", status=400)
|
|
if isinstance(raw_input, str):
|
|
user_message = raw_input
|
|
else:
|
|
user_message = raw_input[-1].get("content", "") if isinstance(raw_input, list) else ""
|
|
if not user_message:
|
|
return _json_error(_openai_error, "No user message found in input", status=400)
|
|
try:
|
|
turn_author = _api_server._request_turn_author(body)
|
|
except ValueError as exc:
|
|
return _json_error(_openai_error, str(exc), code="invalid_author", status=400)
|
|
conversation_history, instructions, stored_session_id, history_err = (
|
|
_resolve_conversation_history(self, body, raw_input, _openai_error=_openai_error))
|
|
if history_err is not None:
|
|
return history_err
|
|
previous_response_id = body.get("previous_response_id")
|
|
session_id = body.get("session_id") or stored_session_id
|
|
route = self._resolve_route(body.get("model"))
|
|
agent_overrides = _api_server._request_agent_overrides(body, virtual_model=self._model_name)
|
|
selection_error = self._request_route_conflict_error(
|
|
session_id=session_id, gateway_session_key=gateway_session_key,
|
|
requested_model=agent_overrides.get("requested_model"),
|
|
requested_provider=agent_overrides.get("requested_provider"), route=route)
|
|
if selection_error:
|
|
return _json_error(_openai_error, selection_error, status=400)
|
|
# A lost-acceptance replay must resolve even while the original run holds the last
|
|
# concurrency slot; this read reserves nothing (the atomic reserve below closes the race).
|
|
if idempotency_key:
|
|
outcome, record = self._run_idempotency_store.lookup(
|
|
idempotency_scope, idempotency_key, idempotency_fingerprint,
|
|
retention_until=_room_retention_until(request))
|
|
if outcome == "conflict" or (outcome == "reused" and record is not None):
|
|
return _replay_or_conflict(self, request, outcome, record, gateway_session_key, _openai_error)
|
|
# Enforce concurrency only for a genuinely new run.
|
|
limited = self._concurrency_limited_response()
|
|
if limited is not None:
|
|
return limited
|
|
run_id = f"run_{uuid.uuid4().hex}"
|
|
self._run_owners[run_id] = self._run_idempotency_scope(request)
|
|
# Same precedence as /v1/responses: body session_id > response chain > X-Hermes-Session-Key
|
|
# conversation > run_id (which would otherwise re-key every affinity surface per run).
|
|
# An explicit or chained session owns its routing key and is never rebound to the header.
|
|
_declared_selected = not session_id and bool(gateway_session_key)
|
|
selected_session_id = session_id or (
|
|
await asyncio.to_thread(self._declared_conversation_session, gateway_session_key)
|
|
if _declared_selected else None)
|
|
# A client-addressed id from before a compression rotation must adopt the live tip (#98619):
|
|
# history loads from it, the turn writes to it, and a detached delivery row persisted to it
|
|
# is what the next same-id run consumes below.
|
|
if selected_session_id:
|
|
selected_session_id = await _resolve_live_session_id(self, str(selected_session_id))
|
|
session_id = selected_session_id or run_id
|
|
# History loads for the session the request actually selected — including one resolved from
|
|
# a declared X-Hermes-Session-Key, whose persisted delivery rows must reach the next
|
|
# same-key run's context (#98619). previous_response_id continuations keep their
|
|
# ResponseStore snapshot as history (they cannot consume a SessionDB delivery row and are
|
|
# accordingly denied wake capability in _run_agent_sync); the fresh run_id fallback has
|
|
# nothing persisted to load yet. Wake authority is fixed here, before the load can
|
|
# overwrite ``conversation_history``: a caller-supplied history is authoritative for this
|
|
# turn, never consumes the SessionDB delivery row, and is denied on the same contract.
|
|
session_history_delivery = not previous_response_id and not conversation_history
|
|
if not conversation_history and selected_session_id and not previous_response_id:
|
|
conversation_history = await self._conversation_history_for_session(str(selected_session_id))
|
|
q = self._run_streams[run_id] = asyncio.Queue()
|
|
created_at = self._run_streams_created[run_id] = time.time()
|
|
self._run_approval_sessions[run_id] = run_id # approval session key (see _RunLaunch)
|
|
initial_status = self._set_run_status(
|
|
run_id, "queued", created_at=created_at, session_id=session_id, model=body.get("model", self._model_name))
|
|
if idempotency_key:
|
|
outcome, record = self._run_idempotency_store.reserve(
|
|
idempotency_scope, idempotency_key, idempotency_fingerprint, run_id, initial_status,
|
|
owner_pid=self._run_owner_pid, owner_started=self._run_owner_started,
|
|
retention_until=_room_retention_until(request))
|
|
if outcome != "created":
|
|
_forget_run(
|
|
self, run_id, self._run_streams, self._run_streams_created, self._run_approval_sessions,
|
|
self._run_statuses, self._run_owners)
|
|
return _replay_or_conflict(self, request, outcome, record, gateway_session_key, _openai_error)
|
|
self._run_idempotency_ids.add(run_id)
|
|
launch = _RunLaunch(
|
|
self, run_id, q, session_id, gateway_session_key, _declared_selected, user_message,
|
|
conversation_history, session_history_delivery,
|
|
agent_kwargs=dict(
|
|
ephemeral_system_prompt=instructions, session_id=session_id, gateway_session_key=gateway_session_key,
|
|
route=route, room_dispatch=room_dispatch, room_execution_policy=room_execution_policy,
|
|
**{k: agent_overrides.get(k) for k in ("requested_model", "requested_provider", "model_options")}),
|
|
request_profile=_api_server._api_request_profile.get(),
|
|
browser_control_principal=_api_server._api_request_browser_control_principal.get(),
|
|
browser_control_transport_family=_api_server._api_request_browser_control_transport_family.get(),
|
|
turn_author=turn_author)
|
|
self._activate_admitted_request()
|
|
# A canonical Bot Chat that a Desktop holds live is that Desktop's to run: executing here would
|
|
# be a second writer beside its lease (#114959). The owner's mailbox takes the turn and its
|
|
# receipt drives this run's status, so `peer run` keeps its run_id and `peer status` still works.
|
|
admitted = await self._admit_to_live_bot_chat(session_id, user_message, turn_author) if selected_session_id else None
|
|
if admitted is not None:
|
|
task = self._active_run_tasks[run_id] = asyncio.create_task(
|
|
_execute_run_via_live_owner(self, launch, *admitted, _api_server=_api_server))
|
|
else:
|
|
task = self._active_run_tasks[run_id] = asyncio.create_task(_execute_run(self, launch, _api_server=_api_server))
|
|
with suppress(TypeError):
|
|
self._background_tasks.add(task) # tracked for shutdown drain
|
|
if hasattr(task, "add_done_callback"):
|
|
task.add_done_callback(self._background_tasks.discard)
|
|
return _accepted_response(run_id, "started", gateway_session_key, replayed=False)
|
|
|
|
|
|
def _run_usage(agent) -> Dict[str, int]:
|
|
"""Terminal ``usage`` payload from the agent's session counters; a missing or non-numeric
|
|
counter (test doubles, agents without cache accounting) reads as ``0``."""
|
|
usage = {}
|
|
for key, attr in _USAGE_FIELDS:
|
|
value = getattr(agent, attr, 0)
|
|
usage[key] = int(value) if isinstance(value, (int, float)) and not isinstance(value, bool) else 0
|
|
return usage
|
|
|
|
|
|
def _served_runtime(agent) -> Dict[str, str]:
|
|
"""The ``{provider, model}`` pair that actually served the turn. After a ``fallback_providers``
|
|
switch the agent keeps the fallback runtime until the NEXT turn restores the primary, so when
|
|
``run_conversation()`` returns these attributes name the served pair — the run record's
|
|
``model`` field only echoes the request (#102101). Non-string attributes read as ``""``."""
|
|
pair = {}
|
|
for key in ("provider", "model"):
|
|
value = getattr(agent, key, "")
|
|
pair[key] = value if isinstance(value, str) else ""
|
|
return pair
|
|
|
|
|
|
def _run_agent_sync(self, run: _RunLaunch, agent, approval_notify, *, _api_server):
|
|
"""Executor-thread body of one run; returns ``(result, usage, served_runtime)``."""
|
|
from gateway.session_context import clear_session_vars
|
|
from gateway.hosted_room_execution_policy import (
|
|
RoomExecutionPolicy, bind_room_execution_policy, reset_room_execution_policy)
|
|
# No eager slash-worker pre-warm: slash.exec spawns one on demand (its error path already relies on that
|
|
# respawn to recover from a dead worker). Each worker child runs its own MCP discovery (#61891), so
|
|
# pre-warming one per session forks the full stdio MCP fleet — ~20 OS processes per retained session on
|
|
# a config with a few stdio servers — even for sessions that never run a worker-routed command. Sessions
|
|
# held by a live transport are never reaped, so with the desktop app open for days those fleets
|
|
# accumulate until the OS refuses new process spawns.
|
|
from tools.approval import register_gateway_notify, unregister_gateway_notify
|
|
from tools.approval_context import reset_current_session_key, set_current_session_key
|
|
session_id = run.session_id
|
|
effective_task_id = session_id or run.run_id
|
|
# (token, reset) pairs unwound in the finally block; bound only once each step succeeds.
|
|
resets: list[tuple[Any, Callable]] = []
|
|
with self._profile_scope(run.request_profile):
|
|
try:
|
|
# Contextvars, not process env: concurrent runs must not share identity.
|
|
resets.append((set_current_session_key(run.approval_session_key), reset_current_session_key))
|
|
# chat_id carries the raw session id like _run_agent() does; without it
|
|
# tools.async_delegation sees no HERMES_SESSION_CHAT_ID and forces delegations sync.
|
|
session_tokens = self._bind_api_server_session(
|
|
chat_id=session_id or "", session_key=run.approval_session_key, session_id=session_id or "",
|
|
profile=run.request_profile or "",
|
|
browser_control_principal=run.browser_control_principal,
|
|
browser_control_transport_family=run.browser_control_transport_family,
|
|
# #98619 audited opt-in: the /v1/runs session id is wake-capable only when its
|
|
# own continuation path reloads session history — an explicit body/chained
|
|
# session id or a declared X-Hermes-Session-Key conversation (both load
|
|
# SessionDB in _handle_runs), or the run_id fallback the client can post back
|
|
# as body.session_id. A previous_response_id continuation consumes its
|
|
# ResponseStore snapshot instead and can never see a SessionDB delivery row,
|
|
# so it stays default-denied until a merge contract exists for that chain;
|
|
# likewise a caller-supplied conversation_history is authoritative for the
|
|
# turn and never reads the delivery row, so it is denied the same way.
|
|
session_history_delivery="1" if run.session_history_delivery else "")
|
|
if session_tokens:
|
|
resets.append((session_tokens, clear_session_vars))
|
|
if run.agent_kwargs["room_dispatch"] is not None:
|
|
policy = RoomExecutionPolicy.from_mapping(run.agent_kwargs["room_execution_policy"] or {})
|
|
resets.append((bind_room_execution_policy(policy), reset_room_execution_policy))
|
|
register_gateway_notify(run.approval_session_key, approval_notify)
|
|
# /v1/runs owns its agent lifecycle (no TurnRunner): record process ownership
|
|
# so stop/cancel reaps only the background processes this run created.
|
|
_api_server._publish_turn_process_ownership(agent, effective_task_id)
|
|
# Passed only when set: a human turn keeps today's call shape.
|
|
author_kwargs = {"turn_author": run.turn_author} if run.turn_author is not None else {}
|
|
r = agent.run_conversation(
|
|
user_message=run.user_message, conversation_history=run.conversation_history,
|
|
task_id=effective_task_id, **author_kwargs)
|
|
finally:
|
|
# Clear ownership now so a later stop can't reap work this run left running.
|
|
_api_server._clear_turn_process_ownership(agent)
|
|
self._memory_sessions.checkin(agent)
|
|
# Declared-conversation binding, same precedence gate as _run_agent.
|
|
if run.declared_selected:
|
|
self._bind_declared_conversation(
|
|
getattr(agent, "session_id", None) or session_id, run.gateway_session_key)
|
|
try:
|
|
unregister_gateway_notify(run.approval_session_key)
|
|
finally:
|
|
for token, reset in resets:
|
|
with suppress(Exception):
|
|
reset(token)
|
|
return r, _run_usage(agent), _served_runtime(agent)
|
|
|
|
|
|
def _make_approval_notify(self, run: _RunLaunch, *, _api_server) -> Callable[[Dict[str, Any]], None]:
|
|
"""Approval-request bridge: redact, stamp the event envelope, park the run status, enqueue."""
|
|
run_id, q, loop = run.run_id, run.queue, asyncio.get_running_loop()
|
|
|
|
def _approval_notify(approval_data: Dict[str, Any]) -> None:
|
|
event = dict(approval_data or {})
|
|
# Clients must never receive the raw flagged command: redact before it hits the stream.
|
|
# Redact credentials from the command before it enters the SSE/API event stream — same egress bug as
|
|
# #48456, second transport: API/desktop clients would otherwise receive the raw command Tirith
|
|
# flagged. Reuse the gateway seam.
|
|
if "command" in event:
|
|
from gateway.run import _redact_approval_command
|
|
event["command"] = _redact_approval_command(event.get("command"))
|
|
event.update(_run_event(run_id, "approval.request", choices=_api_server._approval_event_choices(
|
|
smart_denied=bool(event.get("smart_denied")),
|
|
allow_session=event.get("allow_session") is not False,
|
|
allow_permanent=event.get("allow_permanent") is not False)))
|
|
self._set_run_status(run_id, "waiting_for_approval", last_event="approval.request", approval=event)
|
|
with suppress(Exception):
|
|
loop.call_soon_threadsafe(q.put_nowait, event)
|
|
|
|
return _approval_notify
|
|
|
|
|
|
async def _execute_run_via_live_owner(self, run: _RunLaunch, home, record: Dict[str, Any], *, _api_server) -> None:
|
|
"""Drive a run whose turn a live Bot Chat owner is executing, from that owner's mailbox receipt.
|
|
|
|
The receipt is the only truth about the turn: ``settled`` completes the run with the owner's
|
|
reply, a failed receipt fails it with the owner's classified reason. ``/stop`` cannot reach the
|
|
owner's turn — the mailbox has no recall once a record is claimed — so a stop ends this run
|
|
as ``cancelled`` while the chat finishes on its own; the stop handler already reports that a
|
|
run without an in-process agent is not interruptible here.
|
|
"""
|
|
from tools.bot_live_delivery import await_delivery_async
|
|
|
|
run_id = run.run_id
|
|
delivery_id = record["delivery_id"]
|
|
|
|
def _finish(status: str, **fields: Any) -> None:
|
|
if run_id in self._shutdown_interrupted_run_ids:
|
|
# Shutdown already published "interrupted"; the cancel that follows must not
|
|
# rewrite it as a plain "cancelled" (same guard as the native _execute_run).
|
|
status, fields = "interrupted", {"error": "Gateway shutdown interrupted the run."}
|
|
self._set_run_status(run_id, status, **fields, last_event=f"run.{status}")
|
|
with suppress(Exception):
|
|
run.put_event(_run_event(run_id, f"run.{status}", **fields))
|
|
|
|
try:
|
|
self._set_run_status(run_id, "running", delivery_id=delivery_id)
|
|
record = await await_delivery_async(
|
|
home, delivery_id, None, should_stop=lambda: run_id in self._stopping_run_ids) or record
|
|
if record["status"] in ("queued", "claimed"):
|
|
_finish("cancelled", completed=False, partial=False, interrupted=True)
|
|
return
|
|
if record["status"] == "settled":
|
|
_finish("completed", completed=True, partial=False, interrupted=False,
|
|
output=record.get("reply") or "", usage={})
|
|
elif record["status"] == "cancelled":
|
|
_finish("cancelled", completed=False, partial=False, interrupted=True)
|
|
else:
|
|
_finish("failed", completed=False, partial=False, interrupted=False,
|
|
error=record.get("error") or f"Bot Chat delivery {record['status']}",
|
|
**({"reason": record["reason"]} if record.get("reason") else {}))
|
|
except asyncio.CancelledError:
|
|
_finish("cancelled", completed=False, partial=False, interrupted=True)
|
|
raise
|
|
except Exception as exc:
|
|
logger.exception("[api_server] run %s (live Bot Chat) failed", run_id)
|
|
_finish("failed", completed=False, partial=False, interrupted=False, error=str(exc))
|
|
finally:
|
|
with suppress(Exception):
|
|
run.put_event(None) # sentinel: close the SSE stream
|
|
_retire_live_run(self, run_id)
|
|
|
|
|
|
async def _execute_run(self, run: _RunLaunch, *, _api_server) -> None:
|
|
"""Drive one admitted run, publish its terminal event/status, release live state."""
|
|
_redact_api_error_text = _api_server._redact_api_error_text
|
|
run_id, loop = run.run_id, asyncio.get_running_loop()
|
|
|
|
def _text_cb(delta: Optional[str]) -> None:
|
|
if delta is None or run_id not in self._run_streams:
|
|
return
|
|
with suppress(Exception):
|
|
loop.call_soon_threadsafe(run.put_event, _run_event(run_id, "message.delta", delta=delta))
|
|
|
|
def _interim_cb(text: str, *, already_streamed: bool = False) -> None:
|
|
# Mid-turn assistant commentary (Codex ``phase="commentary"``, text beside tool calls),
|
|
# same ``message.interim`` contract as the TUI gateway; reasoning never reaches this
|
|
# callback and the final answer still arrives via ``run.completed`` (#67580).
|
|
if not isinstance(text, str) or not text.strip() or run_id not in self._run_streams:
|
|
return
|
|
with suppress(Exception):
|
|
loop.call_soon_threadsafe(run.put_event, _run_event(
|
|
run_id, "message.interim", text=text, already_streamed=bool(already_streamed)))
|
|
|
|
def _finish(status: str, extra: Optional[dict] = None, **fields: Any) -> None:
|
|
"""Terminal status, then best-effort ``run.<status>`` event; key order is wire shape."""
|
|
extra = extra or {}
|
|
if run_id in self._shutdown_interrupted_run_ids:
|
|
status = "interrupted"
|
|
fields = {"error": "Gateway shutdown interrupted the run."}
|
|
extra = {}
|
|
self._set_run_status(run_id, status, **fields, last_event=f"run.{status}", **extra)
|
|
with suppress(Exception):
|
|
# A worker can finish before its Future is wrapped, so awaiting it
|
|
# need not yield to already-scheduled commentary/tool callbacks.
|
|
loop.call_soon(run.put_event, _run_event(run_id, f"run.{status}", **fields, **extra))
|
|
|
|
try:
|
|
# Shutdown landed between admission and the task's first tick: nothing to
|
|
# interrupt yet, and starting a turn now would outlive the gateway.
|
|
if run_id in self._shutdown_interrupted_run_ids:
|
|
_finish("interrupted")
|
|
return
|
|
self._set_run_status(run_id, "running")
|
|
if run_id in self._stopping_run_ids:
|
|
_finish("cancelled")
|
|
return
|
|
with self._profile_scope(run.request_profile):
|
|
agent = self._create_agent(
|
|
stream_delta_callback=_text_cb, tool_progress_callback=self._make_run_event_callback(run_id, loop),
|
|
interim_assistant_callback=_interim_cb, **run.agent_kwargs)
|
|
self._active_run_agents[run_id] = agent
|
|
approval_notify = _make_approval_notify(self, run, _api_server=_api_server)
|
|
result, usage, served_runtime = await _submit_api_worker(
|
|
loop, lambda: _run_agent_sync(self, run, agent, approval_notify, _api_server=_api_server))
|
|
if not isinstance(result, dict):
|
|
result = {}
|
|
status, fields = terminal_run_status(result)
|
|
if status == "cancelled":
|
|
_finish("cancelled", fields)
|
|
elif result.get("failed"):
|
|
# Non-retryable client errors (401/400) return failed=True rather than raising.
|
|
_finish("failed", fields, error=_redact_api_error_text(result.get("error") or "agent run failed"))
|
|
else:
|
|
# ``runtime`` rides on both the pollable status and the run.completed event via _finish, in the
|
|
# canonical shape every other api_server surface emits (route_source/requested, cleaned ids).
|
|
requested = {k: run.agent_kwargs.get(f"requested_{k}") for k in ("provider", "model")}
|
|
served_runtime = self._sanitize_runtime_metadata(
|
|
runtime=served_runtime, requested_runtime=requested if any(requested.values()) else None,
|
|
route_source=("model_routes" if run.agent_kwargs.get("route")
|
|
else "raw_request" if any(requested.values()) else "global"))
|
|
_finish(status, fields, output=result.get("final_response", ""), usage=usage, runtime=served_runtime)
|
|
except asyncio.CancelledError:
|
|
_finish("cancelled")
|
|
raise
|
|
except _api_server._ProviderAuthResolutionError as exc:
|
|
# Same controlled provider-auth message the _run_agent() endpoints give.
|
|
logger.warning("Provider resolution failed for run=%s: %s", run_id, exc)
|
|
_finish("failed", error=exc.user_text())
|
|
except Exception as exc:
|
|
logger.exception("[api_server] run %s failed", run_id)
|
|
_finish("failed", error=_redact_api_error_text(exc))
|
|
finally:
|
|
# On cancellation (/stop) the executor thread may still block on an approval
|
|
# Event; unregistering releases it. Idempotent on normal completion.
|
|
_unregister_approval_notify(run.approval_session_key)
|
|
with suppress(Exception):
|
|
loop.call_soon(run.put_event, None) # close after the queued events
|
|
_retire_live_run(self, run_id)
|
|
|
|
|
|
def _unregister_approval_notify(approval_session_key: Optional[str]) -> None:
|
|
"""Best-effort release of a run's approval waiter (no-op without a key)."""
|
|
with suppress(Exception):
|
|
from tools.approval import unregister_gateway_notify
|
|
if approval_session_key:
|
|
unregister_gateway_notify(approval_session_key)
|
|
|
|
|
|
def _release_run_owner_if_forgotten(self, run_id: str) -> None:
|
|
"""Drop the owner stamp only once nothing keyed by *run_id* survives: ownership must
|
|
outlive every surface it protects (retired on different clocks); ownerless = fail-closed."""
|
|
live = (self._run_statuses, self._active_run_agents, self._active_run_tasks, self._run_streams,
|
|
self._run_approval_sessions)
|
|
if not any(run_id in table for table in live):
|
|
self._run_owners.pop(run_id, None)
|
|
|
|
|
|
def _request_owns_run(self, request: "web.Request", run_id: str) -> bool:
|
|
scope = self._run_idempotency_scope(request)
|
|
owner = self._run_owners.get(run_id)
|
|
if owner is not None:
|
|
return owner == scope
|
|
# No in-memory owner: only a durable record under the caller's scope admits it.
|
|
# Under multiplex_profiles every profile holds a valid key, so ownerless = allow-all.
|
|
# Run state that exists without an owner stamp is an unanswered authorization question, not a run anyone
|
|
# may control — under gateway.multiplex_profiles every served profile holds a valid key, so admitting it
|
|
# would make the boundary allow-all (#93689).
|
|
return self._run_idempotency_store.owns_run(scope, run_id)
|
|
|
|
|
|
def _load_owned_run(self, request, *, _api_server, permission: Optional[str], active_fallback: bool):
|
|
"""Authenticate (*permission* -> room-grant aware; ``None`` -> API key only) and resolve
|
|
``(run_id, status, agent, task, error)``; *active_fallback* reports a live in-process run
|
|
without pollable status as ``running`` instead of 404."""
|
|
auth_err = self._check_run_auth(request, permission=permission) if permission else self._check_auth(request)
|
|
if auth_err:
|
|
return None, None, None, None, auth_err
|
|
_openai_error = _api_server._openai_error
|
|
run_id = request.match_info["run_id"]
|
|
if not self._request_owns_run(request, run_id):
|
|
return run_id, None, None, None, _run_not_found(_openai_error, run_id)
|
|
agent = self._active_run_agents.get(run_id)
|
|
task = self._active_run_tasks.get(run_id)
|
|
status = self._durable_run_status(request, run_id)
|
|
if status is None and active_fallback and (agent is not None or task is not None):
|
|
status = self._set_run_status(run_id, "running")
|
|
if status is None:
|
|
return run_id, None, agent, task, _run_not_found(_openai_error, run_id)
|
|
return run_id, status, agent, task, None
|
|
|
|
|
|
async def _handle_get_run(self, request: "web.Request", *, _api_server) -> "web.Response":
|
|
"""GET /v1/runs/{run_id} — return pollable run status for external UIs."""
|
|
_, status, _, _, err = _load_owned_run(
|
|
self, request, _api_server=_api_server, permission="status", active_fallback=True)
|
|
return err or web.json_response(status)
|
|
|
|
|
|
async def _handle_run_events(self, request: "web.Request", *, _api_server) -> "web.StreamResponse":
|
|
"""GET /v1/runs/{run_id}/events — stream structured agent lifecycle events."""
|
|
auth_err = self._check_auth(request)
|
|
if auth_err:
|
|
return auth_err
|
|
run_id = request.match_info["run_id"]
|
|
if not self._request_owns_run(request, run_id):
|
|
return _run_not_found(_api_server._openai_error, run_id)
|
|
# Allow subscribing slightly before the run is registered (race window).
|
|
# Confirm the force-kill actually reaped the process before we clear its PID file / scoped locks.
|
|
# SIGKILL can fail to take (e.g. an uninterruptible-sleep or zombie-reaping parent), and if we blindly
|
|
# clear the metadata and start a fresh instance we end up with two live gateways fighting over the same
|
|
# token — the duplicate-gateway failure in #19471.
|
|
for _ in range(20):
|
|
if run_id in self._run_streams:
|
|
break
|
|
await asyncio.sleep(0.05)
|
|
else:
|
|
return _run_not_found(_api_server._openai_error, run_id)
|
|
q = self._run_streams[run_id]
|
|
self._run_stream_subscribers.add(run_id)
|
|
response = web.StreamResponse(status=200, headers={
|
|
"Content-Type": "text/event-stream", "Cache-Control": "no-cache", "X-Accel-Buffering": "no"})
|
|
await response.prepare(request)
|
|
try:
|
|
while True:
|
|
try:
|
|
event = await asyncio.wait_for(
|
|
q.get(), timeout=_api_server.CHAT_COMPLETIONS_SSE_KEEPALIVE_SECONDS)
|
|
except asyncio.TimeoutError:
|
|
await response.write(b": keepalive\n\n")
|
|
continue
|
|
if event is None: # run finished
|
|
await response.write(b": stream closed\n\n")
|
|
break
|
|
await response.write(_api_server._sse_frame(event))
|
|
except Exception as exc:
|
|
logger.debug("[api_server] SSE stream error for run %s: %s", run_id, exc)
|
|
finally:
|
|
self._run_stream_subscribers.discard(run_id)
|
|
_drop_run_transport(self, run_id)
|
|
return response
|
|
|
|
|
|
def _mark_run_event(self, run_id: str, name: str, **fields: Any) -> None:
|
|
"""Record a control-plane event on the run status and (best effort) its SSE stream."""
|
|
self._set_run_status(run_id, "running", last_event=name)
|
|
q = self._run_streams.get(run_id)
|
|
if q is not None:
|
|
with suppress(Exception):
|
|
q.put_nowait(_run_event(run_id, name, **fields))
|
|
|
|
|
|
_APPROVAL_CHOICE_ALIASES = {"approve": "once", "approved": "once", "allow": "once"}
|
|
|
|
|
|
async def _handle_run_approval(self, request: "web.Request", *, _api_server) -> "web.Response":
|
|
"""POST /v1/runs/{run_id}/approval — resolve a pending run approval."""
|
|
_openai_error = _api_server._openai_error
|
|
run_id, _, _, _, err = _load_owned_run(
|
|
self, request, _api_server=_api_server, permission="approve", active_fallback=False)
|
|
if err is not None:
|
|
return err
|
|
try:
|
|
body = await request.json()
|
|
except Exception:
|
|
return _json_error(_openai_error, "Invalid JSON", status=400)
|
|
raw_choice = str(body.get("choice", "")).strip().lower()
|
|
choice = _APPROVAL_CHOICE_ALIASES.get(raw_choice, raw_choice)
|
|
room_scoped = bool(self._room_grant_token(request))
|
|
raw_request_id = body.get("request_id")
|
|
request_id = raw_request_id.strip() if isinstance(raw_request_id, str) else ""
|
|
# Room grants may resolve exactly one request and never widen to session/always.
|
|
allowed = {"once", "deny"} if room_scoped else {"once", "session", "always", "deny"}
|
|
resolve_all = any(_api_server._coerce_request_bool(body.get(k), default=False) for k in ("all", "resolve_all"))
|
|
approval_session_key = self._run_approval_sessions.get(run_id)
|
|
for failed, message, code, status in (
|
|
(raw_request_id is not None and (not request_id or len(request_id) > 256),
|
|
"Approval request_id is invalid.", "invalid_approval_request", 400),
|
|
(choice not in allowed,
|
|
"Invalid approval choice; expected one of: " + ", ".join(sorted(allowed)),
|
|
"invalid_approval_choice", 400),
|
|
(room_scoped and resolve_all,
|
|
"Room approvals can resolve only one exact request", "invalid_approval_scope", 400),
|
|
(room_scoped and not request_id,
|
|
"Room approvals require the exact request_id.", "approval_request_required", 400),
|
|
(not approval_session_key,
|
|
f"Run has no active approval session: {run_id}", "approval_not_active", 409)):
|
|
if failed:
|
|
return _json_error(_openai_error, message, code=code, status=status)
|
|
try:
|
|
from tools.approval import resolve_gateway_approval
|
|
resolved = resolve_gateway_approval(
|
|
approval_session_key, choice, resolve_all=resolve_all, request_id=request_id or None)
|
|
except Exception as exc:
|
|
logger.exception("[api_server] approval resolution failed for run %s", run_id)
|
|
return _json_error(_openai_error, str(exc), status=500)
|
|
if resolved <= 0:
|
|
return _json_error(
|
|
_openai_error, f"Run has no pending approval: {run_id}", code="approval_not_pending", status=409)
|
|
request_id_field = {"request_id": request_id} if request_id else {}
|
|
_mark_run_event(self, run_id, "approval.responded", choice=choice, **request_id_field, resolved=resolved)
|
|
return web.json_response({
|
|
"object": "hermes.run.approval_response", "run_id": run_id, "choice": choice, **request_id_field,
|
|
"resolved": resolved})
|
|
|
|
|
|
async def _handle_steer_run(self, request: "web.Request", *, _api_server) -> "web.Response":
|
|
"""POST /v1/runs/{run_id}/steer — inject guidance into a running agent."""
|
|
_openai_error = _api_server._openai_error
|
|
run_id, status, agent, _, err = _load_owned_run(
|
|
self, request, _api_server=_api_server, permission=None, active_fallback=False)
|
|
if err is not None:
|
|
return err
|
|
# /stop keeps agent refs during cooperative shutdown, so the status gate (not the
|
|
# agent ref) is what rejects stop-then-steer.
|
|
if status.get("status") != "running" or not hasattr(agent, "steer"):
|
|
return _json_error(
|
|
_openai_error, f"Run is not currently accepting steer input: {run_id}",
|
|
code="run_not_accepting_steer", status=409)
|
|
body, err = await self._read_json_body(request)
|
|
if err:
|
|
return err
|
|
raw_text = body.get("input") or body.get("message") or body.get("text") or ""
|
|
steer_text = _api_server._normalize_chat_content(raw_text).strip()
|
|
if not steer_text:
|
|
return _json_error(
|
|
_openai_error, "Missing non-empty steer text; expected 'input', 'message', or 'text'.",
|
|
code="invalid_steer_input", status=400)
|
|
try:
|
|
accepted = bool(agent.steer(steer_text))
|
|
except Exception as exc:
|
|
logger.exception("[api_server] steer failed for run %s", run_id)
|
|
return _json_error(_openai_error, _api_server._redact_api_error_text(exc), code="steer_failed", status=500)
|
|
if not accepted:
|
|
return _json_error(
|
|
_openai_error, f"Run did not accept steer text: {run_id}", code="steer_not_accepted", status=409)
|
|
_mark_run_event(self, run_id, "run.steered", accepted=True)
|
|
return web.json_response({"object": "hermes.run.steer", "run_id": run_id, "accepted": True})
|
|
|
|
|
|
async def _handle_stop_run(self, request: "web.Request", *, _api_server) -> "web.Response":
|
|
"""POST /v1/runs/{run_id}/stop — interrupt a running agent."""
|
|
_openai_error = _api_server._openai_error
|
|
run_id, status, agent, task, err = _load_owned_run(
|
|
self, request, _api_server=_api_server, permission="stop", active_fallback=True)
|
|
if err is not None:
|
|
return err
|
|
if status.get("status") in TERMINAL_STATUSES:
|
|
return web.json_response(status)
|
|
if agent is None and task is None:
|
|
return _json_error(
|
|
_openai_error, f"Run is not active in this gateway process: {run_id}",
|
|
code="run_not_active", status=409)
|
|
self._set_run_status(run_id, "stopping", last_event="run.stopping")
|
|
self._stopping_run_ids.add(run_id)
|
|
if agent is not None:
|
|
with suppress(Exception):
|
|
_api_server.request_hard_interrupt(agent, "Stop requested via API")
|
|
# Reap only this run's background processes (epoch-gated inside, so a concurrent
|
|
# run on the same session_id keeps its own); no-op if the run already finished.
|
|
_api_server._reap_disconnected_agent_processes(agent, source="api_server_run_stop")
|
|
return web.json_response({"run_id": run_id, "status": "stopping"})
|
|
|
|
|
|
async def _sweep_orphaned_runs(self) -> None:
|
|
"""Periodically expire transport buffers and terminal status records."""
|
|
while True:
|
|
await asyncio.sleep(60)
|
|
self._sweep_orphaned_runs_once(time.time())
|
|
|
|
|
|
def _sweep_orphaned_runs_once(self, now: Optional[float] = None) -> None:
|
|
"""Expire old SSE buffers without treating transport age as run age."""
|
|
if now is None:
|
|
now = time.time()
|
|
for run_id, created_at in list(self._run_streams_created.items()):
|
|
if now - created_at <= self._RUN_STREAM_TTL or run_id in self._run_stream_subscribers:
|
|
continue
|
|
logger.debug("[api_server] sweeping expired run transport %s", run_id)
|
|
task = self._active_run_tasks.get(run_id)
|
|
# Transport TTL bounds buffering; live control state survives until the task returns.
|
|
_drop_run_transport(self, run_id)
|
|
if task is None or task.done():
|
|
_unregister_approval_notify(self._run_approval_sessions.get(run_id))
|
|
_retire_live_run(self, run_id)
|
|
for run_id, status in list(self._run_statuses.items()):
|
|
if (status.get("status") in {"completed", "failed", "cancelled"}
|
|
and now - float(status.get("updated_at", 0) or 0) > self._RUN_STATUS_TTL):
|
|
_forget_run(self, run_id, self._run_statuses, self._run_idempotency_ids)
|