mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-07-25 17:18:11 +00:00
c1b0f6f3c1
Adds the missing write path for the per-task model_override column (which was previously only settable via manual SQL) and pairs it with a provider_override so cross-provider switches resolve correctly: - kanban_db: provider_override column (+migration), set_model_override() with model_override_set event, create_task(model_override=, provider_override=), dispatcher spawns worker with -m <model> [--provider <name>] - dashboard: Model row in the task drawer — dropdown fed by a new /model-options endpoint (build_models_payload substrate, provider-grouped, free-text fallback), PATCH + bulk model override support - CLI: kanban create --model/--provider, new kanban set-model subcommand, show prints the provider - agent tools: kanban_create accepts model/provider; show/list expose provider_override Rate-limit recovery flow: override is settable on running tasks and takes effect on the next dispatch, without touching the worker profile's config.
292 lines
9.7 KiB
Python
292 lines
9.7 KiB
Python
"""Per-task model/provider override — DB layer, worker spawn, dashboard API.
|
|
|
|
Covers the model-dropdown feature: kanban_db.set_model_override(),
|
|
create_task(model_override=..., provider_override=...), the dispatcher
|
|
passing ``-m <model> --provider <name>`` to the worker, and the dashboard
|
|
PATCH/bulk/model-options surfaces.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import importlib.util
|
|
import subprocess
|
|
import sys
|
|
from pathlib import Path
|
|
|
|
import pytest
|
|
from fastapi import FastAPI
|
|
from fastapi.testclient import TestClient
|
|
|
|
from hermes_cli import kanban_db as kb
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Fixtures
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
@pytest.fixture
|
|
def kanban_home(tmp_path, monkeypatch):
|
|
home = tmp_path / ".hermes"
|
|
home.mkdir()
|
|
monkeypatch.setenv("HERMES_HOME", str(home))
|
|
monkeypatch.setattr(Path, "home", lambda: tmp_path)
|
|
kb.init_db()
|
|
return home
|
|
|
|
|
|
@pytest.fixture
|
|
def conn(kanban_home):
|
|
c = kb.connect()
|
|
yield c
|
|
c.close()
|
|
|
|
|
|
def _load_plugin_router():
|
|
repo_root = Path(__file__).resolve().parents[2]
|
|
plugin_file = repo_root / "plugins" / "kanban" / "dashboard" / "plugin_api.py"
|
|
assert plugin_file.exists(), f"plugin file missing: {plugin_file}"
|
|
spec = importlib.util.spec_from_file_location(
|
|
"hermes_dashboard_plugin_kanban_model_override_test", plugin_file,
|
|
)
|
|
assert spec is not None and spec.loader is not None
|
|
mod = importlib.util.module_from_spec(spec)
|
|
sys.modules[spec.name] = mod
|
|
spec.loader.exec_module(mod)
|
|
return mod.router
|
|
|
|
|
|
@pytest.fixture
|
|
def client(kanban_home):
|
|
app = FastAPI()
|
|
app.include_router(_load_plugin_router(), prefix="/api/plugins/kanban")
|
|
return TestClient(app)
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# DB layer — set_model_override
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
def test_set_and_clear_model_override(conn):
|
|
tid = kb.create_task(conn, title="t", assignee="worker")
|
|
assert kb.set_model_override(conn, tid, "gpt-5.6-sol", provider="openai")
|
|
t = kb.get_task(conn, tid)
|
|
assert t.model_override == "gpt-5.6-sol"
|
|
assert t.provider_override == "openai"
|
|
|
|
# Clearing the model clears the provider too.
|
|
assert kb.set_model_override(conn, tid, None)
|
|
t = kb.get_task(conn, tid)
|
|
assert t.model_override is None
|
|
assert t.provider_override is None
|
|
|
|
|
|
def test_set_model_override_events(conn):
|
|
tid = kb.create_task(conn, title="t", assignee="worker")
|
|
kb.set_model_override(conn, tid, "sonnet-x", provider="anthropic")
|
|
events = kb.list_events(conn, tid)
|
|
kinds = [e.kind for e in events]
|
|
assert "model_override_set" in kinds
|
|
ev = next(e for e in events if e.kind == "model_override_set")
|
|
assert ev.payload["model"] == "sonnet-x"
|
|
assert ev.payload["provider"] == "anthropic"
|
|
|
|
|
|
def test_provider_without_model_rejected(conn):
|
|
tid = kb.create_task(conn, title="t", assignee="worker")
|
|
with pytest.raises(ValueError):
|
|
kb.set_model_override(conn, tid, None, provider="openrouter")
|
|
with pytest.raises(ValueError):
|
|
kb.create_task(
|
|
conn, title="t2", assignee="worker", provider_override="openrouter",
|
|
)
|
|
|
|
|
|
def test_set_model_override_unknown_task(conn):
|
|
assert kb.set_model_override(conn, "t_nope", "some-model") is False
|
|
|
|
|
|
def test_set_model_override_archived_task_rejected(conn):
|
|
tid = kb.create_task(conn, title="t", assignee="worker")
|
|
assert kb.archive_task(conn, tid)
|
|
with pytest.raises(RuntimeError):
|
|
kb.set_model_override(conn, tid, "some-model")
|
|
|
|
|
|
def test_set_model_override_allowed_on_running(conn):
|
|
"""The rate-limit recovery flow: override a running task so the NEXT
|
|
dispatch (after reclaim/retry) picks up the new model."""
|
|
tid = kb.create_task(conn, title="t", assignee="worker")
|
|
claimed = kb.claim_task(conn, tid, claimer="worker")
|
|
assert claimed is not None
|
|
assert kb.set_model_override(conn, tid, "fallback-model", provider="nous")
|
|
t = kb.get_task(conn, tid)
|
|
assert t.status == "running"
|
|
assert t.model_override == "fallback-model"
|
|
assert t.provider_override == "nous"
|
|
|
|
|
|
def test_create_task_with_model_and_provider(conn):
|
|
tid = kb.create_task(
|
|
conn, title="t", assignee="worker",
|
|
model_override="qwen-max", provider_override="openrouter",
|
|
)
|
|
t = kb.get_task(conn, tid)
|
|
assert t.model_override == "qwen-max"
|
|
assert t.provider_override == "openrouter"
|
|
# Creation event carries the override for auditability.
|
|
ev = next(e for e in kb.list_events(conn, tid) if e.kind == "created")
|
|
assert ev.payload["model_override"] == "qwen-max"
|
|
assert ev.payload["provider_override"] == "openrouter"
|
|
|
|
|
|
def test_migration_adds_provider_override_column(conn):
|
|
cols = {row["name"] for row in conn.execute("PRAGMA table_info(tasks)")}
|
|
assert "model_override" in cols
|
|
assert "provider_override" in cols
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Worker spawn — argv carries -m and --provider
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
def _spawn_and_capture(monkeypatch, tmp_path, task):
|
|
monkeypatch.setattr(kb, "_resolve_hermes_argv", lambda: ["hermes"])
|
|
captured = {}
|
|
|
|
class FakeProc:
|
|
pid = 4245
|
|
|
|
def fake_popen(cmd, *args, **kwargs):
|
|
captured["cmd"] = list(cmd)
|
|
return FakeProc()
|
|
|
|
monkeypatch.setattr(subprocess, "Popen", fake_popen)
|
|
workspace = tmp_path / "ws"
|
|
workspace.mkdir(exist_ok=True)
|
|
kb._default_spawn(task, str(workspace))
|
|
return captured["cmd"]
|
|
|
|
|
|
def test_spawn_passes_model_and_provider(monkeypatch, tmp_path, conn):
|
|
tid = kb.create_task(
|
|
conn, title="t", assignee="elias",
|
|
model_override="glm-5", provider_override="openrouter",
|
|
)
|
|
task = kb.get_task(conn, tid)
|
|
cmd = _spawn_and_capture(monkeypatch, tmp_path, task)
|
|
i = cmd.index("-m")
|
|
assert cmd[i + 1] == "glm-5"
|
|
j = cmd.index("--provider")
|
|
assert j == i + 2
|
|
assert cmd[j + 1] == "openrouter"
|
|
|
|
|
|
def test_spawn_model_only_omits_provider_flag(monkeypatch, tmp_path, conn):
|
|
tid = kb.create_task(
|
|
conn, title="t", assignee="elias", model_override="glm-5",
|
|
)
|
|
task = kb.get_task(conn, tid)
|
|
cmd = _spawn_and_capture(monkeypatch, tmp_path, task)
|
|
assert "-m" in cmd
|
|
assert "--provider" not in cmd
|
|
|
|
|
|
def test_spawn_no_override_omits_both_flags(monkeypatch, tmp_path, conn):
|
|
tid = kb.create_task(conn, title="t", assignee="elias")
|
|
task = kb.get_task(conn, tid)
|
|
cmd = _spawn_and_capture(monkeypatch, tmp_path, task)
|
|
assert "-m" not in cmd
|
|
assert "--provider" not in cmd
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Dashboard API — PATCH / bulk / create / model-options
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
def _create(client, **kwargs):
|
|
body = {"title": "task", "assignee": "worker"}
|
|
body.update(kwargs)
|
|
r = client.post("/api/plugins/kanban/tasks", json=body)
|
|
assert r.status_code == 200, r.text
|
|
return r.json()["task"]
|
|
|
|
|
|
def test_patch_sets_model_override(client):
|
|
task = _create(client)
|
|
r = client.patch(
|
|
f"/api/plugins/kanban/tasks/{task['id']}",
|
|
json={"model_override": "gpt-5.6-sol", "provider_override": "openai"},
|
|
)
|
|
assert r.status_code == 200, r.text
|
|
updated = r.json()["task"]
|
|
assert updated["model_override"] == "gpt-5.6-sol"
|
|
assert updated["provider_override"] == "openai"
|
|
|
|
|
|
def test_patch_clears_model_override(client):
|
|
task = _create(
|
|
client, model_override="gpt-5.6-sol", provider_override="openai",
|
|
)
|
|
assert task["model_override"] == "gpt-5.6-sol"
|
|
r = client.patch(
|
|
f"/api/plugins/kanban/tasks/{task['id']}",
|
|
json={"clear_model_override": True},
|
|
)
|
|
assert r.status_code == 200, r.text
|
|
updated = r.json()["task"]
|
|
assert updated["model_override"] is None
|
|
assert updated["provider_override"] is None
|
|
|
|
|
|
def test_patch_provider_without_model_is_400(client):
|
|
task = _create(client)
|
|
r = client.patch(
|
|
f"/api/plugins/kanban/tasks/{task['id']}",
|
|
json={"model_override": "", "provider_override": "openai"},
|
|
)
|
|
assert r.status_code == 400
|
|
|
|
|
|
def test_create_task_with_override_via_api(client):
|
|
task = _create(
|
|
client, model_override="qwen-max", provider_override="openrouter",
|
|
)
|
|
assert task["model_override"] == "qwen-max"
|
|
assert task["provider_override"] == "openrouter"
|
|
|
|
|
|
def test_bulk_model_override(client):
|
|
t1 = _create(client)
|
|
t2 = _create(client)
|
|
r = client.post(
|
|
"/api/plugins/kanban/tasks/bulk",
|
|
json={
|
|
"ids": [t1["id"], t2["id"]],
|
|
"model_override": "fallback-model",
|
|
"provider_override": "nous",
|
|
},
|
|
)
|
|
assert r.status_code == 200, r.text
|
|
assert all(entry["ok"] for entry in r.json()["results"])
|
|
for tid in (t1["id"], t2["id"]):
|
|
got = client.get(f"/api/plugins/kanban/tasks/{tid}").json()["task"]
|
|
assert got["model_override"] == "fallback-model"
|
|
assert got["provider_override"] == "nous"
|
|
|
|
|
|
def test_model_options_endpoint_shape(client, monkeypatch):
|
|
"""The endpoint returns {providers: [{slug,label,models}]} and degrades
|
|
to an empty catalog when the inventory substrate raises."""
|
|
r = client.get("/api/plugins/kanban/model-options")
|
|
assert r.status_code == 200
|
|
data = r.json()
|
|
assert "providers" in data
|
|
assert isinstance(data["providers"], list)
|
|
for row in data["providers"]:
|
|
assert "slug" in row and "label" in row and "models" in row
|
|
assert isinstance(row["models"], list)
|
|
assert len(row["models"]) >= 1 # empty-model rows are filtered out
|