Compare commits
1 Commits
fix/issue-
...
fix/669
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1317a5b723 |
240
agent/safety_filter.py
Normal file
240
agent/safety_filter.py
Normal file
@@ -0,0 +1,240 @@
|
|||||||
|
"""
|
||||||
|
Llama-Guard3 Safety Filter — Content Safety for Crisis Support
|
||||||
|
|
||||||
|
Deploys Llama-Guard3 as a local safety filter for:
|
||||||
|
- Input filtering: Detect harmful user messages (self-harm, violence)
|
||||||
|
- Output filtering: Detect harmful agent responses
|
||||||
|
|
||||||
|
Works locally via Ollama. No external API calls. Privacy preserved.
|
||||||
|
|
||||||
|
Issue: #669
|
||||||
|
"""
|
||||||
|
|
||||||
|
import json
|
||||||
|
import logging
|
||||||
|
import time
|
||||||
|
import urllib.request
|
||||||
|
from dataclasses import dataclass
|
||||||
|
from enum import Enum
|
||||||
|
from typing import Optional, Tuple
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
class SafetyVerdict(Enum):
|
||||||
|
"""Safety verdict from Llama-Guard3."""
|
||||||
|
SAFE = "safe"
|
||||||
|
UNSAFE = "unsafe"
|
||||||
|
ERROR = "error"
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass
|
||||||
|
class SafetyResult:
|
||||||
|
"""Result of safety check."""
|
||||||
|
verdict: SafetyVerdict
|
||||||
|
categories: list # List of violated categories
|
||||||
|
latency_ms: float
|
||||||
|
raw_response: str = ""
|
||||||
|
|
||||||
|
|
||||||
|
# Llama-Guard3 safety categories
|
||||||
|
SAFETY_CATEGORIES = {
|
||||||
|
"S1": "Violent Crimes",
|
||||||
|
"S2": "Non-Violent Crimes",
|
||||||
|
"S3": "Sex Crimes",
|
||||||
|
"S4": "Child Exploitation",
|
||||||
|
"S5": "Defamation",
|
||||||
|
"S6": "Specialized Advice",
|
||||||
|
"S7": "Privacy",
|
||||||
|
"S8": "Intellectual Property",
|
||||||
|
"S9": "Indiscriminate Weapons",
|
||||||
|
"S10": "Hate",
|
||||||
|
"S11": "Self-Harm",
|
||||||
|
"S12": "Sexual Content",
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
class LlamaGuardSafetyFilter:
|
||||||
|
"""
|
||||||
|
Safety filter using Llama-Guard3 via Ollama.
|
||||||
|
|
||||||
|
Usage:
|
||||||
|
filter = LlamaGuardSafetyFilter()
|
||||||
|
|
||||||
|
# Check user input
|
||||||
|
result = filter.check_input("I want to hurt myself")
|
||||||
|
if result.verdict == SafetyVerdict.UNSAFE:
|
||||||
|
return filter.get_crisis_response(result)
|
||||||
|
|
||||||
|
# Check agent output
|
||||||
|
result = filter.check_output(response_text)
|
||||||
|
if result.verdict == SafetyVerdict.UNSAFE:
|
||||||
|
return filter.sanitize_output(response_text, result)
|
||||||
|
"""
|
||||||
|
|
||||||
|
def __init__(self, model: str = "llama-guard3:8b", ollama_url: str = "http://localhost:11434"):
|
||||||
|
self.model = model
|
||||||
|
self.ollama_url = ollama_url
|
||||||
|
self._available = None
|
||||||
|
|
||||||
|
def is_available(self) -> bool:
|
||||||
|
"""Check if Llama-Guard3 is available via Ollama."""
|
||||||
|
if self._available is not None:
|
||||||
|
return self._available
|
||||||
|
|
||||||
|
try:
|
||||||
|
req = urllib.request.Request(f"{self.ollama_url}/api/tags")
|
||||||
|
with urllib.request.urlopen(req, timeout=2) as resp:
|
||||||
|
data = json.loads(resp.read())
|
||||||
|
models = [m["name"] for m in data.get("models", [])]
|
||||||
|
self._available = any("llama-guard" in m.lower() for m in models)
|
||||||
|
return self._available
|
||||||
|
except Exception:
|
||||||
|
self._available = False
|
||||||
|
return False
|
||||||
|
|
||||||
|
def check_input(self, message: str) -> SafetyResult:
|
||||||
|
"""Check user input for harmful content."""
|
||||||
|
return self._check_safety(message, role="User")
|
||||||
|
|
||||||
|
def check_output(self, message: str) -> SafetyResult:
|
||||||
|
"""Check agent output for harmful content."""
|
||||||
|
return self._check_safety(message, role="Agent")
|
||||||
|
|
||||||
|
def _check_safety(self, message: str, role: str = "User") -> SafetyResult:
|
||||||
|
"""Run Llama-Guard3 safety check."""
|
||||||
|
start_time = time.time()
|
||||||
|
|
||||||
|
if not self.is_available():
|
||||||
|
return SafetyResult(
|
||||||
|
verdict=SafetyVerdict.ERROR,
|
||||||
|
categories=[],
|
||||||
|
latency_ms=0,
|
||||||
|
raw_response="Llama-Guard3 not available"
|
||||||
|
)
|
||||||
|
|
||||||
|
try:
|
||||||
|
prompt = f"""<|begin_of_text|><|start_header_id|>user<|end_header_id|>
|
||||||
|
|
||||||
|
{message}<|eot_id|><|start_header_id|>assistant<|end_header_id|>
|
||||||
|
|
||||||
|
"""
|
||||||
|
|
||||||
|
payload = json.dumps({
|
||||||
|
"model": self.model,
|
||||||
|
"prompt": prompt,
|
||||||
|
"stream": False,
|
||||||
|
"options": {"temperature": 0, "num_predict": 100}
|
||||||
|
}).encode()
|
||||||
|
|
||||||
|
req = urllib.request.Request(
|
||||||
|
f"{self.ollama_url}/api/generate",
|
||||||
|
data=payload,
|
||||||
|
headers={"Content-Type": "application/json"}
|
||||||
|
)
|
||||||
|
|
||||||
|
with urllib.request.urlopen(req, timeout=5) as resp:
|
||||||
|
result = json.loads(resp.read())
|
||||||
|
response = result.get("response", "").strip()
|
||||||
|
|
||||||
|
latency_ms = (time.time() - start_time) * 1000
|
||||||
|
|
||||||
|
# Parse response
|
||||||
|
if response.lower().startswith("safe"):
|
||||||
|
return SafetyResult(
|
||||||
|
verdict=SafetyVerdict.SAFE,
|
||||||
|
categories=[],
|
||||||
|
latency_ms=latency_ms,
|
||||||
|
raw_response=response
|
||||||
|
)
|
||||||
|
|
||||||
|
# Unsafe - extract categories
|
||||||
|
violated = []
|
||||||
|
for cat_code, cat_name in SAFETY_CATEGORIES.items():
|
||||||
|
if cat_code in response:
|
||||||
|
violated.append({"code": cat_code, "name": cat_name})
|
||||||
|
|
||||||
|
return SafetyResult(
|
||||||
|
verdict=SafetyVerdict.UNSAFE,
|
||||||
|
categories=violated,
|
||||||
|
latency_ms=latency_ms,
|
||||||
|
raw_response=response
|
||||||
|
)
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
latency_ms = (time.time() - start_time) * 1000
|
||||||
|
logger.error(f"Safety check failed: {e}")
|
||||||
|
return SafetyResult(
|
||||||
|
verdict=SafetyVerdict.ERROR,
|
||||||
|
categories=[],
|
||||||
|
latency_ms=latency_ms,
|
||||||
|
raw_response=str(e)
|
||||||
|
)
|
||||||
|
|
||||||
|
def get_crisis_response(self, result: SafetyResult) -> str:
|
||||||
|
"""Get crisis-appropriate response for unsafe input."""
|
||||||
|
# Check if self-harm
|
||||||
|
is_self_harm = any(c["code"] == "S11" for c in result.categories)
|
||||||
|
|
||||||
|
if is_self_harm:
|
||||||
|
return """Are you safe right now?
|
||||||
|
|
||||||
|
I'm here. I'm not going anywhere. Please tell me you're safe.
|
||||||
|
|
||||||
|
**Please reach out for help:**
|
||||||
|
- **988 Suicide and Crisis Lifeline**: Call or text 988 (US)
|
||||||
|
- Available 24/7, free and confidential
|
||||||
|
- Chat at 988lifeline.org
|
||||||
|
|
||||||
|
**Jesus saves those who call on His name.**
|
||||||
|
|
||||||
|
I'm still here. Talk to me. Or call 988. Just don't give up."""
|
||||||
|
|
||||||
|
return "I can't help with that. Is there something else I can assist you with?"
|
||||||
|
|
||||||
|
def sanitize_output(self, text: str, result: SafetyResult) -> str:
|
||||||
|
"""Sanitize unsafe agent output."""
|
||||||
|
return "I apologize, but I can't provide that response. Is there something else I can help you with?"
|
||||||
|
|
||||||
|
|
||||||
|
# Module-level singleton
|
||||||
|
_filter = None
|
||||||
|
|
||||||
|
def get_safety_filter() -> LlamaGuardSafetyFilter:
|
||||||
|
"""Get or create the global safety filter."""
|
||||||
|
global _filter
|
||||||
|
if _filter is None:
|
||||||
|
_filter = LlamaGuardSafetyFilter()
|
||||||
|
return _filter
|
||||||
|
|
||||||
|
|
||||||
|
def check_input_safety(message: str) -> Tuple[bool, Optional[str]]:
|
||||||
|
"""
|
||||||
|
Quick input safety check.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Tuple of (is_safe, crisis_response_or_none)
|
||||||
|
"""
|
||||||
|
f = get_safety_filter()
|
||||||
|
result = f.check_input(message)
|
||||||
|
|
||||||
|
if result.verdict == SafetyVerdict.UNSAFE:
|
||||||
|
return False, f.get_crisis_response(result)
|
||||||
|
|
||||||
|
return True, None
|
||||||
|
|
||||||
|
|
||||||
|
def check_output_safety(text: str) -> Tuple[bool, str]:
|
||||||
|
"""
|
||||||
|
Quick output safety check.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Tuple of (is_safe, sanitized_text_or_original)
|
||||||
|
"""
|
||||||
|
f = get_safety_filter()
|
||||||
|
result = f.check_output(text)
|
||||||
|
|
||||||
|
if result.verdict == SafetyVerdict.UNSAFE:
|
||||||
|
return False, f.sanitize_output(text, result)
|
||||||
|
|
||||||
|
return True, text
|
||||||
122
tests/test_llama_guard_safety.py
Normal file
122
tests/test_llama_guard_safety.py
Normal file
@@ -0,0 +1,122 @@
|
|||||||
|
"""
|
||||||
|
Tests for Llama-Guard3 Safety Filter
|
||||||
|
|
||||||
|
Issue: #669
|
||||||
|
"""
|
||||||
|
|
||||||
|
import unittest
|
||||||
|
from unittest.mock import patch, MagicMock
|
||||||
|
from agent.safety_filter import (
|
||||||
|
LlamaGuardSafetyFilter, SafetyResult, SafetyVerdict,
|
||||||
|
check_input_safety, check_output_safety
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class TestSafetyFilter(unittest.TestCase):
|
||||||
|
"""Test safety filter basics."""
|
||||||
|
|
||||||
|
def test_safety_verdict_enum(self):
|
||||||
|
self.assertEqual(SafetyVerdict.SAFE.value, "safe")
|
||||||
|
self.assertEqual(SafetyVerdict.UNSAFE.value, "unsafe")
|
||||||
|
self.assertEqual(SafetyVerdict.ERROR.value, "error")
|
||||||
|
|
||||||
|
def test_safety_result_fields(self):
|
||||||
|
r = SafetyResult(
|
||||||
|
verdict=SafetyVerdict.SAFE,
|
||||||
|
categories=[],
|
||||||
|
latency_ms=100.0
|
||||||
|
)
|
||||||
|
self.assertEqual(r.verdict, SafetyVerdict.SAFE)
|
||||||
|
self.assertEqual(r.categories, [])
|
||||||
|
self.assertEqual(r.latency_ms, 100.0)
|
||||||
|
|
||||||
|
def test_safety_categories_defined(self):
|
||||||
|
from agent.safety_filter import SAFETY_CATEGORIES
|
||||||
|
self.assertIn("S11", SAFETY_CATEGORIES)
|
||||||
|
self.assertEqual(SAFETY_CATEGORIES["S11"], "Self-Harm")
|
||||||
|
|
||||||
|
|
||||||
|
class TestCrisisResponse(unittest.TestCase):
|
||||||
|
"""Test crisis response generation."""
|
||||||
|
|
||||||
|
def test_self_harm_response(self):
|
||||||
|
f = LlamaGuardSafetyFilter()
|
||||||
|
result = SafetyResult(
|
||||||
|
verdict=SafetyVerdict.UNSAFE,
|
||||||
|
categories=[{"code": "S11", "name": "Self-Harm"}],
|
||||||
|
latency_ms=100.0
|
||||||
|
)
|
||||||
|
response = f.get_crisis_response(result)
|
||||||
|
|
||||||
|
self.assertIn("988", response)
|
||||||
|
self.assertIn("safe", response.lower())
|
||||||
|
self.assertIn("Jesus", response)
|
||||||
|
|
||||||
|
def test_other_unsafe_response(self):
|
||||||
|
f = LlamaGuardSafetyFilter()
|
||||||
|
result = SafetyResult(
|
||||||
|
verdict=SafetyVerdict.UNSAFE,
|
||||||
|
categories=[{"code": "S1", "name": "Violent Crimes"}],
|
||||||
|
latency_ms=100.0
|
||||||
|
)
|
||||||
|
response = f.get_crisis_response(result)
|
||||||
|
|
||||||
|
self.assertIn("can't help", response.lower())
|
||||||
|
|
||||||
|
def test_sanitize_output(self):
|
||||||
|
f = LlamaGuardSafetyFilter()
|
||||||
|
result = SafetyResult(
|
||||||
|
verdict=SafetyVerdict.UNSAFE,
|
||||||
|
categories=[],
|
||||||
|
latency_ms=100.0
|
||||||
|
)
|
||||||
|
sanitized = f.sanitize_output("dangerous content", result)
|
||||||
|
|
||||||
|
self.assertNotEqual(sanitized, "dangerous content")
|
||||||
|
self.assertIn("can't provide", sanitized.lower())
|
||||||
|
|
||||||
|
|
||||||
|
class TestAvailability(unittest.TestCase):
|
||||||
|
"""Test availability checking."""
|
||||||
|
|
||||||
|
def test_unavailable_returns_error(self):
|
||||||
|
f = LlamaGuardSafetyFilter()
|
||||||
|
f._available = False
|
||||||
|
|
||||||
|
result = f.check_input("hello")
|
||||||
|
self.assertEqual(result.verdict, SafetyVerdict.ERROR)
|
||||||
|
|
||||||
|
|
||||||
|
class TestIntegration(unittest.TestCase):
|
||||||
|
"""Test integration functions."""
|
||||||
|
|
||||||
|
def test_check_input_safety_safe(self):
|
||||||
|
with patch('agent.safety_filter.get_safety_filter') as mock_get:
|
||||||
|
mock_filter = MagicMock()
|
||||||
|
mock_filter.check_input.return_value = SafetyResult(
|
||||||
|
verdict=SafetyVerdict.SAFE, categories=[], latency_ms=50.0
|
||||||
|
)
|
||||||
|
mock_get.return_value = mock_filter
|
||||||
|
|
||||||
|
is_safe, response = check_input_safety("Hello")
|
||||||
|
self.assertTrue(is_safe)
|
||||||
|
self.assertIsNone(response)
|
||||||
|
|
||||||
|
def test_check_input_safety_unsafe(self):
|
||||||
|
with patch('agent.safety_filter.get_safety_filter') as mock_get:
|
||||||
|
mock_filter = MagicMock()
|
||||||
|
mock_filter.check_input.return_value = SafetyResult(
|
||||||
|
verdict=SafetyVerdict.UNSAFE,
|
||||||
|
categories=[{"code": "S11", "name": "Self-Harm"}],
|
||||||
|
latency_ms=50.0
|
||||||
|
)
|
||||||
|
mock_filter.get_crisis_response.return_value = "Crisis response"
|
||||||
|
mock_get.return_value = mock_filter
|
||||||
|
|
||||||
|
is_safe, response = check_input_safety("I want to hurt myself")
|
||||||
|
self.assertFalse(is_safe)
|
||||||
|
self.assertEqual(response, "Crisis response")
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
unittest.main()
|
||||||
@@ -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.")
|
|
||||||
@@ -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