Update app.py

app.py

@@ -174,10 +174,10 @@ def load_midi(input_midi, melody_patch=-1, use_nth_note=1):
 @spaces.GPU
 def Generate_Accompaniment(input_midi,
                            input_melody,
-                           generation_type,
                            melody_patch,
                            use_nth_note,
-                           model_temperature
+                           model_temperature,
+                           model_sampling_top_k
                           ):
 
     #===============================================================================
@@ -220,48 +220,11 @@ def Generate_Accompaniment(input_midi,
 
     #===============================================================================
 
-    def generate_block_seq(input_seq, trg_dtime, temperature=0.9):
-    
-        inp_seq = copy.deepcopy(input_seq)
-    
-        block_seq = []
-    
-        cur_time = 0
-    
-        while cur_time < trg_dtime:
-    
-            x = torch.LongTensor(inp_seq).cuda()
-            
-            with ctx:
-                out = model.generate(x,
-                                     1,
-                                     temperature=temperature,
-                                     return_prime=False,
-                                     verbose=False)
-            
-            y = out.tolist()[0][0]
-    
-            if y < 128:
-                cur_time += y
-    
-            inp_seq.append(y)
-            block_seq.append(y)
-    
-        if cur_time != trg_dtime:
-            return []
-    
-        else:
-            return block_seq
-
-    #===============================================================================
-    
     print('=' * 70)
     print('Req start time: {:%Y-%m-%d %H:%M:%S}'.format(datetime.datetime.now(PDT)))
     start_time = reqtime.time()
     print('=' * 70)
 
-
-
     print('=' * 70)
     print('Requested settings:')
     print('=' * 70)
@@ -270,10 +233,10 @@ def Generate_Accompaniment(input_midi,
         fn1 = fn.split('.')[0]
         print('Input MIDI file name:', fn)
     print('Input sample melody:', input_melody)
-    print('Generation type:', generation_type)
     print('Source melody patch:', melody_patch)
     print('Use nth melody note:', use_nth_note)
     print('Model temperature:', model_temperature)
+    print('Model top k':, model_sampling_top_k)
    
     print('=' * 70)
 
@@ -315,58 +278,7 @@ def Generate_Accompaniment(input_midi,
 
     #==================================================================
 
-    if generation_type == 'Guided':
-
-        input_seq = []
-
-        input_seq.extend(start_score_seq)
-        input_seq.extend(score_list[0][0])
-        
-        block_seq_lens = []
-        
-        idx = 0
-        
-        max_retries = 2
-        mrt = 0
-        
-        while idx < len(score_list)-1:
-        
-            if idx % 10 == 0:
-                print('Generating', idx, 'block')
-        
-            input_seq.extend(score_list[idx][1])
-        
-            block_seq = []
-        
-            for _ in range(max_retries):
-        
-                block_seq = generate_block_seq(input_seq, score_list[idx+1][0][0])
-        
-                if block_seq:
-                    break
-        
-            if block_seq:
-                input_seq.extend(block_seq)
-                block_seq_lens.append(len(block_seq))
-                idx += 1
-                mrt = 0
-        
-            else:
-        
-                if block_seq_lens:
-                    input_seq = input_seq[:-(block_seq_lens[-1]+2)]
-                    block_seq_lens.pop()
-                    idx -= 1
-                    mrt += 1
-        
-                else:
-                    break
-        
-                if mrt == max_retries:
-                    break
-
-    else:
-        input_seq = generate_full_seq(start_score_seq, temperature=model_temperature)
+    input_seq = generate_full_seq(start_score_seq, temperature=model_temperature)
 
     final_song = input_seq[len(start_score_seq):]
    
@@ -492,9 +404,9 @@ with gr.Blocks() as demo:
     
     gr.Markdown("## Generation options")
     
-    generation_type = gr.Radio(["Guided", "Freestyle"], value="Guided", label="Generation type")
     melody_patch = gr.Slider(-1, 127, value=-1, step=1, label="Source melody MIDI patch")
     use_nth_note = gr.Slider(1, 8, value=1, step=1, label="Use each nth melody note")
+    model_sampling_top_k = gr.Slider(1, 100, value=15, step=1, label="Model sampling top k value")
     model_temperature = gr.Slider(0.1, 1, value=0.9, step=0.01, label="Model temperature")
     
     generate_btn = gr.Button("Generate", variant="primary")
@@ -508,10 +420,10 @@ with gr.Blocks() as demo:
     generate_btn.click(Generate_Accompaniment, 
                        [input_midi,
                         input_melody,
-                        generation_type,
                         melody_patch,
                         use_nth_note,
-                        model_temperature
+                        model_temperature,
+                        model_sampling_top_k
                        ], 
                        [output_audio,
                         output_plot,
@@ -520,15 +432,15 @@ with gr.Blocks() as demo:
                       )
 
     gr.Examples(
-                [["USSR-National-Anthem-Seed-Melody.mid", "Custom MIDI", "Freestyle", -1, 1, 0.9],
-                 ["Sparks-Fly-Seed-Melody.mid", "Custom MIDI", "Guided", -1, 1, 0.9]
+                [["USSR-National-Anthem-Seed-Melody.mid", "Custom MIDI", -1, 1, 0.9, 15],
+                 ["Sparks-Fly-Seed-Melody.mid", "Custom MIDI", "Guided", -1, 1, 0.9, 15]
                 ],
                 [input_midi,
                  input_melody,
-                 generation_type,
                  melody_patch,
                  use_nth_note,
-                 model_temperature
+                 model_temperature,
+                 model_sampling_top_k
                 ],
                 [output_audio,
                  output_plot,