Update app.py

app.py

@@ -2,23 +2,15 @@ import argparse
 import glob
 import json
 import os.path
-
 import torch
-import torch.nn.functional as F
-
 import gradio as gr
-
+import matplotlib.pyplot as plt
 from x_transformer import *
-import tqdm
-
-from midi_synthesizer import synthesis
 import TMIDIX
-
-import matplotlib.pyplot as plt
+from midi_synthesizer import synthesis
 
 in_space = os.getenv("SYSTEM") == "spaces"
 
-
 # =================================================================================================
 
 @torch.no_grad()
@@ -136,7 +128,6 @@ def cancel_run(mid_seq):
     yield "Allegro-Music-Transformer-Music-Composition.mid", (44100, audio), [
         create_msg("visualizer_end", None)]
 
-
 # =================================================================================================
 
 def load_javascript(dir="javascript"):
@@ -145,7 +136,8 @@ def load_javascript(dir="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
+
+    template_response_ori = gr.templates.TemplateResponse
 
     def template_response(*args, **kwargs):
         res = template_response_ori(*args, **kwargs)
@@ -154,27 +146,25 @@ def load_javascript(dir="javascript"):
         res.init_headers()
         return res
 
-    gr.routes.templates.TemplateResponse = template_response
+    gr.templates.TemplateResponse = template_response
 
 
-class JSMsgReceiver(gr.HTML):
+class JSMsgReceiver(gr.Interface):
 
     def __init__(self, **kwargs):
-        super().__init__(elem_id="msg_receiver", visible=False, **kwargs)
+        super().__init__(elem_id="msg_receiver", **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 get_interface_name(self) -> str:
+        return "interface"
 
 def create_msg(name, data):
     return {"name": name, "data": data}
 
-
 if __name__ == "__main__":
     parser = argparse.ArgumentParser()
     parser.add_argument("--share", action="store_true", default=False, help="share gradio app")
@@ -212,10 +202,10 @@ if __name__ == "__main__":
     print('Done!')
 
     load_javascript()
-    app = gr.Blocks()
+    app = gr.Interface()
     with app:
-        gr.Markdown("<h1 style='text-align: center; margin-bottom: 1rem'>Allegro Music Transformer</h1>")
-        gr.Markdown(
+        gr.markdown("<h1 style='text-align: center; margin-bottom: 1rem'>Allegro Music Transformer</h1>")
+        gr.markdown(
             "![Visitors](https://api.visitorbadge.io/api/visitors?path=asigalov61.Allegro-Music-Transformer&style=flat)\n\n"
             "Full-attention multi-instrumental music transformer featuring asymmetrical encoding with octo-velocity, and chords counters tokens, optimized for speed and performance\n\n"
             "Check out [Allegro Music Transformer](https://github.com/asigalov61/Allegro-Music-Transformer) on GitHub!\n\n"
@@ -225,20 +215,18 @@ if __name__ == "__main__":
             " for faster execution and endless generation"
         )
         js_msg = JSMsgReceiver()
-        input_drums = gr.Checkbox(label="Drums Controls", value=False, info="Drums present or not")
+        input_drums = gr.Checkbox(label="Drums Controls", default=False, type=bool, description="Drums present or not")
         input_instrument = gr.Radio(
             ["Piano", "Guitar", "Bass", "Violin", "Cello", "Harp", "Trumpet", "Sax", "Flute", "Choir", "Organ"],
-            value="Piano", label="Lead Instrument Controls", info="Desired lead instrument")
-        input_num_tokens = gr.Slider(16, 512, value=256, label="Number of Tokens", info="Number of tokens to generate")
-        run_btn = gr.Button("generate", variant="primary")
+            default="Piano", label="Lead Instrument Controls", description="Desired lead instrument")
+        input_num_tokens = gr.Slider(minimum=16, maximum=512, default=256, label="Number of Tokens", description="Number of tokens to generate")
+        run_btn = gr.Button("generate", type="primary")
         interrupt_btn = gr.Button("interrupt")
 
-        output_midi_seq = gr.Variable()
-        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(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)
-        app.queue(concurrency_count=1).launch(server_port=opt.port, share=opt.share, inbrowser=True)
+        output_midi_seq = gr.Output()
+        output_midi_visualizer = gr.HTML()
+        output_audio = gr.Audio(label="output audio", format="mp3")
+        output_midi = gr.File(label="output midi", type="mid")
+        run_event = run_btn.click(GenerateMIDI, inputs=[input_num_tokens, input_drums, input_instrument], outputs=[output_midi_seq, output_midi, output_audio, js_msg])
+        interrupt_btn.click(cancel_run, inputs=[output_midi_seq], outputs=[output_midi, output_audio, js_msg], cancel=run_event, queue=False)
+        app.run(port=opt.port, share=opt.share, inbrowser=True)