New UI with 2 models

app.py

@@ -1,18 +1,61 @@
-from music import music_gen
+from matplotlib.pyplot import title
+from yaml import Mark
+from music import music_gen #Funtion to generate music based on ABC files
 import gradio as gr
 import os
-from music import GlobalUIGallery
+from MC.markov_chain import main_markov #Function to generate music based on midi files
+
 keysignature = ["C","G","D","No selection"]
 difficulty = ["beginner","intermediate","expert"]
-timesignature = ['3/4','4/4','1/8']
+timesignature = ['3/4','4/4','1/8','6/8']
+
+# output = gr.Gallery() if GlobalUIGallery else "image"
+
+# interface = gr.Interface(fn = music_gen,
+# inputs=[gr.Radio(difficulty,label="Difficulty"),
+# 		gr.Radio(timesignature,label="Time Signature"),
+# 		gr.Dropdown(keysignature,label="Key Signature")],
+# outputs = [gr.Gallery(label="Sheet Music"),gr.Audio(label="Audio")],
+# title="Sheet Music Generation for Sight-Reading",
+# description="TO be added")
+# interface.launch(inline=False)
+
+with gr.Blocks() as demo:
+    
+    gr.Markdown("""
+    ## Sheet Music Generation for Sight-Reading
+    """)
+    with gr.Tabs():
+        with gr.TabItem("ABC Model"):
+            gr.Markdown("ABC Model discription")
+            with gr.Row():
+                with gr.Column():
+                    difficulty_input_abc = gr.Radio(difficulty,label="Difficulty") #input
+                    time_sig_input_abc = gr.Radio(timesignature,label="Time Signature") #input
+                    key_sig_input_abc = gr.Dropdown(keysignature,label="Key Signature") #input
+                    with gr.Row():
+                        abc_button = gr.Button("Create Music!!") #Submit
+
+                with gr.Column():
+                    output_gallery_abc = gr.Gallery(label="Sheet Music")
+                    output_audio_abc = gr.Audio(label="Audio")
+        with gr.TabItem("Midi Model"):
+            gr.Markdown("ABC Model discription")
+            with gr.Row():
+                with gr.Column():
+                    # difficulty_input_midi = gr.Radio(difficulty,label="Difficulty") #input
+                    time_sig_input_midi = gr.Radio(timesignature,label="Time Signature") #input
+                    # key_sig_input_midi = gr.Dropdown(keysignature,label="Key Signature") #input
+                    with gr.Row():
+                        midi_button = gr.Button("Create Music!!") #Submit
 
-output = gr.Gallery() if GlobalUIGallery else "image"
+                with gr.Column():
+                    output_gallery_midi = gr.Gallery(label="Sheet Music")
+                    output_audio_midi = gr.Audio(label="Audio")
+    
+    abc_button.click(music_gen, inputs=[difficulty_input_abc,time_sig_input_abc,key_sig_input_abc], outputs=[output_gallery_abc,output_audio_abc])
+    midi_button.click(main_markov, inputs= time_sig_input_midi, outputs=[output_gallery_midi,output_audio_midi])
+    
+if __name__ == "__main__":
+    demo.launch()
 
-interface = gr.Interface(fn = music_gen,
-inputs=[gr.Radio(difficulty,label="Difficulty"),
-		gr.Radio(timesignature,label="Time Signature"),
-		gr.Dropdown(keysignature,label="Key Signature")],
-outputs = [gr.Gallery(label="Sheet Music"),gr.Audio(label="Audio")],
-title="Sheet Music Generation for Sight-Reading",
-description="TO be added")
-interface.launch(inline=False)

app2.py

@@ -1,69 +0,0 @@
-from matplotlib.pyplot import title
-from yaml import Mark
-from music import music_gen #Funtion to generate music based on ABC files
-import gradio as gr
-import os
-from MC.markov_chain import main_markov #Function to generate music based on midi files
-
-keysignature = ["C","G","D","No selection"]
-difficulty = ["beginner","intermediate","expert"]
-timesignature = ['3/4','4/4','1/8','6/8']
-
-# output = gr.Gallery() if GlobalUIGallery else "image"
-
-# interface = gr.Interface(fn = music_gen,
-# inputs=[gr.Radio(difficulty,label="Difficulty"),
-# 		gr.Radio(timesignature,label="Time Signature"),
-# 		gr.Dropdown(keysignature,label="Key Signature")],
-# outputs = [gr.Gallery(label="Sheet Music"),gr.Audio(label="Audio")],
-# title="Sheet Music Generation for Sight-Reading",
-# description="TO be added")
-# interface.launch(inline=False)
-
-import numpy as np
-
-def flip_text(x):
-    return x[::-1]
-
-def flip_image(x):
-    return np.fliplr(x)
-
-with gr.Blocks() as demo:
-    
-    gr.Markdown("""
-    ## Sheet Music Generation for Sight-Reading
-    """)
-    with gr.Tabs():
-        with gr.TabItem("ABC Model"):
-            gr.Markdown("ABC Model discription")
-            with gr.Row():
-                with gr.Column():
-                    difficulty_input_abc = gr.Radio(difficulty,label="Difficulty") #input
-                    time_sig_input_abc = gr.Radio(timesignature,label="Time Signature") #input
-                    key_sig_input_abc = gr.Dropdown(keysignature,label="Key Signature") #input
-                    with gr.Row():
-                        abc_button = gr.Button("Create Music!!") #Submit
-
-                with gr.Column():
-                    output_gallery_abc = gr.Gallery(label="Sheet Music")
-                    output_audio_abc = gr.Audio(label="Audio")
-        with gr.TabItem("Midi Model"):
-            gr.Markdown("ABC Model discription")
-            with gr.Row():
-                with gr.Column():
-                    # difficulty_input_midi = gr.Radio(difficulty,label="Difficulty") #input
-                    time_sig_input_midi = gr.Radio(timesignature,label="Time Signature") #input
-                    # key_sig_input_midi = gr.Dropdown(keysignature,label="Key Signature") #input
-                    with gr.Row():
-                        midi_button = gr.Button("Create Music!!") #Submit
-
-                with gr.Column():
-                    output_gallery_midi = gr.Gallery(label="Sheet Music")
-                    output_audio_midi = gr.Audio(label="Audio")
-    
-    abc_button.click(music_gen, inputs=[difficulty_input_abc,time_sig_input_abc,key_sig_input_abc], outputs=[output_gallery_abc,output_audio_abc])
-    midi_button.click(main_markov, inputs= time_sig_input_midi, outputs=[output_gallery_midi,output_audio_midi])
-    
-if __name__ == "__main__":
-    demo.launch()
-