* 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.
134 lines
5.5 KiB
Python
134 lines
5.5 KiB
Python
"""Single owner for backend identity and failure-scoped skip decisions.
|
|
|
|
Every fallback / dedup / skip / quarantine decision asks: "is this candidate the same backend
|
|
as the one that failed, along the axis that failure invalidated?" Answering inline at each
|
|
call site kept reintroducing the same bugs (same-shim aliases treated as distinct, sibling
|
|
models skipped for one model's timeout, dedup ignoring ``base_url``). "provider" conflates
|
|
three axes — credential surface (401/402), endpoint (DNS/refused), model deployment
|
|
(timeout/overload/429). Build :class:`BackendIdentity` values, ask :func:`should_skip_candidate`.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import logging
|
|
from dataclasses import dataclass
|
|
from enum import Enum
|
|
from typing import Optional
|
|
|
|
from hermes_cli.route_identity import normalize_route_base_url
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
class FailureScope(Enum):
|
|
"""Which identity axis a failure invalidates."""
|
|
|
|
#: Timeout, overload/429, connection blip, model-incompatible, invalid response:
|
|
#: evidence against ONE model deployment only.
|
|
MODEL = "model"
|
|
#: Auth 401 / payment 402: evidence against the shared credential.
|
|
CREDENTIAL = "credential"
|
|
#: DNS / connection-refused / unreachable host: evidence against the endpoint.
|
|
ENDPOINT = "endpoint"
|
|
|
|
|
|
def _norm(value: Optional[str]) -> str:
|
|
return (value or "").strip().lower()
|
|
|
|
|
|
@dataclass(frozen=True)
|
|
class BackendIdentity:
|
|
"""Normalized identity of one (provider, model, endpoint) deployment.
|
|
|
|
Empty fields mean "unknown" — an unknown axis can neither prove sameness nor difference
|
|
on its own; the remaining axes decide."""
|
|
|
|
provider: str = ""
|
|
model: str = ""
|
|
base_url: str = ""
|
|
|
|
@classmethod
|
|
def build(
|
|
cls, provider: Optional[str] = None, model: Optional[str] = None,
|
|
base_url: Optional[str] = None,
|
|
) -> "BackendIdentity":
|
|
return cls(
|
|
provider=_norm(provider), model=_norm(model),
|
|
base_url=normalize_route_base_url(base_url),
|
|
)
|
|
|
|
|
|
def _both_first_class(a: BackendIdentity, b: BackendIdentity) -> bool:
|
|
"""True when both providers are distinct registered first-class providers.
|
|
|
|
Two different registry providers have distinct credential surfaces even when they share an
|
|
inference host (xai-oauth vs xai). Custom/shim aliases are NOT in the registry, so two
|
|
aliases pointing at one URL still count as the same backend."""
|
|
if not a.provider or not b.provider or a.provider == b.provider:
|
|
return False
|
|
try:
|
|
from hermes_cli.auth import PROVIDER_REGISTRY
|
|
|
|
return a.provider in PROVIDER_REGISTRY and b.provider in PROVIDER_REGISTRY
|
|
except Exception:
|
|
return False
|
|
|
|
|
|
def same_credential_surface(a: BackendIdentity, b: BackendIdentity) -> bool:
|
|
"""Do two identities share the credential a 401/402 just invalidated?
|
|
|
|
Conservative: an unprovable axis answers "different" (one wasted RTT) rather than "same"
|
|
(stranded failover). Same label = same configured credential; custom entries can each carry
|
|
their own api_key, so a shared URL alone is only a weak signal when a label is missing."""
|
|
if a.provider and b.provider:
|
|
# Different labels = different credential config (first-class registry providers explicitly so —
|
|
# #70893; custom entries can each carry their own api_key, so sameness is unprovable and we must not
|
|
# skip).
|
|
return a.provider == b.provider
|
|
return bool(a.base_url and a.base_url == b.base_url)
|
|
|
|
|
|
def same_endpoint(a: BackendIdentity, b: BackendIdentity) -> bool:
|
|
"""Do two identities sit behind the endpoint that just went unreachable?
|
|
An unknown base_url inherits the provider default, so a shared label implies the same endpoint."""
|
|
if a.base_url and b.base_url:
|
|
return a.base_url == b.base_url
|
|
return bool(a.provider and a.provider == b.provider)
|
|
|
|
|
|
def same_deployment(a: BackendIdentity, b: BackendIdentity) -> bool:
|
|
"""Are these the exact same model deployment (the thing a timeout kills)?
|
|
|
|
Provider+model must match; base_url distinguishes only when BOTH sides carry an explicit URL
|
|
(same provider+model on two explicit URLs is a pool, not a dup). Different labels with the
|
|
same URL + model are still one deployment (same-host shim aliases) — unless both labels are
|
|
first-class registry providers."""
|
|
if not (a.provider and b.provider and a.provider == b.provider):
|
|
return bool(
|
|
a.base_url
|
|
# Same-host different-label shims: same URL + same model IS the same deployment even when the
|
|
# alias labels differ (#22548) — unless both labels are first-class registry providers (#70893).
|
|
and a.base_url == b.base_url
|
|
and a.model
|
|
and a.model == b.model
|
|
and not _both_first_class(a, b)
|
|
)
|
|
if not (a.model and b.model and a.model == b.model):
|
|
return False
|
|
return not (a.base_url and b.base_url and a.base_url != b.base_url)
|
|
|
|
|
|
_SCOPE_PREDICATES = {
|
|
FailureScope.CREDENTIAL: same_credential_surface, FailureScope.ENDPOINT: same_endpoint,
|
|
FailureScope.MODEL: same_deployment,
|
|
}
|
|
|
|
|
|
def should_skip_candidate(
|
|
candidate: BackendIdentity, failed: BackendIdentity, scope: FailureScope = FailureScope.MODEL
|
|
) -> bool:
|
|
"""THE skip predicate: would trying ``candidate`` just repeat the failure?
|
|
True when it is the same backend as ``failed`` along the axis ``scope`` invalidated.
|
|
Every fallback/dedup/skip site must call this."""
|
|
return _SCOPE_PREDICATES.get(scope, same_deployment)(candidate, failed)
|