Teknium
2776813df3
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.
74 lines
3.4 KiB
Python
74 lines
3.4 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: ``docs/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)."""
|
|
|
|
|
|
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:
|
|
raise NasCronClientError(f"{method} {path} returned {resp.status_code}: {resp.text[:200]}")
|
|
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 []
|
|
|
|
|
|
# ---- 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.
|
|
from typing import Optional # noqa: F401,E402
|
|
# ---- END PLUGIN-COMPAT ----
|