Update app.py

app.py

@@ -27,7 +27,7 @@ import matplotlib.pyplot as plt
 # =================================================================================================
                        
 @spaces.GPU
-def Generate_Chords(input_midi, input_num_prime_chords, input_num_gen_chords, input_conditioning_type):
+def Generate_Chords(input_midi, input_num_prime_chords, input_num_gen_chords):
     print('=' * 70)
     print('Req start time: {:%Y-%m-%d %H:%M:%S}'.format(datetime.datetime.now(PDT)))
     start_time = reqtime.time()
@@ -88,7 +88,6 @@ def Generate_Chords(input_midi, input_num_prime_chords, input_num_gen_chords, in
     print('Input file name:', fn)
     print('Num prime chords:', input_num_prime_chords)
     print('Num gen chords:', input_num_gen_chords)
-    print('Conditioning type:', input_conditioning_type)
     print('=' * 70)
 
     #===============================================================================
@@ -290,8 +289,6 @@ def Generate_Chords(input_midi, input_num_prime_chords, input_num_gen_chords, in
     print('=' * 70)
     print('Generating...')
 
-    temperature=0.9
-
     output = []
     
     for m in melody_chords2[:input_num_prime_chords]:
@@ -299,29 +296,24 @@ def Generate_Chords(input_midi, input_num_prime_chords, input_num_gen_chords, in
     
     for ct in tqdm.tqdm(melody_chords2[input_num_prime_chords:input_num_prime_chords+input_num_gen_chords]):
 
-        if input_conditioning_type == 'Chords':
-            output.extend(ct[:1])
-
-        else:
-            output.extend(ct[:2])
+        output.extend(ct[:2])
   
-        y = 646
+        y = 774
     
-        while y > 645:
+        while y > 773:
     
             x = torch.LongTensor(output).to(DEVICE)
             
             with ctx:
                 out = model.generate(x,
                                      1,
-                                     temperature=temperature,
-                                     eos_token=2237,
+                                     temperature=0.9,
                                      return_prime=False,
                                      verbose=False)
             
             y = out.tolist()[0][0]
     
-            if y > 645:
+            if y > 773:
                 output.append(y)
 
     print('=' * 70)
@@ -458,8 +450,7 @@ if __name__ == "__main__":
         
         input_midi = gr.File(label="Input MIDI", file_types=[".midi", ".mid", ".kar"])
         input_num_prime_chords = gr.Slider(1, 128, value=1, step=1, label="Number of prime chords")
-        input_num_gen_chords = gr.Slider(4, 256, 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")
+        input_num_gen_chords = gr.Slider(4, 256, value=128, step=1, label="Number of composition chords to generate progression for")
         
         run_btn = gr.Button("Generate Chords", variant="primary")
 
@@ -471,24 +462,24 @@ 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(Generate_Chords, [input_midi, input_num_prime_chords, input_num_gen_chords, input_conditioning_type],
+        run_event = run_btn.click(Generate_Chords, [input_midi, input_num_prime_chords, input_num_gen_chords],
                                   [output_midi_title, output_midi_summary, output_midi, output_audio, output_plot])
 
         gr.Examples(
-            [["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"]
+            [["Chords-Progressions-Transformer-Piano-Seed-1.mid", 16, 128], 
+             ["Chords-Progressions-Transformer-Piano-Seed-2.mid", 1, 128], 
+             ["Chords-Progressions-Transformer-Piano-Seed-3.mid", 16, 128],
+             ["Chords-Progressions-Transformer-Piano-Seed-4.mid", 1, 128],
+             ["Chords-Progressions-Transformer-Piano-Seed-5.mid", 16, 128],
+             ["Chords-Progressions-Transformer-Piano-Seed-6.mid", 1, 128],
+             ["Chords-Progressions-Transformer-MI-Seed-1.mid", 16, 128],
+             ["Chords-Progressions-Transformer-MI-Seed-2.mid", 1, 128],
+             ["Chords-Progressions-Transformer-MI-Seed-3.mid", 16, 128],
+             ["Chords-Progressions-Transformer-MI-Seed-4.mid", 1, 128],
+             ["Chords-Progressions-Transformer-MI-Seed-5.mid", 16, 128],
+             ["Chords-Progressions-Transformer-MI-Seed-6.mid", 1, 128]
             ],
-            [input_midi, input_num_prime_chords, input_num_gen_chords, input_conditioning_type],
+            [input_midi, input_num_prime_chords, input_num_gen_chords],
             [output_midi_title, output_midi_summary, output_midi, output_audio, output_plot],
             Generate_Chords,
             cache_examples=True,