The Sep 2026 decomposition (PR #102117) makes internal import paths a non-API: names now live in the focused modules that define them. This commit is the ONLY thing keeping the old paths alive, so external plugins have time to update. It is deliberately a single, unsquashed commit: git revert <this sha> removes every shim, stub and manifest at once on the announced date. Nothing in-tree may depend on these pointers: scripts/check_compat_pointers.py (wired into lint.yml) fails CI if it does. What it adds (see COMPAT_MANIFEST.md, compat_manifest.json): - 332 facade modules get one delimited `PLUGIN-COMPAT` block appended at the end of the file - 1,172 moved names resolved lazily via a module `__getattr__` (PEP 562) — never a top-level import, so no import cycles; facades that already had `__getattr__` get a chained one - 592 third-party/stdlib names the old modules used to expose, with their original import statements - 266 public definitions that had been deleted as unused, restored byte-for-byte from the pre-decomposition tree (+40 private helpers and 16 imports pulled in only because a restored definition needs them) - 3 deleted modules recreated as re-export stubs (gateway/startup_watchdog, hermes_cli/observability/ relay_runtime, tools/environments/modal_utils) - private names (`_x`) get no pointer: they were never API (3,792 skipped) Verified: all 335 touched modules import under a fresh HERMES_HOME and every manifest name resolves; the lint reports zero in-tree uses; ruff clean; targeted suites unchanged.
116 lines
4.6 KiB
Python
116 lines
4.6 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",
|
|
)
|
|
|
|
|
|
# ---- BEGIN PLUGIN-COMPAT (revert-scheduled; see COMPAT_MANIFEST.md) ----
|
|
# Names external plugins imported from this module before the Sep 2026 decomposition.
|
|
# Internal code MUST NOT use these (scripts/check_compat_pointers.py fails CI if it does).
|
|
# The whole block is removed by reverting the commit that added it.
|
|
import asyncio # noqa: F401,E402
|
|
import inspect # noqa: F401,E402
|
|
# ---- END PLUGIN-COMPAT ----
|