Update app.py

app.py

@@ -178,7 +178,6 @@ def load_midi(input_midi):
 def Inpaint_Pitches(input_midi,
                     patches_to_inpaint,
                     inpaint_every_nth_note,
-                    forbid_original_pitches,
                     max_inpainted_pitch_dev,
                     max_inpaint_tries_per_note,
                     num_prime_tokens,
@@ -206,7 +205,6 @@ def Inpaint_Pitches(input_midi,
     
         print('Patches to inpaint:', patches_to_inpaint)
         print('Inpaint every nth note:', inpaint_every_nth_note)
-        print('Forbid original pitches:', forbid_original_pitches)
         print('Max inpainted pitch dev:', max_inpainted_pitch_dev)
         print('Max inpaint tries per note:', max_inpaint_tries_per_note)
         print('-' * 70)
@@ -251,18 +249,17 @@ def Inpaint_Pitches(input_midi,
                     if old_patch in ipatches and notes_counter % inpaint_every_nth_note == 0:
                     
                         x = torch.LongTensor(inpainted_song[-num_mem_tokens:]).cuda()
-            
-                        new_pitch = old_pitch
+
                         tries = 0
             
-                        while (old_pitch == new_pitch or new_pitch > old_pitch + max_inpainted_pitch_dev or new_pitch < old_pitch - max_inpainted_pitch_dev) and tries < max_inpaint_tries_per_note:
+                        while (new_pitch > old_pitch + max_inpainted_pitch_dev or new_pitch < old_pitch - max_inpainted_pitch_dev) and tries < max_inpaint_tries_per_note:
                         
                             with ctx:
                                 out = model.generate(x,
                                                      1,
-                                                     temperature=0.9,
+                                                     temperature=model_temperature,
                                                      filter_logits_fn=top_k,
-                                                     filter_kwargs={'k': 2},
+                                                     filter_kwargs={'k': model_sampling_top_k},
                                                      return_prime=False,
                                                      verbose=False)
                             
@@ -272,9 +269,6 @@ def Inpaint_Pitches(input_midi,
             
                             tries += 1
             
-                            if not forbid_original_pitches:
-                                break
-            
                         if tries == max_inpaint_tries_per_note:
                             new_pitch = old_pitch
                             
@@ -453,7 +447,6 @@ with gr.Blocks() as demo:
                                     )
 
     inpaint_every_nth_note = gr.Slider(1, 10, value=1, step=1, label="Inpaint every nth note")
-    forbid_original_pitches = gr.Checkbox(value=False, label="Forbid repeating original pitches")
     max_inpainted_pitch_dev = gr.Slider(12, 24, value=12, step=12, label="Maximum inpainted pitch deviation")
     max_inpaint_tries_per_note = gr.Slider(5, 100, value=10, step=1, label="Maximum inpainting attempts per note")
 
@@ -476,7 +469,6 @@ with gr.Blocks() as demo:
                        [input_midi,
                         patches_to_inpaint,
                         inpaint_every_nth_note,
-                        forbid_original_pitches,
                         max_inpainted_pitch_dev,
                         max_inpaint_tries_per_note,
                         num_prime_tokens,
@@ -491,12 +483,11 @@ with gr.Blocks() as demo:
                       )
 
     gr.Examples(
-                [["Orpheus-Music-Transformer-MI-Seed-1.mid", "Clarinet", 1, False, 12, 10, 128, 4096, 0.9, 15]
+                [["Orpheus-Music-Transformer-MI-Seed-1.mid", "Clarinet", 1, 12, 10, 128, 4096, 0.9, 15]
                 ],
                 [input_midi,
                  patches_to_inpaint,
                  inpaint_every_nth_note,
-                 forbid_original_pitches,
                  max_inpainted_pitch_dev,
                  max_inpaint_tries_per_note,
                  num_prime_tokens,