[Release] v0.2.2 prep — studio exclusion, sf2, tension, Windows fix

DaoTwenty · DaoTwenty · commit 144c58b7e734 · 2026-06-01T06:44:17.000-04:00
- pyproject.toml: v0.2.2; exclude midigpt/osc/studio* from wheel;
  remove midigpt-studio entry point
- __init__.py: bump __version__ to 0.2.2
- .gitignore: add *.sf2, hf_model_card.md, slurm/
- README: OSC Studio → OSC Server; document sf2 download; citation
- Remove broken arachno.sf2 symlink and untrack default.sf2
- sf2/SOUNDFONTS.md: instructions for downloading Arachno SoundFont
- test_attributes.py: remove Tension/TensionDrum (not in public API)
- tests/cpp: qualify TokenType as midigpt::TokenType to fix MSVC/winnt.h clash
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -20,7 +20,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.21.3
+        uses: pypa/cibuildwheel@v2.24.1
 
       - uses: actions/upload-artifact@v4
         with:
diff --git a/.gitignore b/.gitignore
@@ -62,6 +62,12 @@ docs/
 # Cluster-specific SLURM scripts and configs
 slurm/
 
+# HuggingFace model card (uploaded separately to HF Hub)
+hf_model_card.md
+
+# SoundFont files (large binaries — see src/python/midigpt/osc/studio/static/sf2/SOUNDFONTS.md)
+*.sf2
+
 # Legacy code
 legacy/
 
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ attention and a KV cache. The library supports bar-level infill (filling in
 masked bars given surrounding context), autoregressive track generation from
 scratch, and attribute-conditioned generation (note density, polyphony, note
 duration). A real-time OSC server integrates with DAWs and live-performance
-environments via the `midigpt-studio` entry point. The Python package (`midigpt`)
+environments via the `midigpt-server` entry point. The Python package (`midigpt`)
 is distributed on PyPI and built with `scikit-build-core` for CPython 3.10,
 3.11, and 3.12 on Linux, macOS, and Windows.
 
@@ -326,7 +326,7 @@ src/
     training/              TrainConfig, MidiGPTDataset, train()
     augmentation/          MaskBar, Transpose, VelocityScale
     attributes/            AttributeAnalyzer, BaseAttribute, ATTRIBUTE_REGISTRY
-    osc/                   MidiGPTServer, studio app
+    osc/                   MidiGPTServer (studio excluded from wheel)
 ```
 
 Token IDs, vocabularies, constraint graphs, and the step planner all live
@@ -389,17 +389,13 @@ containing `config.json` + `model.pt`.
 
 ---
 
-## OSC Studio
+## OSC Server
 
-The `midigpt[realtime]` extra adds a real-time OSC server and a browser-based
-studio for DAW integration.
+The `midigpt[realtime]` extra adds a real-time OSC server for DAW integration.
 
 ```bash
-# Start the low-latency OSC server (receives notes, sends generated bars)
-midigpt-server --ckpt models/ghost_500_bundle.pt --port 7400
-
-# Start the full browser-based studio (wraps the server with a web UI)
-midigpt-studio --ckpt models/ghost_500_bundle.pt
+pip install "midigpt[realtime]"
+midigpt-server --ckpt models/yellow.pt --port 7400
 ```
 
 `midigpt-server` runs `MidiGPTServer`, which listens for OSC messages on a UDP
@@ -427,6 +423,16 @@ Runtime sampling parameters (`/midigpt/param/set`) include `temperature`,
 `top_p`, `mask_mode`, `model_dim`, `buffer_bars`, `lookahead_bars`, and
 `polyphony_hard_limit`, among others.
 
+> The browser-based studio (`midigpt-studio`) is not included in the PyPI
+> package. Clone the repository and run it directly from source.
+>
+> The studio requires a SoundFont file for audio playback. Download
+> [Arachno SoundFont](https://www.arachnosoft.com/main/soundfont.php),
+> rename it to `arachno.sf2`, and place it in
+> `src/python/midigpt/osc/studio/static/sf2/`. See
+> [`SOUNDFONTS.md`](src/python/midigpt/osc/studio/static/sf2/SOUNDFONTS.md)
+> for details.
+
 ---
 
 ## Development
diff --git a/pyproject.toml b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "scikit_build_core.build"
 
 [project]
 name            = "midigpt"
-version         = "0.2.1"
+version         = "0.2.2"
 description     = "GPT-2 transformer for symbolic music generation"
 readme          = "README.md"
 license         = { text = "MIT" }
@@ -37,7 +37,6 @@ all       = ["midigpt[realtime,train]"]
 [project.scripts]
 midigpt-server = "midigpt.osc.server:main"
 midigpt-listen = "midigpt.osc.listen:main"
-midigpt-studio = "midigpt.osc.studio.app:main"
 
 [tool.pytest.ini_options]
 markers = [
@@ -49,6 +48,7 @@ markers = [
 cmake.build-type = "Release"
 cmake.args = ["-DCMAKE_POLICY_VERSION_MINIMUM=3.5"]
 wheel.packages   = ["src/python/midigpt"]
+wheel.exclude    = ["midigpt/osc/studio*"]
 
 [tool.cibuildwheel]
 build         = "cp310-* cp311-* cp312-*"
diff --git a/src/python/midigpt/__init__.py b/src/python/midigpt/__init__.py
@@ -14,7 +14,7 @@
     except (ValueError, AttributeError):
         pass
 
-__version__ = "0.2.1"
+__version__ = "0.2.2"
 __all__ = [
     "Score", "Track", "Bar", "Note",
 ]
diff --git a/src/python/midigpt/osc/studio/static/default.sf2 b/src/python/midigpt/osc/studio/static/default.sf2
diff --git a/src/python/midigpt/osc/studio/static/sf2/SOUNDFONTS.md b/src/python/midigpt/osc/studio/static/sf2/SOUNDFONTS.md
@@ -0,0 +1,22 @@
+# SoundFonts
+
+SF2 files are not included in the repository due to size and licensing.
+
+Place your SoundFont files here so the studio can find them.
+
+## Recommended: Arachno SoundFont
+
+Arachno SoundFont is a high-quality GM SoundFont used as the default in
+MIDI-GPT Studio.
+
+1. Download from the official site: https://www.arachnosoft.com/main/soundfont.php
+2. Rename the downloaded file to `arachno.sf2`
+3. Place it in this directory (`src/python/midigpt/osc/studio/static/sf2/`)
+
+## Other SoundFonts
+
+Any GM-compatible SF2 file works. Place it here and select it in the studio
+interface, or pass `--sf2 path/to/your.sf2` to `midigpt-studio`.
+
+The `default.sf2` (5.7 MB, already in the repo) is a smaller fallback
+SoundFont used when no other file is available.
diff --git a/src/python/midigpt/osc/studio/static/sf2/arachno.sf2 b/src/python/midigpt/osc/studio/static/sf2/arachno.sf2
diff --git a/tests/cpp/test_constraints.cpp b/tests/cpp/test_constraints.cpp
@@ -25,6 +25,8 @@
 using namespace midigpt;
 using namespace midigpt::tokenizer;
 using namespace midigpt::masking;
+// Explicitly shadow winnt.h's TokenType enum value (Windows-only collision).
+using TokenType = midigpt::TokenType;
 
 namespace {
 
diff --git a/tests/cpp/test_session_state.cpp b/tests/cpp/test_session_state.cpp
@@ -25,6 +25,8 @@ using namespace midigpt;
 using namespace midigpt::sampling;
 using namespace midigpt::tokenizer;
 using namespace midigpt::masking;
+// Explicitly shadow winnt.h's TokenType enum value (Windows-only collision).
+using TokenType = midigpt::TokenType;
 
 namespace {
 
diff --git a/tests/cpp/test_tokenizer.cpp b/tests/cpp/test_tokenizer.cpp
@@ -23,6 +23,8 @@
 
 using namespace midigpt;
 using namespace midigpt::tokenizer;
+// Explicitly shadow winnt.h's TokenType enum value (Windows-only collision).
+using TokenType = midigpt::TokenType;
 
 namespace {
 
diff --git a/tests/cpp/test_vocabulary.cpp b/tests/cpp/test_vocabulary.cpp
@@ -10,6 +10,8 @@
 
 using namespace midigpt;
 using namespace midigpt::tokenizer;
+// Explicitly shadow winnt.h's TokenType enum value (Windows-only collision).
+using TokenType = midigpt::TokenType;
 
 // ---------------------------------------------------------------------------
 // Basic operations
diff --git a/tests/python/test_attributes.py b/tests/python/test_attributes.py
@@ -41,8 +41,6 @@
     PitchRange,
     PolyphonyQuantile,
     SilenceProportion,
-    Tension,
-    TensionDrum,
 )
 
 from conftest import make_bar, make_note, melodic_track, drum_track
@@ -104,14 +102,6 @@ def test_note_duration_quantile_metadata(mode):
     assert d.level == "track" and d.size == 6
 
 
-@pytest.mark.parametrize("cls", [Tension, TensionDrum])
-def test_tension_metadata(cls):
-    t = cls()
-    assert t.level == "bar"
-    assert t.size == 10
-    assert t.token_type in ("Tension", "TensionDrum")
-
-
 # --------------------------------------------------------------------------- #
 # 2. Public-API discovery / registry
 # --------------------------------------------------------------------------- #
@@ -120,7 +110,6 @@ def test_attribute_registry_contains_expected_keys():
         "note_density", "onset_polyphony", "pitch_range", "key_signature",
         "note_duration_dist", "silence_proportion", "pitch_class_set",
         "note_density_quantile", "polyphony_quantile", "note_duration_quantile",
-        "tension", "tension_drum",
     }
     assert set(ATTRIBUTE_REGISTRY.keys()) == expected
     # Every value is a BaseAttribute subclass
@@ -360,34 +349,6 @@ def test_note_density_quantile_achievable_range_lower_le_upper():
     assert 0 <= lo <= hi < ndq.size
 
 
-# --------------------------------------------------------------------------- #
-# 5. Tension / TensionDrum — metadata-only (heavy external dep otherwise)
-# --------------------------------------------------------------------------- #
-def test_tension_compute_without_bar_idx_returns_zero():
-    score = _single_track_score(
-        [make_note(pitch=60, onset=0, dur=12)], res=12, n_bars=1)
-    assert Tension().compute(score, 0, bar_idx=None) == 0.0
-    assert TensionDrum().compute(score, 0, bar_idx=None) == 0.0
-
-
-def test_tension_quantize_maps_into_bins():
-    t = Tension()
-    # The quantize() formula maps value [-2, 2] → bins [0, 9] inclusive.
-    assert t.quantize(-2.0) == 0
-    assert t.quantize(2.0) == 9
-    # Out-of-range clamps:
-    assert t.quantize(-100.0) == 0
-    assert t.quantize(100.0) == 9
-    # Midpoint:
-    assert 4 <= t.quantize(0.0) <= 6
-
-
-def test_tension_drum_subclasses_tension():
-    assert issubclass(TensionDrum, Tension)
-    assert TensionDrum().name == "tension_drum"
-    assert TensionDrum().track_type == "drum"
-
-
 # --------------------------------------------------------------------------- #
 # 6. Determinism on fixed input
 # --------------------------------------------------------------------------- #

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`except (ValueError, AttributeError):`
`15`	`15`	`pass`
`16`	`16`
`17`		`-__version__ = "0.2.1"`
	`17`	`+__version__ = "0.2.2"`
`18`	`18`	`__all__ = [`
`19`	`19`	`"Score", "Track", "Bar", "Note",`
`20`	`20`	`]`