3c7069bdcb
authz_mixin, browser_control_broker, delivery, delivery_ledger, display_config, drain_control, hosted_room_links/peer/policy_checkpoint, hosted_rooms, platform_registry, relay/__init__, relay/ws_transport, run.py and slash_commands.py (comments), session_context, session_state, streaming_tts_consumer, turn_lease and small modules. - HostedRoomPolicyCheckpoint._apply_event -> per-kind handler table - WebSocketRelayTransport._handle_frame -> frame-handler table - GatewayAuthorizationMixin: unified adapter setting/flag/extra readers - dead symbols removed (verified zero references): RoomLinkProbe/select_room_link, relay_bot_username, is_restart_loop_tripped, debug_rows, DeadTargetRegistry.all_dead, BrowserControlBroker.detach_owner/_prune_tickets, StreamingTTSConsumer.started/_enqueue_done/ _iter_stream_chunks/_next_stream_chunk, RecoverableHandleCache.status_for, _auth_env, _copy_default_catalog, _parse_timestamp_prefix, _present_* helpers, _send_result_error_kind, _truthy_env, SessionFieldView/TurnLeaseTokenView dunder shims, and their orphaned tests. - lost WHY/invariant text from the earlier compaction restored compactly (541 hunks audited)
58 lines
2.0 KiB
Python
58 lines
2.0 KiB
Python
"""Detect when the gateway is running stale code after a hot ``git pull``.
|
|
|
|
The gateway's ``sys.modules`` is frozen at boot. If the checkout is updated
|
|
underneath it (manual ``git pull``, or the window before ``hermes update``'s
|
|
graceful restart), a first-time lazy import can resolve a freshly-pulled module
|
|
against a stale cached dependency -> ImportError
|
|
(``tests/test_stale_utils_module_import.py``). We snapshot the revision at
|
|
startup so risky callers (e.g. ``/model`` switching) can refuse with a clear
|
|
"restart the gateway" message instead.
|
|
|
|
If the revision can't be read (non-git install, IO error) the boot snapshot
|
|
stays ``None`` and detection no-ops — never a false positive.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
from pathlib import Path
|
|
|
|
_PROJECT_ROOT = Path(__file__).resolve().parent.parent
|
|
_boot_fingerprint: str | None = None
|
|
|
|
|
|
def _fingerprint() -> str | None:
|
|
"""Current checkout fingerprint via the CLI's worktree-aware git-rev reader
|
|
(``hermes_cli.main`` is always already imported in a gateway process)."""
|
|
try:
|
|
from hermes_cli.main import _read_git_revision_fingerprint
|
|
|
|
return _read_git_revision_fingerprint(_PROJECT_ROOT)
|
|
except Exception:
|
|
return None
|
|
|
|
|
|
def record_boot_fingerprint() -> None:
|
|
"""Snapshot the checkout revision at gateway startup (idempotent)."""
|
|
global _boot_fingerprint
|
|
if _boot_fingerprint is None:
|
|
_boot_fingerprint = _fingerprint()
|
|
|
|
|
|
def _short(fingerprint: str) -> str:
|
|
"""Render a ``git:<ref>:<sha>`` fingerprint as a compact label."""
|
|
sha = fingerprint.rsplit(":", 1)[-1]
|
|
if sha and sha != "unresolved" and len(sha) > 10:
|
|
return sha[:10]
|
|
return sha or fingerprint
|
|
|
|
|
|
def detect_code_skew() -> tuple[str, str] | None:
|
|
"""Return ``(boot_rev, disk_rev)`` short labels if the checkout drifted
|
|
since boot, else ``None``."""
|
|
if _boot_fingerprint is None:
|
|
return None
|
|
current = _fingerprint()
|
|
if current is None or current == _boot_fingerprint:
|
|
return None
|
|
return _short(_boot_fingerprint), _short(current)
|