branderson
357715bd7d
The beat grid came from the detected tempo (or the BPM override) and a GAP
pinned to the first note, so it did not always line up with the music,
and snapping did not land on its beats. A GRID bar on the sheet now sets
both, redrawing the grid live as values are tried, with x2 and /2 for a
tempo detected at double or half speed and ALIGN TO NOTE to move GAP the
least that puts the selected note on a beat. Note editing pauses while a
trial grid is unapplied, so notes never snap to a grid that is then
cancelled.
The grid is stored with the song's edits, so every rebuild keeps it, and
grid charts with it in place of its own choice; it records that choice in
tempo.json for RESET to return to. A GAP after the first note moves back
by whole beats, as notes on negative beats are rejected by players. PUT
and DELETE /api/jobs/{id}/grid set and reset it, rewriting the charts in
place.
343 lines
13 KiB
Python
343 lines
13 KiB
Python
import json
|
|
|
|
import numpy as np
|
|
import pytest
|
|
from songtrace.config import Config
|
|
from songtrace.grid import scale_bpm, to_ultrastar
|
|
from songtrace.pipeline import Ctx, PipelineError, SongInput
|
|
from songtrace.stages import all_stages, grid as grid_stage_mod
|
|
from songtrace.ultrastar import (
|
|
LineBreak, Note, get_header, parse_ultrastar,
|
|
)
|
|
|
|
|
|
def note(start, duration, pitch=0, text="la"):
|
|
return {"start": start, "duration": duration, "pitch": pitch, "text": text,
|
|
"low_confidence": False}
|
|
|
|
|
|
def assert_ordered(body):
|
|
"""Beats never go backwards and no two notes share a beat."""
|
|
cursor = None
|
|
for item in body:
|
|
if cursor is not None:
|
|
assert item.beat >= cursor
|
|
cursor = item.beat + (0 if isinstance(item, LineBreak) else item.length)
|
|
notes = [i for i in body if isinstance(i, Note)]
|
|
for a, b in zip(notes, notes[1:]):
|
|
assert a.beat + a.length <= b.beat
|
|
assert all(n.length >= 1 for n in notes)
|
|
|
|
|
|
def test_scale_bpm():
|
|
assert scale_bpm(128.0) == 256.0
|
|
assert scale_bpm(64.0) == 256.0
|
|
assert scale_bpm(250.0) == 250.0
|
|
assert scale_bpm(450.0) == 225.0
|
|
|
|
|
|
@pytest.mark.parametrize("bpm", [0.0, -120.0, float("inf"), float("nan")])
|
|
def test_scale_bpm_rejects_unusable_tempo(bpm):
|
|
with pytest.raises(ValueError):
|
|
scale_bpm(bpm)
|
|
|
|
|
|
def test_to_ultrastar_rejects_empty_notes():
|
|
with pytest.raises(ValueError):
|
|
to_ultrastar([], [], 240.0, [])
|
|
|
|
|
|
def test_to_ultrastar_conversion():
|
|
notes = [note(2.0, 0.5, 3, "la"), note(2.6, 0.25, 5, " la")]
|
|
song = to_ultrastar(notes, breaks=[2.55], file_bpm=240.0,
|
|
headers=[("TITLE", "T")])
|
|
# spb = 60/(4*240) = 0.0625s; gap = 2000ms
|
|
assert get_header(song, "GAP") == "2000"
|
|
assert get_header(song, "BPM") == "240"
|
|
assert song.headers[0] == ("TITLE", "T")
|
|
n0, br, n1 = song.body
|
|
assert n0 == Note(kind=":", beat=0, length=8, pitch=3, text="la")
|
|
assert br == LineBreak(beat=9) # (2.55-2.0)/0.0625 = 8.8 -> 9
|
|
assert n1.beat == 10 and n1.length == 4
|
|
|
|
|
|
def test_min_length_one():
|
|
song = to_ultrastar([note(1.0, 0.001, 0, "x")], [], 240.0, [])
|
|
assert song.body[0].length == 1
|
|
|
|
|
|
def test_fractional_bpm_header():
|
|
song = to_ultrastar([note(0.0, 1.0)], [], 232.5, [])
|
|
assert get_header(song, "BPM") == "232,50"
|
|
|
|
|
|
def test_beat_cursor_separates_notes_quantised_onto_one_beat():
|
|
notes = [note(1.0, 0.01, 0, "a"), note(1.01, 0.01, 1, "b"),
|
|
note(1.02, 0.01, 2, "c")]
|
|
song = to_ultrastar(notes, [], 240.0, []) # all three round to beat 0
|
|
assert [n.beat for n in song.body] == [0, 1, 2]
|
|
assert [n.length for n in song.body] == [1, 1, 1]
|
|
assert_ordered(song.body)
|
|
|
|
|
|
def test_beat_cursor_preserves_onsets_that_do_not_collide():
|
|
notes = [note(0.0, 0.5), note(1.0, 0.5), note(2.0, 0.5)]
|
|
song = to_ultrastar(notes, [], 240.0, [])
|
|
assert [n.beat for n in song.body] == [0, 16, 32]
|
|
|
|
|
|
def test_line_break_pushed_past_the_preceding_note():
|
|
notes = [note(0.0, 0.56), note(0.57, 0.1)]
|
|
song = to_ultrastar(notes, [0.51], 240.0, []) # break rounds to beat 8
|
|
n0, br, n1 = song.body
|
|
assert n0.beat + n0.length == 9
|
|
assert br == LineBreak(beat=9)
|
|
assert n1.beat >= br.beat
|
|
assert_ordered(song.body)
|
|
|
|
|
|
def test_line_break_on_a_note_start_precedes_that_note():
|
|
"""No gap across a line boundary puts the break exactly on the next onset."""
|
|
notes = [note(0.0, 0.5, 0, "end"), note(0.5, 0.5, 2, "New")]
|
|
song = to_ultrastar(notes, [0.5], 240.0, [])
|
|
assert song.body[1] == LineBreak(beat=8)
|
|
assert [n.text for n in song.body if isinstance(n, Note)] == ["end", "New"]
|
|
assert_ordered(song.body)
|
|
|
|
|
|
def test_line_break_not_after_the_following_note():
|
|
notes = [note(0.0, 0.02, 0, "a"), note(0.03, 0.02, 1, "b")]
|
|
song = to_ultrastar(notes, [0.025], 240.0, [])
|
|
br = song.body[1]
|
|
assert isinstance(br, LineBreak)
|
|
assert br.beat <= song.body[2].beat
|
|
assert_ordered(song.body)
|
|
|
|
|
|
def sung_words(rng):
|
|
"""Words cut into equal syllable slices, the way build_notes emits them."""
|
|
notes, breaks, t = [], [], 1.7
|
|
for i in range(60):
|
|
word = float(rng.uniform(0.05, 0.6))
|
|
sylls = int(rng.integers(1, 4))
|
|
for k in range(sylls):
|
|
notes.append(note(t + k * word / sylls, word / sylls,
|
|
int(rng.integers(-12, 12))))
|
|
t += word + float(rng.uniform(0.0, 0.4))
|
|
if i % 5 == 4:
|
|
breaks.append(t - 0.05)
|
|
return notes, breaks
|
|
|
|
|
|
@pytest.mark.parametrize("bpm", [200.0, 300.0, 399.0])
|
|
def test_no_overlap_on_realistic_input(bpm):
|
|
rng = np.random.default_rng(7)
|
|
moved = 0
|
|
for _ in range(20):
|
|
notes, breaks = sung_words(rng)
|
|
song = to_ultrastar(notes, breaks, bpm, [])
|
|
assert len(song.body) == len(notes) + len(breaks)
|
|
assert song.body[0].beat == 0
|
|
assert_ordered(song.body)
|
|
spb = 60 / (4 * bpm)
|
|
emitted = [n for n in song.body if isinstance(n, Note)]
|
|
moved += sum(1 for n, src in zip(emitted, notes)
|
|
if n.beat != round((src["start"] - notes[0]["start"]) / spb))
|
|
assert moved > 0 # otherwise the fuzz never exercises the beat cursor
|
|
|
|
|
|
def write_work(work, video="source_video.webm"):
|
|
work.mkdir()
|
|
(work / "notes_sec.json").write_text(json.dumps({
|
|
"notes": [note(1.0, 0.5, 0, "la"), note(2.0, 0.5, 2, "la")],
|
|
"breaks": [1.75],
|
|
"warnings": [],
|
|
}))
|
|
(work / "meta.json").write_text(json.dumps(
|
|
{"video_file": video, "thumbnail": "source_video.jpg"}))
|
|
|
|
|
|
def make_ctx(work, **kwargs):
|
|
inp = SongInput(title="Song", artist="Band", lyrics_text="x", **kwargs)
|
|
return Ctx(inp=inp, cfg=Config(whisper_url="u", creator="me"), work=work,
|
|
log=lambda m: None)
|
|
|
|
|
|
def test_grid_stage_writes_song_txt(tmp_path, monkeypatch):
|
|
work = tmp_path / "w"
|
|
write_work(work)
|
|
monkeypatch.setattr(grid_stage_mod.grid, "detect_bpm", lambda p: 120.0)
|
|
ctx = make_ctx(work, language="English", genre="Pop", year=1999)
|
|
stage = grid_stage_mod.grid_stage()
|
|
assert stage.outputs(ctx) == [work / "song.txt", work / "notes_final.json"]
|
|
stage.run(ctx)
|
|
song = parse_ultrastar((work / "song.txt").read_text(encoding="utf-8"))
|
|
assert [k for k, _ in song.headers] == [
|
|
"TITLE", "ARTIST", "LANGUAGE", "GENRE", "YEAR", "CREATOR",
|
|
"MP3", "COVER", "VIDEO", "BPM", "GAP"]
|
|
assert get_header(song, "BPM") == "240" # 120 doubled into range
|
|
assert get_header(song, "GAP") == "1000"
|
|
assert get_header(song, "MP3") == "Band - Song.mp3"
|
|
assert get_header(song, "COVER") == "Band - Song.jpg"
|
|
assert get_header(song, "VIDEO") == "Band - Song.webm"
|
|
assert [n.text for n in song.body if isinstance(n, Note)] == ["la", "la"]
|
|
assert_ordered(song.body)
|
|
|
|
|
|
def test_grid_stage_omits_optional_headers(tmp_path, monkeypatch):
|
|
work = tmp_path / "w"
|
|
write_work(work, video="source_video.mp4")
|
|
monkeypatch.setattr(grid_stage_mod.grid, "detect_bpm", lambda p: 210.0)
|
|
ctx = make_ctx(work)
|
|
grid_stage_mod.grid_stage().run(ctx)
|
|
song = parse_ultrastar((work / "song.txt").read_text(encoding="utf-8"))
|
|
assert [k for k, _ in song.headers] == [
|
|
"TITLE", "ARTIST", "CREATOR", "MP3", "COVER", "VIDEO", "BPM", "GAP"]
|
|
assert get_header(song, "VIDEO") == "Band - Song.mp4"
|
|
assert get_header(song, "CREATOR") == "me"
|
|
|
|
|
|
def test_grid_stage_uses_bpm_override(tmp_path, monkeypatch):
|
|
work = tmp_path / "w"
|
|
write_work(work)
|
|
|
|
def boom(path):
|
|
raise AssertionError("detect_bpm must not run with an override")
|
|
|
|
monkeypatch.setattr(grid_stage_mod.grid, "detect_bpm", boom)
|
|
ctx = make_ctx(work, bpm_override=333.0)
|
|
grid_stage_mod.grid_stage().run(ctx)
|
|
song = parse_ultrastar((work / "song.txt").read_text(encoding="utf-8"))
|
|
assert get_header(song, "BPM") == "333"
|
|
|
|
|
|
def test_grid_stage_honours_zero_bpm_override(tmp_path, monkeypatch):
|
|
"""bpm_override=0.0 must not be mistaken for 'not provided' (falsy-zero bug)."""
|
|
work = tmp_path / "w"
|
|
write_work(work)
|
|
|
|
def boom(path):
|
|
raise AssertionError("detect_bpm must not run with an explicit override")
|
|
|
|
monkeypatch.setattr(grid_stage_mod.grid, "detect_bpm", boom)
|
|
captured = {}
|
|
|
|
def fake_to_ultrastar(notes, breaks, file_bpm, headers, gap_ms=None):
|
|
captured["bpm"] = file_bpm
|
|
return to_ultrastar(notes, breaks, 240.0, headers)
|
|
|
|
monkeypatch.setattr(grid_stage_mod.grid, "to_ultrastar", fake_to_ultrastar)
|
|
ctx = make_ctx(work, bpm_override=0.0)
|
|
grid_stage_mod.grid_stage().run(ctx)
|
|
assert captured["bpm"] == 0.0
|
|
|
|
|
|
def test_grid_stage_reports_unusable_tempo_as_pipeline_error(tmp_path, monkeypatch):
|
|
work = tmp_path / "w"
|
|
write_work(work)
|
|
monkeypatch.setattr(grid_stage_mod.grid, "detect_bpm", lambda p: 0.0)
|
|
ctx = make_ctx(work)
|
|
with pytest.raises(PipelineError, match="tempo"):
|
|
grid_stage_mod.grid_stage().run(ctx)
|
|
|
|
|
|
def test_grid_stage_reports_no_notes_as_pipeline_error(tmp_path, monkeypatch):
|
|
work = tmp_path / "w"
|
|
work.mkdir()
|
|
(work / "notes_sec.json").write_text(json.dumps(
|
|
{"notes": [], "breaks": [], "warnings": []}))
|
|
(work / "meta.json").write_text(json.dumps(
|
|
{"video_file": "source_video.webm", "thumbnail": "source_video.jpg"}))
|
|
monkeypatch.setattr(grid_stage_mod.grid, "detect_bpm", lambda p: 120.0)
|
|
ctx = make_ctx(work)
|
|
with pytest.raises(PipelineError, match="no notes"):
|
|
grid_stage_mod.grid_stage().run(ctx)
|
|
|
|
|
|
def test_grid_stage_registered():
|
|
names = [s.name for s in all_stages()]
|
|
assert names[-1] == "package" and names[-2] == "grid"
|
|
|
|
|
|
def _regenerate(work, pitch):
|
|
"""What a rebuild leaves: fresh notes for both lines, at `pitch`."""
|
|
(work / "notes_sec.json").write_text(json.dumps({
|
|
"notes": [{**note(1.0, 0.5, pitch, "one"), "line_index": 0},
|
|
{**note(3.0, 0.5, pitch, "three"), "line_index": 1}],
|
|
"breaks": [2.0], "warnings": []}))
|
|
|
|
|
|
def test_an_edited_line_survives_a_rebuild(tmp_path, monkeypatch):
|
|
from songtrace import edits
|
|
work = tmp_path / "w"
|
|
write_work(work)
|
|
monkeypatch.setattr(grid_stage_mod.grid, "detect_bpm", lambda p: 120.0)
|
|
ctx = make_ctx(work)
|
|
ctx.inp.lyrics_text = "one\nthree"
|
|
data = edits.load(work, [["one"], ["three"]])
|
|
edits.set_line(data, 1, [{"start": 3.2, "duration": 0.6, "pitch": 9,
|
|
"text": "three", "kind": "*"}])
|
|
edits.save(work, data)
|
|
for regenerated_pitch in (0, 4):
|
|
_regenerate(work, regenerated_pitch)
|
|
grid_stage_mod.grid_stage().run(ctx)
|
|
song = parse_ultrastar((work / "song.txt").read_text(encoding="utf-8"))
|
|
notes = [n for n in song.body if isinstance(n, Note)]
|
|
assert [(n.kind, n.pitch, n.text) for n in notes] == [
|
|
(":", regenerated_pitch, "one"), ("*", 9, "three")]
|
|
|
|
|
|
def test_rechart_replaces_the_notes_and_keeps_headers_and_tempo(tmp_path):
|
|
from songtrace.grid import rechart
|
|
from songtrace.ultrastar import serialize_ultrastar
|
|
txt = tmp_path / "song.txt"
|
|
txt.write_text(serialize_ultrastar(to_ultrastar(
|
|
[note(1.0, 0.5)], [], 300.0,
|
|
[("TITLE", "Song"), ("VIDEO", "Band - Song.mp4")])), encoding="utf-8")
|
|
rechart(txt, [{**note(2.0, 0.5, 7, "new"), "kind": "F"}], [])
|
|
song = parse_ultrastar(txt.read_text(encoding="utf-8"))
|
|
assert [k for k, _ in song.headers] == ["TITLE", "VIDEO", "BPM", "GAP"]
|
|
assert get_header(song, "BPM") == "300" and get_header(song, "GAP") == "2000"
|
|
assert [(n.kind, n.pitch, n.text) for n in song.body] == [("F", 7, "new")]
|
|
|
|
|
|
def test_an_explicit_gap_sets_the_grid():
|
|
# 300 BPM: 0.05s beats; notes at 1.02s and 1.27s against GAP 1.0s
|
|
song = to_ultrastar([note(1.02, 0.1), note(1.27, 0.1)], [], 300.0, [], gap_ms=1000)
|
|
assert get_header(song, "GAP") == "1000"
|
|
assert [n.beat for n in song.body] == [0, 5]
|
|
|
|
|
|
def test_a_gap_after_the_first_note_moves_back_by_whole_beats():
|
|
# GAP 1.13s is after the first note at 1.02s: back 3 beats to 0.98s, so
|
|
# the grid lines stay where they were set and the note is on beat 1
|
|
song = to_ultrastar([note(1.02, 0.1)], [], 300.0, [], gap_ms=1130)
|
|
assert get_header(song, "GAP") == "980"
|
|
assert song.body[0].beat == 1
|
|
|
|
|
|
def test_the_grid_stage_uses_the_editors_grid_and_records_its_own(tmp_path, monkeypatch):
|
|
from songtrace import edits
|
|
work = tmp_path / "w"
|
|
write_work(work)
|
|
monkeypatch.setattr(grid_stage_mod.grid, "detect_bpm", lambda p: 120.0)
|
|
ctx = make_ctx(work)
|
|
data = edits.load(work, [["x"]])
|
|
edits.set_grid(data, 300.0, 900)
|
|
edits.save(work, data)
|
|
grid_stage_mod.grid_stage().run(ctx)
|
|
song = parse_ultrastar((work / "song.txt").read_text(encoding="utf-8"))
|
|
assert (get_header(song, "BPM"), get_header(song, "GAP")) == ("300", "900")
|
|
assert json.loads((work / "tempo.json").read_text()) == {"bpm": 240.0}
|
|
|
|
|
|
def test_rechart_can_set_a_new_bpm_and_gap(tmp_path):
|
|
from songtrace.grid import rechart
|
|
from songtrace.ultrastar import serialize_ultrastar
|
|
txt = tmp_path / "song.txt"
|
|
txt.write_text(serialize_ultrastar(to_ultrastar([note(1.0, 0.5)], [], 240.0, [])),
|
|
encoding="utf-8")
|
|
rechart(txt, [note(1.02, 0.1)], [], 300.0, 1000)
|
|
song = parse_ultrastar(txt.read_text(encoding="utf-8"))
|
|
assert (get_header(song, "BPM"), get_header(song, "GAP")) == ("300", "1000")
|