mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-11-06 05:17:15 +00:00
Maciej Lisiewski
619b6b7a84
cached_provider_model_ids and cached_fetch_api_models loaded the cache, fetched live, then saved that pre-fetch snapshot unlocked, so a slower prefetch worker, SWR thread or other process dropped rows written meanwhile and the picker fell back to curated lists. _store_cache_entry now always re-reads under the thread lock plus a cross-process flock. Drop the prefetch worker's compensating update_provider_cache_entry re-persist: it re-stamped rows the canonical path deliberately leaves untouched (stale catalog served on a failed fetch looked fresh for a TTL), stripped the curated-fallback flag, and keyed ollama as "custom".
38 lines
1.4 KiB
Python
38 lines
1.4 KiB
Python
"""Cross-process lock for ``provider_models_cache.json`` read-modify-write.
|
|
|
|
Parallel prefetch workers, SWR refresh threads and other Hermes processes (dashboard, desktop,
|
|
CLI) all rewrite the one cache file; each write must re-read it under this lock or a slow writer
|
|
puts back the snapshot it loaded before its fetch, dropping rows written meanwhile.
|
|
"""
|
|
|
|
import logging
|
|
import threading
|
|
from contextlib import contextmanager
|
|
from pathlib import Path
|
|
from typing import Callable
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
_thread_lock = threading.Lock()
|
|
_holder = threading.local()
|
|
|
|
|
|
@contextmanager
|
|
def provider_models_cache_lock(path: Path):
|
|
from hermes_cli.auth import _file_lock
|
|
with _thread_lock, _file_lock(path.with_name(path.name + ".lock"), _holder, 10.0,
|
|
f"Timed out waiting for the provider models cache lock ({path})"):
|
|
yield
|
|
|
|
|
|
def write_under_cache_lock(path: Path, write: Callable[[], None]) -> None:
|
|
"""Run ``write`` (re-read, set one row, save) under the thread + cross-process lock.
|
|
|
|
The file is a cache: an unwritable home or a wedged lock skips the write instead of failing
|
|
the model listing that triggered it."""
|
|
try:
|
|
with provider_models_cache_lock(path):
|
|
write()
|
|
except (OSError, TimeoutError):
|
|
logger.debug("provider models cache write skipped (%s)", path, exc_info=True)
|