Update app.py

app.py

@@ -27,7 +27,7 @@ import matplotlib.pyplot as plt
 # =================================================================================================
                        
 @spaces.GPU
-def GenerateAccompaniment(input_midi, input_num_tokens, input_conditioning_type, input_strip_notes):
+def Generate_Chords(input_midi, input_num_prime_chords, input_num_gen_chords, input_conditioning_type):
     print('=' * 70)
     print('Req start time: {:%Y-%m-%d %H:%M:%S}'.format(datetime.datetime.now(PDT)))
     start_time = reqtime.time()
@@ -85,9 +85,9 @@ def GenerateAccompaniment(input_midi, input_num_tokens, input_conditioning_type,
 
     print('=' * 70)
     print('Input file name:', fn)
-    print('Req num toks:', input_num_tokens)
+    print('Num prime chords:', input_num_prime_chords)
+    print('Num gen chords:', input_num_gen_chords)
     print('Conditioning type:', input_conditioning_type)
-    print('Strip notes:', input_strip_notes)
     print('=' * 70)
 
     #===============================================================================
@@ -293,20 +293,22 @@ def GenerateAccompaniment(input_midi, input_num_tokens, input_conditioning_type,
 
     output = []
     
-    num_prime_chords = 1
-        
-    for m in melody_chords2[:num_prime_chords]:
+    for m in melody_chords2[:input_num_prime_chords]:
         output.extend(m)
     
-    for ct in tqdm.tqdm(melody_chords2[num_prime_chords:]):
-    
-        output.extend(ct[:2])
-    
+    for ct in tqdm.tqdm(melody_chords2[input_num_prime_chords:]):
+
+        if input_conditioning_type == 'Chords':
+            output.extend(ct[:1])
+
+        else:
+            output.extend(ct[:2])
+  
         y = 646
     
         while y > 645:
     
-            x = torch.tensor(song, dtype=torch.long, device=DEVICE)
+            x = torch.LongTensor(song).to(DEVICE)
             
             with ctx:
                 out = model.generate(x,
@@ -420,10 +422,11 @@ def GenerateAccompaniment(input_midi, input_num_tokens, input_conditioning_type,
 
     #========================================================
     
-    print('-' * 70)
+    print('=' * 70)
     print('Req end time: {:%Y-%m-%d %H:%M:%S}'.format(datetime.datetime.now(PDT)))
-    print('-' * 70)
+    print('=' * 70)
     print('Req execution time:', (reqtime.time() - start_time), 'sec')
+    print('*' * 70)
 
     return output_midi_title, output_midi_summary, output_midi, output_audio, output_plot
 
@@ -453,11 +456,11 @@ if __name__ == "__main__":
         gr.Markdown("## Upload your MIDI or select a sample example MIDI")
         
         input_midi = gr.File(label="Input MIDI", file_types=[".midi", ".mid", ".kar"])
-        input_num_tokens = gr.Slider(4, 128, value=32, step=1, label="Number of composition chords to generate progression for")
-        input_conditioning_type = gr.Radio(["Chords", "Chords-Times", "Chords-Times-Durations"], value="Chords", label="Conditioning type")
-        input_strip_notes = gr.Checkbox(label="Strip notes from the composition")
+        input_num_prime_chords = gr.Slider(1, 128, value=1, step=1, label="Number of prime chords")
+        input_num_gen_chords = gr.Slider(4, 128, value=32, step=1, label="Number of composition chords to generate progression for")
+        input_conditioning_type = gr.Radio(["Chords", "Chords-Times"], value="Chords", label="Conditioning type")
         
-        run_btn = gr.Button("generate", variant="primary")
+        run_btn = gr.Button("Generate Chords", variant="primary")
 
         gr.Markdown("## Generation results")
 
@@ -467,26 +470,26 @@ if __name__ == "__main__":
         output_plot = gr.Plot(label="Output MIDI score plot")
         output_midi = gr.File(label="Output MIDI file", file_types=[".mid"])
 
-        run_event = run_btn.click(GenerateAccompaniment, [input_midi, input_num_tokens, input_conditioning_type, input_strip_notes],
+        run_event = run_btn.click(Generate_Chords, [input_midi, input_num_prime_chords, input_num_gen_chords, input_conditioning_type],
                                   [output_midi_title, output_midi_summary, output_midi, output_audio, output_plot])
 
         gr.Examples(
-            [["Chords-Progressions-Transformer-Piano-Seed-1.mid", 128, "Chords", False], 
-             ["Chords-Progressions-Transformer-Piano-Seed-2.mid", 128, "Chords-Times", False], 
-             ["Chords-Progressions-Transformer-Piano-Seed-3.mid", 128, "Chords-Times-Durations", False],
-             ["Chords-Progressions-Transformer-Piano-Seed-4.mid", 128, "Chords", False],
-             ["Chords-Progressions-Transformer-Piano-Seed-5.mid", 128, "Chords-Times", False],
-             ["Chords-Progressions-Transformer-Piano-Seed-6.mid", 128, "Chords-Times-Durations", False],
-             ["Chords-Progressions-Transformer-MI-Seed-1.mid", 128, "Chords", False],
-             ["Chords-Progressions-Transformer-MI-Seed-2.mid", 128, "Chords-Times", False],
-             ["Chords-Progressions-Transformer-MI-Seed-3.mid", 128, "Chords-Times-Durations", False],
-             ["Chords-Progressions-Transformer-MI-Seed-4.mid", 128, "Chords-Times", False],
-             ["Chords-Progressions-Transformer-MI-Seed-5.mid", 128, "Chords", False],
-             ["Chords-Progressions-Transformer-MI-Seed-6.mid", 128, "Chords-Times-Durations", False]
+            [["Chords-Progressions-Transformer-Piano-Seed-1.mid", 16, 128, "Chords"], 
+             ["Chords-Progressions-Transformer-Piano-Seed-2.mid", 16, 128, "Chords-Times"], 
+             ["Chords-Progressions-Transformer-Piano-Seed-3.mid", 16, 128, "Chords-Times"],
+             ["Chords-Progressions-Transformer-Piano-Seed-4.mid", 16, 128, "Chords"],
+             ["Chords-Progressions-Transformer-Piano-Seed-5.mid", 16, 128, "Chords-Times"],
+             ["Chords-Progressions-Transformer-Piano-Seed-6.mid", 16, 128, "Chords-Times"],
+             ["Chords-Progressions-Transformer-MI-Seed-1.mid", 16, 128, "Chords"],
+             ["Chords-Progressions-Transformer-MI-Seed-2.mid", 16, 128, "Chords-Times"],
+             ["Chords-Progressions-Transformer-MI-Seed-3.mid", 16, 128, "Chords-Times"],
+             ["Chords-Progressions-Transformer-MI-Seed-4.mid", 16, 128, "Chords-Times"],
+             ["Chords-Progressions-Transformer-MI-Seed-5.mid", 16, 128, "Chords"],
+             ["Chords-Progressions-Transformer-MI-Seed-6.mid", 16, 128, "Chords-Times"]
             ],
-            [input_midi, input_num_tokens, input_conditioning_type, input_strip_notes],
+            [input_midi, input_num_prime_chords, input_num_gen_chords, input_conditioning_type],
             [output_midi_title, output_midi_summary, output_midi, output_audio, output_plot],
-            GenerateAccompaniment,
+            Generate_Chords,
             cache_examples=False,
         )