Update app.py

app.py

@@ -189,10 +189,8 @@ def generate_music(prime,
                    num_gen_tokens,
                    num_mem_tokens,
                    num_gen_batches,
-                   gen_outro,
-                   gen_drums,
                    model_temperature,
-                   model_sampling_top_p
+                   # model_sampling_top_p
                   ):
 
     if not prime:
@@ -233,10 +231,8 @@ def generate_callback(input_midi,
                       num_prime_tokens, 
                       num_gen_tokens,
                       num_mem_tokens,
-                      gen_outro,
-                      gen_drums,
                       model_temperature,
-                      model_sampling_top_p,
+                      # model_sampling_top_p,
                       final_composition, 
                       generated_batches, 
                       block_lines
@@ -253,10 +249,8 @@ def generate_callback(input_midi,
                                         num_gen_tokens,
                                         num_mem_tokens,
                                         NUM_OUT_BATCHES,
-                                        gen_outro,
-                                        gen_drums,
                                         model_temperature,
-                                        model_sampling_top_p
+                                        # model_sampling_top_p
                                        )
     
     outputs = []
@@ -306,10 +300,8 @@ def generate_callback_wrapper(input_midi,
                               num_prime_tokens, 
                               num_gen_tokens,
                               num_mem_tokens,
-                              gen_outro,
-                              gen_drums,
                               model_temperature,
-                              model_sampling_top_p,
+                              # model_sampling_top_p,
                               final_composition, 
                               generated_batches, 
                               block_lines
@@ -328,21 +320,17 @@ def generate_callback_wrapper(input_midi,
     print('Num prime tokens:', num_prime_tokens)
     print('Num gen tokens:', num_gen_tokens)
     print('Num mem tokens:', num_mem_tokens)
-    print('Gen drums:', gen_drums)
-    print('Gen outro:', gen_outro)
 
     print('Model temp:', model_temperature)
-    print('Model top_p:', model_sampling_top_p)
+    # print('Model top_p:', model_sampling_top_p)
     print('=' * 70)
     
     result = generate_callback(input_midi, 
                                 num_prime_tokens, 
                                 num_gen_tokens,
                                 num_mem_tokens,
-                                gen_outro,
-                                gen_drums,
                                 model_temperature,
-                                model_sampling_top_p,
+                                # model_sampling_top_p,
                                 final_composition,
                                 generated_batches,
                                 block_lines
@@ -494,13 +482,11 @@ with gr.Blocks() as demo:
     
     gr.Markdown("## Generate")
     
-    num_prime_tokens = gr.Slider(15, 6990, value=600, step=3, label="Number of prime tokens")
-    num_gen_tokens = gr.Slider(15, 1200, value=600, step=3, label="Number of tokens to generate")
-    num_mem_tokens = gr.Slider(15, 6990, value=6990, step=3, label="Number of memory tokens")
-    gen_drums = gr.Checkbox(value=False, label="Introduce drums")
-    gen_outro = gr.Radio(["Auto", "Disable", "Force"], value="Auto", label="Outro options")
+    num_prime_tokens = gr.Slider(15, 1024, value=1024, step=1, label="Number of prime tokens")
+    num_gen_tokens = gr.Slider(15, 1024, value=1024, step=1, label="Number of tokens to generate")
+    num_mem_tokens = gr.Slider(15, 2048, value=2048, step=1, label="Number of memory tokens")
     model_temperature = gr.Slider(0.1, 1, value=0.9, step=0.01, label="Model temperature")
-    model_sampling_top_p = gr.Slider(0.1, 1, value=0.96, step=0.01, label="Model sampling top p value")
+    # model_sampling_top_p = gr.Slider(0.1, 1, value=0.96, step=0.01, label="Model sampling top p value")
     
     generate_btn = gr.Button("Generate", variant="primary")
 
@@ -521,10 +507,8 @@ with gr.Blocks() as demo:
                         num_prime_tokens, 
                         num_gen_tokens,
                         num_mem_tokens,
-                        gen_outro,
-                        gen_drums,
                         model_temperature,
-                        model_sampling_top_p,
+                        # model_sampling_top_p,
                         final_composition,
                         generated_batches,
                         block_lines