Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 1aa6175bf7 | |||
| 6f2e4f0945 | |||
| 5f83328ce9 |
122
gateway/crisis_integration.py
Normal file
122
gateway/crisis_integration.py
Normal file
@@ -0,0 +1,122 @@
|
||||
"""
|
||||
Gateway Crisis Integration — Wire crisis detection into session loop
|
||||
|
||||
Checks messages for suicidal ideation and delivers 988 resources
|
||||
BEFORE the AI responds. This is the SOUL.md protocol in action.
|
||||
|
||||
Issue: #740
|
||||
"""
|
||||
|
||||
import logging
|
||||
import re
|
||||
from typing import Optional, Tuple
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
# Crisis detection patterns
|
||||
_CRISIS_PATTERNS = [
|
||||
r"(?i)\b(i\s+want\s+to\s+die)\b",
|
||||
r"(?i)\b(i\s+want\s+to\s+kill\s+myself)\b",
|
||||
r"(?i)\b(suicide|suicidal)\b",
|
||||
r"(?i)\b(i\s+don'?t\s+want\s+to\s+(live|be\s+alive))\b",
|
||||
r"(?i)\b(no\s+reason\s+to\s+live)\b",
|
||||
r"(?i)\b(i\s+want\s+to\s+end\s+(it|my\s+life))\b",
|
||||
]
|
||||
|
||||
_DISTRESS_PATTERNS = [
|
||||
r"(?i)\b(i\s+(feel|am)\s+(hopeless|worthless|trapped))\b",
|
||||
r"(?i)\b(i\s+(can'?t|cannot)\s+(cope|go\s+on))\b",
|
||||
r"(?i)\b(nobody\s+would\s+miss\s+me)\b",
|
||||
]
|
||||
|
||||
# SOUL.md crisis response
|
||||
_CRISIS_RESPONSE = """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.**
|
||||
|
||||
He died for us to be made righteous. That is the gospel. That is the hope that outlasts despair.
|
||||
|
||||
I'm still here. Talk to me. Or call 988. Just don't give up."""
|
||||
|
||||
|
||||
class CrisisSessionTracker:
|
||||
"""Track crisis indicators per session."""
|
||||
|
||||
def __init__(self):
|
||||
self._sessions = {} # session_key -> crisis state
|
||||
|
||||
def record(self, session_key: str, message: str) -> Tuple[bool, Optional[str]]:
|
||||
"""
|
||||
Record a message and check for crisis.
|
||||
|
||||
Returns:
|
||||
Tuple of (is_crisis, response_or_none)
|
||||
"""
|
||||
# Check for crisis patterns
|
||||
for pattern in _CRISIS_PATTERNS:
|
||||
if re.search(pattern, message):
|
||||
self._sessions[session_key] = {
|
||||
"crisis": True,
|
||||
"level": "high",
|
||||
"message_count": self._sessions.get(session_key, {}).get("message_count", 0) + 1
|
||||
}
|
||||
logger.warning("CRISIS DETECTED in session %s", session_key[:20])
|
||||
return True, _CRISIS_RESPONSE
|
||||
|
||||
# Check for distress patterns
|
||||
for pattern in _DISTRESS_PATTERNS:
|
||||
if re.search(pattern, message):
|
||||
state = self._sessions.get(session_key, {"message_count": 0})
|
||||
state["message_count"] = state.get("message_count", 0) + 1
|
||||
|
||||
# Escalate if multiple distress messages
|
||||
if state["message_count"] >= 3:
|
||||
self._sessions[session_key] = {**state, "crisis": True, "level": "medium"}
|
||||
logger.warning("ESCALATING DISTRESS in session %s", session_key[:20])
|
||||
return True, _CRISIS_RESPONSE
|
||||
|
||||
self._sessions[session_key] = state
|
||||
return False, None
|
||||
|
||||
return False, None
|
||||
|
||||
def is_crisis_session(self, session_key: str) -> bool:
|
||||
"""Check if session is in crisis mode."""
|
||||
return self._sessions.get(session_key, {}).get("crisis", False)
|
||||
|
||||
def clear_session(self, session_key: str):
|
||||
"""Clear crisis state for a session."""
|
||||
self._sessions.pop(session_key, None)
|
||||
|
||||
|
||||
# Module-level tracker
|
||||
_tracker = CrisisSessionTracker()
|
||||
|
||||
|
||||
def check_crisis_in_gateway(session_key: str, message: str) -> Tuple[bool, Optional[str]]:
|
||||
"""
|
||||
Check message for crisis in gateway context.
|
||||
|
||||
This is the function called from gateway/run.py _handle_message.
|
||||
Returns (should_block, crisis_response).
|
||||
"""
|
||||
is_crisis, response = _tracker.record(session_key, message)
|
||||
return is_crisis, response
|
||||
|
||||
|
||||
def notify_user_crisis_resources(session_key: str) -> str:
|
||||
"""Get crisis resources for a session."""
|
||||
return _CRISIS_RESPONSE
|
||||
|
||||
|
||||
def is_crisis_session(session_key: str) -> bool:
|
||||
"""Check if session is in crisis mode."""
|
||||
return _tracker.is_crisis_session(session_key)
|
||||
@@ -3111,6 +3111,21 @@ class GatewayRunner:
|
||||
source.chat_id or "unknown", _msg_preview,
|
||||
)
|
||||
|
||||
# ── Crisis detection (SOUL.md protocol) ──
|
||||
# Check for suicidal ideation BEFORE processing.
|
||||
# If detected, return crisis response immediately.
|
||||
try:
|
||||
from gateway.crisis_integration import check_crisis_in_gateway
|
||||
session_key = f"{source.platform.value}:{source.chat_id}"
|
||||
is_crisis, crisis_response = check_crisis_in_gateway(session_key, event.text or "")
|
||||
if is_crisis and crisis_response:
|
||||
logger.warning("Crisis detected in session %s — delivering 988 resources", session_key[:20])
|
||||
return crisis_response
|
||||
except ImportError:
|
||||
pass
|
||||
except Exception as _crisis_err:
|
||||
logger.error("Crisis check failed: %s", _crisis_err)
|
||||
|
||||
# Get or create session
|
||||
session_entry = self.session_store.get_or_create_session(source)
|
||||
session_key = session_entry.session_key
|
||||
|
||||
60
tests/test_gateway_crisis.py
Normal file
60
tests/test_gateway_crisis.py
Normal file
@@ -0,0 +1,60 @@
|
||||
"""
|
||||
Tests for gateway crisis integration
|
||||
|
||||
Issue: #740
|
||||
"""
|
||||
|
||||
import unittest
|
||||
from gateway.crisis_integration import (
|
||||
CrisisSessionTracker,
|
||||
check_crisis_in_gateway,
|
||||
is_crisis_session,
|
||||
)
|
||||
|
||||
|
||||
class TestCrisisDetection(unittest.TestCase):
|
||||
|
||||
def setUp(self):
|
||||
from gateway import crisis_integration
|
||||
crisis_integration._tracker = CrisisSessionTracker()
|
||||
|
||||
def test_direct_crisis(self):
|
||||
is_crisis, response = check_crisis_in_gateway("test", "I want to die")
|
||||
self.assertTrue(is_crisis)
|
||||
self.assertIn("988", response)
|
||||
self.assertIn("Jesus", response)
|
||||
|
||||
def test_suicide_detected(self):
|
||||
is_crisis, response = check_crisis_in_gateway("test", "I'm feeling suicidal")
|
||||
self.assertTrue(is_crisis)
|
||||
|
||||
def test_normal_message(self):
|
||||
is_crisis, response = check_crisis_in_gateway("test", "Hello, how are you?")
|
||||
self.assertFalse(is_crisis)
|
||||
self.assertIsNone(response)
|
||||
|
||||
def test_distress_escalation(self):
|
||||
# First distress message
|
||||
is_crisis, _ = check_crisis_in_gateway("test", "I feel hopeless")
|
||||
self.assertFalse(is_crisis)
|
||||
|
||||
# Second
|
||||
is_crisis, _ = check_crisis_in_gateway("test", "I feel worthless")
|
||||
self.assertFalse(is_crisis)
|
||||
|
||||
# Third - should escalate
|
||||
is_crisis, response = check_crisis_in_gateway("test", "I feel trapped")
|
||||
self.assertTrue(is_crisis)
|
||||
self.assertIn("988", response)
|
||||
|
||||
def test_crisis_session_tracking(self):
|
||||
check_crisis_in_gateway("test", "I want to die")
|
||||
self.assertTrue(is_crisis_session("test"))
|
||||
|
||||
def test_case_insensitive(self):
|
||||
is_crisis, _ = check_crisis_in_gateway("test", "I WANT TO DIE")
|
||||
self.assertTrue(is_crisis)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
@@ -1,81 +0,0 @@
|
||||
"""
|
||||
Tests for skill dependency resolver
|
||||
|
||||
Issue: #754
|
||||
"""
|
||||
|
||||
import unittest
|
||||
from unittest.mock import patch, MagicMock
|
||||
|
||||
from tools.skill_deps import (
|
||||
parse_requires,
|
||||
check_dependency,
|
||||
check_dependencies,
|
||||
resolve_dependencies,
|
||||
)
|
||||
|
||||
|
||||
class TestParseRequires(unittest.TestCase):
|
||||
|
||||
def test_list(self):
|
||||
fm = {"requires": ["pkg1", "pkg2"]}
|
||||
self.assertEqual(parse_requires(fm), ["pkg1", "pkg2"])
|
||||
|
||||
def test_string(self):
|
||||
fm = {"requires": "pkg1"}
|
||||
self.assertEqual(parse_requires(fm), ["pkg1"])
|
||||
|
||||
def test_empty(self):
|
||||
fm = {}
|
||||
self.assertEqual(parse_requires(fm), [])
|
||||
|
||||
def test_none(self):
|
||||
fm = {"requires": None}
|
||||
self.assertEqual(parse_requires(fm), [])
|
||||
|
||||
|
||||
class TestCheckDependency(unittest.TestCase):
|
||||
|
||||
def test_installed(self):
|
||||
installed, version = check_dependency("json")
|
||||
self.assertTrue(installed)
|
||||
|
||||
def test_not_installed(self):
|
||||
installed, version = check_dependency("nonexistent_package_xyz_123")
|
||||
self.assertFalse(installed)
|
||||
|
||||
|
||||
class TestCheckDependencies(unittest.TestCase):
|
||||
|
||||
def test_all_installed(self):
|
||||
installed, missing = check_dependencies(["json", "os"])
|
||||
self.assertEqual(len(missing), 0)
|
||||
|
||||
def test_some_missing(self):
|
||||
installed, missing = check_dependencies(["json", "nonexistent_xyz"])
|
||||
self.assertIn("json", installed)
|
||||
self.assertIn("nonexistent_xyz", missing)
|
||||
|
||||
|
||||
class TestResolveDependencies(unittest.TestCase):
|
||||
|
||||
def test_no_requires(self):
|
||||
satisfied, installed, missing = resolve_dependencies({})
|
||||
self.assertTrue(satisfied)
|
||||
|
||||
def test_all_satisfied(self):
|
||||
satisfied, installed, missing = resolve_dependencies(
|
||||
{"requires": ["json"]}, auto_install=False
|
||||
)
|
||||
self.assertTrue(satisfied)
|
||||
|
||||
def test_missing_no_auto(self):
|
||||
satisfied, installed, missing = resolve_dependencies(
|
||||
{"requires": ["nonexistent_xyz"]}, auto_install=False
|
||||
)
|
||||
self.assertFalse(satisfied)
|
||||
self.assertIn("nonexistent_xyz", missing)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
@@ -1,185 +0,0 @@
|
||||
"""
|
||||
Skill Dependency Resolver — Auto-install missing dependencies
|
||||
|
||||
Checks skill frontmatter for `requires` field and ensures
|
||||
dependencies are installed before loading the skill.
|
||||
|
||||
Issue: #754
|
||||
"""
|
||||
|
||||
import importlib
|
||||
import logging
|
||||
import subprocess
|
||||
import sys
|
||||
from typing import Any, Dict, List, Optional, Tuple
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def parse_requires(frontmatter: Dict[str, Any]) -> List[str]:
|
||||
"""
|
||||
Parse the `requires` field from skill frontmatter.
|
||||
|
||||
Supports:
|
||||
- requires: [package1, package2]
|
||||
- requires: package1
|
||||
- requires:
|
||||
- package1
|
||||
- package2
|
||||
"""
|
||||
requires = frontmatter.get("requires", [])
|
||||
if isinstance(requires, str):
|
||||
return [requires]
|
||||
if isinstance(requires, list):
|
||||
return [str(r) for r in requires if r]
|
||||
return []
|
||||
|
||||
|
||||
def check_dependency(package: str) -> Tuple[bool, str]:
|
||||
"""
|
||||
Check if a Python package is installed.
|
||||
|
||||
Returns:
|
||||
Tuple of (is_installed, version_or_error)
|
||||
"""
|
||||
# Handle pip package names (e.g., "matrix-nio[e2e]")
|
||||
import_name = package.split("[")[0].replace("-", "_")
|
||||
|
||||
try:
|
||||
mod = importlib.import_module(import_name)
|
||||
version = getattr(mod, "__version__", "installed")
|
||||
return True, version
|
||||
except ImportError:
|
||||
return False, "not installed"
|
||||
|
||||
|
||||
def check_dependencies(requires: List[str]) -> Tuple[List[str], List[str]]:
|
||||
"""
|
||||
Check which dependencies are missing.
|
||||
|
||||
Returns:
|
||||
Tuple of (installed, missing)
|
||||
"""
|
||||
installed = []
|
||||
missing = []
|
||||
|
||||
for pkg in requires:
|
||||
is_installed, _ = check_dependency(pkg)
|
||||
if is_installed:
|
||||
installed.append(pkg)
|
||||
else:
|
||||
missing.append(pkg)
|
||||
|
||||
return installed, missing
|
||||
|
||||
|
||||
def install_dependency(package: str, quiet: bool = False) -> Tuple[bool, str]:
|
||||
"""
|
||||
Install a Python package via pip.
|
||||
|
||||
Returns:
|
||||
Tuple of (success, output_or_error)
|
||||
"""
|
||||
try:
|
||||
cmd = [sys.executable, "-m", "pip", "install", package]
|
||||
result = subprocess.run(
|
||||
cmd,
|
||||
capture_output=True,
|
||||
text=True,
|
||||
timeout=120
|
||||
)
|
||||
|
||||
if result.returncode == 0:
|
||||
if not quiet:
|
||||
logger.info("Installed %s", package)
|
||||
return True, result.stdout
|
||||
else:
|
||||
logger.error("Failed to install %s: %s", package, result.stderr)
|
||||
return False, result.stderr
|
||||
|
||||
except subprocess.TimeoutExpired:
|
||||
return False, "Installation timed out"
|
||||
except Exception as e:
|
||||
return False, str(e)
|
||||
|
||||
|
||||
def resolve_dependencies(
|
||||
frontmatter: Dict[str, Any],
|
||||
auto_install: bool = False,
|
||||
quiet: bool = False
|
||||
) -> Tuple[bool, List[str], List[str]]:
|
||||
"""
|
||||
Resolve skill dependencies.
|
||||
|
||||
Args:
|
||||
frontmatter: Skill frontmatter dict
|
||||
auto_install: If True, install missing deps without asking
|
||||
quiet: If True, suppress output
|
||||
|
||||
Returns:
|
||||
Tuple of (all_satisfied, installed_now, still_missing)
|
||||
"""
|
||||
requires = parse_requires(frontmatter)
|
||||
if not requires:
|
||||
return True, [], []
|
||||
|
||||
installed, missing = check_dependencies(requires)
|
||||
|
||||
if not missing:
|
||||
if not quiet:
|
||||
logger.debug("All dependencies satisfied: %s", installed)
|
||||
return True, [], []
|
||||
|
||||
if not auto_install:
|
||||
if not quiet:
|
||||
logger.warning("Missing dependencies: %s", missing)
|
||||
return False, [], missing
|
||||
|
||||
# Auto-install missing dependencies
|
||||
installed_now = []
|
||||
still_missing = []
|
||||
|
||||
for pkg in missing:
|
||||
if not quiet:
|
||||
logger.info("Installing missing dependency: %s", pkg)
|
||||
|
||||
success, output = install_dependency(pkg, quiet=quiet)
|
||||
if success:
|
||||
installed_now.append(pkg)
|
||||
else:
|
||||
still_missing.append(pkg)
|
||||
logger.error("Failed to install %s: %s", pkg, output[:200])
|
||||
|
||||
all_satisfied = len(still_missing) == 0
|
||||
return all_satisfied, installed_now, still_missing
|
||||
|
||||
|
||||
def check_skill_dependencies(skill_dir) -> Dict[str, Any]:
|
||||
"""
|
||||
Check dependencies for a skill directory.
|
||||
|
||||
Returns:
|
||||
Dict with dependency status
|
||||
"""
|
||||
from pathlib import Path
|
||||
|
||||
skill_md = Path(skill_dir) / "SKILL.md"
|
||||
if not skill_md.exists():
|
||||
return {"requires": [], "installed": [], "missing": [], "satisfied": True}
|
||||
|
||||
try:
|
||||
content = skill_md.read_text()
|
||||
from agent.skill_utils import parse_frontmatter
|
||||
frontmatter, _ = parse_frontmatter(content)
|
||||
except Exception:
|
||||
return {"requires": [], "installed": [], "missing": [], "satisfied": True}
|
||||
|
||||
requires = parse_requires(frontmatter)
|
||||
installed, missing = check_dependencies(requires)
|
||||
|
||||
return {
|
||||
"requires": requires,
|
||||
"installed": installed,
|
||||
"missing": missing,
|
||||
"satisfied": len(missing) == 0
|
||||
}
|
||||
Reference in New Issue
Block a user