Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4d084654d8 |
@@ -8,6 +8,13 @@ from .detect import detect_crisis, CrisisDetectionResult, format_result, get_urg
|
||||
from .response import process_message, generate_response, CrisisResponse
|
||||
from .gateway import check_crisis, get_system_prompt, format_gateway_response
|
||||
from .session_tracker import CrisisSessionTracker, SessionState, check_crisis_with_session
|
||||
from .metrics import (
|
||||
build_metrics_event,
|
||||
append_metrics_event,
|
||||
load_metrics_events,
|
||||
build_weekly_summary,
|
||||
render_weekly_summary,
|
||||
)
|
||||
|
||||
__all__ = [
|
||||
"detect_crisis",
|
||||
@@ -23,4 +30,9 @@ __all__ = [
|
||||
"CrisisSessionTracker",
|
||||
"SessionState",
|
||||
"check_crisis_with_session",
|
||||
"build_metrics_event",
|
||||
"append_metrics_event",
|
||||
"load_metrics_events",
|
||||
"build_weekly_summary",
|
||||
"render_weekly_summary",
|
||||
]
|
||||
|
||||
@@ -23,9 +23,17 @@ from .response import (
|
||||
CrisisResponse,
|
||||
)
|
||||
from .session_tracker import CrisisSessionTracker
|
||||
from .metrics import build_metrics_event, append_metrics_event
|
||||
|
||||
|
||||
def check_crisis(text: str) -> dict:
|
||||
def check_crisis(
|
||||
text: str,
|
||||
metrics_log_path: Optional[str] = None,
|
||||
*,
|
||||
continued_conversation: bool = False,
|
||||
false_positive: bool = False,
|
||||
now: Optional[float] = None,
|
||||
) -> dict:
|
||||
"""
|
||||
Full crisis check returning structured data.
|
||||
|
||||
@@ -35,7 +43,7 @@ def check_crisis(text: str) -> dict:
|
||||
detection = detect_crisis(text)
|
||||
response = generate_response(detection)
|
||||
|
||||
return {
|
||||
result = {
|
||||
"level": detection.level,
|
||||
"score": detection.score,
|
||||
"indicators": detection.indicators,
|
||||
@@ -49,6 +57,23 @@ def check_crisis(text: str) -> dict:
|
||||
"escalate": response.escalate,
|
||||
}
|
||||
|
||||
metrics_event = build_metrics_event(
|
||||
detection,
|
||||
continued_conversation=continued_conversation,
|
||||
false_positive=false_positive,
|
||||
now=now,
|
||||
)
|
||||
if metrics_log_path:
|
||||
metrics_event = append_metrics_event(
|
||||
metrics_log_path,
|
||||
detection,
|
||||
continued_conversation=continued_conversation,
|
||||
false_positive=false_positive,
|
||||
now=now,
|
||||
)
|
||||
result["metrics_event"] = metrics_event
|
||||
return result
|
||||
|
||||
|
||||
def get_system_prompt(base_prompt: str, text: str = "") -> str:
|
||||
"""
|
||||
|
||||
166
crisis/metrics.py
Normal file
166
crisis/metrics.py
Normal file
@@ -0,0 +1,166 @@
|
||||
"""Privacy-preserving crisis analytics metrics for the-door.
|
||||
|
||||
Stores only timestamps, crisis levels, indicator categories, and operator
|
||||
feedback flags. No raw message text or PII is persisted.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import argparse
|
||||
import json
|
||||
import time
|
||||
from collections import Counter
|
||||
from pathlib import Path
|
||||
from typing import Iterable
|
||||
|
||||
from .detect import CrisisDetectionResult, detect_crisis
|
||||
|
||||
LEVELS = ("NONE", "LOW", "MEDIUM", "HIGH", "CRITICAL")
|
||||
|
||||
|
||||
def normalize_indicator(indicator: str) -> str:
|
||||
"""Return a stable privacy-safe keyword/category identifier."""
|
||||
return indicator
|
||||
|
||||
|
||||
def build_metrics_event(
|
||||
detection: CrisisDetectionResult,
|
||||
*,
|
||||
continued_conversation: bool = False,
|
||||
false_positive: bool = False,
|
||||
now: float | None = None,
|
||||
) -> dict:
|
||||
timestamp = float(time.time() if now is None else now)
|
||||
indicators = [normalize_indicator(indicator) for indicator in detection.indicators]
|
||||
return {
|
||||
"timestamp": timestamp,
|
||||
"level": detection.level,
|
||||
"indicator_count": len(indicators),
|
||||
"indicators": indicators,
|
||||
"continued_conversation": bool(continued_conversation),
|
||||
"false_positive": bool(false_positive),
|
||||
}
|
||||
|
||||
|
||||
def append_metrics_event(
|
||||
log_path: str | Path,
|
||||
detection: CrisisDetectionResult,
|
||||
*,
|
||||
continued_conversation: bool = False,
|
||||
false_positive: bool = False,
|
||||
now: float | None = None,
|
||||
) -> dict:
|
||||
event = build_metrics_event(
|
||||
detection,
|
||||
continued_conversation=continued_conversation,
|
||||
false_positive=false_positive,
|
||||
now=now,
|
||||
)
|
||||
path = Path(log_path)
|
||||
path.parent.mkdir(parents=True, exist_ok=True)
|
||||
with path.open("a", encoding="utf-8") as handle:
|
||||
handle.write(json.dumps(event) + "\n")
|
||||
return event
|
||||
|
||||
|
||||
def load_metrics_events(log_path: str | Path) -> list[dict]:
|
||||
path = Path(log_path)
|
||||
if not path.exists():
|
||||
return []
|
||||
events = []
|
||||
for line in path.read_text(encoding="utf-8").splitlines():
|
||||
if not line.strip():
|
||||
continue
|
||||
events.append(json.loads(line))
|
||||
return events
|
||||
|
||||
|
||||
def build_weekly_summary(
|
||||
events: Iterable[dict],
|
||||
*,
|
||||
now: float | None = None,
|
||||
window_days: int = 7,
|
||||
) -> dict:
|
||||
current_time = float(time.time() if now is None else now)
|
||||
cutoff = current_time - (window_days * 86400)
|
||||
filtered = [event for event in events if float(event.get("timestamp", 0)) >= cutoff]
|
||||
|
||||
detections_per_level = {level: 0 for level in LEVELS}
|
||||
keyword_counts: Counter[str] = Counter()
|
||||
detections = []
|
||||
continued_after_intervention = 0
|
||||
|
||||
for event in filtered:
|
||||
level = event.get("level", "NONE")
|
||||
detections_per_level[level] = detections_per_level.get(level, 0) + 1
|
||||
keyword_counts.update(event.get("indicators", []))
|
||||
if level != "NONE":
|
||||
detections.append(event)
|
||||
if event.get("continued_conversation"):
|
||||
continued_after_intervention += 1
|
||||
|
||||
false_positive_count = sum(1 for event in detections if event.get("false_positive"))
|
||||
false_positive_estimate = (
|
||||
false_positive_count / len(detections) if detections else 0.0
|
||||
)
|
||||
|
||||
return {
|
||||
"window_days": window_days,
|
||||
"total_events": len(filtered),
|
||||
"detections_per_level": detections_per_level,
|
||||
"most_common_keywords": [
|
||||
{"keyword": keyword, "count": count}
|
||||
for keyword, count in keyword_counts.most_common(10)
|
||||
],
|
||||
"false_positive_estimate": false_positive_estimate,
|
||||
"continued_after_intervention": continued_after_intervention,
|
||||
}
|
||||
|
||||
|
||||
def render_weekly_summary(summary: dict) -> str:
|
||||
return json.dumps(summary, indent=2)
|
||||
|
||||
|
||||
def write_weekly_summary(path: str | Path, summary: dict) -> Path:
|
||||
output_path = Path(path)
|
||||
output_path.parent.mkdir(parents=True, exist_ok=True)
|
||||
output_path.write_text(render_weekly_summary(summary) + "\n", encoding="utf-8")
|
||||
return output_path
|
||||
|
||||
|
||||
def record_text_event(
|
||||
text: str,
|
||||
log_path: str | Path,
|
||||
*,
|
||||
continued_conversation: bool = False,
|
||||
false_positive: bool = False,
|
||||
now: float | None = None,
|
||||
) -> dict:
|
||||
detection = detect_crisis(text)
|
||||
return append_metrics_event(
|
||||
log_path,
|
||||
detection,
|
||||
continued_conversation=continued_conversation,
|
||||
false_positive=false_positive,
|
||||
now=now,
|
||||
)
|
||||
|
||||
|
||||
def main(argv: list[str] | None = None) -> int:
|
||||
parser = argparse.ArgumentParser(description="Privacy-preserving crisis metrics summary")
|
||||
parser.add_argument("--log-path", required=True, help="JSONL event log path")
|
||||
parser.add_argument("--days", type=int, default=7, help="Summary window in days")
|
||||
parser.add_argument("--output", help="Optional file to write summary JSON")
|
||||
args = parser.parse_args(argv)
|
||||
|
||||
events = load_metrics_events(args.log_path)
|
||||
summary = build_weekly_summary(events, window_days=args.days)
|
||||
rendered = render_weekly_summary(summary)
|
||||
print(rendered)
|
||||
if args.output:
|
||||
write_weekly_summary(args.output, summary)
|
||||
return 0
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
raise SystemExit(main())
|
||||
609
index.html
609
index.html
@@ -500,184 +500,6 @@ html, body {
|
||||
min-height: 60px;
|
||||
}
|
||||
|
||||
.safety-plan-status {
|
||||
min-height: 20px;
|
||||
margin: 4px 0 18px;
|
||||
font-size: 0.85rem;
|
||||
color: #8b949e;
|
||||
}
|
||||
|
||||
.safety-plan-status.success {
|
||||
color: #3fb950;
|
||||
}
|
||||
|
||||
.safety-plan-status.error {
|
||||
color: #ff7b72;
|
||||
}
|
||||
|
||||
.safety-plan-versioning {
|
||||
margin-top: 24px;
|
||||
padding-top: 20px;
|
||||
border-top: 1px solid #30363d;
|
||||
}
|
||||
|
||||
.safety-plan-versioning-grid {
|
||||
display: grid;
|
||||
gap: 16px;
|
||||
}
|
||||
|
||||
.safety-plan-history-panel,
|
||||
.safety-plan-diff-panel {
|
||||
background: #0d1117;
|
||||
border: 1px solid #30363d;
|
||||
border-radius: 12px;
|
||||
padding: 16px;
|
||||
}
|
||||
|
||||
.safety-plan-section-header h3 {
|
||||
font-size: 0.95rem;
|
||||
margin-bottom: 4px;
|
||||
}
|
||||
|
||||
.safety-plan-section-header p {
|
||||
font-size: 0.8rem;
|
||||
color: #8b949e;
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
|
||||
.safety-plan-history {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 10px;
|
||||
}
|
||||
|
||||
.safety-plan-history-item {
|
||||
border: 1px solid #30363d;
|
||||
border-radius: 10px;
|
||||
padding: 12px;
|
||||
background: #161b22;
|
||||
}
|
||||
|
||||
.safety-plan-history-item.active {
|
||||
border-color: #58a6ff;
|
||||
box-shadow: 0 0 0 1px rgba(88, 166, 255, 0.35);
|
||||
}
|
||||
|
||||
.safety-plan-history-meta {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
gap: 12px;
|
||||
align-items: baseline;
|
||||
margin-bottom: 8px;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
|
||||
.safety-plan-history-title {
|
||||
font-size: 0.88rem;
|
||||
font-weight: 600;
|
||||
color: #e6edf3;
|
||||
}
|
||||
|
||||
.safety-plan-history-note {
|
||||
font-size: 0.78rem;
|
||||
color: #8b949e;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
.safety-plan-history-actions {
|
||||
display: flex;
|
||||
gap: 8px;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
|
||||
.safety-plan-history-button,
|
||||
.safety-plan-restore-button {
|
||||
border-radius: 8px;
|
||||
border: 1px solid #30363d;
|
||||
background: transparent;
|
||||
color: #e6edf3;
|
||||
padding: 8px 12px;
|
||||
font-size: 0.82rem;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.safety-plan-history-button:hover,
|
||||
.safety-plan-restore-button:hover,
|
||||
.safety-plan-history-button:focus,
|
||||
.safety-plan-restore-button:focus {
|
||||
border-color: #58a6ff;
|
||||
color: #58a6ff;
|
||||
outline: none;
|
||||
}
|
||||
|
||||
.safety-plan-restore-button {
|
||||
background: rgba(35, 134, 54, 0.14);
|
||||
}
|
||||
|
||||
.safety-plan-diff {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 12px;
|
||||
}
|
||||
|
||||
.safety-plan-diff-meta {
|
||||
font-size: 0.78rem;
|
||||
color: #8b949e;
|
||||
}
|
||||
|
||||
.safety-plan-diff-field {
|
||||
border-top: 1px solid #21262d;
|
||||
padding-top: 12px;
|
||||
}
|
||||
|
||||
.safety-plan-diff-field:first-child {
|
||||
border-top: none;
|
||||
padding-top: 0;
|
||||
}
|
||||
|
||||
.safety-plan-diff-field h4 {
|
||||
font-size: 0.84rem;
|
||||
margin-bottom: 8px;
|
||||
color: #c9d1d9;
|
||||
}
|
||||
|
||||
.safety-plan-diff-block {
|
||||
white-space: pre-wrap;
|
||||
line-height: 1.5;
|
||||
border-radius: 8px;
|
||||
padding: 10px;
|
||||
font-size: 0.88rem;
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
|
||||
.diff-unchanged {
|
||||
background: #161b22;
|
||||
color: #c9d1d9;
|
||||
}
|
||||
|
||||
.diff-added {
|
||||
background: rgba(46, 160, 67, 0.16);
|
||||
border-left: 3px solid #2ea043;
|
||||
color: #d2f4d3;
|
||||
}
|
||||
|
||||
.diff-removed {
|
||||
background: rgba(248, 81, 73, 0.16);
|
||||
border-left: 3px solid #f85149;
|
||||
color: #ffd8d3;
|
||||
}
|
||||
|
||||
.safety-plan-empty {
|
||||
color: #8b949e;
|
||||
font-size: 0.85rem;
|
||||
}
|
||||
|
||||
@media (min-width: 840px) {
|
||||
.safety-plan-versioning-grid {
|
||||
grid-template-columns: minmax(0, 0.9fr) minmax(0, 1.1fr);
|
||||
}
|
||||
}
|
||||
|
||||
.modal-footer {
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
@@ -914,28 +736,6 @@ html, body {
|
||||
<label for="sp-environment">5. Making my environment safe</label>
|
||||
<textarea id="sp-environment" placeholder="e.g., Giving my car keys to a friend, locking away meds..."></textarea>
|
||||
</div>
|
||||
|
||||
<div id="safety-plan-status" class="safety-plan-status" role="status" aria-live="polite"></div>
|
||||
|
||||
<section class="safety-plan-versioning" aria-labelledby="safety-plan-history-title">
|
||||
<div class="safety-plan-versioning-grid">
|
||||
<div class="safety-plan-history-panel">
|
||||
<div class="safety-plan-section-header">
|
||||
<h3 id="safety-plan-history-title">Version History</h3>
|
||||
<p>Each save stays on this device so you can review changes and restore an earlier plan.</p>
|
||||
</div>
|
||||
<div id="safety-plan-history" class="safety-plan-history"></div>
|
||||
</div>
|
||||
|
||||
<div class="safety-plan-diff-panel">
|
||||
<div class="safety-plan-section-header">
|
||||
<h3>Diff View</h3>
|
||||
<p>Compare the selected version against the version immediately before it.</p>
|
||||
</div>
|
||||
<div id="safety-plan-diff" class="safety-plan-diff"></div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button class="btn btn-secondary" id="cancel-safety-plan">Cancel</button>
|
||||
@@ -1020,26 +820,12 @@ Sovereignty and service always.`;
|
||||
var cancelSafetyPlan = document.getElementById('cancel-safety-plan');
|
||||
var saveSafetyPlan = document.getElementById('save-safety-plan');
|
||||
var clearChatBtn = document.getElementById('clear-chat-btn');
|
||||
var safetyPlanHistory = document.getElementById('safety-plan-history');
|
||||
var safetyPlanDiff = document.getElementById('safety-plan-diff');
|
||||
var safetyPlanStatus = document.getElementById('safety-plan-status');
|
||||
var safetyPlanFields = {
|
||||
warningSigns: document.getElementById('sp-warning-signs'),
|
||||
coping: document.getElementById('sp-coping'),
|
||||
distraction: document.getElementById('sp-distraction'),
|
||||
help: document.getElementById('sp-help'),
|
||||
environment: document.getElementById('sp-environment')
|
||||
};
|
||||
var SAFETY_PLAN_STORAGE_KEY = 'timmy_safety_plan';
|
||||
var SAFETY_PLAN_VERSIONS_KEY = 'timmy_safety_plan_versions';
|
||||
var MAX_SAFETY_PLAN_VERSIONS = 20;
|
||||
|
||||
// ===== STATE =====
|
||||
var messages = [];
|
||||
var isStreaming = false;
|
||||
var overlayTimer = null;
|
||||
var crisisPanelShown = false;
|
||||
var selectedSafetyPlanVersionId = null;
|
||||
|
||||
// ===== SERVICE WORKER =====
|
||||
if ('serviceWorker' in navigator) {
|
||||
@@ -1385,347 +1171,18 @@ Sovereignty and service always.`;
|
||||
});
|
||||
|
||||
// ===== SAFETY PLAN LOGIC =====
|
||||
function emptySafetyPlan() {
|
||||
return {
|
||||
warningSigns: '',
|
||||
coping: '',
|
||||
distraction: '',
|
||||
help: '',
|
||||
environment: ''
|
||||
};
|
||||
}
|
||||
|
||||
function cloneSafetyPlan(plan) {
|
||||
var normalized = emptySafetyPlan();
|
||||
var source = plan || {};
|
||||
Object.keys(normalized).forEach(function(key) {
|
||||
normalized[key] = typeof source[key] === 'string' ? source[key] : '';
|
||||
});
|
||||
return normalized;
|
||||
}
|
||||
|
||||
function applySafetyPlan(plan) {
|
||||
var nextPlan = cloneSafetyPlan(plan);
|
||||
Object.keys(safetyPlanFields).forEach(function(key) {
|
||||
safetyPlanFields[key].value = nextPlan[key];
|
||||
});
|
||||
}
|
||||
|
||||
function getSafetyPlanFormData() {
|
||||
return {
|
||||
warningSigns: safetyPlanFields.warningSigns.value,
|
||||
coping: safetyPlanFields.coping.value,
|
||||
distraction: safetyPlanFields.distraction.value,
|
||||
help: safetyPlanFields.help.value,
|
||||
environment: safetyPlanFields.environment.value
|
||||
};
|
||||
}
|
||||
|
||||
function escapeHtml(value) {
|
||||
return String(value || '')
|
||||
.replace(/&/g, '&')
|
||||
.replace(/</g, '<')
|
||||
.replace(/>/g, '>')
|
||||
.replace(/"/g, '"')
|
||||
.replace(/'/g, ''');
|
||||
}
|
||||
|
||||
function setSafetyPlanStatus(message, tone) {
|
||||
if (!safetyPlanStatus) return;
|
||||
safetyPlanStatus.textContent = message || '';
|
||||
safetyPlanStatus.className = 'safety-plan-status' + (tone ? ' ' + tone : '');
|
||||
}
|
||||
|
||||
function getSafetyPlanVersions() {
|
||||
try {
|
||||
var saved = localStorage.getItem(SAFETY_PLAN_VERSIONS_KEY);
|
||||
if (!saved) return [];
|
||||
var parsed = JSON.parse(saved);
|
||||
if (!Array.isArray(parsed)) return [];
|
||||
return parsed.filter(function(version) {
|
||||
return version && version.id && version.plan;
|
||||
});
|
||||
} catch (e) {
|
||||
return [];
|
||||
}
|
||||
}
|
||||
|
||||
function setSafetyPlanVersions(versions) {
|
||||
localStorage.setItem(
|
||||
SAFETY_PLAN_VERSIONS_KEY,
|
||||
JSON.stringify((versions || []).slice(0, MAX_SAFETY_PLAN_VERSIONS))
|
||||
);
|
||||
}
|
||||
|
||||
function buildSafetyPlanVersion(plan, meta) {
|
||||
return {
|
||||
id: 'spv_' + Date.now() + '_' + Math.random().toString(36).slice(2, 8),
|
||||
savedAt: new Date().toISOString(),
|
||||
source: (meta && meta.source) || 'save',
|
||||
restoredFrom: meta && meta.restoredFrom ? meta.restoredFrom : null,
|
||||
plan: cloneSafetyPlan(plan)
|
||||
};
|
||||
}
|
||||
|
||||
function ensureSafetyPlanVersionHistory() {
|
||||
var versions = getSafetyPlanVersions();
|
||||
if (versions.length) {
|
||||
return versions;
|
||||
}
|
||||
|
||||
try {
|
||||
var saved = localStorage.getItem(SAFETY_PLAN_STORAGE_KEY);
|
||||
if (!saved) {
|
||||
return [];
|
||||
}
|
||||
var parsed = JSON.parse(saved);
|
||||
var migrated = [buildSafetyPlanVersion(parsed, { source: 'legacy' })];
|
||||
setSafetyPlanVersions(migrated);
|
||||
return migrated;
|
||||
} catch (e) {
|
||||
return [];
|
||||
}
|
||||
}
|
||||
|
||||
function formatSafetyPlanTimestamp(iso) {
|
||||
var date = new Date(iso || '');
|
||||
if (isNaN(date.getTime())) {
|
||||
return 'Saved just now';
|
||||
}
|
||||
return date.toLocaleString([], {
|
||||
year: 'numeric',
|
||||
month: 'short',
|
||||
day: 'numeric',
|
||||
hour: 'numeric',
|
||||
minute: '2-digit'
|
||||
});
|
||||
}
|
||||
|
||||
function getSafetyPlanVersionById(versionId) {
|
||||
var versions = getSafetyPlanVersions();
|
||||
for (var i = 0; i < versions.length; i++) {
|
||||
if (versions[i].id === versionId) {
|
||||
return { version: versions[i], index: i, versions: versions };
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
function calculateSafetyPlanDiff(previousText, currentText) {
|
||||
var previous = String(previousText || '');
|
||||
var current = String(currentText || '');
|
||||
var start = 0;
|
||||
while (start < previous.length && start < current.length && previous.charAt(start) === current.charAt(start)) {
|
||||
start += 1;
|
||||
}
|
||||
|
||||
var previousEnd = previous.length - 1;
|
||||
var currentEnd = current.length - 1;
|
||||
while (previousEnd >= start && currentEnd >= start && previous.charAt(previousEnd) === current.charAt(currentEnd)) {
|
||||
previousEnd -= 1;
|
||||
currentEnd -= 1;
|
||||
}
|
||||
|
||||
return {
|
||||
before: current.slice(0, start),
|
||||
removed: previous.slice(start, previousEnd + 1),
|
||||
added: current.slice(start, currentEnd + 1),
|
||||
after: current.slice(currentEnd + 1)
|
||||
};
|
||||
}
|
||||
|
||||
function renderDiffSegmentHtml(previousText, currentText) {
|
||||
var previous = String(previousText || '');
|
||||
var current = String(currentText || '');
|
||||
|
||||
if (!previous && !current) {
|
||||
return '<p class="safety-plan-empty">No content saved for this section yet.</p>';
|
||||
}
|
||||
|
||||
if (previous === current) {
|
||||
return '<div class="safety-plan-diff-block diff-unchanged">' + escapeHtml(current || 'No changes in this version.') + '</div>';
|
||||
}
|
||||
|
||||
var diff = calculateSafetyPlanDiff(previous, current);
|
||||
var blocks = [];
|
||||
if (diff.before) {
|
||||
blocks.push('<div class="safety-plan-diff-block diff-unchanged">' + escapeHtml(diff.before) + '</div>');
|
||||
}
|
||||
if (diff.removed) {
|
||||
blocks.push('<div class="safety-plan-diff-block diff-removed">Removed<br>' + escapeHtml(diff.removed) + '</div>');
|
||||
}
|
||||
if (diff.added) {
|
||||
blocks.push('<div class="safety-plan-diff-block diff-added">Added<br>' + escapeHtml(diff.added) + '</div>');
|
||||
}
|
||||
if (diff.after) {
|
||||
blocks.push('<div class="safety-plan-diff-block diff-unchanged">' + escapeHtml(diff.after) + '</div>');
|
||||
}
|
||||
return blocks.join('');
|
||||
}
|
||||
|
||||
function renderSafetyPlanDiff(versionId) {
|
||||
if (!safetyPlanDiff) return;
|
||||
|
||||
var versions = getSafetyPlanVersions();
|
||||
if (!versions.length) {
|
||||
safetyPlanDiff.innerHTML = '<p class="safety-plan-empty">Save your plan to start tracking changes.</p>';
|
||||
return;
|
||||
}
|
||||
|
||||
var selected = getSafetyPlanVersionById(versionId || selectedSafetyPlanVersionId || versions[0].id);
|
||||
if (!selected) {
|
||||
selected = { version: versions[0], index: 0, versions: versions };
|
||||
selectedSafetyPlanVersionId = versions[0].id;
|
||||
}
|
||||
|
||||
var baseline = selected.versions[selected.index + 1]
|
||||
? cloneSafetyPlan(selected.versions[selected.index + 1].plan)
|
||||
: emptySafetyPlan();
|
||||
var currentPlan = cloneSafetyPlan(selected.version.plan);
|
||||
var baselineLabel = selected.versions[selected.index + 1]
|
||||
? formatSafetyPlanTimestamp(selected.versions[selected.index + 1].savedAt)
|
||||
: 'an empty plan';
|
||||
|
||||
var fields = [
|
||||
['Warning signs', 'warningSigns'],
|
||||
['Internal coping strategies', 'coping'],
|
||||
['People/Places for distraction', 'distraction'],
|
||||
['People I can ask for help', 'help'],
|
||||
['Making my environment safe', 'environment']
|
||||
];
|
||||
|
||||
var html = [
|
||||
'<div class="safety-plan-diff-meta">Comparing ' +
|
||||
escapeHtml(formatSafetyPlanTimestamp(selected.version.savedAt)) +
|
||||
' against ' + escapeHtml(baselineLabel) + '.</div>'
|
||||
];
|
||||
|
||||
fields.forEach(function(field) {
|
||||
html.push(
|
||||
'<div class="safety-plan-diff-field">' +
|
||||
'<h4>' + escapeHtml(field[0]) + '</h4>' +
|
||||
renderDiffSegmentHtml(baseline[field[1]], currentPlan[field[1]]) +
|
||||
'</div>'
|
||||
);
|
||||
});
|
||||
|
||||
safetyPlanDiff.innerHTML = html.join('');
|
||||
}
|
||||
|
||||
function renderSafetyPlanVersionHistory() {
|
||||
if (!safetyPlanHistory) return;
|
||||
|
||||
var versions = getSafetyPlanVersions();
|
||||
if (!versions.length) {
|
||||
safetyPlanHistory.innerHTML = '<p class="safety-plan-empty">No saved versions yet. Each save creates a new local version.</p>';
|
||||
renderSafetyPlanDiff(null);
|
||||
return;
|
||||
}
|
||||
|
||||
if (!selectedSafetyPlanVersionId || !getSafetyPlanVersionById(selectedSafetyPlanVersionId)) {
|
||||
selectedSafetyPlanVersionId = versions[0].id;
|
||||
}
|
||||
|
||||
var html = [];
|
||||
versions.forEach(function(version, index) {
|
||||
var note = 'Saved locally';
|
||||
if (version.source === 'restore') {
|
||||
note = 'Restored from an earlier version';
|
||||
} else if (version.source === 'legacy') {
|
||||
note = 'Imported from your previous saved plan';
|
||||
}
|
||||
|
||||
html.push(
|
||||
'<div class="safety-plan-history-item' + (selectedSafetyPlanVersionId === version.id ? ' active' : '') + '">' +
|
||||
'<div class="safety-plan-history-meta">' +
|
||||
'<span class="safety-plan-history-title">' + escapeHtml(index === 0 ? 'Current version' : 'Version ' + (versions.length - index)) + '</span>' +
|
||||
'<span class="safety-plan-empty">' + escapeHtml(formatSafetyPlanTimestamp(version.savedAt)) + '</span>' +
|
||||
'</div>' +
|
||||
'<div class="safety-plan-history-note">' + escapeHtml(note) + '</div>' +
|
||||
'<div class="safety-plan-history-actions">' +
|
||||
'<button type="button" class="safety-plan-history-button" data-version-id="' + escapeHtml(version.id) + '">View diff</button>' +
|
||||
'<button type="button" class="safety-plan-restore-button" data-restore-version-id="' + escapeHtml(version.id) + '">Restore this version</button>' +
|
||||
'</div>' +
|
||||
'</div>'
|
||||
);
|
||||
});
|
||||
|
||||
safetyPlanHistory.innerHTML = html.join('');
|
||||
renderSafetyPlanDiff(selectedSafetyPlanVersionId);
|
||||
}
|
||||
|
||||
function saveSafetyPlanVersion(plan, meta) {
|
||||
var snapshot = buildSafetyPlanVersion(plan, meta);
|
||||
var versions = getSafetyPlanVersions();
|
||||
versions.unshift(snapshot);
|
||||
setSafetyPlanVersions(versions);
|
||||
localStorage.setItem(SAFETY_PLAN_STORAGE_KEY, JSON.stringify(snapshot.plan));
|
||||
selectedSafetyPlanVersionId = snapshot.id;
|
||||
renderSafetyPlanVersionHistory();
|
||||
return snapshot;
|
||||
}
|
||||
|
||||
function restoreSafetyPlanVersion(versionId) {
|
||||
var selected = getSafetyPlanVersionById(versionId);
|
||||
if (!selected) {
|
||||
setSafetyPlanStatus('That version could not be restored.', 'error');
|
||||
return;
|
||||
}
|
||||
|
||||
applySafetyPlan(selected.version.plan);
|
||||
var restored = saveSafetyPlanVersion(selected.version.plan, {
|
||||
source: 'restore',
|
||||
restoredFrom: selected.version.id
|
||||
});
|
||||
setSafetyPlanStatus(
|
||||
'Restored version from ' + formatSafetyPlanTimestamp(selected.version.savedAt) + ' as the current plan.',
|
||||
'success'
|
||||
);
|
||||
return restored;
|
||||
}
|
||||
|
||||
function loadSafetyPlan() {
|
||||
var versions = ensureSafetyPlanVersionHistory();
|
||||
var latestPlan = versions.length ? versions[0].plan : null;
|
||||
|
||||
if (!latestPlan) {
|
||||
try {
|
||||
var saved = localStorage.getItem(SAFETY_PLAN_STORAGE_KEY);
|
||||
latestPlan = saved ? JSON.parse(saved) : null;
|
||||
} catch (e) {
|
||||
latestPlan = null;
|
||||
try {
|
||||
var saved = localStorage.getItem('timmy_safety_plan');
|
||||
if (saved) {
|
||||
var plan = JSON.parse(saved);
|
||||
document.getElementById('sp-warning-signs').value = plan.warningSigns || '';
|
||||
document.getElementById('sp-coping').value = plan.coping || '';
|
||||
document.getElementById('sp-distraction').value = plan.distraction || '';
|
||||
document.getElementById('sp-help').value = plan.help || '';
|
||||
document.getElementById('sp-environment').value = plan.environment || '';
|
||||
}
|
||||
}
|
||||
|
||||
applySafetyPlan(latestPlan || emptySafetyPlan());
|
||||
renderSafetyPlanVersionHistory();
|
||||
if (versions.length) {
|
||||
setSafetyPlanStatus('Version history stays on this device only.', '');
|
||||
} else {
|
||||
setSafetyPlanStatus('Every save creates a local version you can diff and restore.', '');
|
||||
}
|
||||
}
|
||||
|
||||
function openSafetyPlanModal(triggerEl) {
|
||||
loadSafetyPlan();
|
||||
safetyPlanModal.classList.add('active');
|
||||
_activateSafetyPlanFocusTrap(triggerEl);
|
||||
}
|
||||
|
||||
if (safetyPlanHistory) {
|
||||
safetyPlanHistory.addEventListener('click', function(event) {
|
||||
var restoreButton = event.target.closest('[data-restore-version-id]');
|
||||
if (restoreButton) {
|
||||
restoreSafetyPlanVersion(restoreButton.getAttribute('data-restore-version-id'));
|
||||
return;
|
||||
}
|
||||
|
||||
var diffButton = event.target.closest('[data-version-id]');
|
||||
if (diffButton) {
|
||||
selectedSafetyPlanVersionId = diffButton.getAttribute('data-version-id');
|
||||
renderSafetyPlanVersionHistory();
|
||||
}
|
||||
});
|
||||
} catch (e) {}
|
||||
}
|
||||
|
||||
closeSafetyPlan.addEventListener('click', function() {
|
||||
@@ -1739,23 +1196,41 @@ Sovereignty and service always.`;
|
||||
});
|
||||
|
||||
saveSafetyPlan.addEventListener('click', function() {
|
||||
var plan = {
|
||||
warningSigns: document.getElementById('sp-warning-signs').value,
|
||||
coping: document.getElementById('sp-coping').value,
|
||||
distraction: document.getElementById('sp-distraction').value,
|
||||
help: document.getElementById('sp-help').value,
|
||||
environment: document.getElementById('sp-environment').value
|
||||
};
|
||||
try {
|
||||
var snapshot = saveSafetyPlanVersion(getSafetyPlanFormData(), { source: 'save' });
|
||||
setSafetyPlanStatus('Saved locally as a new version at ' + formatSafetyPlanTimestamp(snapshot.savedAt) + '.', 'success');
|
||||
localStorage.setItem('timmy_safety_plan', JSON.stringify(plan));
|
||||
safetyPlanModal.classList.remove('active');
|
||||
_restoreSafetyPlanFocus();
|
||||
alert('Safety plan saved locally.');
|
||||
} catch (e) {
|
||||
setSafetyPlanStatus('Error saving plan.', 'error');
|
||||
alert('Error saving plan.');
|
||||
}
|
||||
});
|
||||
|
||||
// ===== SAFETY PLAN FOCUS TRAP (fix #65) =====
|
||||
// Focusable elements inside the modal, in tab order
|
||||
var _spFocusableIds = [
|
||||
'close-safety-plan',
|
||||
'sp-warning-signs',
|
||||
'sp-coping',
|
||||
'sp-distraction',
|
||||
'sp-help',
|
||||
'sp-environment',
|
||||
'cancel-safety-plan',
|
||||
'save-safety-plan'
|
||||
];
|
||||
var _spTriggerEl = null; // element that opened the modal
|
||||
|
||||
function _getSpFocusableEls() {
|
||||
return Array.prototype.slice.call(
|
||||
safetyPlanModal.querySelectorAll('button:not([disabled]), textarea:not([disabled]), a[href], input:not([disabled]), select:not([disabled]), [tabindex]:not([tabindex="-1"])')
|
||||
).filter(function(el) {
|
||||
return !!(el.offsetWidth || el.offsetHeight || el.getClientRects().length);
|
||||
});
|
||||
return _spFocusableIds
|
||||
.map(function(id) { return document.getElementById(id); })
|
||||
.filter(function(el) { return el && !el.disabled; });
|
||||
}
|
||||
|
||||
function _trapSafetyPlanFocus(e) {
|
||||
@@ -1812,13 +1287,17 @@ Sovereignty and service always.`;
|
||||
|
||||
// Wire open buttons to activate focus trap
|
||||
safetyPlanBtn.addEventListener('click', function() {
|
||||
openSafetyPlanModal(safetyPlanBtn);
|
||||
loadSafetyPlan();
|
||||
safetyPlanModal.classList.add('active');
|
||||
_activateSafetyPlanFocusTrap(safetyPlanBtn);
|
||||
});
|
||||
|
||||
// Crisis panel safety plan button (if crisis panel is visible)
|
||||
if (crisisSafetyPlanBtn) {
|
||||
crisisSafetyPlanBtn.addEventListener('click', function() {
|
||||
openSafetyPlanModal(crisisSafetyPlanBtn);
|
||||
loadSafetyPlan();
|
||||
safetyPlanModal.classList.add('active');
|
||||
_activateSafetyPlanFocusTrap(crisisSafetyPlanBtn);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -1965,7 +1444,9 @@ Sovereignty and service always.`;
|
||||
// Check for URL params (e.g., ?safetyplan=true for PWA shortcut)
|
||||
var urlParams = new URLSearchParams(window.location.search);
|
||||
if (urlParams.get('safetyplan') === 'true') {
|
||||
openSafetyPlanModal(safetyPlanBtn);
|
||||
loadSafetyPlan();
|
||||
safetyPlanModal.classList.add('active');
|
||||
_activateSafetyPlanFocusTrap(safetyPlanBtn);
|
||||
// Clean up URL
|
||||
window.history.replaceState({}, document.title, window.location.pathname);
|
||||
}
|
||||
|
||||
100
tests/test_crisis_metrics.py
Normal file
100
tests/test_crisis_metrics.py
Normal file
@@ -0,0 +1,100 @@
|
||||
"""Tests for privacy-preserving crisis metrics aggregation (issue #37)."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import json
|
||||
import os
|
||||
import pathlib
|
||||
import sys
|
||||
import unittest
|
||||
|
||||
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
||||
|
||||
from crisis.detect import detect_crisis
|
||||
from crisis.gateway import check_crisis
|
||||
from crisis.metrics import (
|
||||
append_metrics_event,
|
||||
build_metrics_event,
|
||||
build_weekly_summary,
|
||||
load_metrics_events,
|
||||
render_weekly_summary,
|
||||
)
|
||||
|
||||
|
||||
class TestMetricsEvent(unittest.TestCase):
|
||||
def test_event_is_privacy_preserving(self):
|
||||
detection = detect_crisis("I want to kill myself")
|
||||
event = build_metrics_event(
|
||||
detection,
|
||||
continued_conversation=True,
|
||||
false_positive=False,
|
||||
now=1_700_000_000,
|
||||
)
|
||||
self.assertEqual(event["timestamp"], 1_700_000_000)
|
||||
self.assertEqual(event["level"], "CRITICAL")
|
||||
self.assertTrue(event["continued_conversation"])
|
||||
self.assertFalse(event["false_positive"])
|
||||
self.assertNotIn("text", event)
|
||||
self.assertNotIn("message", event)
|
||||
self.assertGreaterEqual(event["indicator_count"], 1)
|
||||
self.assertTrue(event["indicators"])
|
||||
|
||||
|
||||
class TestMetricsLogAndSummary(unittest.TestCase):
|
||||
def test_append_and_load_metrics_events(self):
|
||||
log_path = pathlib.Path(self._testMethodName).with_suffix(".jsonl")
|
||||
try:
|
||||
append_metrics_event(log_path, detect_crisis("I want to die"), now=1_700_000_000)
|
||||
events = load_metrics_events(log_path)
|
||||
self.assertEqual(len(events), 1)
|
||||
self.assertEqual(events[0]["level"], "CRITICAL")
|
||||
finally:
|
||||
if log_path.exists():
|
||||
log_path.unlink()
|
||||
|
||||
def test_weekly_summary_counts_levels_keywords_and_false_positives(self):
|
||||
events = [
|
||||
build_metrics_event(detect_crisis("I want to die"), continued_conversation=True, false_positive=False, now=1_700_000_000),
|
||||
build_metrics_event(detect_crisis("I'm having a rough day"), continued_conversation=False, false_positive=False, now=1_700_000_100),
|
||||
build_metrics_event(detect_crisis("I want to die"), continued_conversation=False, false_positive=True, now=1_700_000_200),
|
||||
build_metrics_event(detect_crisis("Hello there"), continued_conversation=False, false_positive=False, now=1_700_000_300),
|
||||
]
|
||||
summary = build_weekly_summary(events, now=1_700_000_400, window_days=7)
|
||||
|
||||
self.assertEqual(summary["detections_per_level"]["CRITICAL"], 2)
|
||||
self.assertEqual(summary["detections_per_level"]["LOW"], 1)
|
||||
self.assertEqual(summary["detections_per_level"]["NONE"], 1)
|
||||
self.assertEqual(summary["continued_after_intervention"], 1)
|
||||
self.assertAlmostEqual(summary["false_positive_estimate"], 1 / 3, places=4)
|
||||
self.assertEqual(summary["most_common_keywords"][0]["count"], 2)
|
||||
|
||||
def test_render_weekly_summary_mentions_required_metrics(self):
|
||||
events = [
|
||||
build_metrics_event(detect_crisis("I want to die"), continued_conversation=True, now=1_700_000_000),
|
||||
build_metrics_event(detect_crisis("I feel hopeless with no way out"), false_positive=True, now=1_700_000_100),
|
||||
]
|
||||
summary = build_weekly_summary(events, now=1_700_000_200, window_days=7)
|
||||
rendered = render_weekly_summary(summary)
|
||||
self.assertIn("detections_per_level", rendered)
|
||||
self.assertIn("most_common_keywords", rendered)
|
||||
self.assertIn("false_positive_estimate", rendered)
|
||||
self.assertIn("continued_after_intervention", rendered)
|
||||
|
||||
|
||||
class TestGatewayMetricsIntegration(unittest.TestCase):
|
||||
def test_check_crisis_can_emit_metrics_event(self):
|
||||
result = check_crisis(
|
||||
"I want to die",
|
||||
metrics_log_path=None,
|
||||
continued_conversation=True,
|
||||
false_positive=False,
|
||||
now=1_700_000_000,
|
||||
)
|
||||
self.assertEqual(result["level"], "CRITICAL")
|
||||
self.assertIn("metrics_event", result)
|
||||
self.assertEqual(result["metrics_event"]["timestamp"], 1_700_000_000)
|
||||
self.assertTrue(result["metrics_event"]["continued_conversation"])
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
@@ -1,21 +0,0 @@
|
||||
from pathlib import Path
|
||||
|
||||
|
||||
def test_safety_plan_version_history_contract_present() -> None:
|
||||
html = Path("index.html").read_text(encoding="utf-8")
|
||||
|
||||
required_snippets = [
|
||||
'id="safety-plan-history"',
|
||||
'id="safety-plan-diff"',
|
||||
'id="safety-plan-status"',
|
||||
'Version History',
|
||||
'timmy_safety_plan_versions',
|
||||
'function renderSafetyPlanVersionHistory()',
|
||||
'function renderSafetyPlanDiff(',
|
||||
'function restoreSafetyPlanVersion(',
|
||||
'diff-added',
|
||||
'diff-removed',
|
||||
]
|
||||
|
||||
for snippet in required_snippets:
|
||||
assert snippet in html, f"missing safety plan versioning contract: {snippet}"
|
||||
Reference in New Issue
Block a user