opencode-dashboard-server 0.3.0__tar.gz → 0.4.0__tar.gz

{opencode_dashboard_server-0.3.0 → opencode_dashboard_server-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opencode-dashboard-server
-Version: 0.3.0
+Version: 0.4.0
 Summary: FastAPI aggregator over opencode's SQLite storage
 Project-URL: Homepage, https://github.com/GCS-ZHN/opencode-dashboard
 Project-URL: Repository, https://github.com/GCS-ZHN/opencode-dashboard

{opencode_dashboard_server-0.3.0 → opencode_dashboard_server-0.4.0}/aggregate.py

@@ -205,6 +205,17 @@ def project_detail(runner, project_id) -> tuple[dict, list[dict]] | None:
     return _project(rows[0]), [_session(r) for r in sessions]
 
 
+def _model_entry(d: dict) -> dict:
+    return {
+        "model": normalize_model(d["model_id"]),
+        "provider": d["provider"],
+        "mode": d["mode"],
+        "messageCount": int(d["message_count"] or 0),
+        "tokens": tokens(d),
+        "cost": round(float(d["cost"] or 0), 6),
+    }
+
+
 def session_detail(runner, session_id) -> tuple[dict, list[dict]] | None:
     rows = runner.query(SESSIONS_SQL + " WHERE id = ?", (session_id,))
     if not rows:
@@ -213,16 +224,36 @@ def session_detail(runner, session_id) -> tuple[dict, list[dict]] | None:
         MESSAGES_SQL + " AND session_id = ? GROUP BY model_id, provider, mode",
         (session_id,),
     )
-    models = []
-    for row in msg_rows:
-        d = dict(zip(_MSG_KEYS, row))
-        models.append({
-            "model": normalize_model(d["model_id"]),
-            "provider": d["provider"],
-            "mode": d["mode"],
-            "messageCount": int(d["message_count"] or 0),
-            "tokens": tokens(d),
-            "cost": round(float(d["cost"] or 0), 6),
-        })
+    models = [_model_entry(dict(zip(_MSG_KEYS, row))) for row in msg_rows]
     models.sort(key=lambda m: (-m["cost"], m["model"] or ""))
     return _session(rows[0]), models
+
+
+def models(runner) -> list[dict]:
+    """Whole-host per-model rollup from message.data (same shape as the
+    per-session model breakdown, but aggregated across all sessions).
+
+    Rows are grouped by (model_id, provider, mode) so provider/mode labels are
+    accurate, then merged by display name so prefixed/unprefixed ids (e.g.
+    deepseek/deepseek-v4-flash vs deepseek-v4-flash) don't create duplicate
+    slices. On merge, the higher-cost row keeps its provider/mode label.
+    """
+    msg_rows = runner.query_tsv(MESSAGES_SQL + " GROUP BY model_id, provider, mode")
+    merged: dict[str, dict] = {}
+    for row in msg_rows:
+        e = _model_entry(dict(zip(_MSG_KEYS, row)))
+        key = e["model"] or ""
+        cur = merged.get(key)
+        if cur is None:
+            merged[key] = e
+        else:
+            if e["cost"] > cur["cost"]:
+                cur["provider"] = e["provider"]
+                cur["mode"] = e["mode"]
+            cur["messageCount"] += e["messageCount"]
+            for k in ("input", "output", "reasoning", "cacheRead", "cacheWrite", "total"):
+                cur["tokens"][k] += e["tokens"][k]
+            cur["cost"] = round(cur["cost"] + e["cost"], 6)
+    ms = list(merged.values())
+    ms.sort(key=lambda m: (-m["cost"], m["model"] or ""))
+    return ms

{opencode_dashboard_server-0.3.0 → opencode_dashboard_server-0.4.0}/app.py

@@ -89,6 +89,10 @@ def create_app(runner=None, cors_origins=None, poll_seconds=None, opencode_bin=N
     def projects():
         return handle(lambda: aggregate.projects(runner))
 
+    @app.get("/models")
+    def models():
+        return handle(lambda: aggregate.models(runner))
+
     @app.get("/projects/{project_id}")
     def project(project_id: str):
         def run():

{opencode_dashboard_server-0.3.0 → opencode_dashboard_server-0.4.0}/opencode_dashboard_server.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opencode-dashboard-server
-Version: 0.3.0
+Version: 0.4.0
 Summary: FastAPI aggregator over opencode's SQLite storage
 Project-URL: Homepage, https://github.com/GCS-ZHN/opencode-dashboard
 Project-URL: Repository, https://github.com/GCS-ZHN/opencode-dashboard

{opencode_dashboard_server-0.3.0 → opencode_dashboard_server-0.4.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "opencode-dashboard-server"
-version = "0.3.0"
+version = "0.4.0"
 description = "FastAPI aggregator over opencode's SQLite storage"
 readme = "README.md"
 requires-python = ">=3.10"

{opencode_dashboard_server-0.3.0 → opencode_dashboard_server-0.4.0}/tests/test_aggregate.py

@@ -1,6 +1,7 @@
 """Assert-based tests for the aggregation logic, driven via SqliteRunner."""
 
 from aggregate import (
+    models,
     normalize_model,
     overview,
     project_detail,
@@ -74,7 +75,10 @@ def test_project_detail_flat_sessions(runner):
 def test_session_detail_model_breakdown(runner):
     sess, models = session_detail(runner, "s4")
     assert sess["cost"] == 0.9
-    assert [m["model"] for m in models] == ["deepseek-v4-flash", "claude-sonnet-4.5"]
+    # per-session breakdown keeps (model, provider, mode) granularity, so the
+    # deepseek/build + openrouter/plan pair for the same model id stays split
+    assert [m["model"] for m in models] == ["deepseek-v4-flash", "claude-sonnet-4.5", "deepseek-v4-flash"]
+    assert [m["provider"] for m in models] == ["deepseek", "opencode", "openrouter"]
     flash = models[0]
     assert flash["provider"] == "deepseek"
     assert flash["mode"] == "build"
@@ -87,6 +91,13 @@ def test_session_detail_model_breakdown(runner):
     assert claude["tokens"] == {"input": 200, "output": 100, "reasoning": 50,
                                 "cacheRead": 0, "cacheWrite": 0, "total": 350}
     assert claude["cost"] == 0.3
+    flash2 = models[2]
+    assert flash2["provider"] == "openrouter"
+    assert flash2["mode"] == "plan"
+    assert flash2["messageCount"] == 1
+    assert flash2["tokens"] == {"input": 50, "output": 20, "reasoning": 10,
+                                "cacheRead": 5, "cacheWrite": 2, "total": 87}
+    assert flash2["cost"] == 0.1
 
 
 def test_zero_token_session_is_zeros_not_null(runner):
@@ -114,3 +125,27 @@ def test_normalize_model():
 def test_unknown_ids_return_none(runner):
     assert project_detail(runner, "nope") is None
     assert session_detail(runner, "nope") is None
+
+
+def test_models_hostwide_rollup(runner):
+    ms = models(runner)
+    # ordered by cost desc (tie by model name); user message in m5 excluded
+    assert [m["model"] for m in ms] == ["deepseek-v4-flash", "claude-sonnet-4.5", "kimi-k3"]
+    flash = ms[0]
+    # m1+m2 (deepseek/build) and m6 (openrouter/plan) share a model id; the
+    # host-wide rollup merges them into one entry, keeping the higher-cost label
+    assert flash["provider"] == "deepseek"
+    assert flash["mode"] == "build"
+    assert flash["messageCount"] == 3  # m1 + m2 + m6, not the m5 user message
+    assert flash["tokens"] == {"input": 250, "output": 120, "reasoning": 60,
+                               "cacheRead": 25, "cacheWrite": 12, "total": 467}
+    assert flash["cost"] == 0.7
+    claude = ms[1]
+    assert claude["provider"] == "opencode"
+    assert claude["messageCount"] == 1
+    assert claude["tokens"]["total"] == 350
+    assert claude["cost"] == 0.3
+    kimi = ms[2]
+    assert kimi["messageCount"] == 1  # only m4; the m5 user message is excluded
+    assert kimi["tokens"] == ZERO_TOKENS
+    assert kimi["cost"] == 0.0

{opencode_dashboard_server-0.3.0 → opencode_dashboard_server-0.4.0}/tests/test_app.py

@@ -39,6 +39,16 @@ def test_overview_keys():
             "tokens", "cost", "updatedAt"} <= set(r.json())
 
 
+def test_models_keys():
+    c, _ = make_client()
+    r = c.get("/models")
+    assert r.status_code == 200
+    rows = r.json()
+    assert rows  # fixture seeds assistant token-bearing messages
+    assert {"model", "provider", "mode", "messageCount", "tokens", "cost"} <= set(rows[0])
+    assert rows == sorted(rows, key=lambda m: (-m["cost"], m["model"] or ""))
+
+
 def test_foreign_origin_not_allowed_by_cors():
     c, _ = make_client()
     r = c.options("/projects", headers={