Update app.py

app.py

@@ -220,16 +220,35 @@ def Generate_Drums(input_midi,
         if score is not None and chords is not None:
             
             print('Sample score tokens', score[:10])
+            print('=' * 70)
         
             #==================================================================
 
-            def gen_drums(seq):
+            dur_vel_toks_num = len([t for t in score if 16767 < t < 18816])
 
-                y = 16641
+            print('Number of tokens to inapint:', dur_vel_toks_num)
 
-                while y > 16640:
-                
-                    x = torch.LongTensor(seq).to(device_type)
+            #==================================================================
+            
+            print('=' * 70)
+            print('Generating...')
+
+            inpaint_durations = True
+            inpaint_velocities = True
+
+            final_song = []
+        
+            for t in tqdm.tqdm(score):
+
+                if t < 16767 or t > 18815:
+                    final_song.append(t)
+
+                else:
+
+                    fdur = ((t-16768) // 8) * 16
+                    fvel = (((t-16768) % 8)+1) * 15 
+
+                    x = torch.LongTensor(final_song).to(device_type)
                     
                     with ctx:
                         out = model.generate(x,
@@ -243,26 +262,18 @@ def Generate_Drums(input_midi,
         
                     y = out.tolist()[0]
 
-                    if y > 16640:
-                        seq.append(y)
-
-                return seq
-   
-            #==================================================================
-            
-            print('=' * 70)
-            print('Generating...')
-
-            final_song = [18816]
-        
-            for i in range(len(chords)):
-
-                final_song.extend(chords[i])
-
-                if i == 0 or (final_song[-2] < 16640 and i % 8 == 0):
-                    final_song.append((128*128)+38+256) # Drum pitch
+                    gdur = ((y-16768) // 8) * 16
+                    gvel = (((y-16768) % 8)+1) * 15                    
+                    
+                    if inpaint_durations:
+                        fdur = gdur
 
-                final_song = gen_drums(final_song)
+                    if inpaint_velocities:
+                        fvel = gvel
+                        
+                    dur_vel_tok = ((8 * fdur) + fvel) + 16768
+                    
+                    final_song.append(dur_vel_tok)
 
             #==================================================================