Update app.py

app.py

@@ -72,6 +72,8 @@ print('=' * 70)
 
 def load_midi(midi_file)
 
+    print('Loading MIDI...')
+
     raw_score = TMIDIX.midi2single_track_ms_score(midi_file)
     
     escore_notes = TMIDIX.advanced_score_processor(raw_score, return_enhanced_score_notes=True)
@@ -149,17 +151,13 @@ def load_midi(midi_file)
                        
 @spaces.GPU
 def Convert_Score_to_Performance(input_midi,
-                                   input_gen_type,
-                                   input_number_prime_chords,
-                                   input_number_gen_chords,
-                                   input_use_original_durations,
-                                   input_match_original_pitches_counts,
-                                   input_number_prime_tokens,
-                                   input_number_gen_tokens,
-                                   input_num_memory_tokens,
-                                   input_model_temperature,
-                                   input_model_top_p
-                                  ):
+                                 input_conv_type,
+                                 input_number_prime_notes,
+                                 input_number_conv_notes,
+                                 input_model_dur_top_k,
+                                 input_model_dur_temperature,
+                                 input_model_vel_temperature
+                                ):
 
     #===============================================================================
     
@@ -175,115 +173,22 @@ def Convert_Score_to_Performance(input_midi,
     print('Requested settings:')
     print('=' * 70)
     print('Input MIDI file name:', fn)
-    print('Generation type:', input_gen_type)
-    print('Number of prime chords:', input_number_prime_chords)
-    print('Number of chords to generate:', input_number_gen_chords)
-    print('Use original durations:', input_use_original_durations)
-    print('Match original pitches counts:', input_match_original_pitches_counts)
-    print('Number of prime tokens:', input_number_prime_tokens)
-    print('Number of tokens to generate:', input_number_gen_tokens)
-    print('Number of memory tokens:', input_num_memory_tokens)
-    print('Model temperature:', input_model_temperature)
-    print('Model sampling top p value:', input_model_top_p)
+    print('Conversion type:', input_conv_type)
+    print('Number of prime notes:', input_number_prime_notes)
+    print('Number of notes to convert:', input_number_conv_notes)
+    print('Model durations sampling top value:', input_model_dur_top_k)
+    print('Model durations temperature:', input_model_dur_temperature)
+    print('Model velocities temperature:', input_model_vel_temperature)
+    
     print('=' * 70)
 
+    #==================================================================
 
-
-    #===============================================================================
-
-    print('Loading MIDI...')
-    
-    #===============================================================================
-    # Raw single-track ms score
-    
-    raw_score = TMIDIX.midi2single_track_ms_score(input_midi.name)
-    
-    #===============================================================================
-    # Enhanced score notes
-    
-    escore_notes = TMIDIX.advanced_score_processor(raw_score, return_enhanced_score_notes=True)[0]
-    
-    escore_notes = [e for e in escore_notes if e[6] < 72 or e[6] == 128]
-    
-    #=======================================================
-    # PRE-PROCESSING
-    
-    #===============================================================================
-    # Augmented enhanced score notes
-    
-    escore_notes = TMIDIX.augment_enhanced_score_notes(escore_notes, timings_divider=32, legacy_timings=True)
-    
-    #===============================================================================
-    
-    dscore = TMIDIX.enhanced_delta_score_notes(escore_notes)
-    
-    cscore = TMIDIX.chordify_score(dscore)
-    
-    #===============================================================================
-    
-    score_toks = []
-    control_toks = []
-    prime_toks = []
-    
-    for c in cscore:
-    
-        ctime = c[0][0]
-    
-        #=================================================================
-    
-        chord = sorted(c, key=lambda x: -x[5])
-    
-        gnotes = []
-        gdrums = []
-    
-        for k, v in groupby(chord, key=lambda x: x[5]):
-            if k == 128:
-                gdrums.extend(sorted(v, key=lambda x: x[3], reverse=True))
-            else:
-                gnotes.append(sorted(v, key=lambda x: x[3], reverse=True))
-    
-        #=================================================================
-    
-        chord_toks = []
-        ctoks = []
-        ptoks = []
-    
-        chord_toks.append(ctime)
-        ptoks.append(ctime)
-    
-        if gdrums:
-            chord_toks.extend([e[3]+128 for e in gdrums] + [128])
-            ptoks.extend([e[3]+128 for e in gdrums] + [128])
-        
-        else:
-            chord_toks.append(128)
-            ptoks.append(128)
-    
-        if gnotes:
-            for g in gnotes:
-                
-                durs = [e[1] // 4 for e in g]
-                clipped_dur = max(1, min(31, min(durs)))
-                
-                chan = max(0, min(8, g[0][5] // 8))
-    
-                chan_dur_tok = ((chan * 32) + clipped_dur) + 256
-    
-                ctoks.append([chan_dur_tok, len(g)])
-    
-                ptoks.append(chan_dur_tok)
-                ptoks.extend([e[3]+544 for e in g])
-                
-        score_toks.append(chord_toks)
-        control_toks.append(ctoks)
-        prime_toks.append(ptoks)
-        
-    print('Done!')
-    print('=' * 70)
+    melody_chords, src_melody_chords = load_midi(input_midi)
 
     #==================================================================
     
-    print('Sample output events', prime_toks[:16])
+    print('Sample output events', melody_chords[:16])
     print('=' * 70)
     print('Generating...')