* 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.
107 lines
4.1 KiB
Python
107 lines
4.1 KiB
Python
"""Core NeMo Relay adapter for Hermes tool execution."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import contextvars
|
|
import json
|
|
import logging
|
|
from collections.abc import Callable
|
|
from typing import Any
|
|
|
|
from agent import relay_llm, relay_runtime
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
def execute(
|
|
tool_name: str, args: dict[str, Any], callback: Callable[[dict[str, Any]], Any], *,
|
|
session_id: str, tool_call_id: str | None = None, metadata: dict[str, Any] | None = None,
|
|
) -> tuple[Any, dict[str, Any]]:
|
|
"""Run one tool call through Relay and return its final arguments."""
|
|
runtime, session, parent = relay_runtime.resolve_execution_context(session_id)
|
|
if runtime is None or session is None or not runtime.managed_execution_enabled():
|
|
return callback(args), args
|
|
observed_args = args
|
|
raw_result: dict[str, Any] = {}
|
|
callback_error: BaseException | None = None
|
|
callback_context = contextvars.copy_context()
|
|
|
|
def guarded(final_args: dict[str, Any]) -> Any:
|
|
# Everything the tool transitively calls (incl. auxiliary LLM calls on worker
|
|
# threads) must bypass managed Relay: the pipeline's Futures bind to THIS loop,
|
|
# which is blocked until the tool returns.
|
|
# See #77244.
|
|
with relay_runtime.managed_callback_guard():
|
|
return callback(final_args)
|
|
|
|
def invoke(next_args: Any) -> Any:
|
|
nonlocal callback_error, observed_args
|
|
observed_args = next_args if isinstance(next_args, dict) else args
|
|
try:
|
|
result = callback_context.copy().run(guarded, observed_args)
|
|
except BaseException as exc:
|
|
callback_error = exc
|
|
raise
|
|
raw_result.update(value=result, json=_jsonable(result))
|
|
return runtime.relay.ToolExecutionResult(raw_result["json"])
|
|
|
|
try:
|
|
managed = _run_awaitable(
|
|
runtime.run_in_session_async(
|
|
session, runtime.relay.tools.execute, tool_name, _jsonable(args), invoke,
|
|
handle=parent, metadata=_jsonable(metadata or {}), tool_call_id=tool_call_id or None,
|
|
)
|
|
)
|
|
except BaseException as exc:
|
|
if callback_error is not None and relay_runtime._is_relay_wrapped_callback_error(exc, callback_error):
|
|
raise callback_error
|
|
if isinstance(exc, Exception) and callback_error is None and "value" in raw_result:
|
|
logger.warning(
|
|
"NeMo Relay tool post-processing failed after dispatch success; returning the Hermes tool result",
|
|
exc_info=True,
|
|
)
|
|
return raw_result["value"], observed_args
|
|
raise
|
|
managed_result = managed.result
|
|
if "value" in raw_result and _json_equal(managed_result, raw_result["json"]):
|
|
return raw_result["value"], observed_args
|
|
if isinstance(managed_result, str):
|
|
return managed_result, observed_args
|
|
return json.dumps(_jsonable(managed_result), ensure_ascii=False), observed_args
|
|
|
|
|
|
def _jsonable(value: Any) -> Any:
|
|
if value is None or isinstance(value, (str, int, float, bool)):
|
|
return value
|
|
if isinstance(value, dict):
|
|
return {str(key): _jsonable(item) for key, item in value.items()}
|
|
if isinstance(value, (list, tuple, set)):
|
|
return [_jsonable(item) for item in value]
|
|
model_dump = getattr(value, "model_dump", None)
|
|
if callable(model_dump):
|
|
try:
|
|
# warnings=False: pydantic's generic-union warning would leak to the CLI mid-turn.
|
|
try:
|
|
return _jsonable(model_dump(mode="json", warnings=False))
|
|
except TypeError:
|
|
return _jsonable(model_dump())
|
|
except Exception:
|
|
pass
|
|
try:
|
|
return _jsonable(vars(value))
|
|
except (TypeError, AttributeError):
|
|
return str(value)
|
|
|
|
|
|
def _json_equal(left: Any, right: Any) -> bool:
|
|
try:
|
|
return relay_llm._canonical_json(left, _jsonable) == relay_llm._canonical_json(right, _jsonable)
|
|
except (TypeError, ValueError):
|
|
return left == right
|
|
|
|
|
|
def _run_awaitable(value: Any) -> Any:
|
|
return relay_llm._run_awaitable(
|
|
value, loop_error="Synchronous Hermes Relay tool execution cannot run on an active event-loop thread",
|
|
)
|