Update app.py

app.py

@@ -18,10 +18,7 @@ import TMIDIX
 
 # =================================================================================================
 
-def Mix_Chords(input_find_best_match, 
-               input_adjust_melody_notes_durations, 
-               input_adjust_accompaniment_notes_durations,
-               input_output_as_solo_piano,
+def Mix_Chords(input_output_as_solo_piano,
                input_remove_drums,
                input_output_tempo,
                input_transform,
@@ -38,9 +35,6 @@ def Mix_Chords(input_find_best_match,
     print('-' * 70)
     print('Requested settings:')
     print('-' * 70)
-    print('Find best matches', input_find_best_match)
-    print('Adjust melody notes durations:', input_adjust_melody_notes_durations)
-    print('Adjust accompaniment notes durations:', input_adjust_accompaniment_notes_durations)
     print('Output as Solo Piano:', input_output_as_solo_piano)
     print('Remove drums:', input_remove_drums)
     print('Output tempo:', input_output_tempo)
@@ -191,6 +185,45 @@ if __name__ == "__main__":
     soundfont = "SGM-v2.01-YamahaGrand-Guit-Bass-v2.7.sf2"
     
     all_chords_chunks = TMIDIX.Tegridy_Any_Pickle_File_Reader('Los_Angeles_Chords_Songs_MIDI_Dataset_79898_128_256')
+    
+    print('=' * 70)
+    print('Prepping loaded data...')
+
+    #=====================================================================
+
+    chords_drums_counts = []
+    
+    for a in all_chords_chunks:
+      score = a[1]
+      ccount = 0
+      dcount = 0
+      for s in score:
+        if any(a[2] < 80 for a in s):
+          ccount += 1
+        if all(a[2] == 128 for a in s):
+          dcount += 1
+    
+      chords_drums_counts.append([ccount, dcount])
+        
+    #=====================================================================
+    
+    all_chords_indexes = []
+    
+    for a in all_chords_chunks:
+    
+      score = a[1]
+    
+      chords_indexes = []
+      
+      for i, s in enumerate(score):
+        if any(a[2] < 80 for a in s):
+          chords_indexes.append(i)
+    
+      all_chords_indexes.append(chords_indexes)
+
+    #=====================================================================
+
+    print('Done!')
     print('=' * 70)
     
     app = gr.Blocks()
@@ -207,37 +240,30 @@ if __name__ == "__main__":
 
         gr.Markdown("## Select mixing options")
         
-        input_find_best_match = gr.Checkbox(label="Find best match", value=False)
-        input_adjust_melody_notes_durations = gr.Checkbox(label="Adjust melody notes durations", value=False)
-        input_adjust_accompaniment_notes_durations = gr.Checkbox(label="Adjust accompaniment notes durations", value=False)
         input_output_as_solo_piano = gr.Checkbox(label="Output as Solo Piano", value=False)
         input_remove_drums = gr.Checkbox(label="Remove drums from output", value=False)
-        input_output_tempo = gr.Radio(["Mix Melody", "Source Melody", "Mix"], value="Mix Melody", label="Output tempo")
+        input_output_tempo = gr.Radio(["Source MIDI", "Target MIDI", "MIDI Mix"], value="Mix", label="Output tempo")
         input_transform = gr.Radio(["As-is", "Flip Melody", "Reverse Melody", "Flip Mix", "Reverse Mix"], value="As-is", label="Transform")        
         input_transpose_value = gr.Slider(-12, 12, value=0, step=1, label="Transpose value")
         input_transpose_to_C4 = gr.Checkbox(label="Transpose to C4", value=False)
          
-        run_btn = gr.Button("mix chords", variant="primary")
+        run_btn = gr.Button("Mix Chords", variant="primary")
 
         gr.Markdown("## Output results")
 
         output_midi_title = gr.Textbox(label="Output MIDI title")
-        output_midi_summary = gr.Textbox(label="Output MIDI summary")
         output_audio = gr.Audio(label="Output MIDI audio", format="mp3", elem_id="midi_audio")
         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(Mix_Chords, [input_find_best_match, 
-                                               input_adjust_melody_notes_durations, 
-                                               input_adjust_accompaniment_notes_durations,
-                                               input_output_as_solo_piano,
+        run_event = run_btn.click(Mix_Chords, [input_output_as_solo_piano,
                                                input_remove_drums,
                                                input_output_tempo,
                                                input_transform,
                                                input_transpose_to_C4,
                                                input_transpose_value
                                               ],
-                                            [output_midi_title, output_midi_summary, output_midi, output_audio, output_plot])
+                                            [output_midi_title, output_midi, output_audio, output_plot])
 
         app.queue().launch()