Sync from GitHub 44e6d8ff

README.md

@@ -1,3 +1,14 @@
+---
+title: Jam Buddy
+emoji: 🎸
+colorFrom: red
+colorTo: purple
+sdk: docker
+app_port: 7860
+pinned: false
+short_description: You start playing, it joins in — an AI music companion.
+---
+
 # Jam Buddy
 
 > An AI music companion that listens to what you play and joins in — at your

apps/web/__tests__/prompt.test.ts

@@ -54,13 +54,13 @@ describe("buildPrompt", () => {
     expect(negativePrompt).toContain("drums");
   });
 
-  it("does not negate the buddy's own instrument family in the negative prompt (lead guitar + input guitar)", () => {
+  it("does not negate the buddy's own instrument family in the negative prompt (guitar + input guitar)", () => {
     const { negativePrompt } = buildPrompt({
       ...base,
-      instrument: "lead",
+      instrument: "guitar",
       inputInstrument: "guitar",
     });
-    // buddy=lead is in the guitar family; adding "guitar" to the negative
+    // buddy=guitar is in the guitar family; adding "guitar" to the negative
     // would steer SA3 away from the buddy itself, so we must NOT add it.
     expect(negativePrompt).not.toContain("guitar");
   });

apps/web/app/page.tsx

@@ -396,31 +396,19 @@ export default function HomePage() {
           </span>
         </header>
 
-        {/* Instrument / trigger pads */}
-        <section aria-labelledby="pads-label" className="mb-6">
-          <h2
-            id="pads-label"
-            className="mb-2 font-mono text-[10px] uppercase tracking-widest text-[#7f829c]"
-          >
-            Instrument
-          </h2>
-          <div className="grid grid-cols-4 gap-2 sm:grid-cols-8">
-            {INSTRUMENTS.map((inst) => (
-              <Pad
-                key={inst}
-                label={INSTRUMENT_LABELS[inst]}
-                selected={instrument === inst}
-                onSelect={() => setInstrument(inst)}
-              />
-            ))}
-          </div>
-        </section>
-
-        {/* Knob row */}
+        {/* Knob row — all 4 knobs on one row */}
         <section
           aria-label="Style controls"
-          className="mb-6 grid grid-cols-3 gap-4 rounded-xl bg-[#15161f] p-4"
+          className="mb-6 grid grid-cols-4 gap-4 rounded-xl bg-[#15161f] p-4"
         >
+          <Knob
+            label="Instrument"
+            value={INSTRUMENTS.indexOf(instrument)}
+            min={0}
+            max={INSTRUMENTS.length - 1}
+            onChange={(v) => setInstrument(INSTRUMENTS[v] ?? "guitar")}
+            format={(v) => INSTRUMENT_LABELS[INSTRUMENTS[v] ?? "guitar"] ?? ""}
+          />
           <Knob
             label="Genre"
             value={GENRES.indexOf(genre)}

apps/web/lib/jambuddy/prompt.ts

@@ -19,14 +19,12 @@
  */
 
 export type BuddyInstrument =
+  | "guitar"
   | "bass"
-  | "lead"
-  | "rhythm"
-  | "synth"
   | "drums"
-  | "sax"
-  | "cleanguitar"
-  | "overdrivenguitar";
+  | "synth"
+  | "piano"
+  | "sax";
 
 /**
  * What the user IS playing on their take. SA3 has no MIR — it cannot read the
@@ -62,14 +60,12 @@ export type BuddyMood =
 
 /** Instrument → AudioSparx `Instruments:` tag fragment (the "knob" options). */
 export const INSTRUMENT_PROMPTS: Readonly<Record<BuddyInstrument, string>> = {
+  guitar: "Guitar, a tight electric guitar riff",
   bass: "Bass Guitar, a grooving bass line, tight and in the pocket",
-  lead: "Lead Guitar, a soaring melodic lead guitar riff",
-  rhythm: "Rhythm Guitar, tight palm-muted power chords",
-  synth: "Synth, a warm atmospheric pad",
   drums: "Drums, a punchy drum groove, kick and snare locked in",
+  synth: "Synth, a warm atmospheric pad",
+  piano: "Piano, a melodic piano part",
   sax: "Saxophone, a warm breathy saxophone line with a rich tone",
-  cleanguitar: "Clean Guitar, bright chimey clean electric guitar arpeggios",
-  overdrivenguitar: "Overdriven Guitar, a gritty overdriven guitar riff with crunch",
 };
 
 /** Genre → AudioSparx `Genre:` tag. Matches the model's training vocab. */
@@ -107,14 +103,12 @@ const BASE_NEGATIVES: readonly string[] = [
  * for musical phrases.
  */
 export const MODEL_FOR_INSTRUMENT: Readonly<Record<BuddyInstrument, string>> = {
+  guitar: "small-music",
   bass: "small-music",
-  lead: "small-music",
-  rhythm: "small-music",
-  synth: "small-music",
   drums: "small-sfx",
+  synth: "small-music",
+  piano: "small-music",
   sax: "small-music",
-  cleanguitar: "small-music",
-  overdrivenguitar: "small-music",
 };
 
 export interface BuddyKnobs {
@@ -201,28 +195,24 @@ function buddyInstrumentFamilyMatches(
   inputNoun: string,
 ): boolean {
   const family: Readonly<Record<BuddyInstrument, string>> = {
+    guitar: "guitar",
     bass: "bass",
-    lead: "guitar",
-    rhythm: "guitar",
-    synth: "synth",
     drums: "drums",
+    synth: "synth",
+    piano: "piano",
     sax: "sax",
-    cleanguitar: "guitar",
-    overdrivenguitar: "guitar",
   };
   return family[instrument] === inputNoun;
 }
 
 /** The knob options, for rendering dropdowns. */
 export const INSTRUMENTS: readonly BuddyInstrument[] = [
+  "guitar",
   "bass",
-  "lead",
-  "rhythm",
-  "synth",
   "drums",
+  "synth",
+  "piano",
   "sax",
-  "cleanguitar",
-  "overdrivenguitar",
 ];
 /** Input-instrument vocab (what the user is playing on the take). */
 export const INPUT_INSTRUMENTS: readonly InputInstrument[] = [
@@ -281,7 +271,6 @@ export const MOOD_LABELS: Readonly<Record<BuddyMood, string>> = {
 };
 /** Human-friendly labels for the buddy-instrument pads. */
 export const INSTRUMENT_LABELS: Readonly<Record<BuddyInstrument, string>> = {
-  bass: "Bass", lead: "Lead Guitar", rhythm: "Rhythm Guitar", synth: "Synth",
-  drums: "Drums", sax: "Sax", cleanguitar: "Clean Guitar",
-  overdrivenguitar: "Overdriven Guitar",
+  guitar: "Guitar", bass: "Bass", drums: "Drums", synth: "Synth",
+  piano: "Piano", sax: "Sax",
 };

tools/jam_buddy.py

@@ -43,14 +43,12 @@ import torchaudio
 
 # Instrument -> AudioSparx `Instruments:` tag fragment (the "knob" options)
 INSTRUMENTS = {
+    "guitar": "Guitar, a tight electric guitar riff",
     "bass": "Bass Guitar, a grooving bass line, tight and in the pocket",
-    "lead": "Lead Guitar, a soaring melodic lead guitar riff",
-    "rhythm": "Rhythm Guitar, tight palm-muted power chords",
-    "synth": "Synth, a warm atmospheric pad",
     "drums": "Drums, a punchy drum groove, kick and snare locked in",
+    "synth": "Synth, a warm atmospheric pad",
+    "piano": "Piano, a melodic piano part",
     "sax": "Saxophone, a warm breathy saxophone line with a rich tone",
-    "cleanguitar": "Clean Guitar, bright chimey clean electric guitar arpeggios",
-    "overdrivenguitar": "Overdriven Guitar, a gritty overdriven guitar riff with crunch",
 }
 
 # Genre tempo-range prior (BPM) to disambiguate the octave-drop on AUDIO.

tools/jam_buddy_api.py

@@ -37,14 +37,12 @@ CREDITS_PER_GEN = 26
 
 # Instrument -> AudioSparx `Instruments:` tag fragment (matches jam_buddy.py)
 INSTRUMENTS = {
+    "guitar": "Guitar, a tight electric guitar riff",
     "bass": "Bass Guitar, a grooving bass line, tight and in the pocket",
-    "lead": "Lead Guitar, a soaring melodic lead guitar riff",
-    "rhythm": "Rhythm Guitar, tight palm-muted power chords",
-    "synth": "Synth, a warm atmospheric pad",
     "drums": "Drums, a punchy drum groove, kick and snare locked in",
+    "synth": "Synth, a warm atmospheric pad",
+    "piano": "Piano, a melodic piano part",
     "sax": "Saxophone, a warm breathy saxophone line with a rich tone",
-    "cleanguitar": "Clean Guitar, bright chimey clean electric guitar arpeggios",
-    "overdrivenguitar": "Overdriven Guitar, a gritty overdriven guitar riff with crunch",
 }
 DEFAULT_GENRE = "any"
 GENRE_TEMPO = {