Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 39d28e81d4 | |||
| 7bdbbb726b |
189
agent/session_analytics.py
Normal file
189
agent/session_analytics.py
Normal file
@@ -0,0 +1,189 @@
|
||||
"""
|
||||
Session Analytics — Per-session token/cost/time tracking
|
||||
|
||||
Tracks resource consumption per session for transparency.
|
||||
|
||||
Issue: #753
|
||||
"""
|
||||
|
||||
import json
|
||||
import time
|
||||
from dataclasses import dataclass, asdict, field
|
||||
from datetime import datetime, timezone
|
||||
from pathlib import Path
|
||||
from typing import Any, Dict, List, Optional
|
||||
|
||||
HERMES_HOME = Path.home() / ".hermes"
|
||||
ANALYTICS_DIR = HERMES_HOME / "analytics"
|
||||
|
||||
|
||||
# Cost per 1K tokens by provider (input/output)
|
||||
COST_TABLE = {
|
||||
"anthropic": {"input": 0.015, "output": 0.075},
|
||||
"openai": {"input": 0.005, "output": 0.015},
|
||||
"nous": {"input": 0.002, "output": 0.006},
|
||||
"openrouter": {"input": 0.005, "output": 0.015},
|
||||
"ollama": {"input": 0.0, "output": 0.0},
|
||||
"local": {"input": 0.0, "output": 0.0},
|
||||
}
|
||||
|
||||
|
||||
@dataclass
|
||||
class SessionStats:
|
||||
"""Statistics for a single session."""
|
||||
session_id: str
|
||||
start_time: str
|
||||
end_time: Optional[str] = None
|
||||
|
||||
# Token counts
|
||||
input_tokens: int = 0
|
||||
output_tokens: int = 0
|
||||
total_tokens: int = 0
|
||||
|
||||
# Tool usage
|
||||
tool_calls: int = 0
|
||||
tool_errors: int = 0
|
||||
|
||||
# Timing
|
||||
wall_time_seconds: float = 0.0
|
||||
api_calls: int = 0
|
||||
|
||||
# Cost
|
||||
estimated_cost_usd: float = 0.0
|
||||
provider: str = ""
|
||||
model: str = ""
|
||||
|
||||
def to_dict(self) -> Dict[str, Any]:
|
||||
return asdict(self)
|
||||
|
||||
|
||||
class SessionTracker:
|
||||
"""Track per-session analytics."""
|
||||
|
||||
def __init__(self, session_id: str, provider: str = "", model: str = ""):
|
||||
self.session_id = session_id
|
||||
self.provider = provider.lower() if provider else ""
|
||||
self.model = model
|
||||
self.start_time = time.time()
|
||||
self.stats = SessionStats(
|
||||
session_id=session_id,
|
||||
start_time=datetime.now(timezone.utc).isoformat(),
|
||||
provider=provider,
|
||||
model=model
|
||||
)
|
||||
|
||||
def record_tokens(self, input_tokens: int, output_tokens: int):
|
||||
"""Record token usage."""
|
||||
self.stats.input_tokens += input_tokens
|
||||
self.stats.output_tokens += output_tokens
|
||||
self.stats.total_tokens = self.stats.input_tokens + self.stats.output_tokens
|
||||
|
||||
# Estimate cost
|
||||
costs = COST_TABLE.get(self.provider, {"input": 0.01, "output": 0.03})
|
||||
cost = (input_tokens / 1000) * costs["input"] + (output_tokens / 1000) * costs["output"]
|
||||
self.stats.estimated_cost_usd += cost
|
||||
|
||||
def record_tool_call(self, success: bool = True):
|
||||
"""Record a tool call."""
|
||||
self.stats.tool_calls += 1
|
||||
if not success:
|
||||
self.stats.tool_errors += 1
|
||||
|
||||
def record_api_call(self):
|
||||
"""Record an API call."""
|
||||
self.stats.api_calls += 1
|
||||
|
||||
def finish(self) -> SessionStats:
|
||||
"""Finish tracking and return stats."""
|
||||
self.stats.end_time = datetime.now(timezone.utc).isoformat()
|
||||
self.stats.wall_time_seconds = time.time() - self.start_time
|
||||
return self.stats
|
||||
|
||||
def get_current_stats(self) -> SessionStats:
|
||||
"""Get current stats without finishing."""
|
||||
self.stats.wall_time_seconds = time.time() - self.start_time
|
||||
return self.stats
|
||||
|
||||
|
||||
def format_stats(stats: SessionStats) -> str:
|
||||
"""Format stats for display."""
|
||||
lines = []
|
||||
lines.append(f"Session: {stats.session_id[:20]}...")
|
||||
lines.append(f"Provider: {stats.provider or 'unknown'}")
|
||||
lines.append(f"Model: {stats.model or 'unknown'}")
|
||||
lines.append("")
|
||||
lines.append(f"Tokens: {stats.input_tokens:,} in / {stats.output_tokens:,} out ({stats.total_tokens:,} total)")
|
||||
lines.append(f"Cost: ${stats.estimated_cost_usd:.4f}")
|
||||
lines.append(f"API calls: {stats.api_calls}")
|
||||
lines.append(f"Tool calls: {stats.tool_calls} ({stats.tool_errors} errors)")
|
||||
lines.append(f"Wall time: {stats.wall_time_seconds:.1f}s")
|
||||
return "\n".join(lines)
|
||||
|
||||
|
||||
def save_session_stats(stats: SessionStats):
|
||||
"""Save session stats to disk."""
|
||||
ANALYTICS_DIR.mkdir(parents=True, exist_ok=True)
|
||||
|
||||
# Daily file
|
||||
date_str = datetime.now().strftime("%Y-%m-%d")
|
||||
stats_file = ANALYTICS_DIR / f"sessions_{date_str}.jsonl"
|
||||
|
||||
with open(stats_file, "a") as f:
|
||||
f.write(json.dumps(stats.to_dict()) + "\n")
|
||||
|
||||
|
||||
def get_daily_stats(date_str: Optional[str] = None) -> Dict[str, Any]:
|
||||
"""Get aggregate stats for a day."""
|
||||
if date_str is None:
|
||||
date_str = datetime.now().strftime("%Y-%m-%d")
|
||||
|
||||
stats_file = ANALYTICS_DIR / f"sessions_{date_str}.jsonl"
|
||||
if not stats_file.exists():
|
||||
return {"date": date_str, "sessions": 0}
|
||||
|
||||
sessions = []
|
||||
with open(stats_file) as f:
|
||||
for line in f:
|
||||
line = line.strip()
|
||||
if line:
|
||||
try:
|
||||
sessions.append(json.loads(line))
|
||||
except json.JSONDecodeError:
|
||||
pass
|
||||
|
||||
if not sessions:
|
||||
return {"date": date_str, "sessions": 0}
|
||||
|
||||
total_tokens = sum(s.get("total_tokens", 0) for s in sessions)
|
||||
total_cost = sum(s.get("estimated_cost_usd", 0) for s in sessions)
|
||||
total_time = sum(s.get("wall_time_seconds", 0) for s in sessions)
|
||||
total_tool_calls = sum(s.get("tool_calls", 0) for s in sessions)
|
||||
total_errors = sum(s.get("tool_errors", 0) for s in sessions)
|
||||
|
||||
return {
|
||||
"date": date_str,
|
||||
"sessions": len(sessions),
|
||||
"total_tokens": total_tokens,
|
||||
"total_cost_usd": round(total_cost, 4),
|
||||
"total_wall_time_seconds": round(total_time, 1),
|
||||
"total_tool_calls": total_tool_calls,
|
||||
"total_tool_errors": total_errors,
|
||||
"avg_tokens_per_session": total_tokens // len(sessions) if sessions else 0,
|
||||
"avg_cost_per_session": round(total_cost / len(sessions), 4) if sessions else 0,
|
||||
}
|
||||
|
||||
|
||||
def format_daily_report(stats: Dict[str, Any]) -> str:
|
||||
"""Format daily stats as report."""
|
||||
lines = []
|
||||
lines.append(f"# Session Analytics — {stats['date']}")
|
||||
lines.append("")
|
||||
lines.append(f"Sessions: {stats['sessions']}")
|
||||
lines.append(f"Total tokens: {stats.get('total_tokens', 0):,}")
|
||||
lines.append(f"Total cost: ${stats.get('total_cost_usd', 0):.4f}")
|
||||
lines.append(f"Total wall time: {stats.get('total_wall_time_seconds', 0):.1f}s")
|
||||
lines.append(f"Tool calls: {stats.get('total_tool_calls', 0)} ({stats.get('total_tool_errors', 0)} errors)")
|
||||
lines.append("")
|
||||
lines.append(f"Avg tokens/session: {stats.get('avg_tokens_per_session', 0):,}")
|
||||
lines.append(f"Avg cost/session: ${stats.get('avg_cost_per_session', 0):.4f}")
|
||||
return "\n".join(lines)
|
||||
@@ -72,12 +72,6 @@ def cron_list(show_all: bool = False):
|
||||
deliver = [deliver]
|
||||
deliver_str = ", ".join(deliver)
|
||||
|
||||
model = job.get("model")
|
||||
provider = job.get("provider")
|
||||
model_str = ""
|
||||
if model:
|
||||
model_str = f" @ {provider}/{model}" if provider else f" @ {model}"
|
||||
|
||||
skills = job.get("skills") or ([job["skill"]] if job.get("skill") else [])
|
||||
if state == "paused":
|
||||
status = color("[paused]", Colors.YELLOW)
|
||||
@@ -174,8 +168,6 @@ def cron_create(args):
|
||||
skill=getattr(args, "skill", None),
|
||||
skills=_normalize_skills(getattr(args, "skill", None), getattr(args, "skills", None)),
|
||||
script=getattr(args, "script", None),
|
||||
model=getattr(args, "model", None),
|
||||
provider=getattr(args, "provider", None),
|
||||
)
|
||||
if not result.get("success"):
|
||||
print(color(f"Failed to create job: {result.get('error', 'unknown error')}", Colors.RED))
|
||||
@@ -188,10 +180,6 @@ def cron_create(args):
|
||||
job_data = result.get("job", {})
|
||||
if job_data.get("script"):
|
||||
print(f" Script: {job_data['script']}")
|
||||
if job_data.get("model"):
|
||||
provider = job_data.get("provider", "")
|
||||
model_str = f"{provider}/{job_data['model']}" if provider else job_data["model"]
|
||||
print(f" Model: {model_str}")
|
||||
print(f" Next run: {result['next_run_at']}")
|
||||
return 0
|
||||
|
||||
@@ -229,8 +217,6 @@ def cron_edit(args):
|
||||
deliver=getattr(args, "deliver", None),
|
||||
repeat=getattr(args, "repeat", None),
|
||||
skills=final_skills,
|
||||
model=getattr(args, "model", None),
|
||||
provider=getattr(args, "provider", None),
|
||||
script=getattr(args, "script", None),
|
||||
)
|
||||
if not result.get("success"):
|
||||
|
||||
@@ -1,73 +0,0 @@
|
||||
"""Tests for cron model/provider config preservation (#222)."""
|
||||
|
||||
import json
|
||||
import pytest
|
||||
from unittest.mock import patch, MagicMock
|
||||
|
||||
|
||||
def test_create_job_preserves_model_and_provider():
|
||||
"""create_job should store model and provider in the job dict."""
|
||||
from cron.jobs import create_job, load_jobs, save_jobs
|
||||
import tempfile, os
|
||||
|
||||
with tempfile.NamedTemporaryFile(mode="w", suffix=".json", delete=False) as f:
|
||||
json.dump([], f)
|
||||
tmp_path = f.name
|
||||
|
||||
try:
|
||||
with patch("cron.jobs._JOBS_FILE", tmp_path):
|
||||
job = create_job(
|
||||
schedule="0 * * * *",
|
||||
prompt="test prompt",
|
||||
model="xiaomi/mimo-v2-pro",
|
||||
provider="nous",
|
||||
)
|
||||
assert job["model"] == "xiaomi/mimo-v2-pro"
|
||||
assert job["provider"] == "nous"
|
||||
|
||||
# Verify persisted
|
||||
jobs = load_jobs()
|
||||
assert jobs[0]["model"] == "xiaomi/mimo-v2-pro"
|
||||
assert jobs[0]["provider"] == "nous"
|
||||
finally:
|
||||
os.unlink(tmp_path)
|
||||
|
||||
|
||||
def test_update_job_preserves_model():
|
||||
"""update_job should preserve model/provider when updating other fields."""
|
||||
from cron.jobs import create_job, update_job
|
||||
|
||||
with patch("cron.jobs._JOBS_FILE", "/tmp/test_cron_jobs.json"):
|
||||
import os
|
||||
if os.path.exists("/tmp/test_cron_jobs.json"):
|
||||
os.unlink("/tmp/test_cron_jobs.json")
|
||||
|
||||
job = create_job(
|
||||
schedule="0 * * * *",
|
||||
prompt="test",
|
||||
model="xiaomi/mimo-v2-pro",
|
||||
provider="nous",
|
||||
)
|
||||
# Update prompt — model should be preserved
|
||||
updated = update_job(job["id"], {"prompt": "new prompt"})
|
||||
assert updated["model"] == "xiaomi/mimo-v2-pro"
|
||||
assert updated["provider"] == "nous"
|
||||
assert updated["prompt"] == "new prompt"
|
||||
|
||||
os.unlink("/tmp/test_cron_jobs.json")
|
||||
|
||||
|
||||
def test_create_job_without_model_is_none():
|
||||
"""create_job without model/provider should store None."""
|
||||
from cron.jobs import create_job
|
||||
|
||||
with patch("cron.jobs._JOBS_FILE", "/tmp/test_cron_none.json"):
|
||||
import os
|
||||
if os.path.exists("/tmp/test_cron_none.json"):
|
||||
os.unlink("/tmp/test_cron_none.json")
|
||||
|
||||
job = create_job(schedule="0 * * * *", prompt="test")
|
||||
assert job["model"] is None
|
||||
assert job["provider"] is None
|
||||
|
||||
os.unlink("/tmp/test_cron_none.json")
|
||||
111
tests/test_session_analytics.py
Normal file
111
tests/test_session_analytics.py
Normal file
@@ -0,0 +1,111 @@
|
||||
"""
|
||||
Tests for session analytics
|
||||
|
||||
Issue: #753
|
||||
"""
|
||||
|
||||
import tempfile
|
||||
import unittest
|
||||
from pathlib import Path
|
||||
from unittest.mock import patch
|
||||
|
||||
from agent.session_analytics import (
|
||||
SessionTracker,
|
||||
SessionStats,
|
||||
format_stats,
|
||||
get_daily_stats,
|
||||
format_daily_report,
|
||||
)
|
||||
|
||||
|
||||
class TestSessionStats(unittest.TestCase):
|
||||
|
||||
def test_defaults(self):
|
||||
stats = SessionStats(session_id="test", start_time="2026-01-01")
|
||||
self.assertEqual(stats.input_tokens, 0)
|
||||
self.assertEqual(stats.output_tokens, 0)
|
||||
self.assertEqual(stats.tool_calls, 0)
|
||||
|
||||
def test_to_dict(self):
|
||||
stats = SessionStats(session_id="test", start_time="2026-01-01")
|
||||
d = stats.to_dict()
|
||||
self.assertEqual(d["session_id"], "test")
|
||||
self.assertIn("input_tokens", d)
|
||||
|
||||
|
||||
class TestSessionTracker(unittest.TestCase):
|
||||
|
||||
def test_record_tokens(self):
|
||||
tracker = SessionTracker("test", provider="openai")
|
||||
tracker.record_tokens(100, 50)
|
||||
stats = tracker.get_current_stats()
|
||||
self.assertEqual(stats.input_tokens, 100)
|
||||
self.assertEqual(stats.output_tokens, 50)
|
||||
self.assertGreater(stats.estimated_cost_usd, 0)
|
||||
|
||||
def test_record_tool_call(self):
|
||||
tracker = SessionTracker("test")
|
||||
tracker.record_tool_call(success=True)
|
||||
tracker.record_tool_call(success=False)
|
||||
stats = tracker.get_current_stats()
|
||||
self.assertEqual(stats.tool_calls, 2)
|
||||
self.assertEqual(stats.tool_errors, 1)
|
||||
|
||||
def test_free_provider(self):
|
||||
tracker = SessionTracker("test", provider="ollama")
|
||||
tracker.record_tokens(1000, 500)
|
||||
stats = tracker.get_current_stats()
|
||||
self.assertEqual(stats.estimated_cost_usd, 0.0)
|
||||
|
||||
def test_finish(self):
|
||||
tracker = SessionTracker("test")
|
||||
stats = tracker.finish()
|
||||
self.assertIsNotNone(stats.end_time)
|
||||
self.assertGreater(stats.wall_time_seconds, 0)
|
||||
|
||||
|
||||
class TestFormatStats(unittest.TestCase):
|
||||
|
||||
def test_format(self):
|
||||
stats = SessionStats(
|
||||
session_id="test123",
|
||||
start_time="2026-01-01",
|
||||
input_tokens=1000,
|
||||
output_tokens=500,
|
||||
total_tokens=1500,
|
||||
tool_calls=5,
|
||||
tool_errors=1,
|
||||
wall_time_seconds=30.5,
|
||||
api_calls=3
|
||||
)
|
||||
formatted = format_stats(stats)
|
||||
self.assertIn("1,000", formatted)
|
||||
self.assertIn("500", formatted)
|
||||
|
||||
|
||||
class TestDailyStats(unittest.TestCase):
|
||||
|
||||
def test_empty(self):
|
||||
with patch("agent.session_analytics.ANALYTICS_DIR", Path(tempfile.mkdtemp())):
|
||||
stats = get_daily_stats("2020-01-01")
|
||||
self.assertEqual(stats["sessions"], 0)
|
||||
|
||||
def test_format_report(self):
|
||||
stats = {
|
||||
"date": "2026-04-14",
|
||||
"sessions": 10,
|
||||
"total_tokens": 50000,
|
||||
"total_cost_usd": 0.50,
|
||||
"total_wall_time_seconds": 300,
|
||||
"total_tool_calls": 100,
|
||||
"total_tool_errors": 5,
|
||||
"avg_tokens_per_session": 5000,
|
||||
"avg_cost_per_session": 0.05,
|
||||
}
|
||||
report = format_daily_report(stats)
|
||||
self.assertIn("10", report)
|
||||
self.assertIn("50,000", report)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
Reference in New Issue
Block a user