Update app.py

app.py

@@ -66,7 +66,7 @@ def GenerateDrums(input_midi, input_num_tokens):
 
     print('-' * 70)
     print('Input file name:', fn)
-    print('Req num tok:', input_num_tokens)
+    print('Req num toks:', input_num_tokens)
     print('-' * 70)
 
     #===============================================================================
@@ -101,99 +101,115 @@ def GenerateDrums(input_midi, input_num_tokens):
 
     #===============================================================================
 
-    print('Selected Improv sequence:')
-    print(start_tokens)
-    print('-' * 70)
-
-    output_signature = 'Allegro Music Transformer'
-    output_file_name = 'Allegro-Music-Transformer-Music-Composition'
-    track_name = 'Project Los Angeles'
-    list_of_MIDI_patches = [0, 24, 32, 40, 42, 46, 56, 71, 73, 0, 53, 19, 0, 0, 0, 0]
-    number_of_ticks_per_quarter = 500
-    text_encoding = 'ISO-8859-1'
-
-    output_header = [number_of_ticks_per_quarter,
-                     [['track_name', 0, bytes(output_signature, text_encoding)]]]
-
-    patch_list = [['patch_change', 0, 0, list_of_MIDI_patches[0]],
-                  ['patch_change', 0, 1, list_of_MIDI_patches[1]],
-                  ['patch_change', 0, 2, list_of_MIDI_patches[2]],
-                  ['patch_change', 0, 3, list_of_MIDI_patches[3]],
-                  ['patch_change', 0, 4, list_of_MIDI_patches[4]],
-                  ['patch_change', 0, 5, list_of_MIDI_patches[5]],
-                  ['patch_change', 0, 6, list_of_MIDI_patches[6]],
-                  ['patch_change', 0, 7, list_of_MIDI_patches[7]],
-                  ['patch_change', 0, 8, list_of_MIDI_patches[8]],
-                  ['patch_change', 0, 9, list_of_MIDI_patches[9]],
-                  ['patch_change', 0, 10, list_of_MIDI_patches[10]],
-                  ['patch_change', 0, 11, list_of_MIDI_patches[11]],
-                  ['patch_change', 0, 12, list_of_MIDI_patches[12]],
-                  ['patch_change', 0, 13, list_of_MIDI_patches[13]],
-                  ['patch_change', 0, 14, list_of_MIDI_patches[14]],
-                  ['patch_change', 0, 15, list_of_MIDI_patches[15]],
-                  ['track_name', 0, bytes(track_name, text_encoding)]]
-
-    output = output_header + [patch_list]
-
-    yield output, None, None, [create_msg("visualizer_clear", None)]
-
-    outy = start_tokens
-    
-    ctime = 0
-    dur = 0
-    vel = 90
-    pitch = 0
-    channel = 0
-
-    for i in range(max(1, min(512, num_tok))):
-        
-        inp = torch.LongTensor([outy]).cpu()
-
-        with ctx:
-        
-            out = model.module.generate(inp,
-                                        1,
-                                        temperature=0.9,
-                                        return_prime=False,
-                                        verbose=False)
-
-        out0 = out[0].tolist()
-        outy.extend(out0)
-        
-        ss1 = out0[0]
-
-        if 0 < ss1 < 256:
-            ctime += ss1 * 8
+    print('=' * 70)
+    
+    print('Sample output events', escore_notes[:5])
+    print('=' * 70)
+    print('Generating...')
 
-        if 256 <= ss1 < 1280:
-            dur = ((ss1 - 256) // 8) * 32
-            vel = (((ss1 - 256) % 8) + 1) * 15
+    for c in comp_times[:input_num_tokens]:
+      output.append(c)
+    
+      out = generate_drums(output,
+                           temperature=0.9,
+                           max_drums_limit=8,
+                           num_memory_tokens=4096
+                           )
+      output.extend(out)
 
-        if 1280 <= ss1 < 2816:
-            channel = (ss1 - 1280) // 128
-            pitch = (ss1 - 1280) % 128
-            event = ['note', ctime, dur, channel, pitch, vel]
-            output[-1].append(event)
+    print('=' * 70)
+    print('Done!')
+    print('=' * 70)
+    
+    #===============================================================================
+    print('Rendering results...')
+    
+    print('=' * 70)
+    print('Sample INTs', output[:12])
+    print('=' * 70)
+    
+    if len(output) != 0:
+    
+        song = output
+        song_f = []
+    
+        time = 0
+        dtime = 0
+        ntime = 0
+        dur = 32
+        vel = 90
+        vels = [100, 120]
+        pitch = 0
+        channel = 0
+    
+        idx = 0
+    
+        for ss in song:
+    
+            if 0 <= ss < 128:
+    
+                dtime = time
+    
+                time += cscore[idx][0][0] * 32
+    
+                for c in cscore[idx]:
+                  song_f.append(['note', time, c[1] * 32, c[2], c[3], c[4], c[5]])
+    
+                idx += 1
+    
+            if 128 <= ss < 256:
+    
+                dtime += (ss-128) * 32
+    
+            if 256 <= ss < 384:
+    
+                pitch = (ss-256)
+    
+                song_f.append(['note', dtime, dur, 9, pitch, vels[pitch % 2], 128 ])
+    
+    detailed_stats = TMIDIX.Tegridy_ms_SONG_to_MIDI_Converter(song_f,
+                                                              output_signature = 'Ultimate Drums Transformer',
+                                                              output_file_name = '/content/Ultimate-Drums-Transformer-Composition',
+                                                              track_name='Project Los Angeles',
+                                                              list_of_MIDI_patches=patches
+                                                              )
+    
+    new_fn = fn1+'.mid'
+            
+    
+    audio = midi_to_colab_audio(new_fn, 
+                        soundfont_path=soundfont,
+                        sample_rate=16000,
+                        volume_scale=10,
+                        output_for_gradio=True
+                        )
+    
+    print('Done!')
+    print('=' * 70)
 
-            yield output, None, None, [create_msg("visualizer_append", event), create_msg("progress", [i + 1, num_tok])]
+    #========================================================
 
-    midi_data = TMIDIX.score2midi(output, text_encoding)
+    output_midi_title = str(fn1)
+    output_midi_summary = str('')
+    output_midi = str(fn1)
+    output_audio = (16000, audio)
+    
+    output_plot = TMIDIX.plot_ms_SONG(output_score, plot_title=output_midi, return_plt=True)
 
-    with open(f"Allegro-Music-Transformer-Music-Composition.mid", 'wb') as f:
-        f.write(midi_data)
+    print('Output MIDI file name:', output_midi)
+    print('Output MIDI title:', output_midi_title)
+    print('Output MIDI summary:', '')
+    print('=' * 70) 
+    
 
-    audio = synthesis(TMIDIX.score2opus(output), 'SGM-v2.01-YamahaGrand-Guit-Bass-v2.7.sf2')
+    #========================================================
     
-    print('Sample INTs', outy[:16])
-    print('-' * 70)
-    print('Last generated MIDI event', output[2][-1])
     print('-' * 70)
     print('Req end time: {:%Y-%m-%d %H:%M:%S}'.format(datetime.datetime.now(PDT)))
     print('-' * 70)
     print('Req execution time:', (time.time() - start_time), 'sec')
     
-    yield output, "Allegro-Music-Transformer-Music-Composition.mid", (44100, audio), [
-        create_msg("visualizer_end", None)]
+    yield output_midi_title, output_midi_summary, output_midi, output_audio, output_plot
 
 # =================================================================================================
 
@@ -273,6 +289,6 @@ if __name__ == "__main__":
 
         
         run_event = run_btn.click(GenerateDrums, [input_midi, input_num_tokens],
-                                  [output_midi_title, output_midi_summary, output_audio, output_plot, output_midi])
+                                  [output_midi_title, output_midi_summary, output_midi, output_audio, output_plot])
         
         app.queue(concurrency_count=1).launch(server_port=opt.port, share=opt.share, inbrowser=True)