Update app.py

app.py

@@ -21,10 +21,12 @@ from midi_to_colab_audio import midi_to_colab_audio
 # =================================================================================================
                        
 @spaces.GPU
-def Generate_Rock_Song(input_melody_seed_number):
+def Generate_Rock_Song(input_midi, input_melody_seed_number):
+    
     print('=' * 70)
     print('Req start time: {:%Y-%m-%d %H:%M:%S}'.format(datetime.datetime.now(PDT)))
     start_time = reqtime.time()
+    print('=' * 70)
 
     print('Loading model...')
 
@@ -63,7 +65,97 @@ def Generate_Rock_Song(input_melody_seed_number):
 
     print('Done!')
     print('=' * 70)
-    seed_melody = seed_melodies_data[input_melody_seed_number]
+
+    #==================================================================
+
+    fn = os.path.basename(input_midi)
+    fn1 = fn.split('.')[0]
+    
+    #===============================================================================
+    # Raw single-track ms score
+    
+    raw_score = TMIDIX.midi2single_track_ms_score(input_midi)
+    
+    #===============================================================================
+    # Enhanced score notes
+    
+    escore_notes = TMIDIX.advanced_score_processor(raw_score, return_enhanced_score_notes=True)[0]
+    
+    escore_notes = [e for e in escore_notes if e[6] < 72 or e[6] == 128]
+    
+    #=======================================================
+    # PRE-PROCESSING
+    
+    #===============================================================================
+    # Augmented enhanced score notes
+    
+    escore_notes = TMIDIX.augment_enhanced_score_notes(escore_notes, timings_divider=32, legacy_timings=True)
+    
+    #===============================================================================
+    
+    dscore = TMIDIX.enhanced_delta_score_notes(escore_notes)
+    
+    cscore = TMIDIX.chordify_score(dscore)
+    
+    #===============================================================================
+    
+    score_toks = []
+    control_toks = []
+    prime_toks = []
+    
+    for c in cscore:
+    
+        ctime = c[0][0]
+    
+        #=================================================================
+    
+        chord = sorted(c, key=lambda x: -x[5])
+    
+        gnotes = []
+        gdrums = []
+    
+        for k, v in groupby(chord, key=lambda x: x[5]):
+            if k == 128:
+                gdrums.extend(sorted(v, key=lambda x: x[3], reverse=True))
+            else:
+                gnotes.append(sorted(v, key=lambda x: x[3], reverse=True))
+    
+        #=================================================================
+    
+        chord_toks = []
+        ctoks = []
+        ptoks = []
+    
+        chord_toks.append(ctime)
+        ptoks.append(ctime)
+    
+        if gdrums:
+            chord_toks.extend([e[3]+128 for e in gdrums] + [128])
+            ptoks.extend([e[3]+128 for e in gdrums] + [128])
+        
+        else:
+            chord_toks.append(128)
+            ptoks.append(128)
+    
+        if gnotes:
+            for g in gnotes:
+                
+                durs = [e[1] // 4 for e in g]
+                clipped_dur = max(1, min(31, min(durs)))
+                
+                chan = max(0, min(8, g[0][5] // 8))
+    
+                chan_dur_tok = ((chan * 32) + clipped_dur) + 256
+    
+                ctoks.append([chan_dur_tok, len(g)])
+    
+                ptoks.append(chan_dur_tok)
+                ptoks.extend([e[3]+544 for e in g])
+                
+        score_toks.append(chord_toks)
+        control_toks.append(ctoks)
+        prime_toks.append(ptoks)
+        
     print('Input melody seed number:', input_melody_seed_number)
     print('-' * 70)
 
@@ -71,7 +163,7 @@ def Generate_Rock_Song(input_melody_seed_number):
 
     print('=' * 70)
     
-    print('Sample output events', seed_melody[:16])
+    print('Sample output events', prime_toks[:16])
     print('=' * 70)
     print('Generating...')
 
@@ -105,44 +197,42 @@ def Generate_Rock_Song(input_melody_seed_number):
         song_f = []
     
         time = 0
-        dur = 0
-        vel = 90
-        pitch = 0
+        dur = 32
         channel = 0
-    
-        patches = [0] * 16
-        patches[3] = 40
+        pitch = 60
+        vel = 90
+        
+        patches = [0, 10, 19, 24, 35, 40, 52, 56, 65, 9, 73, 46, 0, 0, 0, 0]
     
         for ss in song:
     
-            if 0 < ss < 128:
-    
-                time += (ss * 32)
+            if 0 <= ss < 128:
     
+                time += ss * 32
+                
             if 128 < ss < 256:
+                
+                song_f.append(['note', time, 32, 9, ss-128, 110, 128])
+                
+            if 256 < ss < 544:
+    
+                dur =  ((ss-256) % 32) * 4 * 32
+                channel = (ss-256) // 32
     
-                dur = (ss-128) * 32
+            if 544 < ss < 672:
     
-            if 256 < ss < 512:
+                patch = channel * 8
     
-                pitch = (ss-256) % 128
+                pitch = ss-544
     
-                channel = (ss-256) // 128
+                song_f.append(['note', time, dur, channel, pitch, vel, patch])
     
-                if channel == 1:
-                    channel = 3
-                    vel = 110 + (pitch % 12)
-                    song_f.append(['note', time, dur, channel, pitch, vel, 40])
-                    
-                else:
-                    vel = 80 + (pitch % 12)
-                    channel = 0
-                    song_f.append(['note', time, dur, channel, pitch, vel, 0])
+    song_f, patches, overflow_patches = TMIDIX.patch_enhanced_score_notes(song_f)
 
-    fn1 = "Melody2Song-Seq2Seq-Music-Transformer-Composition"
+    fn1 = "Guided-Rock-Music-Transformer-Composition"
     
     detailed_stats = TMIDIX.Tegridy_ms_SONG_to_MIDI_Converter(song_f,
-                                                              output_signature = 'Melody2Song Seq2Seq Music Transformer',
+                                                              output_signature = 'Guided Rock Music Transformer',
                                                               output_file_name = fn1,
                                                               track_name='Project Los Angeles',
                                                               list_of_MIDI_patches=patches
@@ -224,7 +314,7 @@ if __name__ == "__main__":
         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(Generate_Rock_Song, [input_melody_seed_number],
+        run_event = run_btn.click(Generate_Rock_Song, [input_midi, input_melody_seed_number],
                                   [output_midi_title, output_midi_summary, output_midi, output_audio, output_plot])
 
         gr.Examples(