Update app.py

app.py

@@ -111,80 +111,28 @@ print('=' * 70)
 def load_midi(input_midi):
 
     raw_score = TMIDIX.midi2single_track_ms_score(input_midi.name)
-    
-    escore_notes = TMIDIX.advanced_score_processor(raw_score, return_enhanced_score_notes=True)
-    
-    escore_notes = TMIDIX.augment_enhanced_score_notes(escore_notes[0], timings_divider=16)
 
-    instruments_list = list(set([y[6] for y in escore_notes]))
-
-    #=======================================================
-    # FINAL PROCESSING
-    #=======================================================
+    escore_notes = TMIDIX.advanced_score_processor(raw_score, return_enhanced_score_notes=True)[0]
+    escore_notes = TMIDIX.augment_enhanced_score_notes(escore_notes, timings_divider=32)
     
-    melody_chords = []
-
-    # Break between compositions / Intro seq
+    sp_escore_notes = TMIDIX.solo_piano_escore_notes(escore_notes, keep_drums=False)
+    zscore = TMIDIX.recalculate_score_timings(sp_escore_notes)
     
-    if 128 in instruments_list:
-      drums_present = 19331 # Yes
-    else:
-      drums_present = 19330 # No
-    
-    pat = escore_notes[0][6]
+    cscore = TMIDIX.chordify_score([1000, zscore])
     
-    melody_chords.extend([19461, drums_present, 19332+pat]) # Intro seq
+    score = []
     
-    #=======================================================
-    # MAIN PROCESSING CYCLE
-    #=======================================================
+    pc = cscore[0]
     
-    pe = escore_notes[0]
+    for c in cscore:
+        score.append(max(0, min(127, c[0][1]-pc[0][1])))
     
-    for e in escore_notes:
+        for n in c:
+            score.extend([max(1, min(127, n[2]))+128, max(1, min(127, n[4]))+256, max(1, min(127, n[5]))+384])
     
-        #=======================================================
-        # Timings...
-        
-        # Cliping all values...
-        delta_time = max(0, min(255, e[1]-pe[1]))
-        
-        # Durations and channels
-        
-        dur = max(0, min(255, e[2]))
-        cha = max(0, min(15, e[3]))
-        
-        # Patches
-        if cha == 9: # Drums patch will be == 128
-          pat = 128
-        
-        else:
-          pat = e[6]
-        
-        # Pitches
-        
-        ptc = max(1, min(127, e[4]))
-        
-        # Velocities
-        
-        # Calculating octo-velocity
-        vel = max(8, min(127, e[5]))
-        velocity = round(vel / 15)-1
-        
-        #=======================================================
-        # FINAL NOTE SEQ
-        #=======================================================
-        
-        # Writing final note asynchronously
-        
-        dur_vel = (8 * dur) + velocity
-        pat_ptc = (129 * pat) + ptc
-        
-        melody_chords.extend([delta_time, dur_vel+256, pat_ptc+2304])
-        
-        pe = e
+        pc = c
 
-    return melody_chords
+    return score
 
 #==================================================================================
 
@@ -198,50 +146,25 @@ def save_midi(tokens, batch_number=None):
     vel = 90
     pitch = 0
     channel = 0
-    
-    patches = [-1] * 16
-    patches[9] = 9
-    
-    channels = [0] * 16
-    channels[9] = 1
-    
-    for ss in song:
-    
-      if 0 <= ss < 256:
-    
-          time += ss * 16
-    
-      if 256 <= ss < 2304:
-    
-          dur = ((ss-256) // 8) * 16
-          vel = (((ss-256) % 8)+1) * 15
-    
-      if 2304 <= ss < 18945:
-    
-          patch = (ss-2304) // 129
-    
-          if patch < 128:
-    
-              if patch not in patches:
-                if 0 in channels:
-                    cha = channels.index(0)
-                    channels[cha] = 1
-                else:
-                    cha = 15
-    
-                patches[cha] = patch
-                channel = patches.index(patch)
-              else:
-                channel = patches.index(patch)
-    
-          if patch == 128:
-              channel = 9
-    
-          pitch = (ss-2304) % 129
-    
-          song_f.append(['note', time, dur, channel, pitch, vel, patch ])
-    
-    patches = [0 if x==-1 else x for x in patches]
+    patch = 0
+
+    patches = [0] * 16
+
+    for m in song:
+
+        if 0 <= m < 128:
+            time += m * 32
+
+        elif 128 < m < 256:
+            dur = (m-128) * 32
+
+        elif 256 < m < 384:
+            pitch = (m-256)
+
+        elif 384 < m < 512:
+            vel = (m-384)
+
+            song_f.append(['note', time, dur, 0, pitch, vel, 0])
 
     if batch_number == None:
         fname = 'Monster-Piano-Transformer-Music-Composition'
@@ -273,20 +196,11 @@ def generate_music(prime,
                   ):
 
     if not prime:
-        inputs = [19461]
+        inputs = [0]
 
     else:
         inputs = prime[-num_mem_tokens:]
-
-    if gen_outro == 'Force':
-      inputs.extend([18945])
-    
-    if gen_drums:
-        drums = [36, 38]
-        drum_pitch = random.choice(drums)
-        inputs.extend([0, ((8*8)+6)+256, ((128*129)+drum_pitch)+2304])
         
-    # torch.cuda.empty_cache()
     model.cuda()
     model.eval()
 
@@ -300,27 +214,18 @@ def generate_music(prime,
       with torch.inference_mode():
         out = model.generate(inp,
                               num_gen_tokens,
-                              filter_logits_fn=top_p,
-                              filter_kwargs={'thres': model_sampling_top_p},
+                              #filter_logits_fn=top_p,
+                              #filter_kwargs={'thres': model_sampling_top_p},
                               temperature=model_temperature,
                               return_prime=False,
                               verbose=False)
     
     output = out.tolist()
 
-    output_batches = []
-
-    if gen_outro == 'Disable':
-        for o in output:
-            output_batches.append([t for t in o if not 18944 < t < 19330])
-
-    else:
-        output_batches = output
-
     print('Done!')
     print('=' * 70)
             
-    return output_batches
+    return output
     
 #==================================================================================