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.
110 lines
3.4 KiB
Python
110 lines
3.4 KiB
Python
"""Late-binding dependency seam for extracted dashboard routers.
|
|
|
|
``web_server`` owns the dashboard app and its process state; routers under
|
|
``web_routers/`` cannot import it at import time (web_server imports them to mount them —
|
|
a cycle) and must not copy its state (tests ``monkeypatch.setattr(web_server, ...)`` and
|
|
expect that to win). ``late(name)`` / ``LateState(name)`` resolve ``<module>.<name>`` *at
|
|
call time*; ``module`` defaults to ``web_server`` and may name a ``web_server_<concern>``
|
|
module whose helper tests monkeypatch there.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import importlib
|
|
import sys
|
|
from typing import Any
|
|
|
|
WEB_SERVER = "hermes_cli.web_server"
|
|
|
|
|
|
def _server(module: str = WEB_SERVER):
|
|
"""Return the live ``module`` (imported on demand)."""
|
|
mod = sys.modules.get(module)
|
|
if mod is None: # pragma: no cover - routers are only mounted by web_server
|
|
mod = importlib.import_module(module)
|
|
return mod
|
|
|
|
|
|
def late(name: str, module: str = WEB_SERVER):
|
|
"""Late-binding proxy for a callable defined on ``module``."""
|
|
|
|
def _proxy(*args: Any, **kwargs: Any):
|
|
return getattr(_server(module), name)(*args, **kwargs)
|
|
|
|
_proxy.__name__ = name
|
|
_proxy.__qualname__ = name
|
|
return _proxy
|
|
|
|
|
|
class LateState:
|
|
"""Live proxy for module-level state owned by ``web_server``.
|
|
|
|
Forwards attribute/item access, iteration, membership, len/truthiness, ``with`` (locks)
|
|
and rich comparisons to ``web_server.<name>`` resolved at operation time — some state is
|
|
defined *after* the router's ``include_router`` point, so a late import would miss it.
|
|
"""
|
|
|
|
__slots__ = ("_name", "_module")
|
|
|
|
def __init__(self, name: str, module: str = WEB_SERVER) -> None:
|
|
object.__setattr__(self, "_name", name)
|
|
object.__setattr__(self, "_module", module)
|
|
|
|
def _target(self) -> Any:
|
|
return getattr(_server(object.__getattribute__(self, "_module")),
|
|
object.__getattribute__(self, "_name"))
|
|
|
|
def __getattr__(self, attr: str) -> Any:
|
|
return getattr(self._target(), attr)
|
|
|
|
def __getitem__(self, key: Any) -> Any:
|
|
return self._target()[key]
|
|
|
|
def __setitem__(self, key: Any, value: Any) -> None:
|
|
self._target()[key] = value
|
|
|
|
def __delitem__(self, key: Any) -> None:
|
|
del self._target()[key]
|
|
|
|
def __contains__(self, item: Any) -> bool:
|
|
return item in self._target()
|
|
|
|
def __iter__(self):
|
|
return iter(self._target())
|
|
|
|
def __len__(self) -> int:
|
|
return len(self._target())
|
|
|
|
def __bool__(self) -> bool:
|
|
return bool(self._target())
|
|
|
|
def __enter__(self):
|
|
return self._target().__enter__()
|
|
|
|
def __exit__(self, *exc):
|
|
return self._target().__exit__(*exc)
|
|
|
|
def __eq__(self, other: Any) -> bool:
|
|
return self._target() == other
|
|
|
|
def __ne__(self, other: Any) -> bool:
|
|
return self._target() != other
|
|
|
|
def __lt__(self, other: Any) -> bool:
|
|
return self._target() < other
|
|
|
|
def __le__(self, other: Any) -> bool:
|
|
return self._target() <= other
|
|
|
|
def __gt__(self, other: Any) -> bool:
|
|
return self._target() > other
|
|
|
|
def __ge__(self, other: Any) -> bool:
|
|
return self._target() >= other
|
|
|
|
def __hash__(self) -> int:
|
|
return hash(self._target())
|
|
|
|
def __repr__(self) -> str: # pragma: no cover - debugging aid
|
|
return f"<LateState {object.__getattribute__(self, '_name')} -> {self._target()!r}>"
|