Update app.py

app.py

@@ -1,16 +1,16 @@
-# https://huggingface.co/spaces/asigalov61/Harmonic-Melody-MIDI-Mixer
-
-import os.path
+#=========================================================================
+# https://huggingface.co/spaces/asigalov61/Parsons-Code-Melody-Transformer
+#=========================================================================
 
 import time as reqtime
 import datetime
 from pytz import timezone
 
-from itertools import groupby
 import copy
 
 import gradio as gr
 
+from x_transformer_1_23_2 import *
 import random
 
 from midi_to_colab_audio import midi_to_colab_audio
@@ -20,122 +20,19 @@ import matplotlib.pyplot as plt
     
 # =================================================================================================
 
-def pitches_counts(melody_score):
-
-  pitches = [p[4] for p in melody_score]
-
-  pcounts = []
-
-  count = 0
-  pp = -1
-    
-  for p in pitches:
-    if p == pp:
-      count += 1
-      pcounts.append(count)
-    else:
-      count = 0
-      pcounts.append(count)
-    pp = p
-
-  return pcounts
-
-# =================================================================================================
-
-def find_similar_song(songs, src_melody):
-
-  src_pcount = pitches_counts(src_melody)
-
-  ratios = []
-
-  for s in songs:
-    patch = s[1]
-
-    trg_melody = [e for e in s[3] if e[6] == patch]
-    trg_pcount = pitches_counts(trg_melody)
-
-    pcount = 0
-
-    for i, c in enumerate(src_pcount):
-      if c == trg_pcount[i]:
-        pcount += 1
-
-    ratios.append(pcount / len(src_pcount))
-
-  max_ratio = max(ratios)
-
-  return songs[ratios.index(max_ratio)], max_ratio, ratios.count(max_ratio)
-
 # =================================================================================================
 
-def mix_chord(chord, tones_chord, mel_patch, mel_pitch, next_note_dtime):
-
-  cho = []
-
-  for k, g in groupby(sorted(chord, key=lambda x: x[6]), lambda x: x[6]):
-
-    if k != 128:
-      if k == mel_patch:
-          
-        cg = list(g)
-          
-        c = copy.deepcopy(cg[0])
-          
-        if cg[0][2] > next_note_dtime:
-            c[2] = next_note_dtime
-            
-        c[4] = mel_pitch
-        c[5] = 105 + (mel_pitch % 12)
-          
-        cho.append(c)
-
-      else:
-        cg = list(g)
-
-        tclen = len(tones_chord)
-
-        if len(cg) > tclen:
-          tchord = tones_chord + [random.choice(tones_chord) for _ in range(len(cg)-tclen)]
-        
-        else:
-          tchord = tones_chord
-
-        seen = []
-
-        for i, cc in enumerate(cg):
-
-            if [cc[4], cc[6]] not in seen:
-            
-                c = copy.deepcopy(cc)
-                
-                if cc[2] > next_note_dtime:
-                    c[2] = next_note_dtime
-                  
-                c[4] = ((c[4] // 12) * 12) + tchord[i]
-                c[5] += c[4] % 12
-                
-                cho.append(c)
-
-                seen.append([cc[4], cc[6]])
-
-    else:
-      cho.extend(list(g))
-
-  return cho
-
-# =================================================================================================
-
-def Mix_Melody(input_midi, 
-               input_find_best_match, 
-               input_adjust_melody_notes_durations, 
-               input_adjust_accompaniment_notes_durations,
-               input_output_as_solo_piano,
-               input_remove_drums,
-               input_output_tempo,
-               input_transform,
-               input_transpose_to_C4,
-               input_transpose_value
-             ):
+def Generate_Melody(input_midi, 
+                   input_find_best_match, 
+                   input_adjust_melody_notes_durations, 
+                   input_adjust_accompaniment_notes_durations,
+                   input_output_as_solo_piano,
+                   input_remove_drums,
+                   input_output_tempo,
+                   input_transform,
+                   input_transpose_to_C4,
+                   input_transpose_value
+                 ):
     
     print('=' * 70)
     print('Req start time: {:%Y-%m-%d %H:%M:%S}'.format(datetime.datetime.now(PDT)))
@@ -402,20 +299,20 @@ if __name__ == "__main__":
     print('=' * 70)
 
     soundfont = "SGM-v2.01-YamahaGrand-Guit-Bass-v2.7.sf2"
-    
-    all_songs = TMIDIX.Tegridy_Any_Pickle_File_Reader('Monster_Mono_Melodies_MIDI_Dataset_65536_32_256')
-    print('=' * 70)
-    
+
     app = gr.Blocks()
+    
     with app:
-        gr.Markdown("<h1 style='text-align: center; margin-bottom: 1rem'>Harmonic Melody MIDI Mixer</h1>")
-        gr.Markdown("<h1 style='text-align: center; margin-bottom: 1rem'>Harmonize and mix any MIDI melody</h1>")
+        
+        gr.Markdown("<h1 style='text-align: center; margin-bottom: 1rem'>Parsons Code Melody Transformer</h1>")
+        gr.Markdown("<h1 style='text-align: center; margin-bottom: 1rem'>Generate unique melodies from Parsons codes</h1>")
         gr.Markdown(
-            "![Visitors](https://api.visitorbadge.io/api/visitors?path=asigalov61.Harmonic-Melody-MIDI-Mixer&style=flat)\n\n"
+            "![Visitors](https://api.visitorbadge.io/api/visitors?path=asigalov61.Parsons-Code-Melody-Transformer&style=flat)\n\n"
             "This is a demo for TMIDIX Python module from tegridy-tools and Monster Mono Melodies MIDI Dataset\n\n"
             "Check out [tegridy-tools](https://github.com/asigalov61/tegridy-tools) on GitHub!\n\n"
             "Check out [Monster-MIDI-Dataset](https://github.com/asigalov61/Monster-MIDI-Dataset) on GitHub!\n\n"
         )
+        
         gr.Markdown("## Upload your MIDI or select a sample example MIDI below")
         
         input_midi = gr.File(label="Input MIDI", file_types=[".midi", ".mid", ".kar"])
@@ -443,18 +340,18 @@ if __name__ == "__main__":
         output_midi = gr.File(label="Output MIDI file", file_types=[".mid"])
 
 
-        run_event = run_btn.click(Mix_Melody, [input_midi, 
-                                               input_find_best_match, 
-                                               input_adjust_melody_notes_durations, 
-                                               input_adjust_accompaniment_notes_durations,
-                                               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])
+        run_event = run_btn.click(Generate_Melody, [input_midi, 
+                                                   input_find_best_match, 
+                                                   input_adjust_melody_notes_durations, 
+                                                   input_adjust_accompaniment_notes_durations,
+                                                   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])
 
         gr.Examples(
             [["Abracadabra-Sample-Melody.mid", True, True, True, False, False, "Mix Melody", "As-is", False, 0], 
@@ -472,7 +369,7 @@ if __name__ == "__main__":
              input_transpose_value
             ],
             [output_midi_title, output_midi_summary, output_midi, output_audio, output_plot],
-            Mix_Melody,
+            Generate_Melody,
             cache_examples=True,
         )