mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-11-06 05:17:15 +00:00
Teknium
c9577b6722
Review fixes for the bounded-cache PR: - models_pricing: catalog + deadline are expired, swept and published under one lock, so a refresh landing between a sweep's two pops can no longer keep its catalog without its deadline (Nous 300 s policy TTL never expiring). - model_metadata memos: endpoint sweep+publish and both Codex writers (evict + context/max publish) hold one MEMO_LOCK. - skill_commands: the per-scope maps share one recency order, touched on every use, so a scope used for dispatch no longer loses its /reload-skills baseline and reports unchanged commands as added.
37 lines
1.8 KiB
Python
37 lines
1.8 KiB
Python
"""Memory bounds for ``agent.model_metadata``'s per-credential in-process memos.
|
|
|
|
The memos are keyed by a credential fingerprint, and minted keys (Nous agent keys, OAuth access
|
|
tokens) rotate, so each rotation adds a key the process never reads again. Only entries no reader
|
|
can use are shed: expired ones, or the oldest past a count far above any real working set.
|
|
"""
|
|
|
|
import threading
|
|
import time
|
|
from typing import Any
|
|
|
|
from agent.cache_bounds import drop_expired, evict_oldest
|
|
|
|
# Same bound as ``agent.codex_service_tiers._MAX_CATALOGS`` for the same token-fingerprint keys.
|
|
CODEX_CACHE_MAX = 128
|
|
# Every writer of a paired memo (value + stamp, context + max-context) holds this from sweep to publish:
|
|
# a sweep pops two tables, and a refresh landing between the pops would keep half an entry.
|
|
MEMO_LOCK = threading.Lock()
|
|
|
|
|
|
def remember_endpoint_models(memo_key: tuple[str, str], cache: dict[str, dict[str, Any]]) -> dict[str, dict[str, Any]]:
|
|
"""Publish a ``/models`` catalog, sweeping expired ones (the reader refetches those anyway)."""
|
|
from agent import model_metadata as mm # facade seam: tests swap the memo dicts there
|
|
with MEMO_LOCK:
|
|
now = time.time()
|
|
drop_expired(mm._endpoint_model_metadata_cache, mm._endpoint_model_metadata_cache_time, mm._ENDPOINT_MODEL_CACHE_TTL, now)
|
|
mm._endpoint_model_metadata_cache[memo_key] = cache
|
|
mm._endpoint_model_metadata_cache_time[memo_key] = now
|
|
return cache
|
|
|
|
|
|
def bound_codex_caches(cache_key: str) -> None:
|
|
"""Before storing ``cache_key``, evict the stalest Codex token entry from both context memos.
|
|
Caller holds ``MEMO_LOCK`` through its publish."""
|
|
from agent import model_metadata as mm # facade seam: tests swap the memo dicts there
|
|
evict_oldest(mm._codex_oauth_context_cache, cache_key, lambda entry: entry[1], CODEX_CACHE_MAX, mm._codex_oauth_max_context_cache)
|