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.
86 lines
3.9 KiB
Python
86 lines
3.9 KiB
Python
"""Thin HTTP client for the agent -> NAS ``agent-cron`` endpoints (Chronos): arm one-shot / cancel /
|
|
list, authenticated with the existing Nous Portal token.
|
|
Wire contract: ``website/docs/developer-guide/chronos-managed-cron-contract.md``."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import contextlib
|
|
import logging
|
|
from typing import Any, Dict, List
|
|
|
|
logger = logging.getLogger("cron.chronos")
|
|
|
|
_PROVISION_PATH = "/api/agent-cron/provision"
|
|
_CANCEL_PATH = "/api/agent-cron/cancel"
|
|
_LIST_PATH = "/api/agent-cron/list"
|
|
|
|
|
|
class NasCronClientError(RuntimeError):
|
|
"""Raised when a NAS agent-cron call fails (non-2xx or transport error).
|
|
|
|
``status`` is the HTTP status (None on transport error) and ``error_code`` the OAuth-style
|
|
``error`` field of a JSON error body (``invalid_client`` marks a deterministic identity
|
|
rejection the provider can act on, unlike a transient 5xx).
|
|
"""
|
|
|
|
def __init__(self, message: str, *, status: int | None = None, error_code: str = "") -> None:
|
|
super().__init__(message)
|
|
self.status = status
|
|
self.error_code = error_code
|
|
|
|
@property
|
|
def identity_rejected(self) -> bool:
|
|
"""NAS refused the bearer as not belonging to a provisioned agent (never transient)."""
|
|
return self.status == 403 and self.error_code == "invalid_client"
|
|
|
|
|
|
class NasCronClient:
|
|
"""Minimal client for the agent->NAS provision/cancel/list endpoints."""
|
|
|
|
def __init__(self, portal_url: str, *, timeout_seconds: float = 15.0) -> None:
|
|
self.portal_url = portal_url.rstrip("/")
|
|
self.timeout_seconds = timeout_seconds
|
|
|
|
def _headers(self) -> Dict[str, str]:
|
|
"""Bearer auth with the agent's existing Nous Portal access token (refresh-aware)."""
|
|
from hermes_cli.auth import resolve_nous_access_token
|
|
return {"Authorization": f"Bearer {resolve_nous_access_token()}",
|
|
"Content-Type": "application/json"}
|
|
|
|
def _request(self, method: str, path: str, **kwargs: Any) -> Dict[str, Any]:
|
|
"""Issue one request; raise NasCronClientError on transport error or non-2xx."""
|
|
import requests # lazy: agent already depends on requests
|
|
try:
|
|
resp = requests.request(method, f"{self.portal_url}{path}", headers=self._headers(),
|
|
timeout=self.timeout_seconds, **kwargs)
|
|
except Exception as e:
|
|
raise NasCronClientError(f"{method} {path} failed: {e}") from e
|
|
if resp.status_code // 100 != 2:
|
|
error_code = ""
|
|
with contextlib.suppress(Exception):
|
|
error_code = str((resp.json() or {}).get("error") or "")
|
|
raise NasCronClientError(
|
|
f"{method} {path} returned {resp.status_code}: {resp.text[:200]}",
|
|
status=resp.status_code, error_code=error_code)
|
|
with contextlib.suppress(Exception):
|
|
return resp.json() if resp.content else {}
|
|
return {}
|
|
|
|
def provision(self, *, job_id: str, fire_at: str, agent_callback_url: str,
|
|
dedup_key: str) -> Dict[str, Any]:
|
|
"""Arm a one-shot for ``job_id`` at ``fire_at`` (ISO 8601); ``dedup_key`` makes re-arming
|
|
idempotent NAS-side. Returns the NAS response (e.g. ``{schedule_id}``)."""
|
|
return self._request("POST", _PROVISION_PATH, json={
|
|
"job_id": job_id, "fire_at": fire_at, "agent_callback_url": agent_callback_url,
|
|
"dedup_key": dedup_key})
|
|
|
|
def cancel(self, *, job_id: str) -> Dict[str, Any]:
|
|
"""Cancel any armed one-shot for ``job_id``."""
|
|
return self._request("POST", _CANCEL_PATH, json={"job_id": job_id})
|
|
|
|
def list_armed(self) -> List[Dict[str, Any]]:
|
|
"""List armed one-shots (``{job_id, fire_at, schedule_id}``); best-effort, [] on odd shape."""
|
|
data = self._request("GET", _LIST_PATH, params={})
|
|
items = data.get("armed") if isinstance(data, dict) else None
|
|
return items if isinstance(items, list) else []
|