Update app.py

app.py

@@ -115,6 +115,8 @@ def load_midi(input_midi):
     if escore_notes:
     
         escore_notes = TMIDIX.augment_enhanced_score_notes(escore_notes[0], sort_drums_last=True)
+
+        escore_notes = TMIDIX.recalculate_score_timings([e for e in escore_notes if e[3] != 9])
         
         dscore = TMIDIX.delta_score_notes(escore_notes)
         
@@ -213,43 +215,53 @@ def Generate_Drums(input_midi,
 
         print('Loading MIDI...')
     
-        score = load_midi(input_midi.name)
+        score, chords = load_midi(input_midi.name)
     
-        if score is not None:
+        if score is not None and chords is not None:
             
             print('Sample score tokens', score[:10])
         
             #==================================================================
+
+            def gen_drums(seq):
+
+                y = 256
+                seq.append((128*128)+38+256) # Drum pitch
+
+                while y > 255:
+                
+                    x = torch.LongTensor(seq).to(device_type)
+                    
+                    with ctx:
+                        out = model.generate(x,
+                                             1,
+                                             temperature=model_temperature,
+                                             filter_logits_fn=top_p,
+                                             filter_kwargs={'thres': model_sampling_top_p},
+                                             return_prime=False,
+                                             eos_token=18818,
+                                             verbose=False)
         
-            full_chunk = score[:1536]
-            left_chunk = full_chunk[:512]
-            right_chunk = full_chunk[-512:]
-            
-            bridge_chunk = full_chunk[448:1088]
-            
-            seq = [18815] + left_chunk + [18816] + right_chunk + [18817]
-        
+                    y = out.tolist()[0]
+
+                    if y > 255:
+                        seq.append(y)
+
+                return seq
+   
             #==================================================================
             
             print('=' * 70)
             print('Generating...')
+
+            final_song = [18816]
         
-            x = torch.LongTensor(seq).to(device_type)
-            
-            with ctx:
-                out = model.generate(x,
-                                     641,
-                                     temperature=model_temperature,
-                                     filter_logits_fn=top_p,
-                                     filter_kwargs={'thres': model_sampling_top_p},
-                                     return_prime=False,
-                                     eos_token=18818,
-                                     verbose=False)
+            for i in range(len(chords)):
 
-            y = out.tolist()
+                final_song.extend(chords[i])
+
+                final_song = gen_drums(final_song)
 
-            final_song = left_chunk + y[64:-64] + right_chunk
-        
             #==================================================================
            
             print('=' * 70)