changed instrument mapping

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+  "python.formatting.provider": "black"
+}

constants.py

@@ -24,54 +24,98 @@ INSTRUMENT_CLASSES = [
 INSTRUMENT_TRANSFER_CLASSES = [
     {
         "name": "Piano",
-        "program_range": [4],  # Electric Piano 1
+        "program_range": [4],
         "family_number": 0,
+        "transfer_to": "Electric Piano 1",
     },
     {
         "name": "Chromatic Percussion",
-        "program_range": [11],  # Vibraphone
+        "program_range": [11],
         "family_number": 1,
+        "transfer_to": "Vibraphone",
+    },
+    {
+        "name": "Organ",
+        "program_range": [17],
+        "family_number": 2,
+        "transfer_to": "Percussive Organ",
     },
-    {"name": "Organ", "program_range": [17], "family_number": 2},  # Percussive Organ
     {
         "name": "Guitar",
-        "program_range": [80],  # Synth Lead Square
+        "program_range": [80],
         "family_number": 3,
+        "transfer_to": "Synth Lead Square",
     },
     {
         "name": "Bass",
-        "program_range": [38],  # Synth bass 1,
+        "program_range": [38],
         "family_number": 4,
+        "transfer_to": "Synth Bass 1",
     },
     {
         "name": "Strings",
-        "program_range": [50],  # Synth Strings 1
+        "program_range": [50],
         "family_number": 5,
+        "transfer_to": "Synth Strings 1",
     },
     {
         "name": "Ensemble",
-        "program_range": [51],  # Synth Strings 2
+        "program_range": [51],
         "family_number": 6,
+        "transfer_to": "Synth Strings 2",
     },
     {
         "name": "Brass",
-        "program_range": [63],  # 63 Synth Brass 1,
+        "program_range": [63],
         "family_number": 7,
+        "transfer_to": "Synth Brass 1",
+    },
+    {
+        "name": "Reed",
+        "program_range": [64],
+        "family_number": 8,
+        "transfer_to": "Synth Brass 2",
+    },
+    {
+        "name": "Pipe",
+        "program_range": [82],
+        "family_number": 9,
+        "transfer_to": "Synth Lead Calliope",
     },
-    {"name": "Reed", "program_range": [64], "family_number": 8},  # Synth Brass 2
-    {"name": "Pipe", "program_range": [82], "family_number": 9},  #  Lead 3
     {
         "name": "Synth Lead",
         "program_range": [81],  # Synth Lead Sawtooth
         "family_number": 10,
+        "transfer_to": "Synth Lead Sawtooth",
+    },
+    {
+        "name": "Synth Pad",
+        "program_range": range(88, 96),
+        "family_number": 11,
+        "transfer_to": "Synth Pad",
+    },
+    {
+        "name": "Synth Effects",
+        "program_range": range(96, 104),
+        "family_number": 12,
+        "transfer_to": "Synth Effects",
+    },
+    {
+        "name": "Ethnic",
+        "program_range": range(104, 112),
+        "family_number": 13,
+        "transfer_to": "Ethnic",
+    },
+    {
+        "name": "Percussive",
+        "program_range": range(112, 120),
+        "family_number": 14,
+        "transfer_to": "Percussive",
     },
-    {"name": "Synth Pad", "program_range": range(88, 96), "family_number": 11},
-    {"name": "Synth Effects", "program_range": range(96, 104), "family_number": 12},
-    {"name": "Ethnic", "program_range": range(104, 112), "family_number": 13},
-    {"name": "Percussive", "program_range": range(112, 120), "family_number": 14},
     {
         "name": "Sound Effects",
         "program_range": range(120, 128),
         "family_number": 15,
+        "transfer_to": "Sound Effects",
     },
 ]

load.py

@@ -40,11 +40,11 @@ class LoadModel:
 
     def load_model(self):
         if self.revision is None:
-            model = GPT2LMHeadModel.from_pretrained(self.path).to(self.device)
+            model = GPT2LMHeadModel.from_pretrained(self.path)  # .to(self.device)
         else:
             model = GPT2LMHeadModel.from_pretrained(
                 self.path, revision=self.revision
-            ).to(self.device)
+            )  # .to(self.device)
 
         return model
 

playground.py

@@ -1,7 +1,8 @@
+import matplotlib.pyplot as plt
 import gradio as gr
 from load import LoadModel
 from generate import GenerateMidiText
-from constants import INSTRUMENT_CLASSES
+from constants import INSTRUMENT_CLASSES, INSTRUMENT_TRANSFER_CLASSES
 from decoder import TextDecoder
 from utils import get_miditok, index_has_substring
 from playback import get_music
@@ -12,7 +13,6 @@ from generation_utils import plot_piano_roll
 import numpy as np
 
 matplotlib.use("Agg")
-import matplotlib.pyplot as plt
 
 sys.modules["pylab"] = pylab
 
@@ -53,7 +53,11 @@ def generator(
     genesis = GenerateMidiText(model, tokenizer, piece_by_track)
     track = {"label": label}
     inst = next(
-        (inst for inst in INSTRUMENT_CLASSES if inst["name"] == instrument),
+        (
+            inst
+            for inst in INSTRUMENT_TRANSFER_CLASSES
+            if inst["transfer_to"] == instrument
+        ),
         {"family_number": "DRUMS"},
     )["family_number"]
 
@@ -114,7 +118,8 @@ def instrument_row(default_inst, row_id):
         row = gr.Variable(row_id)
         with gr.Column(scale=1, min_width=50):
             inst = gr.Dropdown(
-                [inst["name"] for inst in INSTRUMENT_CLASSES] + ["Drums"],
+                [inst["transfer_to"] for inst in INSTRUMENT_TRANSFER_CLASSES]
+                + ["Drums"],
                 value=default_inst,
                 label="Instrument",
             )
@@ -150,16 +155,13 @@ with gr.Blocks() as demo:
     mixed_audio = gr.Audio(label="Mixed Audio")
     piano_roll = gr.Plot(label="Piano Roll")
     instrument_row("Drums", 0)
-    instrument_row("Bass", 1)
-    instrument_row("Synth Lead", 2)
+    instrument_row("Synth Bass 1", 1)
+    instrument_row("Synth Lead Square", 2)
     # instrument_row("Piano")
 
 demo.launch(debug=True)
 
 """
-TODO: DEPLOY
-TODO: temp file situation
-TODO: clear cache situation
 TODO: reset button
 TODO: add a button to save the generated midi
 TODO: add improvise button