Update app.py

app.py

@@ -24,28 +24,82 @@ in_space = os.getenv("SYSTEM") == "spaces"
 
 # =================================================================================================
 
+def generate_drums(notes_times,
+                   max_drums_limit = 8,
+                   num_memory_tokens = 4096,
+                   temperature=0.9):
+
+    x = torch.tensor([notes_times] * 1, dtype=torch.long, device='cpu')
+
+    o = 128
+
+    ncount = 0
+
+    while o > 127 and ncount < max_drums_limit:
+      with ctx:
+        out = model.generate(x[-num_memory_tokens:],
+                            1,
+                            temperature=temperature,
+                            return_prime=False,
+                            verbose=False)
+
+      o = out.tolist()[0][0]
+
+      if 256 <= o < 384:
+        ncount += 1
+
+      if o > 127:
+        x = torch.cat((x, out), 1)
+
+    return x.tolist()[0][len(notes_times):]
+
+# =================================================================================================
+
 @torch.no_grad()
-def GenerateMIDI(num_tok, idrums, iinstr):
+def GenerateMIDI(input_midi, input_num_tokens):
     print('=' * 70)
     print('Req start time: {:%Y-%m-%d %H:%M:%S}'.format(datetime.datetime.now(PDT)))
     start_time = time.time()
 
+    fn = os.path.basename(input_midi)
+    fn1 = fn.split('.')[0]
+
     print('-' * 70)
-    print('Req num tok:', num_tok)
-    print('Req instr:', iinstr)
-    print('Drums:', idrums)
+    print('Input file name:', fn)
+    print('Req num tok:', input_num_tokens)
     print('-' * 70)
 
-    if idrums:
-        drums = 3074
-    else:
-        drums = 3073
-
-    instruments_list = ["Piano", "Guitar", "Bass", "Violin", "Cello", "Harp", "Trumpet", "Sax", "Flute", 'Drums',
-                        "Choir", "Organ"]
-    first_note_instrument_number = instruments_list.index(iinstr)
+    #===============================================================================
+    # 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]
+    
+    #=======================================================
+    # PRE-PROCESSING
+    
+    #===============================================================================
+    # Augmented enhanced score notes
+    
+    escore_notes = [e for e in escore_notes if e[3] != 9]
+    
+    escore_notes = TMIDIX.augment_enhanced_score_notes(escore_notes)
+    
+    patches = TMIDIX.patch_list_from_enhanced_score_notes(escore_notes)
+    
+    dscore = TMIDIX.delta_score_notes(escore_notes, compress_timings=True, even_timings=True)
+    
+    cscore = TMIDIX.chordify_score([d[1:] for d in dscore])
+    
+    cscore_melody = [c[0] for c in cscore]
+    
+    comp_times = [0] + [t[1] for t in dscore if t[1] != 0]
 
-    start_tokens = [3087, drums, 3075 + first_note_instrument_number]
+    #===============================================================================
 
     print('Selected Improv sequence:')
     print(start_tokens)
@@ -219,7 +273,7 @@ if __name__ == "__main__":
         output_midi = gr.File(label="Output MIDI file", file_types=[".mid"])
 
         
-        run_event = run_btn.click(GenerateMIDI, [input_midi, input_num_tokens],
+        run_event = run_btn.click(GenerateDrums, [input_midi, input_num_tokens],
                                   [output_midi_title, output_midi_summary, output_audio, output_plot, output_midi])
         
         app.queue(concurrency_count=1).launch(server_port=opt.port, share=opt.share, inbrowser=True)