mirror of
https://github.com/got-feedBack/feedBack.git
synced 2026-07-22 04:41:23 +00:00
a86abadb14
* settings: add host instrument profiles Signed-off-by: ChrisBeWithYou <christian.a.cowan@gmail.com> * settings: add instrument pathway selection Signed-off-by: ChrisBeWithYou <christian.a.cowan@gmail.com> * fix(settings): profile-aware saves/resets/switch, provider tunings, bass-5 Five regressions from the instrument-profiles rework: 1. save_settings canonicalized profiles on EVERY save -> empty/unrelated POST froze default profiles into config.json (broke test_empty_post_preserves_all_existing_keys). Gate on the save touching instrument settings; GET already virtualizes profiles. 2. pathway is profile-mirrored, so the Gameplay reset (flat-key delete) was a no-op. reset_settings now resets pathway inside the persisted profiles too. 3. Per-profile tuning validation rejected provider/custom tunings (tuner plugin, /api/tunings). _valid_tuning_for_key now accepts a name unknown to every built-in table while still rejecting a built-in misapplied to the wrong key. 4. First-migration overwrote an explicit active_instrument_profile with the legacy-inferred one, so a fresh-config switch to 'bass' was lost. Use setdefault so an explicit request wins. 5. Pre-existing test_instrument_fields_persist used bass-5 + 'Drop D' (a 4-string tuning). Updated to the valid 'Drop A'. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(settings): partial-merge instrument_profiles; clamp tuning on string-count switch Two partial-update follow-ups: - save_settings normalized a POSTed instrument_profiles by FILLING every omitted profile with defaults and replacing wholesale, so a one-profile update reset the others. Validate each PROVIDED profile individually and merge the partial over the persisted set inside the lock — /api/settings is partial-merge. - the string-count picker posted only string_count, so the backend silently reset a now-invalid tuning to Standard while the UI kept the old value (settings/tuner desync). Clamp + post the valid tuning too, mirroring the instrument-switch path. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> --------- Signed-off-by: ChrisBeWithYou <christian.a.cowan@gmail.com> Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
97 lines
3.4 KiB
Python
97 lines
3.4 KiB
Python
"""Tests for the v0.3.0 audio/instrument settings fields (P17)."""
|
|
|
|
import importlib
|
|
import json
|
|
import sys
|
|
|
|
import pytest
|
|
from fastapi.testclient import TestClient
|
|
|
|
|
|
@pytest.fixture()
|
|
def env(tmp_path, monkeypatch, isolate_logging):
|
|
monkeypatch.setenv("CONFIG_DIR", str(tmp_path))
|
|
monkeypatch.setenv("FEEDBACK_SKIP_STARTUP_TASKS", "1")
|
|
sys.modules.pop("server", None)
|
|
srv = importlib.import_module("server")
|
|
try:
|
|
yield srv, tmp_path
|
|
finally:
|
|
conn = getattr(getattr(srv, "meta_db", None), "conn", None)
|
|
if conn is not None:
|
|
getattr(__import__("sys").modules.get("server"), "_join_background_db_threads", lambda: None)()
|
|
conn.close()
|
|
sys.modules.pop("server", None)
|
|
|
|
|
|
def _cfg(tmp_path):
|
|
return json.loads((tmp_path / "config.json").read_text())
|
|
|
|
|
|
def test_instrument_fields_persist(env):
|
|
srv, tmp = env
|
|
c = TestClient(srv.app)
|
|
# "Drop A" is the 5-string bass drop tuning (its low string is B, not E, so
|
|
# "Drop D" is a 4-string tuning — now correctly rejected per-profile).
|
|
r = c.post("/api/settings", json={"instrument": "bass", "string_count": 5,
|
|
"tuning": "Drop A", "reference_pitch": 442})
|
|
assert r.status_code == 200
|
|
cfg = _cfg(tmp)
|
|
assert cfg["instrument"] == "bass" and cfg["string_count"] == 5
|
|
assert cfg["tuning"] == "Drop A" and cfg["reference_pitch"] == 442.0
|
|
# Reflected back through GET.
|
|
got = c.get("/api/settings").json()
|
|
assert got["instrument"] == "bass" and got["reference_pitch"] == 442.0
|
|
|
|
|
|
def test_reference_pitch_clamped(env):
|
|
srv, tmp = env
|
|
c = TestClient(srv.app)
|
|
c.post("/api/settings", json={"reference_pitch": 999})
|
|
assert _cfg(tmp)["reference_pitch"] == 450.0
|
|
c.post("/api/settings", json={"reference_pitch": 400})
|
|
assert _cfg(tmp)["reference_pitch"] == 430.0
|
|
|
|
|
|
@pytest.mark.parametrize("body", [
|
|
{"instrument": "drums"},
|
|
{"string_count": 3},
|
|
{"string_count": 9},
|
|
{"reference_pitch": "x"},
|
|
{"string_count": 4.9}, # non-integral must be rejected, not truncated to 4
|
|
{"tuning": ["x"]},
|
|
{"tuning": [99]},
|
|
])
|
|
def test_invalid_values_rejected(env, body):
|
|
srv, _ = env
|
|
c = TestClient(srv.app)
|
|
r = c.post("/api/settings", json=body)
|
|
assert r.status_code == 200 and "error" in r.json()
|
|
|
|
|
|
def test_reference_pitch_rejects_non_finite(env):
|
|
# NaN/Infinity must be rejected, not silently clamped to 430/450. Sent as a
|
|
# raw body since httpx's json= serializer can't emit non-finite numbers.
|
|
srv, _ = env
|
|
c = TestClient(srv.app)
|
|
for raw in ('{"reference_pitch": NaN}', '{"reference_pitch": Infinity}', '{"reference_pitch": "inf"}'):
|
|
r = c.post("/api/settings", content=raw, headers={"Content-Type": "application/json"})
|
|
assert "error" in r.json(), raw
|
|
|
|
|
|
def test_tuning_accepts_offsets_list(env):
|
|
srv, tmp = env
|
|
c = TestClient(srv.app)
|
|
r = c.post("/api/settings", json={"tuning": [-2, 0, 0, 0, 0, 0]})
|
|
assert r.status_code == 200 and "error" not in r.json()
|
|
assert _cfg(tmp)["tuning"] == [-2, 0, 0, 0, 0, 0]
|
|
|
|
|
|
def test_partial_post_does_not_clobber(env):
|
|
srv, tmp = env
|
|
c = TestClient(srv.app)
|
|
c.post("/api/settings", json={"instrument": "guitar", "string_count": 7})
|
|
c.post("/api/settings", json={"reference_pitch": 441}) # unrelated key
|
|
cfg = _cfg(tmp)
|
|
assert cfg["instrument"] == "guitar" and cfg["string_count"] == 7 and cfg["reference_pitch"] == 441.0
|