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.
59 lines
2.3 KiB
Python
59 lines
2.3 KiB
Python
"""Builder-declared stable prefixes for Anthropic prompt caching.
|
|
|
|
Skill/webhook/cron builders concatenate a large static scaffold with a small volatile
|
|
tail into one user-message string. Only the builder knows where the tail begins, so it
|
|
registers the stable prefix here and the cache planner places a breakpoint at that
|
|
boundary. Re-parsing marker strings at request time is deliberately avoided: markers
|
|
can legitimately appear inside skill bodies, and any delimiter heuristic then shrinks
|
|
the cached prefix or absorbs volatile bytes. Process-local by design: any miss falls
|
|
back to the whole-message policy.
|
|
"""
|
|
|
|
import threading
|
|
from collections import OrderedDict
|
|
from typing import Optional
|
|
|
|
# A couple dozen active scaffolds is generous for one gateway process.
|
|
_MAX_ENTRIES = 32
|
|
# Entries hold whole expanded skill bodies, so also bound total retained chars.
|
|
# The newest entry is always kept so one oversized scaffold still gets a boundary.
|
|
_MAX_CHARS = 4 * 1024 * 1024
|
|
|
|
_lock = threading.Lock()
|
|
_prefixes: "OrderedDict[str, None]" = OrderedDict()
|
|
|
|
|
|
def register_stable_prefix(prefix: str) -> None:
|
|
"""Record ``prefix`` as the stable scaffold of a just-built message."""
|
|
if not prefix:
|
|
return
|
|
with _lock:
|
|
_prefixes[prefix] = None
|
|
_prefixes.move_to_end(prefix)
|
|
while len(_prefixes) > _MAX_ENTRIES:
|
|
_prefixes.popitem(last=False)
|
|
while len(_prefixes) > 1 and sum(map(len, _prefixes)) > _MAX_CHARS:
|
|
_prefixes.popitem(last=False)
|
|
|
|
|
|
def find_stable_prefix(content: str) -> Optional[str]:
|
|
"""Longest registered *proper* prefix of ``content`` with a non-whitespace tail.
|
|
|
|
The tail must be non-whitespace so the split never yields an empty text
|
|
block (Anthropic rejects it with HTTP 400). A hit refreshes the entry's LRU
|
|
position so a scaffold fired every minute by cron is not evicted by a
|
|
burst of one-off skill invocations.
|
|
"""
|
|
with _lock:
|
|
best: Optional[str] = None
|
|
for prefix in _prefixes:
|
|
if (
|
|
content.startswith(prefix)
|
|
and content[len(prefix):].strip()
|
|
and (best is None or len(prefix) > len(best))
|
|
):
|
|
best = prefix
|
|
if best is not None:
|
|
_prefixes.move_to_end(best) # after the scan: never mutate mid-iteration
|
|
return best
|