Compare commits
2 Commits
fix/issue-
...
fix/741
| Author | SHA1 | Date | |
|---|---|---|---|
| fe619a1774 | |||
| 8194e9c651 |
223
agent/session_model_metadata.py
Normal file
223
agent/session_model_metadata.py
Normal file
@@ -0,0 +1,223 @@
|
||||
"""
|
||||
Session Model Metadata — Persist model context info per session
|
||||
|
||||
When a session switches models mid-conversation, context length and
|
||||
token budget need to be updated to prevent silent truncation.
|
||||
|
||||
Issue: #741
|
||||
"""
|
||||
|
||||
import json
|
||||
import logging
|
||||
from dataclasses import dataclass, asdict
|
||||
from pathlib import Path
|
||||
from typing import Any, Dict, Optional
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
HERMES_HOME = Path.home() / ".hermes"
|
||||
|
||||
|
||||
# Common model context lengths (tokens)
|
||||
KNOWN_CONTEXT_LENGTHS = {
|
||||
# Anthropic
|
||||
"claude-opus-4-6": 200000,
|
||||
"claude-sonnet-4": 200000,
|
||||
"claude-3.5-sonnet": 200000,
|
||||
"claude-3-haiku": 200000,
|
||||
|
||||
# OpenAI
|
||||
"gpt-4o": 128000,
|
||||
"gpt-4-turbo": 128000,
|
||||
"gpt-4": 8192,
|
||||
"gpt-3.5-turbo": 16385,
|
||||
|
||||
# Nous / open models
|
||||
"hermes-3-llama-3.1-405b": 131072,
|
||||
"hermes-3-llama-3.1-70b": 131072,
|
||||
"deepseek-r1": 131072,
|
||||
"deepseek-v3": 131072,
|
||||
|
||||
# Local
|
||||
"llama-3.1-8b": 131072,
|
||||
"llama-3.1-70b": 131072,
|
||||
"qwen-2.5-72b": 131072,
|
||||
|
||||
# Xiaomi
|
||||
"mimo-v2-pro": 131072,
|
||||
"mimo-v2-flash": 131072,
|
||||
|
||||
# Defaults
|
||||
"default": 4096,
|
||||
}
|
||||
|
||||
# Reserve tokens for system prompt, response, and overhead
|
||||
TOKEN_RESERVE = 2000
|
||||
|
||||
|
||||
@dataclass
|
||||
class ModelMetadata:
|
||||
"""Metadata for a model in a session."""
|
||||
model: str
|
||||
provider: str
|
||||
context_length: int
|
||||
available_for_input: int # context_length - reserve
|
||||
current_tokens_used: int = 0
|
||||
|
||||
@property
|
||||
def remaining_tokens(self) -> int:
|
||||
"""Tokens remaining for new input."""
|
||||
return max(0, self.available_for_input - self.current_tokens_used)
|
||||
|
||||
@property
|
||||
def utilization_pct(self) -> float:
|
||||
"""Percentage of context used."""
|
||||
if self.available_for_input == 0:
|
||||
return 0.0
|
||||
return (self.current_tokens_used / self.available_for_input) * 100
|
||||
|
||||
def to_dict(self) -> Dict[str, Any]:
|
||||
return asdict(self)
|
||||
|
||||
|
||||
def get_context_length(model: str) -> int:
|
||||
"""Get context length for a model."""
|
||||
model_lower = model.lower()
|
||||
|
||||
# Check exact match
|
||||
if model_lower in KNOWN_CONTEXT_LENGTHS:
|
||||
return KNOWN_CONTEXT_LENGTHS[model_lower]
|
||||
|
||||
# Check partial match
|
||||
for key, length in KNOWN_CONTEXT_LENGTHS.items():
|
||||
if key in model_lower:
|
||||
return length
|
||||
|
||||
return KNOWN_CONTEXT_LENGTHS["default"]
|
||||
|
||||
|
||||
def create_metadata(model: str, provider: str = "", current_tokens: int = 0) -> ModelMetadata:
|
||||
"""Create model metadata."""
|
||||
context_length = get_context_length(model)
|
||||
available = max(0, context_length - TOKEN_RESERVE)
|
||||
|
||||
return ModelMetadata(
|
||||
model=model,
|
||||
provider=provider,
|
||||
context_length=context_length,
|
||||
available_for_input=available,
|
||||
current_tokens_used=current_tokens
|
||||
)
|
||||
|
||||
|
||||
def check_model_switch(
|
||||
old_model: str,
|
||||
new_model: str,
|
||||
current_tokens: int
|
||||
) -> Dict[str, Any]:
|
||||
"""
|
||||
Check impact of switching models mid-session.
|
||||
|
||||
Returns:
|
||||
Dict with switch analysis including warnings
|
||||
"""
|
||||
old_ctx = get_context_length(old_model)
|
||||
new_ctx = get_context_length(new_model)
|
||||
|
||||
old_available = old_ctx - TOKEN_RESERVE
|
||||
new_available = new_ctx - TOKEN_RESERVE
|
||||
|
||||
result = {
|
||||
"old_model": old_model,
|
||||
"new_model": new_model,
|
||||
"old_context": old_ctx,
|
||||
"new_context": new_ctx,
|
||||
"current_tokens": current_tokens,
|
||||
"fits_in_new": current_tokens <= new_available,
|
||||
"truncation_needed": max(0, current_tokens - new_available),
|
||||
"warning": None,
|
||||
}
|
||||
|
||||
if not result["fits_in_new"]:
|
||||
result["warning"] = (
|
||||
f"Switching to {new_model} ({new_ctx:,} ctx) with {current_tokens:,} tokens "
|
||||
f"will truncate {result['truncation_needed']:,} tokens of history. "
|
||||
f"Consider starting a new session."
|
||||
)
|
||||
|
||||
if new_ctx < old_ctx:
|
||||
reduction = old_ctx - new_ctx
|
||||
result["warning"] = (
|
||||
f"New model has {reduction:,} fewer tokens of context. "
|
||||
f"({old_ctx:,} -> {new_ctx:,})"
|
||||
)
|
||||
|
||||
return result
|
||||
|
||||
|
||||
class SessionModelTracker:
|
||||
"""Track model metadata for a session."""
|
||||
|
||||
def __init__(self, session_id: str):
|
||||
self.session_id = session_id
|
||||
self.metadata: Optional[ModelMetadata] = None
|
||||
self.history: list = [] # Model switch history
|
||||
|
||||
def set_model(self, model: str, provider: str = "", tokens_used: int = 0):
|
||||
"""Set the current model for the session."""
|
||||
old_model = self.metadata.model if self.metadata else None
|
||||
|
||||
self.metadata = create_metadata(model, provider, tokens_used)
|
||||
|
||||
# Record switch in history
|
||||
if old_model and old_model != model:
|
||||
self.history.append({
|
||||
"from": old_model,
|
||||
"to": model,
|
||||
"tokens_at_switch": tokens_used,
|
||||
"context_length": self.metadata.context_length
|
||||
})
|
||||
|
||||
logger.info(
|
||||
"Session %s: model=%s context=%d available=%d",
|
||||
self.session_id[:12], model,
|
||||
self.metadata.context_length,
|
||||
self.metadata.available_for_input
|
||||
)
|
||||
|
||||
def update_tokens(self, tokens: int):
|
||||
"""Update current token usage."""
|
||||
if self.metadata:
|
||||
self.metadata.current_tokens_used = tokens
|
||||
|
||||
def get_remaining(self) -> int:
|
||||
"""Get remaining tokens."""
|
||||
if not self.metadata:
|
||||
return 0
|
||||
return self.metadata.remaining_tokens
|
||||
|
||||
def can_fit(self, additional_tokens: int) -> bool:
|
||||
"""Check if additional tokens fit in context."""
|
||||
if not self.metadata:
|
||||
return False
|
||||
return self.metadata.remaining_tokens >= additional_tokens
|
||||
|
||||
def get_warning(self) -> Optional[str]:
|
||||
"""Get warning if context is running low."""
|
||||
if not self.metadata:
|
||||
return None
|
||||
|
||||
util = self.metadata.utilization_pct
|
||||
if util > 90:
|
||||
return f"Context {util:.0f}% full. Consider compression or new session."
|
||||
if util > 75:
|
||||
return f"Context {util:.0f}% full."
|
||||
return None
|
||||
|
||||
def to_dict(self) -> Dict[str, Any]:
|
||||
"""Export state."""
|
||||
return {
|
||||
"session_id": self.session_id,
|
||||
"metadata": self.metadata.to_dict() if self.metadata else None,
|
||||
"history": self.history
|
||||
}
|
||||
@@ -1,75 +0,0 @@
|
||||
"""Tests for MCP PID file lock (#734)."""
|
||||
|
||||
import os
|
||||
import sys
|
||||
import tempfile
|
||||
from pathlib import Path
|
||||
|
||||
sys.path.insert(0, str(Path(__file__).parent.parent))
|
||||
|
||||
# Override MCP_DIR for testing
|
||||
import tools.mcp_pid_lock as lock_mod
|
||||
_test_dir = Path(tempfile.mkdtemp())
|
||||
lock_mod._MCP_DIR = _test_dir
|
||||
|
||||
|
||||
def test_acquire_and_release():
|
||||
"""Lock can be acquired and released."""
|
||||
pid = lock_mod.acquire_lock("test_server")
|
||||
assert pid == os.getpid()
|
||||
assert lock_mod.is_locked("test_server")
|
||||
lock_mod.release_lock("test_server")
|
||||
assert not lock_mod.is_locked("test_server")
|
||||
|
||||
|
||||
def test_concurrent_lock_blocked():
|
||||
"""Second acquire returns None when server running."""
|
||||
lock_mod.acquire_lock("test_concurrent")
|
||||
result = lock_mod.acquire_lock("test_concurrent")
|
||||
assert result is None
|
||||
lock_mod.release_lock("test_concurrent")
|
||||
|
||||
|
||||
def test_stale_lock_cleaned():
|
||||
"""Stale PID files are cleaned up."""
|
||||
# Write a fake stale PID
|
||||
pid_file = _test_dir / "stale.pid"
|
||||
pid_file.write_text("99999999")
|
||||
assert not lock_mod.is_locked("stale")
|
||||
assert not pid_file.exists()
|
||||
|
||||
|
||||
def test_list_locks():
|
||||
"""list_locks returns only active locks."""
|
||||
lock_mod.acquire_lock("list_test")
|
||||
locks = lock_mod.list_locks()
|
||||
assert "list_test" in locks
|
||||
assert locks["list_test"] == os.getpid()
|
||||
lock_mod.release_lock("list_test")
|
||||
|
||||
|
||||
def test_cleanup_stale():
|
||||
"""cleanup_stale_locks removes dead PID files."""
|
||||
(_test_dir / "dead1.pid").write_text("99999998")
|
||||
(_test_dir / "dead2.pid").write_text("99999999")
|
||||
count = lock_mod.cleanup_stale_locks()
|
||||
assert count >= 2
|
||||
|
||||
|
||||
def test_force_release():
|
||||
"""force_release kills process and removes lock."""
|
||||
lock_mod.acquire_lock("force_test")
|
||||
assert lock_mod.is_locked("force_test")
|
||||
lock_mod.force_release("force_test")
|
||||
assert not lock_mod.is_locked("force_test")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
tests = [test_acquire_and_release, test_concurrent_lock_blocked,
|
||||
test_stale_lock_cleaned, test_list_locks, test_cleanup_stale,
|
||||
test_force_release]
|
||||
for t in tests:
|
||||
print(f"Running {t.__name__}...")
|
||||
t()
|
||||
print(" PASS")
|
||||
print("\nAll tests passed.")
|
||||
105
tests/test_session_model_metadata.py
Normal file
105
tests/test_session_model_metadata.py
Normal file
@@ -0,0 +1,105 @@
|
||||
"""
|
||||
Tests for session model metadata
|
||||
|
||||
Issue: #741
|
||||
"""
|
||||
|
||||
import unittest
|
||||
from agent.session_model_metadata import (
|
||||
get_context_length,
|
||||
create_metadata,
|
||||
check_model_switch,
|
||||
SessionModelTracker,
|
||||
)
|
||||
|
||||
|
||||
class TestContextLength(unittest.TestCase):
|
||||
|
||||
def test_known_model(self):
|
||||
ctx = get_context_length("claude-opus-4-6")
|
||||
self.assertEqual(ctx, 200000)
|
||||
|
||||
def test_partial_match(self):
|
||||
ctx = get_context_length("anthropic/claude-sonnet-4")
|
||||
self.assertEqual(ctx, 200000)
|
||||
|
||||
def test_unknown_model(self):
|
||||
ctx = get_context_length("unknown-model-xyz")
|
||||
self.assertEqual(ctx, 4096)
|
||||
|
||||
|
||||
class TestModelMetadata(unittest.TestCase):
|
||||
|
||||
def test_create(self):
|
||||
meta = create_metadata("gpt-4o", "openai", 1000)
|
||||
self.assertEqual(meta.context_length, 128000)
|
||||
self.assertEqual(meta.current_tokens_used, 1000)
|
||||
self.assertGreater(meta.remaining_tokens, 0)
|
||||
|
||||
def test_utilization(self):
|
||||
meta = create_metadata("gpt-4o", "openai", 64000)
|
||||
self.assertAlmostEqual(meta.utilization_pct, 50.0, delta=1)
|
||||
|
||||
|
||||
class TestModelSwitch(unittest.TestCase):
|
||||
|
||||
def test_safe_switch(self):
|
||||
result = check_model_switch("gpt-3.5-turbo", "gpt-4o", 5000)
|
||||
self.assertTrue(result["fits_in_new"])
|
||||
self.assertIsNone(result["warning"])
|
||||
|
||||
def test_truncation_warning(self):
|
||||
result = check_model_switch("gpt-4o", "gpt-3.5-turbo", 20000)
|
||||
self.assertFalse(result["fits_in_new"])
|
||||
self.assertIsNotNone(result["warning"])
|
||||
self.assertIn("truncate", result["warning"].lower())
|
||||
|
||||
def test_downgrade_warning(self):
|
||||
result = check_model_switch("claude-opus-4-6", "gpt-4", 5000)
|
||||
self.assertIsNotNone(result["warning"])
|
||||
|
||||
|
||||
class TestSessionModelTracker(unittest.TestCase):
|
||||
|
||||
def test_set_model(self):
|
||||
tracker = SessionModelTracker("test")
|
||||
tracker.set_model("gpt-4o", "openai")
|
||||
self.assertEqual(tracker.metadata.model, "gpt-4o")
|
||||
|
||||
def test_update_tokens(self):
|
||||
tracker = SessionModelTracker("test")
|
||||
tracker.set_model("gpt-4o")
|
||||
tracker.update_tokens(5000)
|
||||
self.assertEqual(tracker.metadata.current_tokens_used, 5000)
|
||||
|
||||
def test_remaining(self):
|
||||
tracker = SessionModelTracker("test")
|
||||
tracker.set_model("gpt-4o")
|
||||
tracker.update_tokens(10000)
|
||||
self.assertGreater(tracker.get_remaining(), 0)
|
||||
|
||||
def test_can_fit(self):
|
||||
tracker = SessionModelTracker("test")
|
||||
tracker.set_model("gpt-4o")
|
||||
tracker.update_tokens(10000)
|
||||
self.assertTrue(tracker.can_fit(5000))
|
||||
self.assertFalse(tracker.can_fit(200000))
|
||||
|
||||
def test_warning_low_context(self):
|
||||
tracker = SessionModelTracker("test")
|
||||
tracker.set_model("gpt-4o")
|
||||
tracker.update_tokens(115000) # ~90% used
|
||||
warning = tracker.get_warning()
|
||||
self.assertIsNotNone(warning)
|
||||
|
||||
def test_model_switch_history(self):
|
||||
tracker = SessionModelTracker("test")
|
||||
tracker.set_model("gpt-4o", "openai")
|
||||
tracker.update_tokens(5000)
|
||||
tracker.set_model("claude-opus-4-6", "anthropic")
|
||||
self.assertEqual(len(tracker.history), 1)
|
||||
self.assertEqual(tracker.history[0]["from"], "gpt-4o")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
@@ -1,158 +0,0 @@
|
||||
"""
|
||||
MCP PID File Lock — Prevent concurrent MCP server instances.
|
||||
|
||||
Uses PID files at ~/.hermes/mcp/{name}.pid to ensure only one instance
|
||||
of each MCP server runs at a time. Prevents zombie accumulation (#714).
|
||||
|
||||
Usage:
|
||||
from tools.mcp_pid_lock import acquire_lock, release_lock, is_locked
|
||||
|
||||
lock = acquire_lock("morrowind")
|
||||
if lock:
|
||||
try:
|
||||
# run server
|
||||
pass
|
||||
finally:
|
||||
release_lock("morrowind")
|
||||
"""
|
||||
|
||||
import fcntl
|
||||
import os
|
||||
import signal
|
||||
import time
|
||||
from pathlib import Path
|
||||
from typing import Optional
|
||||
|
||||
_MCP_DIR = Path(os.getenv("HERMES_HOME", str(Path.home() / ".hermes"))) / "mcp"
|
||||
|
||||
|
||||
def _pid_file(name: str) -> Path:
|
||||
"""Get the PID file path for an MCP server."""
|
||||
_MCP_DIR.mkdir(parents=True, exist_ok=True)
|
||||
return _MCP_DIR / f"{name}.pid"
|
||||
|
||||
|
||||
def _is_process_alive(pid: int) -> bool:
|
||||
"""Check if a process is running."""
|
||||
try:
|
||||
os.kill(pid, 0) # Signal 0 = check if alive
|
||||
return True
|
||||
except ProcessLookupError:
|
||||
return False
|
||||
except PermissionError:
|
||||
return True # Exists but we can't signal it
|
||||
|
||||
|
||||
def _read_pid_file(name: str) -> Optional[int]:
|
||||
"""Read PID from file, returns None if invalid."""
|
||||
path = _pid_file(name)
|
||||
if not path.exists():
|
||||
return None
|
||||
try:
|
||||
content = path.read_text().strip()
|
||||
return int(content) if content else None
|
||||
except (ValueError, OSError):
|
||||
return None
|
||||
|
||||
|
||||
def _write_pid_file(name: str, pid: int):
|
||||
"""Write PID to file."""
|
||||
path = _pid_file(name)
|
||||
path.write_text(str(pid))
|
||||
|
||||
|
||||
def _remove_pid_file(name: str):
|
||||
"""Remove PID file."""
|
||||
path = _pid_file(name)
|
||||
try:
|
||||
path.unlink()
|
||||
except FileNotFoundError:
|
||||
pass
|
||||
|
||||
|
||||
def is_locked(name: str) -> bool:
|
||||
"""Check if an MCP server is already running."""
|
||||
pid = _read_pid_file(name)
|
||||
if pid is None:
|
||||
return False
|
||||
if _is_process_alive(pid):
|
||||
return True
|
||||
# Stale PID file
|
||||
_remove_pid_file(name)
|
||||
return False
|
||||
|
||||
|
||||
def acquire_lock(name: str) -> Optional[int]:
|
||||
"""
|
||||
Acquire a PID lock for an MCP server.
|
||||
|
||||
Returns the PID if lock acquired, None if server already running.
|
||||
"""
|
||||
# Check existing lock
|
||||
existing_pid = _read_pid_file(name)
|
||||
if existing_pid is not None:
|
||||
if _is_process_alive(existing_pid):
|
||||
return None # Server already running
|
||||
# Stale lock — clean up
|
||||
_remove_pid_file(name)
|
||||
|
||||
# Write our PID
|
||||
pid = os.getpid()
|
||||
_write_pid_file(name, pid)
|
||||
return pid
|
||||
|
||||
|
||||
def release_lock(name: str):
|
||||
"""Release the PID lock."""
|
||||
# Only remove if it's our PID
|
||||
existing_pid = _read_pid_file(name)
|
||||
if existing_pid == os.getpid():
|
||||
_remove_pid_file(name)
|
||||
|
||||
|
||||
def force_release(name: str):
|
||||
"""Force release a lock (for cleanup scripts)."""
|
||||
pid = _read_pid_file(name)
|
||||
if pid and _is_process_alive(pid):
|
||||
try:
|
||||
os.kill(pid, signal.SIGTERM)
|
||||
time.sleep(0.5)
|
||||
if _is_process_alive(pid):
|
||||
os.kill(pid, signal.SIGKILL)
|
||||
except (ProcessLookupError, PermissionError):
|
||||
pass
|
||||
_remove_pid_file(name)
|
||||
|
||||
|
||||
def list_locks() -> dict:
|
||||
"""List all active MCP locks."""
|
||||
locks = {}
|
||||
if not _MCP_DIR.exists():
|
||||
return locks
|
||||
|
||||
for pid_file in _MCP_DIR.glob("*.pid"):
|
||||
name = pid_file.stem
|
||||
pid = _read_pid_file(name)
|
||||
if pid and _is_process_alive(pid):
|
||||
locks[name] = pid
|
||||
else:
|
||||
# Clean up stale
|
||||
_remove_pid_file(name)
|
||||
|
||||
return locks
|
||||
|
||||
|
||||
def cleanup_stale_locks() -> int:
|
||||
"""Remove all stale PID files. Returns count cleaned."""
|
||||
cleaned = 0
|
||||
if not _MCP_DIR.exists():
|
||||
return 0
|
||||
|
||||
for pid_file in _MCP_DIR.glob("*.pid"):
|
||||
name = pid_file.stem
|
||||
pid = _read_pid_file(name)
|
||||
if pid is None or not _is_process_alive(pid):
|
||||
_remove_pid_file(name)
|
||||
cleaned += 1
|
||||
|
||||
return cleaned
|
||||
Reference in New Issue
Block a user