Compare commits
2 Commits
fix/issue-
...
fix/745
| Author | SHA1 | Date | |
|---|---|---|---|
| 9288ae8be9 | |||
| f86233cd52 |
41
tests/test_cost_estimator.py
Normal file
41
tests/test_cost_estimator.py
Normal file
@@ -0,0 +1,41 @@
|
||||
"""
|
||||
Tests for cost estimator tool (#745).
|
||||
"""
|
||||
|
||||
import pytest
|
||||
from tools.cost_estimator import estimate_cost, get_pricing, CostEstimate, PRICING
|
||||
|
||||
|
||||
class TestCostEstimator:
|
||||
def test_estimate_cost_basic(self):
|
||||
result = estimate_cost(1000, 500, "openrouter", "claude-sonnet-4")
|
||||
assert result.input_tokens == 1000
|
||||
assert result.output_tokens == 500
|
||||
assert result.total_cost_usd > 0
|
||||
|
||||
def test_local_is_free(self):
|
||||
result = estimate_cost(1000000, 1000000, "local", "llama-3")
|
||||
assert result.total_cost_usd == 0.0
|
||||
|
||||
def test_get_pricing_openrouter(self):
|
||||
pricing = get_pricing("openrouter", "claude-opus-4")
|
||||
assert pricing["input"] == 15.0
|
||||
assert pricing["output"] == 75.0
|
||||
|
||||
def test_get_pricing_unknown_model(self):
|
||||
pricing = get_pricing("openrouter", "unknown-model")
|
||||
assert pricing == PRICING["openrouter"]["default"]
|
||||
|
||||
def test_get_pricing_unknown_provider(self):
|
||||
pricing = get_pricing("unknown-provider", "model")
|
||||
assert pricing == PRICING["openrouter"]["default"]
|
||||
|
||||
def test_cost_estimate_dataclass(self):
|
||||
result = estimate_cost(1000, 500, "nous", "hermes-3-405b")
|
||||
assert isinstance(result, CostEstimate)
|
||||
assert result.provider == "nous"
|
||||
assert result.model == "hermes-3-405b"
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
pytest.main([__file__])
|
||||
@@ -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.")
|
||||
192
tools/cost_estimator.py
Normal file
192
tools/cost_estimator.py
Normal file
@@ -0,0 +1,192 @@
|
||||
"""
|
||||
Provider Cost Estimator — Estimate API costs from token counts.
|
||||
|
||||
Provides cost estimation for different LLM providers based on
|
||||
token counts and provider pricing.
|
||||
"""
|
||||
|
||||
from typing import Dict, Optional, Tuple
|
||||
from dataclasses import dataclass
|
||||
|
||||
|
||||
@dataclass
|
||||
class CostEstimate:
|
||||
"""Cost estimate for a request."""
|
||||
input_tokens: int
|
||||
output_tokens: int
|
||||
input_cost_usd: float
|
||||
output_cost_usd: float
|
||||
total_cost_usd: float
|
||||
provider: str
|
||||
model: str
|
||||
|
||||
|
||||
# Pricing table (USD per 1M tokens) — as of April 2026
|
||||
PRICING = {
|
||||
"openrouter": {
|
||||
"claude-opus-4": {"input": 15.0, "output": 75.0},
|
||||
"claude-sonnet-4": {"input": 3.0, "output": 15.0},
|
||||
"claude-haiku-3.5": {"input": 0.80, "output": 4.0},
|
||||
"gpt-4o": {"input": 2.50, "output": 10.0},
|
||||
"gpt-4o-mini": {"input": 0.15, "output": 0.60},
|
||||
"gemini-2.5-pro": {"input": 1.25, "output": 10.0},
|
||||
"gemini-2.5-flash": {"input": 0.15, "output": 0.60},
|
||||
"llama-4-scout": {"input": 0.20, "output": 0.80},
|
||||
"llama-4-maverick": {"input": 0.50, "output": 2.0},
|
||||
"default": {"input": 1.0, "output": 3.0},
|
||||
},
|
||||
"nous": {
|
||||
"hermes-3-405b": {"input": 5.0, "output": 5.0},
|
||||
"mixtral-8x22b": {"input": 2.0, "output": 2.0},
|
||||
"hermes-2-mixtral-8x7b": {"input": 0.90, "output": 0.90},
|
||||
"default": {"input": 2.0, "output": 2.0},
|
||||
},
|
||||
"anthropic": {
|
||||
"claude-opus-4": {"input": 15.0, "output": 75.0},
|
||||
"claude-sonnet-4": {"input": 3.0, "output": 15.0},
|
||||
"claude-haiku-3.5": {"input": 0.80, "output": 4.0},
|
||||
"default": {"input": 3.0, "output": 15.0},
|
||||
},
|
||||
"local": {
|
||||
# Local models are free (electricity only)
|
||||
"default": {"input": 0.0, "output": 0.0},
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
def get_pricing(provider: str, model: str) -> Dict[str, float]:
|
||||
"""
|
||||
Get pricing for a provider/model combination.
|
||||
|
||||
Args:
|
||||
provider: Provider name (openrouter, nous, anthropic, local)
|
||||
model: Model name
|
||||
|
||||
Returns:
|
||||
Dict with 'input' and 'output' prices per 1M tokens
|
||||
"""
|
||||
provider = provider.lower().strip()
|
||||
model = model.lower().strip()
|
||||
|
||||
provider_pricing = PRICING.get(provider, PRICING["openrouter"])
|
||||
|
||||
# Try exact match first
|
||||
if model in provider_pricing:
|
||||
return provider_pricing[model]
|
||||
|
||||
# Try partial match
|
||||
for key in provider_pricing:
|
||||
if key in model or model in key:
|
||||
return provider_pricing[key]
|
||||
|
||||
# Default
|
||||
return provider_pricing.get("default", {"input": 1.0, "output": 3.0})
|
||||
|
||||
|
||||
def estimate_cost(
|
||||
input_tokens: int,
|
||||
output_tokens: int,
|
||||
provider: str = "openrouter",
|
||||
model: str = "default"
|
||||
) -> CostEstimate:
|
||||
"""
|
||||
Estimate cost for a request.
|
||||
|
||||
Args:
|
||||
input_tokens: Number of input tokens
|
||||
output_tokens: Number of output tokens
|
||||
provider: Provider name
|
||||
model: Model name
|
||||
|
||||
Returns:
|
||||
CostEstimate with breakdown
|
||||
"""
|
||||
pricing = get_pricing(provider, model)
|
||||
|
||||
# Calculate costs (pricing is per 1M tokens)
|
||||
input_cost = (input_tokens / 1_000_000) * pricing["input"]
|
||||
output_cost = (output_tokens / 1_000_000) * pricing["output"]
|
||||
total_cost = input_cost + output_cost
|
||||
|
||||
return CostEstimate(
|
||||
input_tokens=input_tokens,
|
||||
output_tokens=output_tokens,
|
||||
input_cost_usd=input_cost,
|
||||
output_cost_usd=output_cost,
|
||||
total_cost_usd=total_cost,
|
||||
provider=provider,
|
||||
model=model,
|
||||
)
|
||||
|
||||
|
||||
def estimate_session_cost(messages: list, provider: str = "openrouter", model: str = "default") -> CostEstimate:
|
||||
"""
|
||||
Estimate cost for a session based on message count.
|
||||
|
||||
Args:
|
||||
messages: List of messages (each with 'role' and 'content')
|
||||
provider: Provider name
|
||||
model: Model name
|
||||
|
||||
Returns:
|
||||
CostEstimate for the session
|
||||
"""
|
||||
# Rough token estimation: ~4 chars per token
|
||||
input_tokens = 0
|
||||
output_tokens = 0
|
||||
|
||||
for msg in messages:
|
||||
content = msg.get("content", "")
|
||||
if isinstance(content, str):
|
||||
tokens = len(content) // 4
|
||||
if msg.get("role") == "user":
|
||||
input_tokens += tokens
|
||||
elif msg.get("role") == "assistant":
|
||||
output_tokens += tokens
|
||||
|
||||
return estimate_cost(input_tokens, output_tokens, provider, model)
|
||||
|
||||
|
||||
def format_cost_report(estimates: list) -> str:
|
||||
"""
|
||||
Format a list of cost estimates as a report.
|
||||
|
||||
Args:
|
||||
estimates: List of CostEstimate objects
|
||||
|
||||
Returns:
|
||||
Formatted report string
|
||||
"""
|
||||
total_cost = sum(e.total_cost_usd for e in estimates)
|
||||
total_input = sum(e.input_tokens for e in estimates)
|
||||
total_output = sum(e.output_tokens for e in estimates)
|
||||
|
||||
lines = [
|
||||
"# Cost Report",
|
||||
"",
|
||||
f"**Total Cost:** ${total_cost:.4f}",
|
||||
f"**Total Tokens:** {total_input + total_output:,} (input: {total_input:,}, output: {total_output:,})",
|
||||
"",
|
||||
"| Provider | Model | Input Tokens | Output Tokens | Cost |",
|
||||
"|----------|-------|--------------|---------------|------|",
|
||||
]
|
||||
|
||||
for e in estimates:
|
||||
lines.append(f"| {e.provider} | {e.model} | {e.input_tokens:,} | {e.output_tokens:,} | ${e.total_cost_usd:.4f} |")
|
||||
|
||||
lines.append("")
|
||||
lines.append(f"*Generated by cost_estimator.py*")
|
||||
|
||||
return "\n".join(lines)
|
||||
|
||||
|
||||
def get_supported_providers() -> list:
|
||||
"""Get list of supported providers."""
|
||||
return list(PRICING.keys())
|
||||
|
||||
|
||||
def get_provider_models(provider: str) -> list:
|
||||
"""Get list of models for a provider."""
|
||||
provider = provider.lower().strip()
|
||||
provider_pricing = PRICING.get(provider, {})
|
||||
return [k for k in provider_pricing.keys() if k != "default"]
|
||||
@@ -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