Update app.py

app.py

@@ -1,5 +1,3 @@
-import glob
-import json
 import os.path
 
 import time
@@ -15,7 +13,6 @@ import spaces
 from x_transformer import *
 import tqdm
 
-from midi_synthesizer import synthesis
 import TMIDIX
 
 import matplotlib.pyplot as plt
@@ -149,17 +146,22 @@ def GenerateMIDI(num_tok, idrums, iinstr):
         if 1280 <= ss1 < 2816:
             channel = (ss1 - 1280) // 128
             pitch = (ss1 - 1280) % 128
-            event = ['note', ctime, dur, channel, pitch, vel]
+            event = ['note', ctime, dur, channel, pitch, vel, list_of_MIDI_patches[chanel]]
             output[-1].append(event)
 
-            yield output, None, None, [create_msg("visualizer_append", event), create_msg("progress", [i + 1, num_tok])]
-
     midi_data = TMIDIX.score2midi(output, text_encoding)
 
     with open(f"Allegro-Music-Transformer-Music-Composition.mid", 'wb') as f:
         f.write(midi_data)
 
-    audio = synthesis(TMIDIX.score2opus(output), 'SGM-v2.01-YamahaGrand-Guit-Bass-v2.7.sf2')
+    output_plot = TMIDIX.plot_ms_SONG(output, plot_title='Allegro-Music-Transformer-Music-Composition', return_plt=True)
+
+    audio = midi_to_colab_audio(new_fn, 
+                        soundfont_path="SGM-v2.01-YamahaGrand-Guit-Bass-v2.7.sf2",
+                        sample_rate=16000,
+                        volume_scale=10,
+                        output_for_gradio=True
+                        )
     
     print('Sample INTs', outy[:16])
     print('-' * 70)
@@ -169,61 +171,10 @@ def GenerateMIDI(num_tok, idrums, iinstr):
     print('-' * 70)
     print('Req execution time:', (time.time() - start_time), 'sec')
     
-    yield output, "Allegro-Music-Transformer-Music-Composition.mid", (44100, audio), [
-        create_msg("visualizer_end", None)]
-
-
-def cancel_run(mid_seq):
-    if mid_seq is None:
-        return None, None, None
-    text_encoding = 'ISO-8859-1'
-    midi_data = TMIDIX.score2midi(mid_seq, text_encoding)
-
-    with open(f"Allegro-Music-Transformer-Music-Composition.mid", 'wb') as f:
-        f.write(midi_data)
-
-    audio = synthesis(TMIDIX.score2opus(mid_seq), 'SGM-v2.01-YamahaGrand-Guit-Bass-v2.7.sf2')
-
-    yield "Allegro-Music-Transformer-Music-Composition.mid", (44100, audio), [
-        create_msg("visualizer_end", None)]
-
+    return output_plot, "Allegro-Music-Transformer-Music-Composition.mid", (16000, audio)
 
 # =================================================================================================
 
-def load_javascript(dir="javascript"):
-    scripts_list = glob.glob(f"{dir}/*.js")
-    javascript = ""
-    for path in scripts_list:
-        with open(path, "r", encoding="utf8") as jsfile:
-            javascript += f"\n<!-- {path} --><script>{jsfile.read()}</script>"
-    template_response_ori = gr.routes.templates.TemplateResponse
-
-    def template_response(*args, **kwargs):
-        res = template_response_ori(*args, **kwargs)
-        res.body = res.body.replace(
-            b'</head>', f'{javascript}</head>'.encode("utf8"))
-        res.init_headers()
-        return res
-
-    gr.routes.templates.TemplateResponse = template_response
-
-
-class JSMsgReceiver(gr.HTML):
-    def __init__(self, **kwargs):
-        super().__init__(elem_id="msg_receiver", visible=False, **kwargs)
-    
-    def postprocess(self, y):
-        if y:
-            y = f"<p>{json.dumps(y)}</p>"
-        return super().postprocess(y)
-
-    def get_block_name(self) -> str:
-        return "html"
-
-def create_msg(name, data):
-    return {"name": name, "data": data}
-
-
 if __name__ == "__main__":
     
     PDT = timezone('US/Pacific')
@@ -232,7 +183,6 @@ if __name__ == "__main__":
     print('App start time: {:%Y-%m-%d %H:%M:%S}'.format(datetime.datetime.now(PDT)))
     print('=' * 70)
     
-    load_javascript()
     app = gr.Blocks()
     with app:
         gr.Markdown("<h1 style='text-align: center; margin-bottom: 1rem'>Allegro Music Transformer</h1>")
@@ -245,7 +195,6 @@ if __name__ == "__main__":
             "(https://colab.research.google.com/github/asigalov61/Allegro-Music-Transformer/blob/main/Allegro_Music_Transformer_Composer.ipynb)"
             " for faster execution and endless generation"
         )
-        js_msg = JSMsgReceiver()
         input_drums = gr.Checkbox(label="Add Drums", value=False, info="Add drums to the composition")
         input_instrument = gr.Radio(
             ["Piano", "Guitar", "Bass", "Violin", "Cello", "Harp", "Trumpet", "Sax", "Flute", "Choir", "Organ"],
@@ -254,12 +203,9 @@ if __name__ == "__main__":
         run_btn = gr.Button("generate", variant="primary")
         interrupt_btn = gr.Button("interrupt")
 
-        output_midi_seq = gr.State()
-        output_midi_visualizer = gr.HTML(elem_id="midi_visualizer_container")
+        output_plot = gr.Plot(label='output plot')
         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(GenerateMIDI, [input_num_tokens, input_drums, input_instrument],
-                                  [output_midi_seq, output_midi, output_audio, js_msg])
-        interrupt_btn.click(cancel_run, output_midi_seq, [output_midi, output_audio, js_msg],
-                            cancels=run_event, queue=False)
+                                  [output_plot, output_midi, output_audio])
         app.queue().launch()