* 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.
208 lines
9.5 KiB
Python
208 lines
9.5 KiB
Python
"""Chronos — NAS-mediated managed cron provider (scale-to-zero).
|
|
|
|
Instead of a 60s ticker, asks NAS to arm one external one-shot per job at its next-fire time;
|
|
NAS calls back ``/api/cron/fire`` and the job re-arms after running. start() never blocks or
|
|
spawns a periodic wake; reconcile runs only on a warm process (start / on_jobs_changed / fire).
|
|
Holds no scheduler credentials — speaks only to NAS ``agent-cron`` endpoints with the Nous token.
|
|
Inert unless ``cron.provider: chronos``. Wire contract: ``website/docs/developer-guide/chronos-managed-cron-contract.md``.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import logging
|
|
import threading
|
|
from typing import Any, Dict
|
|
|
|
from cron.scheduler_provider import CronScheduler
|
|
|
|
from ._nas_client import NasCronClientError
|
|
|
|
logger = logging.getLogger("cron.chronos")
|
|
|
|
|
|
def _cfg(*keys: str, default: Any = "") -> Any:
|
|
"""Read a cron.chronos.* config value (no network)."""
|
|
try:
|
|
from hermes_cli.config import cfg_get, load_config
|
|
return cfg_get(load_config(), *keys, default=default)
|
|
except Exception:
|
|
return default
|
|
|
|
|
|
class ChronosCronScheduler(CronScheduler):
|
|
"""NAS-mediated external cron provider."""
|
|
|
|
def __init__(self) -> None:
|
|
# Best-effort job_id -> fire_at cache; a cold process simply re-arms (idempotent).
|
|
self._armed: Dict[str, str] = {}
|
|
self._lock = threading.Lock()
|
|
self._client = None # lazily constructed (no network in is_available)
|
|
# Set when NAS answered 403 invalid_client: the Nous token in auth.json is not this
|
|
# instance's provisioned identity, so every arm would fail the same way for the life of
|
|
# the process. Once set, NAS is left alone and the built-in ticker fires jobs (#97494).
|
|
self._identity_rejected = False
|
|
self._stop_event = None
|
|
self._ticker_kwargs: Dict[str, Any] = {}
|
|
|
|
@property
|
|
def name(self) -> str:
|
|
return "chronos"
|
|
|
|
def is_available(self) -> bool:
|
|
"""Config presence only — NO network: portal URL, publicly reachable callback URL and a
|
|
Nous login; otherwise the resolver falls back to the built-in ticker."""
|
|
if not (_cfg("cron", "chronos", "portal_url") and _cfg("cron", "chronos", "callback_url")):
|
|
return False
|
|
# Stored-token presence only (no refresh); refresh-aware token resolved at provision time.
|
|
try:
|
|
from hermes_cli.auth import get_provider_auth_state
|
|
return bool((get_provider_auth_state("nous") or {}).get("access_token"))
|
|
except Exception:
|
|
return False
|
|
|
|
def _get_client(self):
|
|
if self._client is None:
|
|
from ._nas_client import NasCronClient
|
|
self._client = NasCronClient(_cfg("cron", "chronos", "portal_url"))
|
|
return self._client
|
|
|
|
def _reconcile_logged(self, log, what: str) -> None:
|
|
try:
|
|
self.reconcile()
|
|
except Exception as e:
|
|
log("Chronos %s reconcile failed: %s", what, e)
|
|
|
|
def start(self, stop_event, *, adapters=None, loop=None, interval=60):
|
|
"""Arm all enabled jobs via NAS, then RETURN — no loop, no periodic wake (scale-to-zero)."""
|
|
# Kept so a later identity rejection (boot or mid-life re-arm) can hand this process's
|
|
# fires to the built-in ticker with the gateway's own adapters/loop.
|
|
self._ticker_kwargs = {"adapters": adapters, "loop": loop, "interval": interval}
|
|
self._stop_event = stop_event
|
|
# A new lifecycle can't prove what an interrupted process did: classify unknown, never requeue.
|
|
self.recover_interrupted()
|
|
self._reconcile_logged(logger.warning, "start()")
|
|
|
|
def stop(self) -> None:
|
|
pass
|
|
|
|
def on_jobs_changed(self) -> None:
|
|
if not self._identity_rejected:
|
|
self._reconcile_logged(logger.debug, "on_jobs_changed")
|
|
|
|
def register_job(self, job: Dict[str, Any]) -> None:
|
|
"""Arm the first one-shot for a new job; may raise so creation can report it."""
|
|
try:
|
|
self._arm_one_shot(job)
|
|
except NasCronClientError as e:
|
|
if not e.identity_rejected:
|
|
raise
|
|
self._note_identity_rejected() # the job is stored; the ticker fires it
|
|
|
|
def _arm_one_shot(self, job: Dict[str, Any]) -> None:
|
|
"""Arm one one-shot at next_run_at (agent computes the time; NAS executes).
|
|
dedup_key=(job_id, fire_at) makes re-arming the same fire a no-op."""
|
|
if self._identity_rejected:
|
|
return # the built-in ticker owns this process's fires; NAS would 403 again
|
|
job_id = job["id"]
|
|
fire_at = job.get("next_run_at")
|
|
if not fire_at:
|
|
return
|
|
self._get_client().provision(
|
|
job_id=job_id, fire_at=fire_at, dedup_key=f"{job_id}:{fire_at}",
|
|
agent_callback_url=str(_cfg("cron", "chronos", "callback_url") or ""))
|
|
with self._lock:
|
|
self._armed[job_id] = fire_at
|
|
|
|
def _note_identity_rejected(self) -> None:
|
|
"""403 invalid_client is deterministic: NAS maps the bearer to a provisioned instance via an
|
|
``agent:*`` client or the hosted bootstrap session, and a plain ``hermes auth`` login is
|
|
neither — re-logging in cannot fix it, which is what users try first (#97494). Without
|
|
NAS the jobs have no trigger at all (the misfire sweep runs them ``misfire_grace_minutes``
|
|
late), so the built-in ticker takes over this process's fires."""
|
|
with self._lock:
|
|
if self._identity_rejected:
|
|
return
|
|
self._identity_rejected = True
|
|
logger.warning(
|
|
"Chronos: NAS rejected this agent's Nous credential for agent-cron (403 invalid_client). "
|
|
"The Nous token in auth.json is not this instance's provisioned identity (an agent:* client "
|
|
"or the hosted bootstrap session), so no job can be armed. A normal `hermes auth` re-login "
|
|
"cannot fix this; the hosted credential has to be restored from the Nous Portal. Falling back "
|
|
"to the built-in cron ticker for this process so scheduled jobs keep firing on time.")
|
|
if self._stop_event is None:
|
|
return # start() never ran (e.g. a CLI `hermes cron add`); nothing to tick here
|
|
from agent.memory_provider import spawn_context_thread
|
|
from cron.scheduler_provider import InProcessCronScheduler
|
|
spawn_context_thread(
|
|
InProcessCronScheduler().start, name="cron-scheduler-chronos-fallback",
|
|
args=(self._stop_event,), kwargs=self._ticker_kwargs).start()
|
|
|
|
def _arm_logged(self, job: Dict[str, Any], what: str) -> None:
|
|
"""Best-effort arm: log a warning instead of raising (reconcile/fire must not die)."""
|
|
try:
|
|
self._arm_one_shot(job)
|
|
except Exception as e:
|
|
if isinstance(e, NasCronClientError) and e.identity_rejected:
|
|
self._note_identity_rejected()
|
|
return
|
|
logger.warning("Chronos failed to %s: %s", what, e)
|
|
|
|
def _cancel(self, job_id: str) -> None:
|
|
try:
|
|
self._get_client().cancel(job_id=job_id)
|
|
finally:
|
|
with self._lock:
|
|
self._armed.pop(job_id, None)
|
|
|
|
def _list_armed(self) -> Dict[str, str]:
|
|
"""Armed one-shots (job_id -> fire_at): in-memory map when warm, else ask NAS ({} on
|
|
failure — reconcile then re-arms idempotently)."""
|
|
with self._lock:
|
|
if self._armed:
|
|
return dict(self._armed)
|
|
try:
|
|
observed = {item["job_id"]: item.get("fire_at", "")
|
|
for item in self._get_client().list_armed() if item.get("job_id")}
|
|
with self._lock:
|
|
self._armed.update(observed)
|
|
return observed
|
|
except Exception as e:
|
|
logger.debug("Chronos _list_armed failed (will re-arm idempotently): %s", e)
|
|
return {}
|
|
|
|
def reconcile(self) -> None:
|
|
"""Converge NAS one-shots toward jobs.json: arm missing/changed, cancel orphans."""
|
|
from cron.jobs import get_job, load_jobs
|
|
desired: Dict[str, str] = {
|
|
j["id"]: j["next_run_at"] for j in load_jobs()
|
|
if j.get("enabled") and j.get("next_run_at") and j.get("state") != "paused"}
|
|
observed = self._list_armed()
|
|
for job_id, fire_at in desired.items():
|
|
if observed.get(job_id) != fire_at and (job := get_job(job_id)):
|
|
self._arm_logged(job, f"arm job {job_id}")
|
|
for job_id in observed.keys() - desired.keys():
|
|
try:
|
|
self._cancel(job_id)
|
|
except Exception as e:
|
|
logger.warning("Chronos failed to cancel orphan %s: %s", job_id, e)
|
|
|
|
# No ``fire_due`` override on purpose: ``provider_supports_split_fire`` treats ANY override as
|
|
# the legacy single-phase signal, opting Chronos out of claim admission and cancel-aware drain.
|
|
|
|
def fire_claimed(
|
|
self, claimed_job: dict, *, adapters: Any = None, loop: Any = None, cancel_event: Any = None
|
|
) -> bool:
|
|
ran = super().fire_claimed(claimed_job, adapters=adapters, loop=loop, cancel_event=cancel_event)
|
|
if ran:
|
|
from cron.jobs import get_job
|
|
job_id = claimed_job["id"]
|
|
job = get_job(job_id)
|
|
if job and job.get("enabled") and job.get("next_run_at"):
|
|
self._arm_logged(job, f"re-arm job {job_id} after fire")
|
|
return ran
|
|
|
|
|
|
def register(ctx) -> None:
|
|
"""Plugin entrypoint — plugins/cron_providers discovery collects the provider here."""
|
|
ctx.register_cron_scheduler(ChronosCronScheduler())
|