a5bd246865
* refactor(plugins): remove the Sep 2026 decomposition compat layer on schedule The PLUGIN-COMPAT layer (2776813df3+d63e380324+0a5164cebe) kept pre-#102117 import paths alive for external plugins until 2026-09-14. That window closed two weeks ago; since then the loader has already been skipping plugins that use the old paths. This removes the layer itself: - 328 appended `PLUGIN-COMPAT` blocks (lazy `__getattr__` pointer tables, re-exported third-party names, restored dead definitions) and the three re-export stub modules (gateway/startup_watchdog, hermes_cli/observability/relay_runtime, tools/environments/modal_utils) - COMPAT_MANIFEST.md, compat_manifest.json, scripts/check_compat_pointers.py and its lint step - the reporting surfaces: CLI banner notice, `hermes plugins compat`, the `hermes doctor` section, the post-update notice, the Desktop one-time dialog, the loader's pre-import skip and the `plugins.allow_deprecated_imports` escape hatch An external plugin that still imports an old path now fails to load with its ImportError as the reason in `hermes plugins list`, the same path as any broken plugin. hermes_cli/plugin_compat.py stays as three inert stubs (compat_report, removal_in_effect, summary_lines): an already-running pre-removal `hermes update` lazy-imports them after the checkout swap (tests/compat/old_updater_surface.json). In-tree fallout, both already dead: hermes_cli/setup.py::_check_espeak_ng (no callers; its `shutil` came from a compat block) and gateway/config.py::SessionResetPolicy ("retained solely for the scheduled plugin-compat window"). Two test_run_agent patches targeted the removed `run_agent.handle_function_call` pointer; they now patch `model_tools.handle_function_call`, the seam production reads, like every sibling test in that file. * chore: retrigger CI (zero-job startup_failure phantom) * test: drop resolution allowlist rows for the two deleted which() sites hermes_cli/setup.py::_check_espeak_ng (dead) and tools/skillevaluator_scan.py::scanner_available (a restored definition inside a PLUGIN-COMPAT block) no longer exist; the stale-row gate requires their allowlist entries go with them.
69 lines
2.5 KiB
Python
69 lines
2.5 KiB
Python
"""Local JSON registry of approved remote meet nodes.
|
|
|
|
``$HERMES_HOME/workspace/meetings/nodes.json``::
|
|
|
|
{"nodes": {"<name>": {"url": "ws://host:port", "token": "...", "added_at": <epoch>}}}
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import time
|
|
from pathlib import Path
|
|
from typing import Any, Dict, List, Optional
|
|
|
|
from hermes_constants import get_hermes_home
|
|
|
|
from plugins.google_meet._jsonfile import read_json
|
|
from utils import atomic_json_write
|
|
|
|
|
|
def _default_path() -> Path:
|
|
return Path(get_hermes_home()) / "workspace" / "meetings" / "nodes.json"
|
|
|
|
|
|
class NodeRegistry:
|
|
"""File-backed registry; single writer assumed (the gateway CLI)."""
|
|
|
|
def __init__(self, path: Optional[Path] = None) -> None:
|
|
self.path = Path(path) if path is not None else _default_path()
|
|
|
|
def _load(self) -> Dict[str, Dict[str, Any]]:
|
|
"""The ``nodes`` map (name → entry); empty when the file is missing or malformed."""
|
|
data = read_json(self.path)
|
|
nodes = data.get("nodes") if isinstance(data, dict) else None
|
|
return nodes if isinstance(nodes, dict) else {}
|
|
|
|
def _save(self, nodes: Dict[str, Dict[str, Any]]) -> None:
|
|
atomic_json_write(self.path, {"nodes": nodes})
|
|
|
|
def get(self, name: str) -> Optional[Dict[str, Any]]:
|
|
entry = self._load().get(name)
|
|
return None if entry is None else {"name": name, **entry}
|
|
|
|
def add(self, name: str, url: str, token: str) -> None:
|
|
for label, value in (("node name", name), ("url", url), ("token", token)):
|
|
if not isinstance(value, str) or not value:
|
|
raise ValueError(f"{label} must be a non-empty string")
|
|
nodes = self._load()
|
|
nodes[name] = {"url": url, "token": token, "added_at": time.time()}
|
|
self._save(nodes)
|
|
|
|
def remove(self, name: str) -> bool:
|
|
nodes = self._load()
|
|
if name not in nodes:
|
|
return False
|
|
del nodes[name]
|
|
self._save(nodes)
|
|
return True
|
|
|
|
def list_all(self) -> List[Dict[str, Any]]:
|
|
return [{"name": name, **entry} for name, entry in sorted(self._load().items())]
|
|
|
|
def resolve(self, chrome_node: Optional[str]) -> Optional[Dict[str, Any]]:
|
|
"""Named node's entry, or (``chrome_node`` falsy) the sole registered node; None if unknown
|
|
or when zero / several nodes are registered (ambiguous)."""
|
|
if chrome_node:
|
|
return self.get(chrome_node)
|
|
nodes = self.list_all()
|
|
return nodes[0] if len(nodes) == 1 else None
|