Update app.py

app.py

@@ -45,9 +45,7 @@ def GenerateAccompaniment(input_midi, input_num_tokens, input_conditioning_type,
     
     escore_notes = TMIDIX.advanced_score_processor(raw_score, return_enhanced_score_notes=True)[0]
     
-    no_drums_escore_notes = [e for e in escore_notes if e[6] < 80]
-    
-    if len(no_drums_escore_notes) > 0:
+    if len(escore_notes) > 0:
     
         #=======================================================
         # PRE-PROCESSING
@@ -55,258 +53,76 @@ def GenerateAccompaniment(input_midi, input_num_tokens, input_conditioning_type,
         #===============================================================================
         # Augmented enhanced score notes
         
-        no_drums_escore_notes = TMIDIX.augment_enhanced_score_notes(no_drums_escore_notes)
-        
-        cscore = TMIDIX.chordify_score([1000, no_drums_escore_notes])
-        
-        clean_cscore = []
-        
-        for c in cscore:
-            pitches = []
-            cho = []
-            for cc in c:
-                if cc[4] not in pitches:
-                    cho.append(cc)
-                    pitches.append(cc[4])
-        
-            clean_cscore.append(cho)
-        
-        #=======================================================
-        # FINAL PROCESSING
-        
-        melody_chords = []
-        chords = []
-        times = [0]
-        durs = []
-        
-        #=======================================================
-        # MAIN PROCESSING CYCLE
-        #=======================================================
-        
-        pe = clean_cscore[0][0]
-        
-        first_chord = True
-        
-        for c in clean_cscore:
-        
-            # Chords
-        
-            c.sort(key=lambda x: x[4], reverse=True)
-        
-            tones_chord = sorted(set([cc[4] % 12 for cc in c]))
-        
-            try:
-                chord_token = TMIDIX.ALL_CHORDS_SORTED.index(tones_chord)
-            except:
-                checked_tones_chord = TMIDIX.check_and_fix_tones_chord(tones_chord)
-                chord_token = TMIDIX.ALL_CHORDS_SORTED.index(checked_tones_chord)
-        
-            melody_chords.extend([chord_token+384])
-        
-            if input_strip_notes:
-              if len(tones_chord) > 1:
-                chords.extend([chord_token+384])
-        
-            else:
-              chords.extend([chord_token+384])
+        escore_notes = TMIDIX.augment_enhanced_score_notes(escore_notes)
         
-            if first_chord:
-                    melody_chords.extend([0])
-                    first_chord = False
-        
-            for e in c:
-        
-                #=======================================================
-                # Timings...
-        
-                time = e[1]-pe[1]
-        
-                dur = e[2]
-        
-                if time != 0 and time % 2 != 0:
-                    time += 1
-                if dur % 2 != 0:
-                    dur += 1
-        
-                delta_time = int(max(0, min(255, time)) / 2)
-        
-                # Durations
-        
-                dur = int(max(0, min(255, dur)) / 2)
-        
-                # Pitches
+        #===============================================================================
+        # Recalculate timings
         
-                ptc = max(1, min(127, e[4]))
+        escore_notes = TMIDIX.recalculate_score_timings(escore_notes)
+        #===============================================================================
+        # Add melody
         
-                #=======================================================
-                # FINAL NOTE SEQ
+        output = TMIDIX.add_melody_to_enhanced_score_notes(escore_notes, melody_channel=15, melody_start_chord=15)
         
-                # Writing final note asynchronously
+        print('=' * 70)
+        print('Done!')
+        print('=' * 70)
         
-                if delta_time != 0:
-                    melody_chords.extend([delta_time, dur+128, ptc+256])
-                    if input_strip_notes:
-                      if len(c) > 1:
-                        times.append(delta_time)
-                        durs.append(dur+128)
-                    else:
-                        times.append(delta_time)
-                        durs.append(dur+128)
-                else:
-                    melody_chords.extend([dur+128, ptc+256])
+        #===============================================================================
+        print('Rendering results...')
         
-                pe = e
+        print('=' * 70)
+        print('Sample INTs', output[:12])
+        print('=' * 70)
         
-    #==================================================================
-
-    print('=' * 70)
-    
-    print('Sample output events', melody_chords[:5])
-    print('=' * 70)
-    print('Generating...')
-
-    output = []
-    
-    max_chords_limit = 8
-    temperature=0.9
-    num_memory_tokens=4096
-
-    output = []
-    
-    idx = 0
-    
-    for c in chords[:input_num_tokens]:
-     
-        output.append(c)
+        output_score, patches, overflow_patches = TMIDIX.patch_enhanced_score_notes(output)
     
-        if input_conditioning_type == 'Chords-Times' or input_conditioning_type == 'Chords-Times-Durations':
-          output.append(times[idx])
-    
-        if input_conditioning_type == 'Chords-Times-Durations':
-          output.append(durs[idx])
-
-        x = torch.tensor([output] * 1, dtype=torch.long, device='cuda')
-        
-        o = 0
+        fn1 = "Chords-Progressions-Transformer-Composition"
         
-        ncount = 0
+        detailed_stats = TMIDIX.Tegridy_ms_SONG_to_MIDI_Converter(output_score,
+                                                                  output_signature = 'MIDI Melody',
+                                                                  output_file_name = fn1,
+                                                                  track_name='Project Los Angeles',
+                                                                  list_of_MIDI_patches=patches,
+                                                                  timings_multiplier=16
+                                                                  )
         
-        while o < 384 and ncount < max_chords_limit:
-          with ctx:
-            out = model.generate(x[-num_memory_tokens:],
-                                1,
-                                temperature=temperature,
-                                return_prime=False,
-                                verbose=False)
+        new_fn = fn1+'.mid'
+                
         
-          o = out.tolist()[0][0]
+        audio = midi_to_colab_audio(new_fn, 
+                            soundfont_path=soundfont,
+                            sample_rate=16000,
+                            volume_scale=10,
+                            output_for_gradio=True
+                            )
         
-          if 256 <= o < 384:
-            ncount += 1
-        
-          if o < 384:
-            x = torch.cat((x, out), 1)
-        
-        outy =  x.tolist()[0][len(output):]
-          
-        output.extend(outy)
+        print('Done!')
+        print('=' * 70)
     
-        idx += 1
-
-        if idx == len(chords[:input_num_tokens])-1:
-            break
-
-    print('=' * 70)
-    print('Done!')
-    print('=' * 70)
-    
-    #===============================================================================
-    print('Rendering results...')
+        #========================================================
     
-    print('=' * 70)
-    print('Sample INTs', output[:12])
-    print('=' * 70)
-    
-    out1 = output
-
-    if len(out1) != 0:
-    
-        song = out1
-        song_f = []
-    
-        time = 0
-        dur = 0
-        vel = 90
-        pitch = 0
-        channel = 0
-        
-        patches = [0] * 16
-        
-        channel = 0
-        
-        for ss in song:
-        
-          if 0 <= ss < 128:
+        output_midi_title = str(fn1)
+        output_midi_summary = str(song_f[:3])
+        output_midi = str(new_fn)
+        output_audio = (16000, audio)
         
-              time += ss * 32
-        
-          if 128 <= ss < 256:
-        
-              dur = (ss-128) * 32
-        
-          if 256 <= ss < 384:
-        
-              pitch = (ss-256)
-        
-              vel = max(40, pitch)
-        
-              song_f.append(['note', time, dur, channel, pitch, vel, 0])
-
-    fn1 = "Chords-Progressions-Transformer-Composition"
-    
-    detailed_stats = TMIDIX.Tegridy_ms_SONG_to_MIDI_Converter(song_f,
-                                                              output_signature = 'Chords Progressions Transformer',
-                                                              output_file_name = fn1,
-                                                              track_name='Project Los Angeles',
-                                                              list_of_MIDI_patches=patches
-                                                              )
-    
-    new_fn = fn1+'.mid'
-            
+        output_plot = TMIDIX.plot_ms_SONG(song_f, plot_title=output_midi, return_plt=True)
     
-    audio = midi_to_colab_audio(new_fn, 
-                        soundfont_path=soundfont,
-                        sample_rate=16000,
-                        volume_scale=10,
-                        output_for_gradio=True
-                        )
-    
-    print('Done!')
-    print('=' * 70)
-
-    #========================================================
-
-    output_midi_title = str(fn1)
-    output_midi_summary = str(song_f[:3])
-    output_midi = str(new_fn)
-    output_audio = (16000, audio)
-    
-    output_plot = TMIDIX.plot_ms_SONG(song_f, plot_title=output_midi, return_plt=True)
-
-    print('Output MIDI file name:', output_midi)
-    print('Output MIDI title:', output_midi_title)
-    print('Output MIDI summary:', '')
-    print('=' * 70) 
+        print('Output MIDI file name:', output_midi)
+        print('Output MIDI title:', output_midi_title)
+        print('Output MIDI summary:', '')
+        print('=' * 70) 
+        
     
-
-    #========================================================
+        #========================================================
+        
+        print('-' * 70)
+        print('Req end time: {:%Y-%m-%d %H:%M:%S}'.format(datetime.datetime.now(PDT)))
+        print('-' * 70)
+        print('Req execution time:', (reqtime.time() - start_time), 'sec')
     
-    print('-' * 70)
-    print('Req end time: {:%Y-%m-%d %H:%M:%S}'.format(datetime.datetime.now(PDT)))
-    print('-' * 70)
-    print('Req execution time:', (reqtime.time() - start_time), 'sec')
-
-    return output_midi_title, output_midi_summary, output_midi, output_audio, output_plot
+        return output_midi_title, output_midi_summary, output_midi, output_audio, output_plot
 
 # =================================================================================================