Update app.py

app.py

@@ -23,13 +23,15 @@ from midi_to_colab_audio import midi_to_colab_audio
 # =================================================================================================
                        
 @spaces.GPU
-def Generate_Rock_Song(input_midi, 
+def Generate_Rock_Song(input_midi,
+                       input_gen_type,
                        input_number_prime_chords, 
                        input_use_original_durations,
                        input_match_original_pitches_counts,
                        input_freestyle_continuation,
                        input_number_prime_tokens,
                        input_number_gen_tokens,
+                       input_num_memory_tokens,
                        input_model_temperature,
                        input_model_top_k
                       ):
@@ -48,12 +50,13 @@ def Generate_Rock_Song(input_midi,
     print('Requested settings:')
     print('=' * 70)
     print('Input MIDI file name:', fn)
+    print('Generation type': input_gen_type)
     print('Number of prime chords:', input_number_prime_chords)
     print('Use original durations:', input_use_original_durations)
     print('Match original pitches counts:', input_match_original_pitches_counts)
-    print('Freestyle continuation:', input_freestyle_continuation)
     print('Number of prime tokens:', input_number_prime_tokens)
     print('Number of tokens to generate:', input_number_gen_tokens)
+    print('Number of memory tokens:', input_num_memory_tokens)
     print('Model temperature:', input_model_temperature)
     print('Model sampling top k value:', input_model_top_k)
     print('=' * 70)
@@ -220,6 +223,8 @@ def Generate_Rock_Song(input_midi,
     def generate_tokens(seq, max_num_ptcs=10):
     
         input = copy.deepcopy(seq)
+
+        input = input[-input_num_memory_tokens:]
     
         pcount = 0
         y = 545
@@ -253,7 +258,8 @@ def Generate_Rock_Song(input_midi,
 
     song = []
     
-    if input_freestyle_continuation:
+    if input_gen_type == 'Freestyle':
+        
         output = generate_continuation(input_number_prime_tokens, input_number_gen_tokens)
         song.extend(output)
 
@@ -432,29 +438,33 @@ if __name__ == "__main__":
         output_midi = gr.File(label="Output MIDI file", file_types=[".mid"])
 
         run_event = run_btn.click(Generate_Rock_Song, [input_midi,
+                                                       input_gen_type,
                                                        input_number_prime_chords, 
                                                        input_use_original_durations,
                                                        input_match_original_pitches_counts,
                                                        input_freestyle_continuation,
                                                        input_number_prime_tokens,
                                                        input_number_gen_tokens,
+                                                       input_num_memory_tokens,
                                                        input_model_temperature,
                                                        input_model_top_k
                                                       ],
                                   [output_midi_title, output_midi_summary, output_midi, output_audio, output_plot])
 
         gr.Examples(
-            [["Sharing The Night Together.kar", 256, True, True, False, 512, 1024, 0.9, 10],
-             ["Hotel California.mid", 256, True, True, False, 512, 1024, 0.9, 10],
-             ["Nothing Else Matters.kar", 256, True, True, False, 512, 1024, 0.9, 10],
+            [["Sharing The Night Together.kar", "Controlled", 256, True, True, False, 512, 1024, 2048, 0.9, 10],
+             ["Hotel California.mid", "Controlled", 256, True, True, False, 512, 1024, 2048, 0.9, 10],
+             ["Nothing Else Matters.kar", "Controlled", 256, True, True, False, 512, 1024, 2048, 0.9, 10],
             ],
             [input_midi,
+             input_gen_type,
              input_number_prime_chords, 
              input_use_original_durations,
              input_match_original_pitches_counts,
              input_freestyle_continuation,
              input_number_prime_tokens,
              input_number_gen_tokens,
+             input_num_memory_tokens,
              input_model_temperature,
              input_model_top_k
             ],