Update app.py

app.py

@@ -84,7 +84,7 @@ def create_msg(name, data):
     return {"name": name, "data": data}
 
 
-def run(model_name, tab, instruments, drum_kit, mid, midi_events, gen_events, temp, top_p, top_k, allow_cc):
+def run(search_prompt):
     mid_seq = []
     gen_events = int(gen_events)
     max_len = gen_events
@@ -92,55 +92,32 @@ def run(model_name, tab, instruments, drum_kit, mid, midi_events, gen_events, te
     disable_patch_change = False
     disable_channels = None
     if tab == 0:
-        i = 0
-        mid = [[tokenizer.bos_id] + [tokenizer.pad_id] * (tokenizer.max_token_seq - 1)]
-        patches = {}
-        for instr in instruments:
-            patches[i] = patch2number[instr]
-            i = (i + 1) if i != 8 else 10
-        if drum_kit != "None":
-            patches[9] = drum_kits2number[drum_kit]
-        for i, (c, p) in enumerate(patches.items()):
-            mid.append(tokenizer.event2tokens(["patch_change", 0, 0, i, c, p]))
-        mid_seq = mid
-        mid = np.asarray(mid, dtype=np.int64)
-        if len(instruments) > 0:
-            disable_patch_change = True
-            disable_channels = [i for i in range(16) if i not in patches]
+        mid_seq = []
+       
     elif mid is not None:
-        mid = tokenizer.tokenize(MIDI.midi2score(mid))
-        mid = np.asarray(mid, dtype=np.int64)
-        mid = mid[:int(midi_events)]
-        max_len += len(mid)
-        for token_seq in mid:
-            mid_seq.append(token_seq.tolist())
+        mid_seq = MIDI.midi2score(mid)
+
     init_msgs = [create_msg("visualizer_clear", None)]
     for tokens in mid_seq:
-        init_msgs.append(create_msg("visualizer_append", tokenizer.tokens2event(tokens)))
+        init_msgs.append(create_msg("visualizer_append", tokens))
     yield mid_seq, None, None, init_msgs
-    model = models[model_name]
-    generator = generate(model, mid, max_len=max_len, temp=temp, top_p=top_p, top_k=top_k,
-                         disable_patch_change=disable_patch_change, disable_control_change=not allow_cc,
-                         disable_channels=disable_channels)
-    for i, token_seq in enumerate(generator):
-        token_seq = token_seq.tolist()
-        mid_seq.append(token_seq)
-        event = tokenizer.tokens2event(token_seq)
-        yield mid_seq, None, None, [create_msg("visualizer_append", event), create_msg("progress", [i + 1, gen_events])]
-    mid = tokenizer.detokenize(mid_seq)
+
+    for i in range(len(mid_seq)):
+        yield mid_seq, None, None, [create_msg("visualizer_append", mid_seq[i]), create_msg("progress", [i + 1, mid_seq[i+1]])]
+
     with open(f"output.mid", 'wb') as f:
-        f.write(MIDI.score2midi(mid))
-    audio = synthesis(MIDI.score2opus(mid), soundfont_path)
+        f.write(MIDI.score2midi(mid_seq))
+    audio = synthesis(MIDI.score2opus(mid_seq), soundfont_path)
     yield mid_seq, "output.mid", (44100, audio), [create_msg("visualizer_end", None)]
 
 
 def cancel_run(mid_seq):
     if mid_seq is None:
         return None, None
-    mid = tokenizer.detokenize(mid_seq)
+
     with open(f"output.mid", 'wb') as f:
-        f.write(MIDI.score2midi(mid))
-    audio = synthesis(MIDI.score2opus(mid), soundfont_path)
+        f.write(MIDI.score2midi(mid_seq))
+    audio = synthesis(MIDI.score2opus(mid_seq), soundfont_path)
     return "output.mid", (44100, audio), [create_msg("visualizer_end", None)]
 
 
@@ -174,11 +151,6 @@ class JSMsgReceiver(gr.HTML):
     def get_block_name(self) -> str:
         return "html"
 
-number2drum_kits = {-1: "None", 0: "Standard", 8: "Room", 16: "Power", 24: "Electric", 25: "TR-808", 32: "Jazz",
-                    40: "Blush", 48: "Orchestra"}
-patch2number = {v: k for k, v in MIDI.Number2patch.items()}
-drum_kits2number = {v: k for k, v in number2drum_kits.items()}
-
 if __name__ == "__main__":
     parser = argparse.ArgumentParser()
     parser.add_argument("--share", action="store_true", default=False, help="share gradio app")
@@ -233,9 +205,7 @@ if __name__ == "__main__":
         output_midi_visualizer = gr.HTML(elem_id="midi_visualizer_container")
         output_audio = gr.Audio(label="output audio", format="mp3", elem_id="midi_audio")
         output_midi = gr.File(label="output midi", file_types=[".mid"])
-        run_event = run_btn.click(run, [input_model, tab_select, input_instruments, input_drum_kit, input_midi,
-                                        input_midi_events, input_gen_events, input_temp, input_top_p, input_top_k,
-                                        input_allow_cc],
+        run_event = search_btn.click(run, [search_prompt],
                                   [output_midi_seq, output_midi, output_audio, js_msg])
         stop_btn.click(cancel_run, output_midi_seq, [output_midi, output_audio, js_msg], cancels=run_event, queue=False)
     app.queue(1).launch(server_port=opt.port, share=opt.share, inbrowser=True)